Reviewers: rjrjr, Nick Chalko, drfibonacci,
Description:
Added validation jars to all calls to GWTC to provide classes rquired by
client-side validation. Fixes Issue 5950.
Please review this at http://gwt-code-reviews.appspot.com/1342803/show
Affected files:
M distro-source/build.xml
M samples/common.ant.xml
M tools/benchmark-viewer/build.xml
M user/src/com/google/gwt/user/tools/.classpathsrc
M user/src/com/google/gwt/user/tools/WebAppCreator.java
M user/src/com/google/gwt/user/tools/project.ant.xmlsrc
Index: distro-source/build.xml
===================================================================
--- distro-source/build.xml (revision 9650)
+++ distro-source/build.xml (working copy)
@@ -29,6 +29,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}" />
Index: samples/common.ant.xml
===================================================================
--- samples/common.ant.xml (revision 9650)
+++ samples/common.ant.xml (working copy)
@@ -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" />
Index: tools/benchmark-viewer/build.xml
===================================================================
--- tools/benchmark-viewer/build.xml (revision 9650)
+++ tools/benchmark-viewer/build.xml (working copy)
@@ -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"/>
Index: user/src/com/google/gwt/user/tools/.classpathsrc
===================================================================
--- user/src/com/google/gwt/user/tools/.classpathsrc (revision 9650)
+++ user/src/com/google/gwt/user/tools/.classpathsrc (working copy)
@@ -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"/>
Index: user/src/com/google/gwt/user/tools/WebAppCreator.java
===================================================================
--- user/src/com/google/gwt/user/tools/WebAppCreator.java (revision 9650)
+++ user/src/com/google/gwt/user/tools/WebAppCreator.java (working copy)
@@ -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());
Index: user/src/com/google/gwt/user/tools/project.ant.xmlsrc
===================================================================
--- user/src/com/google/gwt/user/tools/project.ant.xmlsrc (revision 9650)
+++ user/src/com/google/gwt/user/tools/project.ant.xmlsrc (working copy)
@@ -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