diff options
| -rw-r--r-- | WebContent/VAADIN/themes/base/accordion/accordion.scss | 10 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss | 12 | ||||
| -rw-r--r-- | build.properties | 1 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ApplicationConfiguration.java | 4 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ApplicationConnection.java | 10 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/ui/UIConnector.java | 7 | ||||
| -rw-r--r-- | common.xml | 96 | ||||
| -rw-r--r-- | server/build.xml | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/AbstractCommunicationManager.java | 52 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/ServletPortletHelper.java | 4 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/VaadinPortlet.java | 10 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/VaadinServlet.java | 10 | ||||
| -rw-r--r-- | shared/build.xml | 3 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 9 | ||||
| -rw-r--r-- | uitest/ivy.xml | 7 |
15 files changed, 161 insertions, 78 deletions
diff --git a/WebContent/VAADIN/themes/base/accordion/accordion.scss b/WebContent/VAADIN/themes/base/accordion/accordion.scss index 6f4825f16b..694f5ca930 100644 --- a/WebContent/VAADIN/themes/base/accordion/accordion.scss +++ b/WebContent/VAADIN/themes/base/accordion/accordion.scss @@ -27,4 +27,14 @@ width: 100%; } +/* + * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely + * support the HTML5 doctype. Changing the contained element to a block element will not add + * magical bottom paddings to the contained element and cause scrollbars. Doing this for + * all browsers for consistency. + */ +.v-accordion .v-accordion-item-content > .v-widget { + display: block; +} + }
\ No newline at end of file diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss index a001605f27..6fcb3d1705 100644 --- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss +++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.scss @@ -125,4 +125,16 @@ height: 0; } +/* + * In IE8 and IE9 we need to do magic things to avoid scrollbars since it does not completely + * support the HTML5 doctype. Changing the contained element to a block element will not add + * magical bottom paddings to the contained element and cause scrollbars. Doing this for + * all browsers for consistency. + */ +.#{$name} .v-scrollable > .v-widget { + display: block; +} + + + }
\ No newline at end of file diff --git a/build.properties b/build.properties index fb08ef6690..548169c457 100644 --- a/build.properties +++ b/build.properties @@ -2,6 +2,7 @@ javadoc.doctitle=<h1>Vaadin</h1> javadoc.bottom=<i>Copyright © 2000-2011 Vaadin Ltd. All Rights Reserved.</i> ivy.organisation=com.vaadin vaadin.vendor=Vaadin Ltd +vaadin.url=http://vaadin.com vaadin.java.version=1.6 vaadin.version=0.0.0.unversioned-development-build diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java index 9d668121a7..1432e1d5cc 100644 --- a/client/src/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/client/ApplicationConfiguration.java @@ -254,9 +254,7 @@ public class ApplicationConfiguration implements EntryPoint { } public String getThemeName() { - String themeName = getJsoConfiguration(id).getConfigString("theme"); - themeName = themeName.replaceAll("[^a-zA-Z0-9]", ""); - return themeName; + return getJsoConfiguration(id).getConfigString("theme"); } public String getThemeUri() { diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index 1e10762c28..943c826b4f 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -2579,14 +2579,14 @@ public class ApplicationConnection { uidlUri = themeUri + uidlUri.substring(7); } - if (uidlUri.startsWith(ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX)) { + if (uidlUri.startsWith(ApplicationConstants.DEPENDENCY_PROTOCOL_PREFIX)) { // getAppUri *should* always end with / - // substring *should* always start with / (connector:///foo.bar - // without connector://) + // substring *should* always start with / (dependency:///foo.bar + // without dependency://) uidlUri = ApplicationConstants.APP_PROTOCOL_PREFIX - + ApplicationConstants.CONNECTOR_RESOURCE_PREFIX + + ApplicationConstants.DEPENDENCY_RESOURCE_PREFIX + uidlUri - .substring(ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX + .substring(ApplicationConstants.DEPENDENCY_PROTOCOL_PREFIX .length()); // Let translation of app:// urls take care of the rest } diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java index 2a72876924..a6c3b4cf2b 100644 --- a/client/src/com/vaadin/client/ui/ui/UIConnector.java +++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java @@ -300,8 +300,11 @@ public class UIConnector extends AbstractComponentContainerConnector implements // the user root.getElement().setInnerHTML(""); - root.addStyleName("v-theme-" - + applicationConnection.getConfiguration().getThemeName()); + String themeName = applicationConnection.getConfiguration() + .getThemeName(); + // Remove chars that are not suitable for style names + themeName = themeName.replaceAll("[^a-zA-Z0-9]", ""); + root.addStyleName("v-theme-" + themeName); root.add(getWidget()); diff --git a/common.xml b/common.xml index ffaf27b735..4b86bfaa33 100644 --- a/common.xml +++ b/common.xml @@ -161,53 +161,94 @@ <property name="src" location="{$result.dir}/../src" /> <union id="jar.files"> - <fileset dir="${classes}" excludes="${classes.exclude}" /> - <fileset dir="${src}" excludes="${jar.exclude}" /> + <fileset dir="${classes}" excludes="${classes.exclude}" erroronmissingdir="false" /> + <fileset dir="${src}" excludes="${jar.exclude}" erroronmissingdir="false" /> <fileset refid="common.files.for.all.jars" /> <union refid="extra.jar.includes" /> </union> + <jar destfile="${result.jar}" duplicate="fail" index="true"> <manifest> - <attribute name="Implementation-Vendor" value="Vaadin Ltd" /> - <attribute name="Implementation-URL" value="http://vaadin.com" /> + <attribute name="Implementation-Vendor" value="${vaadin.vendor}" /> + <attribute name="Implementation-URL" value="${vaadin.url}" /> <attribute name="Implementation-Version" value="${vaadin.version}" /> - <attribute name="Bundle-Version" value="${vaadin.version}" /> - <attribute name="Bundle-ManifestVersion" value="2" /> - <attribute name="Bundle-Name" value="${module.name}" /> - <attribute name="Bundle-SymbolicName" value="${module.symbolic}" /> - <attribute name="Bundle-Vendor" value="${vaadin.vendor}" /> - <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6" /> </manifest> <union refid="jar.files" /> </jar> - <antcall target="common.generate-osgi-exports"> + <antcall target="common.make-osgi-bundle"> <param name="jar" value="${result.jar}" /> + <param name="bundle-version" value="${vaadin.version}" /> + <param name="bundle-name" value="${module.name}" /> + <param name="bundle-symbolic" value="${module.symbolic}" /> + <param name="bundle-vendor" value="${vaadin.vendor}" /> </antcall> </target> - <target name="generate-osgi-exports"> + <!-- Add OSGi attributes to the manifest of the given jar --> + <target name="make-osgi-bundle"> <fail unless="jar" message="No jar parameter given" /> + <fail unless="bundle-name" message="No bundle-name parameter given" /> + <fail unless="bundle-symbolic" message="No bundle-symbolic parameter given" /> + <fail unless="bundle-version" message="No bundle-version parameter given" /> + <fail unless="bundle-vendor" message="No bundle-vendor parameter given" /> + + <property name="bundle-manifestversion" value="2" /> - <!-- Generate the Export-Package attribute in the manifest of the - JAR --> + <jar file="${jar}" update="true"> + <manifest> + <attribute name="Bundle-Version" value="${bundle-version}" /> + <attribute name="Bundle-ManifestVersion" value="${bundle-manifestversion}" /> + <attribute name="Bundle-Name" value="${bundle-name}" /> + <attribute name="Bundle-SymbolicName" value="${bundle-symbolic}" /> + <attribute name="Bundle-Vendor" value="${bundle-vendor}" /> + <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-${vaadin.java.version}" /> + </manifest> + </jar> + + <antcontrib:if> + <isset property="import-package" /> + <then> + <jar file="${result.jar}" update="true"> + <manifest> + <attribute name="Import-Package" value="${import-package}" /> + </manifest> + </jar> + </then> + </antcontrib:if> + <antcontrib:if> + <isset property="require-bundle" /> + <then> + <jar file="${result.jar}" update="true"> + <manifest> + <attribute name="Require-Bundle" value="${require-bundle}" /> + </manifest> + </jar> + </then> + </antcontrib:if> + <antcontrib:if> + <isset property="export-package" /> + <then> + <jar file="${result.jar}" update="true"> + <manifest> + <attribute name="Export-Package" value="${export-package}" /> + </manifest> + </jar> + </then> + </antcontrib:if> + + <!-- Generate the Export-Package attribute in the manifest --> <java classname="com.vaadin.buildhelpers.GeneratePackageExports" failonerror="true" fork="yes"> <arg value="${jar}" /> <arg value="com/vaadin" /> <arg value="com/google" /> - <classpath refid="vaadin.buildhelpers.classpath" /> </java> </target> - <target name="compile" description="Compiles the module" depends="dependencies"> + <target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists"> <fail unless="module.name" message="No module name given" /> - <property name="result.dir" location="result" /> - <property name="src" location="${result.dir}/../src" /> - <property name="classes" location="${result.dir}/classes" /> - - <mkdir dir="${classes}" /> <javac srcdir="${src}" destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath refid="classpath.compile.dependencies" /> @@ -215,6 +256,14 @@ </javac> </target> + <target name="directories"> + <property name="result.dir" location="result" /> + <property name="src" location="${result.dir}/../src" /> + <property name="classes" location="${result.dir}/classes" /> + <available file="${src}" type="dir" property="src-exists" /> + <mkdir dir="${classes}" /> + </target> + <target name="tests.run" depends="tests.compile"> <fail unless="module.name" message="No module name given" /> @@ -268,8 +317,9 @@ </target> <target name="dependencies" description="Resolves dependencies needed by this module" depends="filter.webcontent"> - <ivy:resolve resolveid="common" conf="build, build-provided" /> - <ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" /> + <property name='conf' value="build, build-provided" /> + <ivy:resolve resolveid="common" conf="${conf}" /> + <ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" /> </target> <target name="dependencies.tests" description="Resolves dependencies needed by tests"> diff --git a/server/build.xml b/server/build.xml index c08df072cd..50311a18d9 100644 --- a/server/build.xml +++ b/server/build.xml @@ -22,8 +22,10 @@ </union> <target name="jar"> + <property name="server.osgi.import" value="org.jsoup;version="1.6.3""/> <antcall target="common.jar"> - <param name="conf" value="build" /> + <param name="require-bundle" value="com.vaadin.vaadin-shared;version="${vaadin.version}""/> + <param name="import-package" value="javax.servlet;version="2.4.0",${server.osgi.import}" /> <reference torefid="extra.jar.includes" refid="jar.includes" /> </antcall> </target> diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java index 5852ff2a93..cb41f9338b 100644 --- a/server/src/com/vaadin/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java @@ -164,7 +164,7 @@ public abstract class AbstractCommunicationManager implements Serializable { private Connector highlightedConnector; - private Map<String, Class<?>> connectorResourceContexts = new HashMap<String, Class<?>>(); + private Map<String, Class<?>> dependencyResourceContexts = new HashMap<String, Class<?>>(); private Map<String, Map<String, StreamVariable>> pidToNameToStreamVariable; @@ -1205,7 +1205,7 @@ public abstract class AbstractCommunicationManager implements Serializable { .getAnnotation(JavaScript.class); if (jsAnnotation != null) { for (String resource : jsAnnotation.value()) { - scriptDependencies.add(registerResource(resource, + scriptDependencies.add(registerDependency(resource, class1)); } } @@ -1214,8 +1214,8 @@ public abstract class AbstractCommunicationManager implements Serializable { .getAnnotation(StyleSheet.class); if (styleAnnotation != null) { for (String resource : styleAnnotation.value()) { - styleDependencies - .add(registerResource(resource, class1)); + styleDependencies.add(registerDependency(resource, + class1)); } } } @@ -1285,27 +1285,27 @@ public abstract class AbstractCommunicationManager implements Serializable { } /** - * Resolves a resource URI, registering the URI with this + * Resolves a dependency URI, registering the URI with this * {@code AbstractCommunicationManager} if needed and returns a fully * qualified URI. */ - private String registerResource(String resourceUri, Class<?> context) { + private String registerDependency(String resourceUri, Class<?> context) { try { URI uri = new URI(resourceUri); String protocol = uri.getScheme(); - if ("connector".equals(protocol)) { + if (ApplicationConstants.DEPENDENCY_PROTOCOL_NAME.equals(protocol)) { // Strip initial slash String resourceName = uri.getPath().substring(1); - return registerConnectorResource(resourceName, context); + return registerDependencyResource(resourceName, context); } if (protocol != null || uri.getHost() != null) { return resourceUri; } - // Bare path interpreted as connector resource - return registerConnectorResource(resourceUri, context); + // Bare path interpreted as dependency resource + return registerDependencyResource(resourceUri, context); } catch (URISyntaxException e) { getLogger().log(Level.WARNING, "Could not parse resource url " + resourceUri, e); @@ -1313,23 +1313,23 @@ public abstract class AbstractCommunicationManager implements Serializable { } } - private String registerConnectorResource(String name, Class<?> context) { - synchronized (connectorResourceContexts) { - // Add to map of names accepted by serveConnectorResource - if (connectorResourceContexts.containsKey(name)) { - Class<?> oldContext = connectorResourceContexts.get(name); + private String registerDependencyResource(String name, Class<?> context) { + synchronized (dependencyResourceContexts) { + // Add to map of names accepted by serveDependencyResource + if (dependencyResourceContexts.containsKey(name)) { + Class<?> oldContext = dependencyResourceContexts.get(name); if (oldContext != context) { getLogger().warning( - "Resource " + name + " defined by both " + context - + " and " + oldContext + ". Resource from " + "Dependency " + name + " defined by both " + context + + " and " + oldContext + ". Dependency from " + oldContext + " will be used."); } } else { - connectorResourceContexts.put(name, context); + dependencyResourceContexts.put(name, context); } } - return ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX + "/" + name; + return ApplicationConstants.DEPENDENCY_PROTOCOL_PREFIX + "/" + name; } /** @@ -2588,7 +2588,7 @@ public abstract class AbstractCommunicationManager implements Serializable { /** * Serve a connector resource from the classpath if the resource has * previously been registered by calling - * {@link #registerResource(String, Class)}. Sending arbitrary files from + * {@link #registerDependency(String, Class)}. Sending arbitrary files from * the classpath is prevented by only accepting resource names that have * explicitly been registered. Resources can currently only be registered by * including a {@link JavaScript} or {@link StyleSheet} annotation on a @@ -2599,13 +2599,13 @@ public abstract class AbstractCommunicationManager implements Serializable { * * @throws IOException */ - public void serveConnectorResource(VaadinRequest request, + public void serveDependencyResource(VaadinRequest request, VaadinResponse response) throws IOException { String pathInfo = request.getRequestPathInfo(); // + 2 to also remove beginning and ending slashes String resourceName = pathInfo - .substring(ApplicationConstants.CONNECTOR_RESOURCE_PREFIX + .substring(ApplicationConstants.DEPENDENCY_RESOURCE_PREFIX .length() + 2); final String mimetype = response.getService().getMimeType(resourceName); @@ -2614,7 +2614,7 @@ public abstract class AbstractCommunicationManager implements Serializable { // classpath instead of relative to the context class if (resourceName.startsWith("/")) { getLogger().warning( - "Connector resource request starting with / rejected: " + "Dependency resource request starting with / rejected: " + resourceName); response.sendError(HttpServletResponse.SC_NOT_FOUND, resourceName); return; @@ -2622,15 +2622,15 @@ public abstract class AbstractCommunicationManager implements Serializable { // Check that the resource name has been registered Class<?> context; - synchronized (connectorResourceContexts) { - context = connectorResourceContexts.get(resourceName); + synchronized (dependencyResourceContexts) { + context = dependencyResourceContexts.get(resourceName); } // Security check: don't serve resource if the name hasn't been // registered in the map if (context == null) { getLogger().warning( - "Connector resource request for unknown resource rejected: " + "Dependency resource request for unknown resource rejected: " + resourceName); response.sendError(HttpServletResponse.SC_NOT_FOUND, resourceName); return; diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java index ab03e0cc06..59c0b382c9 100644 --- a/server/src/com/vaadin/server/ServletPortletHelper.java +++ b/server/src/com/vaadin/server/ServletPortletHelper.java @@ -101,9 +101,9 @@ class ServletPortletHelper implements Serializable { return hasPathPrefix(request, UPLOAD_URL_PREFIX); } - public static boolean isConnectorResourceRequest(VaadinRequest request) { + public static boolean isDependencyResourceRequest(VaadinRequest request) { return hasPathPrefix(request, - ApplicationConstants.CONNECTOR_RESOURCE_PREFIX + "/"); + ApplicationConstants.DEPENDENCY_RESOURCE_PREFIX + "/"); } public static boolean isUIDLRequest(VaadinRequest request) { diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java index db1425ba12..b18eff2f09 100644 --- a/server/src/com/vaadin/server/VaadinPortlet.java +++ b/server/src/com/vaadin/server/VaadinPortlet.java @@ -284,7 +284,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants { */ @Deprecated protected enum RequestType { - FILE_UPLOAD, UIDL, RENDER, STATIC_FILE, APP, DUMMY, EVENT, ACTION, UNKNOWN, BROWSER_DETAILS, CONNECTOR_RESOURCE, HEARTBEAT; + FILE_UPLOAD, UIDL, RENDER, STATIC_FILE, APP, DUMMY, EVENT, ACTION, UNKNOWN, BROWSER_DETAILS, DEPENDENCY_RESOURCE, HEARTBEAT; } /** @@ -307,8 +307,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants { } else if (ServletPortletHelper.isFileUploadRequest(vaadinRequest)) { return RequestType.FILE_UPLOAD; } else if (ServletPortletHelper - .isConnectorResourceRequest(vaadinRequest)) { - return RequestType.CONNECTOR_RESOURCE; + .isDependencyResourceRequest(vaadinRequest)) { + return RequestType.DEPENDENCY_RESOURCE; } else if (ServletPortletHelper.isAppRequest(vaadinRequest)) { return RequestType.APP; } else if (ServletPortletHelper.isHeartbeatRequest(vaadinRequest)) { @@ -400,8 +400,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants { PortletCommunicationManager communicationManager = (PortletCommunicationManager) vaadinSession .getCommunicationManager(); - if (requestType == RequestType.CONNECTOR_RESOURCE) { - communicationManager.serveConnectorResource( + if (requestType == RequestType.DEPENDENCY_RESOURCE) { + communicationManager.serveDependencyResource( vaadinRequest, vaadinResponse); return; } else if (requestType == RequestType.HEARTBEAT) { diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java index c4483b5f79..7673c2d2f7 100644 --- a/server/src/com/vaadin/server/VaadinServlet.java +++ b/server/src/com/vaadin/server/VaadinServlet.java @@ -262,8 +262,8 @@ public class VaadinServlet extends HttpServlet implements Constants { CommunicationManager communicationManager = (CommunicationManager) vaadinSession .getCommunicationManager(); - if (requestType == RequestType.CONNECTOR_RESOURCE) { - communicationManager.serveConnectorResource(request, response); + if (requestType == RequestType.DEPENDENCY_RESOURCE) { + communicationManager.serveDependencyResource(request, response); return; } else if (requestType == RequestType.HEARTBEAT) { communicationManager.handleHeartbeatRequest(request, response, @@ -1033,7 +1033,7 @@ public class VaadinServlet extends HttpServlet implements Constants { */ @Deprecated protected enum RequestType { - FILE_UPLOAD, BROWSER_DETAILS, UIDL, OTHER, STATIC_FILE, APP, CONNECTOR_RESOURCE, HEARTBEAT; + FILE_UPLOAD, BROWSER_DETAILS, UIDL, OTHER, STATIC_FILE, APP, DEPENDENCY_RESOURCE, HEARTBEAT; } /** @@ -1046,8 +1046,8 @@ public class VaadinServlet extends HttpServlet implements Constants { protected RequestType getRequestType(VaadinServletRequest request) { if (ServletPortletHelper.isFileUploadRequest(request)) { return RequestType.FILE_UPLOAD; - } else if (ServletPortletHelper.isConnectorResourceRequest(request)) { - return RequestType.CONNECTOR_RESOURCE; + } else if (ServletPortletHelper.isDependencyResourceRequest(request)) { + return RequestType.DEPENDENCY_RESOURCE; } else if (isBrowserDetailsRequest(request)) { return RequestType.BROWSER_DETAILS; } else if (ServletPortletHelper.isUIDLRequest(request)) { diff --git a/shared/build.xml b/shared/build.xml index d458b57d71..71276a6b19 100644 --- a/shared/build.xml +++ b/shared/build.xml @@ -16,7 +16,10 @@ <target name="jar"> + <property name="shared.osgi.import" value="org.json;version="20080701"" /> <antcall target="common.jar"> + <param name="require-bundle" value="com.vaadin.shared.deps;version="1.0.0""/> + <param name="import-package" value="${shared.osgi.import}" /> <reference refid="shared.gwt.includes" torefid="extra.jar.includes" /> </antcall> </target> diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index 079aa492cc..61b57687bd 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -16,6 +16,7 @@ package com.vaadin.shared; public class ApplicationConstants { + // This indicates the whole page is generated by us (not embedded) public static final String GENERATED_BODY_CLASSNAME = "v-generated-body"; @@ -25,11 +26,13 @@ public class ApplicationConstants { public static final String HEARTBEAT_REQUEST_PATH = "HEARTBEAT/"; - public static final String CONNECTOR_RESOURCE_PREFIX = APP_REQUEST_PATH - + "CONNECTOR"; + public static final String DEPENDENCY_RESOURCE_PREFIX = APP_REQUEST_PATH + + "DEPENDENCY"; public static final String APP_PROTOCOL_PREFIX = "app://"; - public static final String CONNECTOR_PROTOCOL_PREFIX = "connector://"; + public static final String DEPENDENCY_PROTOCOL_NAME = "dependency"; + public static final String DEPENDENCY_PROTOCOL_PREFIX = DEPENDENCY_PROTOCOL_NAME + + "://"; public static final String UIDL_SECURITY_TOKEN_ID = "Vaadin-Security-Key"; public static final String PARAM_UNLOADBURST = "onunloadburst"; diff --git a/uitest/ivy.xml b/uitest/ivy.xml index ce80832689..04488459f3 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -48,13 +48,14 @@ <!-- Newest Jetty does not work with Ivy currently (orbit -> jar mapping problem) --> <dependency org="org.eclipse.jetty" name="jetty-server" - rev="7.4.5.v20110725" conf="build-provided, ide, jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide, jetty-run->default" /> + <!-- jetty-servlets needed in .war by ProxyTest, but not by jetty-runner --> <dependency org="org.eclipse.jetty" name="jetty-servlets" - rev="7.4.5.v20110725" conf="build-provided, ide, jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide->default" /> <!-- <dependency org="org.mortbay.jetty" name="jetty-util" --> <!-- rev="8.1.5.v20120716" conf="build,ide,jetty-run->default" /> --> <dependency org="org.eclipse.jetty" name="jetty-webapp" - rev="7.4.5.v20110725" conf="build-provided, ide,jetty-run->default" /> + rev="7.4.5.v20110725" conf="build, ide,jetty-run->default" /> <dependency org="org.mortbay.jetty" name="jetty-runner" rev="7.4.5.v20110725" conf="jetty-run->default" /> <dependency org="junit" name="junit" rev="4.5" |