jps: fixes

jps/model/src/org/jetbrains/jps/Library.groovy

@@ -23,11 +23,11 @@ class Library extends LazyInitializeableObject implements ClasspathItem {
     Closure lazyInit = {
       def meta = new InitializingExpando()
       meta.classpath = {Object[] arg ->
-        arg.each { classpath << it }
+        arg.each { classpath << it.toString() }
       }
 
       meta.src = {Object[] arg ->
-        arg.each { sourceRoots << it }
+        arg.each { sourceRoots << it.toString() }
       }
 
       initializer.delegate = meta

jps/model/src/org/jetbrains/jps/Module.groovy

@@ -58,19 +58,19 @@ class Module extends LazyInitializeableObject implements ClasspathItem {//}, Com
       }
 
       meta.content = {Object[] arg ->
-        arg.each { contentRoots << it}
+        arg.each { contentRoots << it.toString() }
       }
 
       meta.src = {Object[] arg ->
-        arg.each { sourceRoots << it }
+        arg.each { sourceRoots << it.toString() }
       }
 
       meta.testSrc = {Object[] arg ->
-        arg.each { testRoots << it }
+        arg.each { testRoots << it.toString() }
       }
 
       meta.exclude = {Object[] arg ->
-        arg.each { excludes << it }
+        arg.each { excludes << it.toString() }
       }
 
       initializer.delegate = meta

jps/plugins/gwt/jps-gwt.iml

@@ -11,15 +11,7 @@
     <orderEntry type="module" module-name="jps" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="module" module-name="jps-javaee" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
+    <orderEntry type="library" name="JUnit4" level="project" />
   </component>
 </module>
 

jps/plugins/gwt/testSrc/org/jetbrains/jps/gwt/GwtModulesSearcherTest.java

@@ -5,7 +5,6 @@ import junit.framework.TestCase;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author nik

jps/src/org/jetbrains/jps/ProjectBuilder.groovy

@@ -94,11 +94,12 @@ class ProjectBuilder {
       if (chunk.elements.size() > 1) {
         File outputDir
         if (targetFolder != null) {
-          def basePath = tests ? new File(targetFolder, "test").absolutePath : new File(targetFolder, "production").absolutePath
+          def basePath = forTests ? new File(targetFolder, "test").absolutePath : new File(targetFolder, "production").absolutePath
+          def name = chunk.name
           if (name.length() > 100) {
             name = name.substring(0, 100) + "_etc"
           }
-          outputDir = new File(basePath, name).absolutePath
+          outputDir = new File(basePath, name)
         }
         else {
           outputDir = new File(forTests ? chunk.representativeModule().testOutputPath : chunk.representativeModule().outputPath)

jps/src/org/jetbrains/jps/builders/StandardBuilders.groovy

@@ -60,7 +60,9 @@ class JavacBuilder implements ModuleBuilder, ModuleCycleBuilder {
     params.debug = String.valueOf(debugInfo);
     params.nowarn = String.valueOf(nowarn);
     params.deprecation = String.valueOf(deprecation);
-    params.verbose = "true"
+    if (state.projectWrapper != null) {
+      params.verbose = "true"
+    }
 
     def javacExecutable = getJavacExecutable(module)
     if (javacExecutable != null) {