diff options
-rwxr-xr-x | build/ide.xml | 13 | ||||
-rw-r--r-- | build/ivy.xml | 74 | ||||
-rw-r--r-- | uitest/ivy.xml | 43 |
3 files changed, 78 insertions, 52 deletions
diff --git a/build/ide.xml b/build/ide.xml index a91a29db05..83b0028c41 100755 --- a/build/ide.xml +++ b/build/ide.xml @@ -12,8 +12,6 @@ <ivy:cachepath pathid="early.deps" conf="early" /> <ivy:resolve log="download-only" file="build/ivy.xml" conf="ide" /> <ivy:cachepath pathid="ide.deps" conf="ide" /> - <ivy:resolve log="download-only" file="uitest/ivy.xml" conf="ide" /> - <ivy:cachepath pathid="uitest.deps" conf="ide" /> <path id="classpath"> <path refid="early.deps" /> @@ -26,7 +24,6 @@ <path location="uitest/src" /> <path location="client/src/main/java" /> <path location="client/src/main/resources" /> - <path refid="uitest.deps" /> <path refid="ide.deps" /> </path> <property name="resolve.done" value="true" /> @@ -117,7 +114,8 @@ <arg value="--theme" /> <arg value="${theme}" /> <arg value="--theme-folder" /> - <arg value="WebContent/VAADIN/themes" /> + <!-- TODO relative paths in these are broken --> + <arg value="uitest/target/classes/VAADIN/themes" /> <arg value="--version" /> <arg value="${vaadin.version}" /> </java> @@ -128,18 +126,20 @@ <target name="default-widgetset"> <antcall target="compile-widgetset" inheritRefs="true"> <param name="widgetset" value="com.vaadin.DefaultWidgetSet" /> + <param name="widgetset.output.dir" location="client-compiled/target/classes/VAADIN/widgetsets" /> </antcall> </target> <target name="testing-widgetset"> <antcall target="compile-widgetset" inheritRefs="true"> <param name="widgetset" value="com.vaadin.tests.widgetset.TestingWidgetSet" /> + <param name="widgetset.output.dir" location="uitest/target/classes/VAADIN/widgetsets" /> </antcall> </target> <target name="compile-widgetset" depends="resolve"> <property name="module" value="${widgetset}" /> - <property name="module.output.dir" location="WebContent/VAADIN/widgetsets" /> + <property name="module.output.dir" location="${widgetset.output.dir}" /> <property name="logLevel" value="TRACE" /> <property name="style" value="PRETTY" /> <property name="localWorkers" value="2" /> @@ -158,6 +158,8 @@ <!--<ivy:resolve log="download-only" inline="true" organisation="javax.validation" module="validation-api" revision="1.0.0.GA"/> --> + <!-- TODO this does not work --> + <!-- compile the module --> <java classname="com.google.gwt.dev.Compiler" classpathref="classpath" failonerror="yes" fork="yes" maxmemory="512m"> <arg value="-workDir" /> @@ -185,6 +187,7 @@ <jvmarg value="-Dgwt.persistentunitcache=${gwt.persistentunitcache}" /> </java> </target> + <!-- TODO this should probably be removed - compiles the file to the wrong location --> <target name="vaadinPush.js" depends="resolve"> <property name="project.root" location="."/> <ivy:resolve log="download-only" file="${project.root}/ivy-taskdefs.xml" conf="taskdefs" /> diff --git a/build/ivy.xml b/build/ivy.xml index 385e2a9da3..79fccc0e54 100644 --- a/build/ivy.xml +++ b/build/ivy.xml @@ -4,6 +4,8 @@ <!ENTITY atmosphere.runtime.version "2.2.7.vaadin1"> <!ENTITY atmosphere.js.version "2.2.13.vaadin3"> + + <!ENTITY jetty.version "8.1.12.v20130726"> ]> <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -16,11 +18,57 @@ <configurations> <conf name="build" /> <conf name="ide" visibility="private" /> - <conf name="test" visibility="private" /> <!-- Dependencies that must be early on the classpath for ide.xml --> <conf name="early" visibility="private" /> </configurations> <dependencies> + <!-- Dependencies from uitest --> + +<!-- + <dependency org="javax.validation" name="validation-api" + rev="1.0.0.GA" conf="ide -> default,sources" /> + <dependency org="javax.servlet" name="javax.servlet-api" + rev="3.0.1" conf="ide -> default" /> + <dependency org="org.eclipse.jetty" name="jetty-server" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-servlets" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-websocket" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-webapp" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.eclipse.jetty" name="jetty-util" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="org.mortbay.jetty" name="jetty-runner" + rev="&jetty.version;" conf="ide->default"> + <exclude org="org.eclipse.jetty.orbit"></exclude> + </dependency> + <dependency org="com.jcraft" name="jsch" rev="0.1.52" + conf="ide->default" /> + <dependency org="commons-codec" name="commons-codec" + rev="1.5" conf="ide->default" /> + <dependency org="commons-io" name="commons-io" + rev="${commons-io.version}" conf="ide->default" /> + <dependency org="com.vaadin" name="vaadin-testbench" + rev="4.0.3" conf="ide -> default" /> + <dependency org="commons-lang" name="commons-lang" + rev="2.6" conf="ide -> default" /> + + <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" + rev="3.5.1.201410131835-r" conf="ide->default"> + <exclude org="org.apache.httpcomponents"></exclude> + </dependency> +--> <!-- Vaadin dependencies --> @@ -37,30 +85,6 @@ <dependency org="com.liferay.portal" name="portal-service" rev="6.0.2" conf="ide -> default" /> - <!-- Testing dependencies for Eclipse --> - - <dependency org="junit" name="junit" rev="4.11" - conf="test -> default" /> - - <dependency org="org.easymock" name="easymock" rev="3.0" - conf="test-> default" transitive="true" /> - - <dependency org="org.mockito" name="mockito-all" rev="1.9.5" - conf="test ->default" /> - <dependency org="org.hamcrest" name="hamcrest-all" rev="1.3" - conf="test ->default" /> - <dependency org="commons-lang" name="commons-lang" - rev="2.6" conf="test ->default" /> - <!-- Bean Validation implementation --> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" - conf="test -> default" /> - <dependency org="org.hibernate" name="hibernate-validator" - rev="4.2.0.Final" conf="test -> default" /> - - <!-- For manual testing with PostgreSQL (see SQLTestConstants) --> - <!-- <dependency org="postgresql" name="postgresql" rev="9.1-901.jdbc3" - conf="test->default" /> --> - <!-- Needed by SmartSprites --> <dependency org="com.google.guava" name="guava" rev="14.0.1" conf="early->default" /> diff --git a/uitest/ivy.xml b/uitest/ivy.xml index d9533dd833..be1f7acc34 100644 --- a/uitest/ivy.xml +++ b/uitest/ivy.xml @@ -13,21 +13,20 @@ <configurations> <conf name="build" /> <conf name="build-provided" visibility="private" /> - <conf name="ide" visibility="private" /> <conf name="jetty-run" visibility="private" /> </configurations> - <dependencies defaultconf="build" defaultconfmapping="build,ide->default"> + <dependencies defaultconf="build" defaultconfmapping="build->default"> <!-- API DEPENDENCIES --> <dependency org="javax.portlet" name="portlet-api" - rev="2.0" conf="build-provided,ide -> default" /> + rev="2.0" conf="build-provided -> default" /> <dependency org="javax.validation" name="validation-api" - rev="1.0.0.GA" conf="build,ide -> default,sources" /> + rev="1.0.0.GA" conf="build -> default,sources" /> <dependency org="org.hibernate" name="hibernate-validator" - rev="4.2.0.Final" conf="build,ide -> default" /> + rev="4.2.0.Final" conf="build -> default" /> <!-- Google App Engine --> <dependency org="com.google.appengine" name="appengine-api-1.0-sdk" - rev="1.7.7" conf="build-provided,ide -> default" /> + rev="1.7.7" conf="build-provided -> default" /> <!-- LIBRARY DEPENDENCIES (compile time) --> <!-- Project modules --> @@ -63,55 +62,55 @@ <!-- Servlet 3.0 API --> <dependency org="javax.servlet" name="javax.servlet-api" - rev="3.0.1" conf="build-provided,ide -> default" /> + rev="3.0.1" conf="build-provided -> default" /> <dependency org="org.eclipse.jetty" name="jetty-server" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + rev="&jetty.version;" conf="build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <!-- jetty-servlets needed by ProxyTest, but not by jetty-runner --> <dependency org="org.eclipse.jetty" name="jetty-servlets" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + rev="&jetty.version;" conf="build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="org.eclipse.jetty" name="jetty-websocket" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + rev="&jetty.version;" conf="build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="org.eclipse.jetty" name="jetty-webapp" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + rev="&jetty.version;" conf="build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="org.eclipse.jetty" name="jetty-util" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + rev="&jetty.version;" conf="build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="org.mortbay.jetty" name="jetty-runner" - rev="&jetty.version;" conf="ide, build-provided, jetty-run->default"> + rev="&jetty.version;" conf="build-provided, jetty-run->default"> <exclude org="org.eclipse.jetty.orbit"></exclude> </dependency> <dependency org="junit" name="junit" rev="4.11" - conf="build,ide -> default" /> + conf="build -> default" /> <dependency org="org.hamcrest" name="hamcrest-all" - rev="1.3" conf="build,ide->default" /> + rev="1.3" conf="build->default" /> <dependency org="com.jcraft" name="jsch" rev="0.1.52" - conf="ide, build->default" /> + conf="build->default" /> <dependency org="commons-codec" name="commons-codec" - rev="1.5" conf="build,ide->default" /> + rev="1.5" conf="build->default" /> <dependency org="commons-io" name="commons-io" - rev="${commons-io.version}" conf="build,ide->default" /> + rev="${commons-io.version}" conf="build->default" /> <!-- Mainly for SQLContainer tests --> <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" - conf="build,ide -> default" /> + conf="build -> default" /> <dependency org="com.vaadin" name="vaadin-testbench" - rev="4.0.3" conf="build-provided,ide -> default" /> + rev="4.0.3" conf="build-provided -> default" /> <!-- This should be removed once tests have been updated to use lang3 --> <dependency org="commons-lang" name="commons-lang" - rev="2.6" conf="build,ide -> default" /> + rev="2.6" conf="build -> default" /> <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" - rev="3.5.1.201410131835-r" conf="ide,build->default"> + rev="3.5.1.201410131835-r" conf="build->default"> <exclude org="org.apache.httpcomponents"></exclude> </dependency> |