Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated vertx version #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updated vertx version #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
210871c
Version update to 131.final
matzew Mar 7, 2013
7098ee5
Try to upgrade the plugin to vertx 2.0.0
matzew Mar 18, 2013
ffa9fa0
Hrm... adding the 'defaul' langs.props file, content from the platfor…
matzew Mar 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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.0.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>
Expand Down Expand Up @@ -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>
Expand All @@ -159,5 +158,4 @@
</dependency>

</dependencies>

</project>
2 changes: 1 addition & 1 deletion src/main/java/org/vertx/maven/plugin/VertxServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
47 changes: 37 additions & 10 deletions src/main/resources/langs.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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