Roll-back due to test breakage.
Review at http://gwt-code-reviews.appspot.com/1396801
Review by: pdr@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@9911 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/tools/WebAppCreator.java b/user/src/com/google/gwt/user/tools/WebAppCreator.java
index c3be99c..8ddefe8 100644
--- a/user/src/com/google/gwt/user/tools/WebAppCreator.java
+++ b/user/src/com/google/gwt/user/tools/WebAppCreator.java
@@ -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()) {
diff --git a/user/test/com/google/gwt/user/tools/WebAppCreatorTest.java b/user/test/com/google/gwt/user/tools/WebAppCreatorTest.java
index b637ee3..60fcc91 100644
--- a/user/test/com/google/gwt/user/tools/WebAppCreatorTest.java
+++ b/user/test/com/google/gwt/user/tools/WebAppCreatorTest.java
@@ -15,7 +15,6 @@
*/
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;
@@ -266,32 +265,6 @@
}
/**
- * Generate a .classpath containing a .jar in war/WEB-INF/lib
- */
- public void testCreatorOnlyEclipseWithJars() 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() {
