Fixing LogExample and DynaTableRf for distro builds. The samples were being compiled, but they weren't included in the eclipse.generate target. We also now include json.jar and validation-api-1.0.0.GA.jar in gwt-servlet.jar. And for DynaTableRf (and Validation), we copy other jars into the WEB-INF/lib folder of the sample.
Review at http://gwt-code-reviews.appspot.com/964802
Review by: robertvawter@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8972 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/distro-source/core/src/samples/build.xml b/distro-source/core/src/samples/build.xml
index 1ef868b..b8b4386 100644
--- a/distro-source/core/src/samples/build.xml
+++ b/distro-source/core/src/samples/build.xml
@@ -2,8 +2,10 @@
<target name="-do">
<ant target="${target}" dir="DynaTable"/>
+ <ant target="${target}" dir="DynaTableRf"/>
<ant target="${target}" dir="Hello"/>
<ant target="${target}" dir="JSON"/>
+ <ant target="${target}" dir="LogExample"/>
<ant target="${target}" dir="Mail"/>
<ant target="${target}" dir="Showcase"/>
</target>
diff --git a/samples/common.ant.xml b/samples/common.ant.xml
index ec5bfe7..aa2939f 100755
--- a/samples/common.ant.xml
+++ b/samples/common.ant.xml
@@ -28,6 +28,11 @@
<pathelement location="${gwt.tools.lib}/appengine/datanucleus-appengine-1.0.7.final.jar"/>
</path>
+ <!-- The libraries required by the server that will be copied into WEB-INF/lib. -->
+ <fileset id="sample.server.libs" dir="${gwt.tools.lib}">
+ <include name="" />
+ </fileset>
+
<target name="source" description="Copy source to the output folder">
<mkdir dir="${sample.build}/src" />
<copy todir="${sample.build}/src">
@@ -57,6 +62,13 @@
</if>
</target>
+ <target name="serverlibs" description="Copy server libs to the output folder">
+ <mkdir dir="${sample.build}/war/WEB-INF/lib" />
+ <copy todir="${sample.build}/war/WEB-INF/lib/" flatten="true">
+ <fileset refid="sample.server.libs" />
+ </copy>
+ </target>
+
<target name="compile" description="Compile all java files">
<mkdir dir="${sample.build}/war/WEB-INF/classes" />
<gwt.javac destdir="${sample.build}/war/WEB-INF/classes">
@@ -138,7 +150,7 @@
<webAppCreator platform="mac" />
</target>
- <target name="build" depends="source, compile, gwtc, scripts" description="Build and package this project" />
+ <target name="build" depends="source, serverlibs, compile, gwtc, scripts" description="Build and package this project" />
<target name="checkstyle" description="Static analysis of source">
<gwt.checkstyle outputdirectory="${sample.build}">
diff --git a/samples/dynatablerf/build.xml b/samples/dynatablerf/build.xml
index aa77951..2848b88 100755
--- a/samples/dynatablerf/build.xml
+++ b/samples/dynatablerf/build.xml
@@ -8,4 +8,10 @@
<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>
+ <fileset id="sample.server.libs" dir="${gwt.tools.lib}">
+ <include name="hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
+ <include name="apache/log4j/log4j-1.2.16.jar" />
+ <include name="slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
+ <include name="slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
+ </fileset>
</project>
diff --git a/samples/validation/build.xml b/samples/validation/build.xml
index 03466f4..5f960a7 100755
--- a/samples/validation/build.xml
+++ b/samples/validation/build.xml
@@ -19,4 +19,10 @@
<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>
+ <fileset id="sample.server.libs" dir="${gwt.tools.lib}">
+ <include name="hibernate/validator/hibernate-validator-4.1.0.Final.jar" />
+ <include name="apache/log4j/log4j-1.2.16.jar" />
+ <include name="slf4j/slf4j-api/slf4j-api-1.6.1.jar" />
+ <include name="slf4j/slf4j-log4j12/slf4j-log4j12-1.6.1.jar" />
+ </fileset>
</project>
diff --git a/servlet/build.xml b/servlet/build.xml
index 11aa99d..6440445 100755
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -21,6 +21,9 @@
<exclude name="com/google/gwt/junit/server/**" />
<exclude name="com/google/gwt/benchmarks/*" />
</fileset>
+ <!-- The following two jars satisfy RequestFactory dependencies. -->
+ <zipfileset src="${gwt.tools.redist}/json/r2_20080312/json-1.5.jar" />
+ <zipfileset src="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar" />
</gwt.jar>
</target>
