Revision: 8969
Author: [email protected]
Date: Thu Oct 7 07:43:12 2010
Log: Public: Use a seperate sample.extraclasspath so each sample can
specify their own jars.
Review at http://gwt-code-reviews.appspot.com/969801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=8969
Modified:
/trunk/common.ant.xml
/trunk/samples/common.ant.xml
/trunk/samples/dynatable/build.xml
/trunk/samples/dynatablerf/build.xml
/trunk/samples/expenses/build.xml
/trunk/samples/hello/build.xml
/trunk/samples/json/build.xml
/trunk/samples/logexample/build.xml
/trunk/samples/mail/build.xml
/trunk/samples/showcase/build.xml
/trunk/samples/simplerpc/build.xml
/trunk/samples/simplexml/build.xml
/trunk/samples/validation/build.xml
=======================================
--- /trunk/common.ant.xml Wed Oct 6 08:16:40 2010
+++ /trunk/common.ant.xml Thu Oct 7 07:43:12 2010
@@ -96,7 +96,16 @@
<isset property="build.host.iswindows" />
</condition>
<fail unless="build.host.platform" message="Building on ${os.name} is
not supported" />
-
+
+ <!-- JVM -->
+ <condition property="build.jvm.is15">
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </condition>
+
+ <condition property="build.jvm.is16">
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ </condition>
+
<!-- JUnit support -->
<property name="gwt.dev.staging.jar"
location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar" />
<property name="gwt.junit.port" value="8888" />
=======================================
--- /trunk/samples/common.ant.xml Wed Oct 6 06:53:06 2010
+++ /trunk/samples/common.ant.xml Thu Oct 7 07:43:12 2010
@@ -63,9 +63,7 @@
<classpath>
<pathelement location="${gwt.user.jar}" />
<pathelement location="${gwt.dev.jar}" />
- <pathelement
location="${gwt.tools.lib}/jsr107cache/jsr107cache-1.1.jar"/>
- <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
- <pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"
/>
+ <path refid="sample.extraclasspath" />
<path refid="gae.extraclasspath" />
</classpath>
</gwt.javac>
@@ -78,6 +76,7 @@
<fileset dir="${sample.build}/war/WEB-INF/classes" />
<fileset file="${gwt.user.jar}" />
<fileset file="${gwt.dev.jar}" />
+ <path refid="sample.extraclasspath" />
</sourcefiles>
<targetfiles
path="${sample.build}/war/${sample.lower}/${sample.lower}.nocache.js" />
<sequential>
@@ -87,21 +86,10 @@
fork="yes" failonerror="true">
<classpath>
<pathelement path="${sample.path}" />
+ <path refid="sample.extraclasspath" />
<pathelement location="${sample.build}/war/WEB-INF/classes"
/>
<pathelement location="${gwt.user.jar}" />
<pathelement location="${gwt.dev.jar}" />
- <pathelement
location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar" />
- <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
- <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"
/>
- <pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"
/>
- <pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"
/>
- <pathelement
location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
- <pathelement
location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
- <!-- Needed for JDK 1.5-->
- <pathelement
location="${gwt.tools.lib}/javax/activation/activation-1.1.jar" />
- <pathelement
location="${gwt.tools.lib}/javax/xml/bind/jaxb-api-2.1.jar" />
- <pathelement
location="${gwt.tools.lib}/sun/jaxb/jaxb-impl.2.1.3.jar" />
- <pathelement
location="${gwt.tools.lib}/javax/xml/stream/staxb-api-1.0-2.jar" />
</classpath>
<jvmarg value="-Xmx256M" />
<arg value="-localWorkers" />
=======================================
--- /trunk/samples/dynatable/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/dynatable/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,8 @@
<property name="sample.module" value="DynaTable" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools etc -->
+ <path id="sample.extraclasspath">
+ <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
+ </path>
</project>
=======================================
--- /trunk/samples/dynatablerf/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/dynatablerf/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,9 @@
<property name="sample.module" value="DynaTableRf" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools etc -->
+ <path id="sample.extraclasspath">
+ <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
+ <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"
/>
+ </path>
</project>
=======================================
--- /trunk/samples/expenses/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/expenses/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="Expenses" />
<property name="sample.path" value="src/main/java" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/hello/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/hello/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="Hello" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/json/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/json/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="JSON" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/logexample/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/logexample/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="LogExample" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/mail/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/mail/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="Mail" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/showcase/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/showcase/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="Showcase" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/simplerpc/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/simplerpc/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="SimpleRPC" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/simplexml/build.xml Wed Aug 18 18:29:03 2010
+++ /trunk/samples/simplexml/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,7 @@
<property name="sample.module" value="SimpleXML" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+ <!-- these are after the common.ant.xml so they have gwt.tools... -->
+ <path id="sample.extraclasspath">
+ </path>
</project>
=======================================
--- /trunk/samples/validation/build.xml Fri Aug 27 05:36:49 2010
+++ /trunk/samples/validation/build.xml Thu Oct 7 07:43:12 2010
@@ -3,4 +3,20 @@
<property name="sample.module" value="Validation" />
<property name="sample.path" value="src" />
<import file="../common.ant.xml" />
+
+ <!-- these are after the common.ant.xml so they have gwt.tools etc. -->
+ <path id="sample.extraclasspath">
+ <pathelement location="${gwt.tools.lib}/apache/log4j/log4j-1.2.16.jar"
/>
+ <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
+ <pathelement
location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"
/>
+ <pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final.jar"
/>
+ <pathelement
location="${gwt.tools.lib}/hibernate/validator/hibernate-validator-4.1.0.Final-sources.jar"
/>
+ <pathelement
location="${gwt.tools.lib}/slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
+ <pathelement
location="${gwt.tools.lib}/slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
+ <!-- Needed for JDK 1.5-->
+ <pathelement
location="${gwt.tools.lib}/javax/activation/activation-1.1.jar" />
+ <pathelement
location="${gwt.tools.lib}/javax/xml/bind/jaxb-api-2.1.jar" />
+ <pathelement location="${gwt.tools.lib}/sun/jaxb/jaxb-impl-2.1.3.jar"
/>
+ <pathelement
location="${gwt.tools.lib}/javax/xml/stream/stax-api-1.0-2.jar" />
+ </path>
</project>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
