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
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9731 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/distro-source/build.xml b/distro-source/build.xml
index 7918e52..ad803e9 100755
--- a/distro-source/build.xml
+++ b/distro-source/build.xml
@@ -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}" />
diff --git a/samples/common.ant.xml b/samples/common.ant.xml
index 45fe20b..14c6154 100755
--- a/samples/common.ant.xml
+++ b/samples/common.ant.xml
@@ -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" />
diff --git a/samples/expenses/pom.xml b/samples/expenses/pom.xml
index 567f441..8c542e9 100644
--- a/samples/expenses/pom.xml
+++ b/samples/expenses/pom.xml
@@ -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>
diff --git a/tools/benchmark-viewer/build.xml b/tools/benchmark-viewer/build.xml
index 788b090..d243b06 100755
--- a/tools/benchmark-viewer/build.xml
+++ b/tools/benchmark-viewer/build.xml
@@ -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"/>
diff --git a/user/src/com/google/gwt/user/tools/.classpathsrc b/user/src/com/google/gwt/user/tools/.classpathsrc
index 562628a..c08900c 100644
--- a/user/src/com/google/gwt/user/tools/.classpathsrc
+++ b/user/src/com/google/gwt/user/tools/.classpathsrc
@@ -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"/>
diff --git a/user/src/com/google/gwt/user/tools/WebAppCreator.java b/user/src/com/google/gwt/user/tools/WebAppCreator.java
index 4b8debc..7fb8ff2 100644
--- a/user/src/com/google/gwt/user/tools/WebAppCreator.java
+++ b/user/src/com/google/gwt/user/tools/WebAppCreator.java
@@ -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());
diff --git a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
index dacddf7..6016e26 100644
--- a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
@@ -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"/>
