Skip to content

Commit

Permalink
Add undertow.js support to Wildfly
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartwdouglas committed Aug 6, 2015
1 parent 50c6605 commit 4fdcf40
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 1 deletion.
10 changes: 10 additions & 0 deletions feature-pack/pom.xml
Expand Up @@ -199,6 +199,11 @@
<artifactId>relaxngDatatype</artifactId>
</dependency>

<dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -945,6 +950,11 @@
<artifactId>netty-all</artifactId>
</dependency>

<dependency>
<groupId>io.undertow.js</groupId>
<artifactId>undertow-js</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
Expand Down
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2010, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<module xmlns="urn:jboss:module:1.3" name="com.github.spullara.mustache">
<resources>
<artifact name="${com.github.spullara.mustache.java:compiler}"/>
</resources>

<dependencies>
<module name="com.google.guava" />
</dependencies>
</module>
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2010, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<module xmlns="urn:jboss:module:1.3" name="io.undertow.js">
<resources>
<artifact name="${io.undertow.js:undertow-js}"/>
</resources>

<dependencies>
<module name="javax.api"/>
<module name="javax.servlet.api"/>
<module name="javax.enterprise.api" />
<module name="org.jboss.logging"/>
<module name="io.undertow.core"/>
<module name="io.undertow.servlet"/>
<module name="org.jboss.xnio"/>
<module name="com.github.spullara.mustache" />
</dependencies>
</module>
15 changes: 15 additions & 0 deletions pom.xml
Expand Up @@ -103,6 +103,7 @@
<version.httpunit>1.7</version.httpunit>
<version.io.netty>4.0.26.Final</version.io.netty>
<version.io.undertow.jastow>2.0.0.Beta2</version.io.undertow.jastow>
<version.io.undertow.js>1.0.0.Alpha2</version.io.undertow.js>
<version.javax.activation>1.1.1</version.javax.activation>
<version.javax.enterprise>1.2</version.javax.enterprise>
<version.javax.jws.jsr181-api>1.0-MR1</version.javax.jws.jsr181-api>
Expand Down Expand Up @@ -258,6 +259,7 @@
<org.jboss.model.test.cache.root>[pom.xml,testsuite]</org.jboss.model.test.cache.root>
<!-- Location relative to root that will be used for the cached legacy classpaths used by subsystem-test and core-model-test-->
<org.jboss.model.test.classpath.cache>target/model-test-classpath-cache</org.jboss.model.test.classpath.cache>
<version.com.github.spullara.mustache>0.8.13</version.com.github.spullara.mustache>
</properties>

<modules>
Expand Down Expand Up @@ -1373,6 +1375,13 @@
<version>${version.com.github.relaxng}</version>
</dependency>


<dependency>
<groupId>com.github.spullara.mustache.java</groupId>
<artifactId>compiler</artifactId>
<version>${version.com.github.spullara.mustache}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down Expand Up @@ -4604,6 +4613,12 @@
<version>${version.io.undertow.jastow}</version>
</dependency>

<dependency>
<groupId>io.undertow.js</groupId>
<artifactId>undertow-js</artifactId>
<version>${version.io.undertow.js}</version>
</dependency>

<dependency>
<groupId>org.jberet</groupId>
<artifactId>jberet-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion servlet-feature-pack/pom.xml
Expand Up @@ -41,7 +41,7 @@
<dependencies>

<!-- feature pack dependencies -->

<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack</artifactId>
Expand Down
Expand Up @@ -48,6 +48,7 @@ public class UndertowDependencyProcessor implements DeploymentUnitProcessor {
private static final ModuleIdentifier UNDERTOW_SERVLET = ModuleIdentifier.create("io.undertow.servlet");
private static final ModuleIdentifier UNDERTOW_JSP = ModuleIdentifier.create("io.undertow.jsp");
private static final ModuleIdentifier UNDERTOW_WEBSOCKET = ModuleIdentifier.create("io.undertow.websocket");
private static final ModuleIdentifier UNDERTOW_JS = ModuleIdentifier.create("io.undertow.js");
private static final ModuleIdentifier CLUSTERING_API = ModuleIdentifier.create("org.wildfly.clustering.web.api");

private static final ModuleIdentifier SERVLET_API = ModuleIdentifier.create("javax.servlet.api");
Expand Down Expand Up @@ -84,6 +85,7 @@ public void deploy(DeploymentPhaseContext phaseContext) {
moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, UNDERTOW_SERVLET, false, false, true, false));
moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, UNDERTOW_JSP, false, false, true, false));
moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, UNDERTOW_WEBSOCKET, false, false, true, false));
moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, UNDERTOW_JS, true, false, true, false));
moduleSpecification.addSystemDependency(new ModuleDependency(moduleLoader, CLUSTERING_API, true, false, false, false));
}

Expand Down

0 comments on commit 4fdcf40

Please sign in to comment.