Revision: 9731
Author: [email protected]
Date: Fri Feb 11 11:12:39 2011
Log: Added validation jars to all calls to GWTC to provide classes rquired
by
client-side validation. Fixes Issue 5950.
Review at http://gwt-code-reviews.appspot.com/1342803
http://code.google.com/p/google-web-toolkit/source/detail?r=9731
Modified:
/trunk/distro-source/build.xml
/trunk/samples/common.ant.xml
/trunk/samples/expenses/pom.xml
/trunk/tools/benchmark-viewer/build.xml
/trunk/user/src/com/google/gwt/user/tools/.classpathsrc
/trunk/user/src/com/google/gwt/user/tools/WebAppCreator.java
/trunk/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
=======================================
--- /trunk/distro-source/build.xml Fri Oct 22 10:36:00 2010
+++ /trunk/distro-source/build.xml Fri Feb 11 11:12:39 2011
@@ -30,6 +30,10 @@
<!-- jni libs-->
<zipfileset dir="${gwt.build.jni}/windows"
prefix="${project.distname}" />
+ <!-- external libs -->
+ <zipfileset
file="${gwt.tools}/lib/javax/validation/validation-api-1.0.0.GA.jar"
prefix="${project.distname}" />
+ <zipfileset
file="${gwt.tools}/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"
prefix="${project.distname}" />
+
<!-- raw files -->
<zipfileset dir="${dist.resources}" prefix="${project.distname}" />
<zipfileset filemode="755" dir="src" prefix="${project.distname}" />
=======================================
--- /trunk/samples/common.ant.xml Mon Dec 20 11:43:41 2010
+++ /trunk/samples/common.ant.xml Fri Feb 11 11:12:39 2011
@@ -103,6 +103,8 @@
<pathelement location="${sample.build}/war/WEB-INF/classes"
/>
<pathelement location="${gwt.user.jar}" />
<pathelement location="${gwt.dev.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"
/>
</classpath>
<jvmarg value="-Xmx256M" />
<arg value="-localWorkers" />
=======================================
--- /trunk/samples/expenses/pom.xml Tue Feb 8 11:03:03 2011
+++ /trunk/samples/expenses/pom.xml Fri Feb 11 11:12:39 2011
@@ -226,6 +226,12 @@
<version>1.0.0.GA</version>
</dependency>
<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.0.GA</version>
+ <classifier>source</classifier>
+ </dependency>
+ <dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.2</version>
=======================================
--- /trunk/tools/benchmark-viewer/build.xml Tue Oct 13 16:57:19 2009
+++ /trunk/tools/benchmark-viewer/build.xml Fri Feb 11 11:12:39 2011
@@ -60,6 +60,8 @@
<classpath>
<pathelement location="src"/>
<path refid="project.class.path"/>
+ <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"/>
</classpath>
<jvmarg value="-Xmx256M"/>
<arg value="-war"/>
=======================================
--- /trunk/user/src/com/google/gwt/user/tools/.classpathsrc Wed Oct 13
05:26:50 2010
+++ /trunk/user/src/com/google/gwt/user/tools/.classpathsrc Fri Feb 11
11:12:39 2011
@@ -3,6 +3,8 @@
<classpathentry kind="src" path="@srcFolder"/>@eclipseTestDir
<classpathentry kind="lib" path="@gwtUserPath"/>
<classpathentry kind="lib" path="@gwtDevPath"/>
+ <classpathentry kind="lib" path="@gwtValidationPath"/>
+ <classpathentry kind="lib" path="@gwtValidationSourcesPath"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="output" path="@warFolder/WEB-INF/classes"/>
=======================================
--- /trunk/user/src/com/google/gwt/user/tools/WebAppCreator.java Fri Oct 22
10:36:00 2010
+++ /trunk/user/src/com/google/gwt/user/tools/WebAppCreator.java Fri Feb 11
11:12:39 2011
@@ -308,6 +308,8 @@
// GWT libraries
String gwtUserPath = installPath + '/' + "gwt-user.jar";
String gwtDevPath = installPath + '/' + "gwt-dev.jar";
+ String gwtValidationPath = installPath + '/'
+ "validation-api-1.0.0.GA.jar";
+ String gwtValidationSourcesPath = installPath + '/'
+ "validation-api-1.0.0.GA-sources.jar";
// Public builds generate a DTD reference.
String gwtModuleDtd = "";
@@ -358,6 +360,8 @@
replacements.put("@gwtSdk", installPath);
replacements.put("@gwtUserPath", gwtUserPath);
replacements.put("@gwtDevPath", gwtDevPath);
+ replacements.put("@gwtValidationPath", gwtValidationPath);
+ replacements.put("@gwtValidationSourcesPath",
gwtValidationSourcesPath);
replacements.put("@gwtVersion", About.getGwtVersionNum());
replacements.put("@gwtModuleDtd", gwtModuleDtd);
replacements.put("@shellClass", DevMode.class.getName());
=======================================
--- /trunk/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Fri Oct 22
10:36:00 2010
+++ /trunk/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Fri Feb 11
11:12:39 2011
@@ -39,6 +39,8 @@
<classpath>
<pathelement location="@srcFolder"/>
<path refid="project.class.path"/>
+ <pathelement location="@gwtValidationPath" />
+ <pathelement location="@gwtValidationSourcesPath" />
</classpath>
<!-- add jvmarg -Xss16M or similar if you see a StackOverflowError
-->
<jvmarg value="-Xmx256M"/>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
