diff options
| -rw-r--r-- | build/build.xml | 24 | ||||
| -rw-r--r-- | build/ivy/ivy.xml | 16 |
2 files changed, 20 insertions, 20 deletions
diff --git a/build/build.xml b/build/build.xml index 5e9d203ab9..9abb8f746e 100644 --- a/build/build.xml +++ b/build/build.xml @@ -25,10 +25,10 @@ <target name="init-deps" depends="common.init-deps" > <property name="ivy.resolved" value="1" /> - <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="ss.compile, cs.compile, ss.test.runtime"/> - <ivy:cachepath pathid="compile.classpath" conf="ss.compile"/> - <ivy:cachepath pathid="client-side.compile.classpath" conf="cs.compile"/> - <ivy:cachepath pathid="test.runtime.classpath" conf="ss.test.runtime"/> + <ivy:resolve file="build/ivy/ivy.xml" resolveid="common" conf="ss.compile, cs.compile, ss.test.compile"/> + <ivy:cachepath pathid="compile.classpath.server-side" conf="ss.compile"/> + <ivy:cachepath pathid="compile.classpath.client-side" conf="cs.compile"/> + <ivy:cachepath pathid="compile.classpath.server-side-tests" conf="ss.test.compile"/> </target> <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - --> @@ -404,7 +404,7 @@ <echo>Compiling src (server-side)</echo> <!-- Compile core sources first as the other sources depend on these --> <mkdir dir="${result-classes-core}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-core}" debug="true" encoding="UTF-8" includeantruntime="false"> <src path="${result-src-core}"/> </javac> </target> @@ -413,7 +413,7 @@ <echo>Compiling src (Server and client side JUnit tests)</echo> <!-- Compile server and client side JUnit tests --> <mkdir dir="${result-classes-junit}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side-tests" destdir="${result-classes-junit}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-core}"></classpath> <src path="${result-src-junit}"/> </javac> @@ -421,7 +421,7 @@ <echo>Compiling src (TestBench tests)</echo> <!-- Compile TestBench tests --> <mkdir dir="${result-classes-testbench}" /> - <javac source="1.5" target="1.5" classpathref="compile.classpath" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> + <javac source="1.5" target="1.5" classpathref="compile.classpath.server-side" destdir="${result-classes-testbench}" debug="true" encoding="UTF-8" includeantruntime="false"> <classpath path="${result-classes-junit}"></classpath> <classpath path="${result-classes-core}"></classpath> <src path="${result-src-testbench}"/> @@ -486,7 +486,7 @@ <mkdir dir="${widgetsets-output-dir}"/> <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m"> <classpath> - <path refid="client-side.compile.classpath" /> + <path refid="compile.classpath.client-side" /> <pathelement location="${result-path}/classes" /> <pathelement location="${result-path}/src/core" /> </classpath> @@ -510,14 +510,14 @@ <target name="compile-widgetset-default"> <antcall target="compile-widgetset"> - <reference refid="client-side.compile.classpath" /> + <reference refid="compile.classpath.client-side" /> <param name="widgetset" value="com.vaadin.terminal.gwt.DefaultWidgetSet"/> </antcall> </target> <target name="compile-widgetset-portal-default" unless="compile.only.default-widgetset"> <antcall target="compile-widgetset"> - <reference refid="client-side.compile.classpath" /> + <reference refid="compile.classpath.client-side" /> <param name="widgetset" value="com.vaadin.portal.gwt.PortalDefaultWidgetSet"/> </antcall> </target> @@ -652,7 +652,7 @@ <target name="javadoc" depends="init, preprocess-src"> <property name="javadoc.destdir" value="${output-dir}/WebContent/docs/api"/> - <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="client-side.compile.classpath"> + <javadoc destdir="${javadoc.destdir}" author="true" version="true" use="true" windowtitle="${product-name}" classpathref="compile.classpath.client-side"> <packageset dir="${result-src-core}"/> <doctitle>${javadoc.doctitle}</doctitle> <!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> --> @@ -927,7 +927,7 @@ <pathelement path="${result-classes-core-for-emma-junit}" /> <pathelement path="${result-classes-core}" /> <pathelement path="${result-classes-junit}" /> - <path refid="test.runtime.classpath"></path> + <path refid="compile.classpath.server-side-tests"></path> </classpath> <jvmarg value="-Demma.coverage.out.file=../${result-path}/unittests.ec" /> diff --git a/build/ivy/ivy.xml b/build/ivy/ivy.xml index 4fcb44887b..ffcf7b19c8 100644 --- a/build/ivy/ivy.xml +++ b/build/ivy/ivy.xml @@ -6,7 +6,7 @@ <configurations > <conf name="ss.compile" extends="cs.compile" description="Server side compilation dependencies" visibility="private"/> <conf name="cs.compile" description="Client side compilation dependencies" visibility="private"/> - <conf name="ss.test.runtime" description="Test runtime dependencies" visibility="private"/> + <conf name="ss.test.compile" extends="ss.compile" description="Test compilation dependencies" visibility="private"/> <conf name="taskdefs" description="Ant task definitions" visibility="private" /> </configurations> <publications /> @@ -26,21 +26,21 @@ <dependency org="com.google.gwt" name="gwt-dev" rev="2.4.0" conf="cs.compile->master" /> <!-- Test frameworks & related --> - <dependency org="junit" name="junit" rev="4.5" conf="ss.test.runtime -> master"/> - <dependency org="org.easymock" name="easymock" rev="3.0" conf="ss.test.runtime -> master, runtime(*)"/> - <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="ss.test.runtime -> master, runtime(*)"/> + <dependency org="junit" name="junit" rev="4.5" conf="ss.test.compile -> master"/> + <dependency org="org.easymock" name="easymock" rev="3.0" conf="ss.test.compile -> master, runtime(*)"/> + <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" conf="ss.test.compile -> master, runtime(*)"/> <!-- Ant tasks --> <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="taskdefs ->master"/> <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.0.10" conf="taskdefs ->master"/> <!-- Emma --> - <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="ss.test.runtime,taskdefs ->master"/> - <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="ss.test.runtime,taskdefs ->*"/> + <dependency org="emma" name="emma_ant" rev="2.0.5312" conf="ss.test.compile,taskdefs ->master"/> + <dependency org="emma" name="emma" rev="2.0.5312-patched" conf="ss.test.compile,taskdefs ->*"/> <!-- Bean Validation implementation --> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="ss.test.runtime -> default"/> - <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="ss.test.runtime -> default"/> + <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" conf="ss.test.compile -> default"/> + <dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="ss.test.compile -> default"/> </dependencies> </ivy-module>
\ No newline at end of file |