diff --git a/ribbon-webapp/api/pom.xml b/ribbon-webapp/api/pom.xml
index 52a42143f5..b87e54974e 100644
--- a/ribbon-webapp/api/pom.xml
+++ b/ribbon-webapp/api/pom.xml
@@ -10,7 +10,7 @@
org.wildfly.swarm
wildfly-swarm-ribbon-webapp-parent
- 1.0.0.Alpha5-SNAPSHOT
+ 1.0.0.Alpha6-SNAPSHOT
../
@@ -36,6 +36,11 @@
org.wildfly.swarm
wildfly-swarm-undertow
+
+ org.wildfly.swarm
+ wildfly-swarm-ribbon
+ ${project.version}
+
diff --git a/ribbon-webapp/modules/pom.xml b/ribbon-webapp/modules/pom.xml
index c757ca3837..42dbd47723 100644
--- a/ribbon-webapp/modules/pom.xml
+++ b/ribbon-webapp/modules/pom.xml
@@ -10,7 +10,7 @@
org.wildfly.swarm
wildfly-swarm-ribbon-webapp-parent
- 1.0.0.Alpha5-SNAPSHOT
+ 1.0.0.Alpha6-SNAPSHOT
../
diff --git a/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml b/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml
index d39ba8ba3c..5cdb9e0f95 100644
--- a/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml
+++ b/ribbon-webapp/modules/src/main/resources/modules/org/wildfly/swarm/ribbon/webapp/runtime/module.xml
@@ -8,6 +8,8 @@
+
+
diff --git a/ribbon-webapp/pom.xml b/ribbon-webapp/pom.xml
index 2f0951f896..1df44ffd25 100644
--- a/ribbon-webapp/pom.xml
+++ b/ribbon-webapp/pom.xml
@@ -10,7 +10,7 @@
org.wildfly.swarm
wildfly-swarm-parent
- 1.0.0.Alpha5-SNAPSHOT
+ 1.0.0.Alpha6-SNAPSHOT
../
diff --git a/ribbon-webapp/runtime/pom.xml b/ribbon-webapp/runtime/pom.xml
index 150f67fbbd..e0fd2f5db2 100644
--- a/ribbon-webapp/runtime/pom.xml
+++ b/ribbon-webapp/runtime/pom.xml
@@ -10,7 +10,7 @@
org.wildfly.swarm
wildfly-swarm-ribbon-webapp-parent
- 1.0.0.Alpha5-SNAPSHOT
+ 1.0.0.Alpha6-SNAPSHOT
../
@@ -33,6 +33,11 @@
wildfly-swarm-ribbon
${project.version}
+
+ org.wildfly.swarm
+ wildfly-swarm-ribbon
+ ${project.version}
+
org.wildfly.swarm
wildfly-swarm-undertow
diff --git a/ribbon-webapp/runtime/src/main/java/org/wildfly/swarm/ribbon/webapp/runtime/RibbonWebAppConfiguration.java b/ribbon-webapp/runtime/src/main/java/org/wildfly/swarm/ribbon/webapp/runtime/RibbonWebAppConfiguration.java
index e2e19f85b2..ff4b47e57b 100644
--- a/ribbon-webapp/runtime/src/main/java/org/wildfly/swarm/ribbon/webapp/runtime/RibbonWebAppConfiguration.java
+++ b/ribbon-webapp/runtime/src/main/java/org/wildfly/swarm/ribbon/webapp/runtime/RibbonWebAppConfiguration.java
@@ -1,9 +1,11 @@
package org.wildfly.swarm.ribbon.webapp.runtime;
+import com.netflix.ribbon.Ribbon;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.wildfly.swarm.container.runtime.AbstractServerConfiguration;
+import org.wildfly.swarm.netflix.ribbon.RibbonArchive;
import org.wildfly.swarm.ribbon.webapp.RibbonWebAppFraction;
import org.wildfly.swarm.undertow.WARArchive;
@@ -30,8 +32,9 @@ public List getImplicitDeployments(RibbonWebAppFraction fraction) throw
List list = new ArrayList<>();
WARArchive war = ShrinkWrap.create( WARArchive.class );
war.addClass( RibbonToTheCurbSSEServlet.class );
- war.addModule("org.wildfly.swarm.ribbon");
- war.addAsResource(new ClassLoaderAsset("ribbon.js"), "js/ribbon.js");
+ war.addModule("org.wildfly.swarm.netflix.ribbon");
+ war.addAsResource(new ClassLoaderAsset("ribbon.js", this.getClass().getClassLoader()), "js/ribbon.js");
+ war.as(RibbonArchive.class);
list.add(war);
return list;
}
diff --git a/ribbon-webapp/test/pom.xml b/ribbon-webapp/test/pom.xml
index f1ca96dbdf..cbccedbd04 100644
--- a/ribbon-webapp/test/pom.xml
+++ b/ribbon-webapp/test/pom.xml
@@ -10,7 +10,7 @@
org.wildfly.swarm
wildfly-swarm-ribbon-webapp-parent
- 1.0.0.Alpha5-SNAPSHOT
+ 1.0.0.Alpha6-SNAPSHOT
../