Reviewers: jlabanca,
Description:
Fixes issue 6189. WebAppCreator was not scanning war/WEB-INF/lib to fill
up .classpath
Please review this at http://gwt-code-reviews.appspot.com/1393801/
Affected files:
M user/src/com/google/gwt/user/tools/WebAppCreator.java
M user/test/com/google/gwt/user/tools/WebAppCreatorTest.java
Index: user/src/com/google/gwt/user/tools/WebAppCreator.java
===================================================================
--- user/src/com/google/gwt/user/tools/WebAppCreator.java (revision 9906)
+++ user/src/com/google/gwt/user/tools/WebAppCreator.java (working copy)
@@ -542,7 +542,7 @@
replacements.put("@copyServletDeps", copyServletDeps);
// Collect the list of server libs to include on the eclipse classpath.
- File libDirectory = new File(outDir + warFolder + "WEB-INF/lib");
+ File libDirectory = new File(outDir + "/" + warFolder
+ "/WEB-INF/lib");
StringBuilder serverLibs = new StringBuilder();
if (libDirectory.exists()) {
for (File file : libDirectory.listFiles()) {
Index: user/test/com/google/gwt/user/tools/WebAppCreatorTest.java
===================================================================
--- user/test/com/google/gwt/user/tools/WebAppCreatorTest.java (revision
9906)
+++ user/test/com/google/gwt/user/tools/WebAppCreatorTest.java (working
copy)
@@ -15,6 +15,7 @@
*/
package com.google.gwt.user.tools;
+import com.google.gwt.dev.util.Util;
import com.google.gwt.user.tools.WebAppCreator.ArgProcessor;
import junit.framework.TestCase;
@@ -265,6 +266,32 @@
}
/**
+ * Generate a .classpath containing a .jar in war/WEB-INF/lib
+ */
+ public void testCreatorInlyEclipseWithJars() throws IOException,
WebAppCreatorException {
+ runCreator("-out", projectFolder, "-XnoEclipse", "-junit", mockJar,
+ MY_PROJECT);
+
+ String libDir = "war" + File.separatorChar
+ + "WEB-INF" + File.separatorChar
+ + "lib";
+ assertTrue(new File(projectFolder + File.separatorChar +
libDir).mkdirs());
+
+ String libJarName = libDir + File.separatorChar + "foo.jar";
+ File libFile = new File(projectFolder + File.separatorChar +
libJarName);
+ assertTrue(libFile.createNewFile());
+
+ runCreator("-out", projectFolder, "-XonlyEclipse", "-junit", mockJar,
+ MY_PROJECT);
+
+ assertFileExists(".classpath");
+ File classpathFile = new File(projectFolder + File.separatorChar
+ ".classpath");
+ String classpathContents =
Util.readURLAsString(classpathFile.toURI().toURL());
+ assertTrue(".classpath does not contain " + libJarName,
+ classpathContents.contains(libJarName));
+ }
+
+ /**
* Test the main method.
*/
public void testMain() {
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
