From 210871c0cd04f5b31e046184afe30fa5e14c024f Mon Sep 17 00:00:00 2001
From: Matthias Wessendorf <matzew@apache.org>
Date: Thu, 7 Mar 2013 13:27:08 +0100
Subject: [PATCH 1/3] Version update to 131.final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c74d535..7d074b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 
 	<properties>
 		<maven.version>2.2.1</maven.version>
-		<vertx.version>1.3.0.final</vertx.version>
+		<vertx.version>1.3.1.final</vertx.version>
 		<rhino.version>1.7R4</rhino.version>
 		<groovy.version>2.0.0</groovy.version>
 	</properties>

From 7098ee596e22a13b883bcd604085d90bf176caf9 Mon Sep 17 00:00:00 2001
From: Matthias Wessendorf <matzew@apache.org>
Date: Mon, 18 Mar 2013 15:53:29 +0100
Subject: [PATCH 2/3] Try to upgrade the plugin to vertx 2.0.0

---
 pom.xml                                       | 46 +++++++++----------
 .../org/vertx/maven/plugin/VertxServer.java   |  2 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d074b0..013187d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.anacoders.plugins</groupId>
 	<artifactId>vertx-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
-	<version>1.3.0.2-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 
 	<name>vertx-maven-plugin</name>
 	<url>https://github.com/rhart/vertx-maven-plugin</url>
@@ -32,12 +32,13 @@
 			<id>rhart</id>
 			<name>Russell Hart</name>
 			<email>russellxhart@googlemail.com</email>
-		</developer>
+		</developer> 
 	</developers>
 
 	<properties>
 		<maven.version>2.2.1</maven.version>
-		<vertx.version>1.3.1.final</vertx.version>
+		<vertx.version>2.0.0-SNAPSHOT</vertx.version>
+		<vertx-languages.version>1.0.0-SNAPSHOT</vertx-languages.version>
 		<rhino.version>1.7R4</rhino.version>
 		<groovy.version>2.0.0</groovy.version>
 	</properties>
@@ -108,48 +109,46 @@
 
 		<!-- vertx dependencies -->
 		<dependency>
-			<groupId>org.vert-x</groupId>
+			<groupId>io.vertx</groupId>
 			<artifactId>vertx-platform</artifactId>
 			<version>${vertx.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.vert-x</groupId>
+			<groupId>io.vertx</groupId>
 			<artifactId>vertx-core</artifactId>
 			<version>${vertx.version}</version>
 		</dependency>
 
-		<!-- vertx Java dependencies -->
-		<dependency>
-			<groupId>org.vert-x</groupId>
-			<artifactId>vertx-lang-java</artifactId>
-			<version>${vertx.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>io.vertx</groupId>
+            <artifactId>lang-jython</artifactId>
+            <version>${vertx-languages.version}</version>
+            <type>zip</type>
+        </dependency>
 
 		<!-- vertx Groovy dependencies -->
-		<dependency>
-			<groupId>org.vert-x</groupId>
-			<artifactId>vertx-lang-groovy</artifactId>
-			<version>${vertx.version}</version>
+		<!--dependency>
+			<groupId>io.vertx</groupId>
+			<artifactId>lang-groovy</artifactId>
+			<version>${vertx-languages.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
 			<version>${groovy.version}</version>
-		</dependency>
-
+		</dependency-->
 
 		<!-- vertx JavaScript dependencies -->
-		<dependency>
-			<groupId>org.vert-x</groupId>
-			<artifactId>vertx-lang-rhino</artifactId>
-			<version>${vertx.version}</version>
+		<!--dependency>
+			<groupId>io.vertx</groupId>
+			<artifactId>lang-rhino</artifactId>
+			<version>${vertx-languages.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mozilla</groupId>
 			<artifactId>rhino</artifactId>
 			<version>${rhino.version}</version>
-		</dependency>
-
+		</dependency-->
 
 		<!-- 3rd Party dependencies -->
 		<dependency>
@@ -159,5 +158,4 @@
 		</dependency>
 
 	</dependencies>
-
 </project>
diff --git a/src/main/java/org/vertx/maven/plugin/VertxServer.java b/src/main/java/org/vertx/maven/plugin/VertxServer.java
index e1eb07e..5b84009 100644
--- a/src/main/java/org/vertx/maven/plugin/VertxServer.java
+++ b/src/main/java/org/vertx/maven/plugin/VertxServer.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import org.vertx.java.deploy.impl.cli.Starter;
+import org.vertx.java.platform.impl.cli.Starter;
 
 import java.util.List;
 

From ffa9fa0f064744cdfd184e3554581483dcb45855 Mon Sep 17 00:00:00 2001
From: Matthias Wessendorf <matzew@apache.org>
Date: Mon, 18 Mar 2013 17:38:45 +0100
Subject: [PATCH 3/3] Hrm... adding the 'defaul' langs.props file, content from
 the platform jar........

---
 src/main/resources/langs.properties | 47 +++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/langs.properties b/src/main/resources/langs.properties
index 797300b..c89c201 100644
--- a/src/main/resources/langs.properties
+++ b/src/main/resources/langs.properties
@@ -1,13 +1,40 @@
-# Mapping between main file extensions and the verticle factory for the class
+# Language run-times
+# <runtime_name>=[implementing module name:]<FQCN of verticle factory>
+rhino=io.vertx~lang-rhino~1.0.0-SNAPSHOT:org.vertx.java.platform.impl.RhinoVerticleFactory
+dynjs=org.dynjs~lang-dynjs~1.0.0-SNAPSHOT:org.dynjs.vertx.DynJSVerticleFactory
+jruby=io.vertx~lang-jruby~1.0.0-SNAPSHOT:org.vertx.java.platform.impl.JRubyVerticleFactory
+groovy=io.vertx~lang-groovy~1.0.0-SNAPSHOT:org.vertx.groovy.platform.impl.GroovyVerticleFactory
+jython=io.vertx~lang-jython~1.0.0-SNAPSHOT:org.vertx.java.platform.impl.JythonVerticleFactory
 
-java=org.vertx.java.deploy.impl.java.JavaVerticleFactory
-class=org.vertx.java.deploy.impl.java.JavaVerticleFactory
-js=org.vertx.java.deploy.impl.rhino.RhinoVerticleFactory
-coffee=org.vertx.java.deploy.impl.rhino.RhinoVerticleFactory
-rb=org.vertx.java.deploy.impl.jruby.JRubyVerticleFactory
-groovy=org.vertx.groovy.deploy.impl.groovy.GroovyVerticleFactory
-py=org.vertx.java.deploy.impl.jython.JythonVerticleFactory
+# Mapping of file extension to language runtime
+# If the main is specified without a runtime prefix the file extension will be used to determine
+# which runtime to use
+# If a prefix is used e.g. 'groovy:org.foo.MyMainClass' then the prefix will be used to determine the
+# runtime instead
+.js=rhino
+.coffee=rhino
+.rb=jruby
+.py=jython
+.groovy=groovy
+.class=java
+.java=java
 
-# Default - if none match this will be assumed
+# The default runtime - if no prefix is specified and the main does not match any of the file extensions above
+# then the default will be used
+.=java
+
+
+
+
+
+
+
+##java=io.vertx~vertx-platform~2.0.0-SNAPSHOT:org.vertx.java.platform.impl.java.JavaVerticleFactory
+
+##.class=java
+##.java=java
+
+# The default runtime - if no prefix is specified and the main does not match any of the file extensions above
+# then the default will be used
+##.=java
 
-default=org.vertx.java.deploy.impl.java.JavaVerticleFactory
\ No newline at end of file