merged in new build

build.gradle

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-// apply plugin: 'application'
 apply from: 'gradle/extra-tasks.gradle'
 
 buildscript {
@@ -29,8 +28,8 @@ buildscript {
 } 
 
 allprojects {
-    apply plugin: 'eclipse'
-    apply plugin: 'idea'
+  apply plugin: 'eclipse'
+  apply plugin: 'idea'
 
 	configurations {
 		platform
@@ -58,17 +57,17 @@ subprojects {
 		destinationDir = file("build/docs/java/api")
 	}
 
-    task collectDeps(type: Copy) {
-        destinationDir = file("build/deps")
-        into("compile") {
-            from configurations.compile
-            exclude "vertx-*.jar"
-        }
-        into("test") {
-            from configurations.testCompile
-            exclude "vertx-*.jar"
-        }
+  task collectDeps(type: Copy) {
+    destinationDir = file("build/deps")
+    into("compile") {
+      from configurations.compile
+      exclude "vertx-*.jar"
     }
+    into("test") {
+      from configurations.testCompile
+      exclude "vertx-*.jar"
+    }
+  }
 }
 
 defaultTasks = ['preflight']
@@ -95,9 +94,9 @@ task clean(type: Delete, dependsOn: [subprojects.clean]) {
 	description 'Clean the parent and all of the vert.x subprojects'
 
 	delete 'build/release', 'build/distributions'
-    subprojects.each {
-        delete 'build/deps'
-    } 
+  subprojects.each {
+    delete 'build/deps'
+  }
 }
 
 task assemble(type: Copy, dependsOn: ['preflight', subprojects.assemble]) {
@@ -126,7 +125,6 @@ task assemble(type: Copy, dependsOn: ['preflight', subprojects.assemble]) {
 	}
 	into('examples') {
 		from file("vertx-examples/src/main")
-		// from project(":vertx-examples").sourceSets.main
 	}
 	into('lib') {
 		from subprojects.configurations.platform

settings.gradle

@@ -17,6 +17,7 @@
 include 'vertx-boot'
 include 'vertx-core'
 include 'vertx-platform'
+include 'vertx-testframework'
 
 include 'vertx-lang-groovy'
 include 'vertx-lang-java'
@@ -25,7 +26,8 @@ include 'vertx-lang-jython'
 include 'vertx-lang-rhino'
 
 include 'vertx-examples'
-include 'vertx-testframework'
+
+include 'vertx-testsuite'
 
 rootProject.name='vert.x'
 

vertx-examples/build.gradle

@@ -25,16 +25,15 @@ dependencies {
 	compile project(':vertx-platform')
 
 	compile project(':vertx-lang-groovy')
-    compile project(':vertx-lang-java')
-    compile project(':vertx-lang-jruby')
+  compile project(':vertx-lang-java')
+  compile project(':vertx-lang-jruby')
 	compile project(':vertx-lang-jython')
 	compile project(':vertx-lang-rhino')
 
 	groovy "org.codehaus.groovy:groovy-all:$groovyVersion"
 	vertxJRuby "org.jruby:jruby:$jrubyVersion"
 	vertxJython "org.python:jython-standalone:$jythonVersion"
 	vertxRhino "org.mozilla:rhino:$rhinoVersion"
-
 }
 
 javadoc.dependsOn groovydoc

vertx-lang/vertx-lang-java/build.gradle

@@ -17,9 +17,9 @@
 apply from: "$rootDir/gradle/maven.gradle"
 
 dependencies {
-    compile project(':vertx-core')
-    compile project(':vertx-platform')
+  compile project(':vertx-core')
+  compile project(':vertx-platform')
 }
 artifacts {
-    platform jar
+  platform jar
 }

vertx-lang/vertx-lang-jython/build.gradle

@@ -25,29 +25,3 @@ dependencies {
 artifacts {
 	platform jar
 }
-
-// TODO move this into build-tools
-/*
-task pydoc(type: Exec) {
-	group 'documentation'
-	description 'Generates Python API documentation for the main source code.'
-	
-	def jythonHome = System.getProperty('jython.home')
-	def projectClasspath = files(project.configurations.compile).files.join(':')
-
-	workingDir projectDir
-	inputs.files files("/src/main/python", "/src/main/python_scripts", "/tools/doclib")
-	outputs.dir "/build/pydoc"
-
-	commandLine = [ 
-		"${jythonHome}/bin/jython",
-		'-J-classpath',
-		projectClasspath,
-		"-Dpython.path=$projectDir/src/main/python:$projectDir/src/main/python_scripts:$projectDir/tools/doclib",
-		"-Dproj.base=$projectDir",
-		"-Doutput.base=$projectDir/build/python",
-		"$projectDir/tools/pydocx.py"
-	]
-}
-javadoc.dependsOn pydoc
-*/

vertx-lang/vertx-lang-rhino/src/main/java/org/vertx/java/deploy/impl/rhino/RhinoVerticle.java

@@ -131,7 +131,7 @@ public ModuleScript getModuleScript(Context cx, String moduleId, URI uri, URI ba
               }
             }
 
-            if (uri != null && new File(uri).isDirectory()) {
+            if (uri != null && uri.toString().startsWith("file:") && new File(uri).isDirectory()) {
 
               String main = "index";
 
@@ -169,7 +169,7 @@ public ModuleScript getModuleScript(Context cx, String moduleId, URI uri, URI ba
 
             }
 
-            if(uri != null && uri.toString().endsWith(".coffee")) {
+            if (uri != null && uri.toString().endsWith(".coffee")) {
                 uri = getCoffeeScriptCompiler(cl).coffeeScriptToJavaScript(uri);                
             }
             return super.getModuleScript(cx, moduleId, uri, uri, paths);

vertx-testframework/build.gradle

@@ -22,22 +22,13 @@ apply plugin: 'vertx-jruby'
 apply plugin: 'vertx-jython'
 apply plugin: 'vertx-rhino'
 
-/*
-configurations {
-    testVerticles {
-        extendsFrom compile
-    }
-    testCompile.extendsFrom testVerticles
-}
-*/
-
 dependencies {
 	compile "junit:junit:$junitVersion" // provide exportable components
 
 	compile project(':vertx-platform')
-	
-	compile project(':vertx-lang-groovy')
-    compile project(':vertx-lang-java')
+
+  compile project(':vertx-lang-groovy')
+  compile project(':vertx-lang-java')
 	compile project(':vertx-lang-jruby')
 	compile project(':vertx-lang-jython')
 	compile project(':vertx-lang-rhino')
@@ -47,22 +38,7 @@ dependencies {
 	testCompile "org.python:jython-standalone:$jythonVersion"
 	testCompile "org.mozilla:rhino:$rhinoVersion"
 
-    testCompile files("$rootDir/src/dist/conf")
-}
-
-artifacts {
-//    platform jar  // adds testframework to distribution
+  testCompile files("$rootDir/src/dist/conf")
 }
 
 javadoc.dependsOn groovydoc
-
-test {
-	systemProperty 'vertx.test.timeout', 15
-    systemProperty 'vertx.mods', "$projectDir/src/test/mod-test"
-	systemProperty 'jruby.home', System.getenv('JRUBY_HOME')
-	systemProperty 'jython.home', System.getenv('JYTHON_HOME')
-
-	jvmArgs '-server', '-Xms128m', '-Xmx1024m', '-XX:MaxPermSize=128m', '-XX:NewRatio=2'
-
-	forkEvery 50 // FIXME This may not be necessary
-}

vertx-testsuite/build.gradle

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2011-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply from: "$rootDir/gradle/maven.gradle"
+apply plugin: 'java'
+apply plugin: 'groovy'
+apply plugin: 'vertx-groovy'
+apply plugin: 'vertx-jruby'
+apply plugin: 'vertx-jython'
+apply plugin: 'vertx-rhino'
+
+dependencies {
+	compile "junit:junit:$junitVersion" // provide exportable components
+
+	compile project(':vertx-platform')
+
+	compile project(':vertx-lang-groovy')
+  compile project(':vertx-lang-java')
+	compile project(':vertx-lang-jruby')
+	compile project(':vertx-lang-jython')
+	compile project(':vertx-lang-rhino')
+
+  compile project(':vertx-testframework')
+
+	groovy "org.codehaus.groovy:groovy-all:$groovyVersion"
+	testCompile "org.jruby:jruby:$jrubyVersion"
+	testCompile "org.python:jython-standalone:$jythonVersion"
+	testCompile "org.mozilla:rhino:$rhinoVersion"
+
+  testCompile files("$rootDir/src/dist/conf")
+}
+
+javadoc.dependsOn groovydoc
+
+test {
+  testLogging.showStandardStreams = true
+
+	systemProperty 'vertx.test.timeout', 15
+  systemProperty 'vertx.mods', "$projectDir/src/test/mod-test"
+	systemProperty 'jruby.home', System.getenv('JRUBY_HOME')
+	systemProperty 'jython.home', System.getenv('JYTHON_HOME')
+
+	jvmArgs '-server', '-Xms128m', '-Xmx1024m', '-XX:MaxPermSize=128m', '-XX:NewRatio=2'
+
+	forkEvery 50 // FIXME This may not be necessary
+}