[resolves #630] Move module org.apache.cxf.ext to extras

[resolves #629] Move module org.bouncycastle.pgp to extras
wildfly-extras · Jun 9, 2015 · bdf6c6d · bdf6c6d
1 parent b230f4c
commit bdf6c6d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/modules/etc/baseline/module-list.txt b/modules/etc/baseline/module-list.txt
@@ -124,7 +124,7 @@
 /org/apache/xbean/spring/main/xbean-spring-3.18.jar
 /org/apache/xmlbeans/main/xmlbeans-2.6.0.jar
 /org/beanshell/main/bsh-2.0b5.jar
-/org/bouncycastle/pgp/main/bcpg-jdk15on-1.52.jar
+/org/bouncycastle/ext/main/bcpg-jdk15on-1.52.jar
 /org/fusesource/hawtbuf/main/hawtbuf-1.11.jar
 /org/fusesource/hawtdispatch/main/hawtdispatch-1.21.jar
 /org/fusesource/hawtdispatch/main/hawtdispatch-transport-1.21.jar

diff --git a/...ated/wildfly/modules/system/layers/fuse/org/apache/camel/component/crypto/main/module.xml b/...ated/wildfly/modules/system/layers/fuse/org/apache/camel/component/crypto/main/module.xml
@@ -11,6 +11,6 @@
     <module name="org.apache.commons.codec" />
     <module name="org.apache.commons.io" />
     <module name="org.bouncycastle" />
-    <module name="org.bouncycastle.pgp" />
+    <module name="org.bouncycastle.ext" />
   </dependencies>
 </module>
diff --git a/...fuse/org/bouncycastle/pgp/main/module.xml → ...fuse/org/bouncycastle/ext/main/module.xml b/...fuse/org/bouncycastle/pgp/main/module.xml → ...fuse/org/bouncycastle/ext/main/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.1" name="org.bouncycastle.pgp">
+<module xmlns="urn:jboss:module:1.1" name="org.bouncycastle.ext">
   <resources>
     <resource-root path="bcpg-jdk15on-1.52.jar" />
   </resources>

diff --git a/modules/etc/smartics/cxf-modules.xml → modules/etc/smartics/extra-modules.xml b/modules/etc/smartics/cxf-modules.xml → modules/etc/smartics/extra-modules.xml
@@ -18,8 +18,12 @@
   limitations under the License.
   #L%
   -->
+
+<!--
+  This file holds extensions to module definitions that come with wildfly.
+-->
 <modules xmlns="http://smartics.de/ns/jboss-modules-descriptor/2">
-
+    
     <module name="org.apache.cxf.ext" >
         <include artifact="cxf-rt-features-clustering" />
         <include artifact="cxf-rt-frontend-jaxrs" />
@@ -38,5 +42,12 @@
             <exclude path="schemas/blueprint" />
         </exports>
     </module>
-
+
+    <module name="org.bouncycastle.ext">
+        <include artifact="org.bouncycastle:bcpg-jdk15on" />
+        <dependencies>
+            <module name="javax.api" />
+        </dependencies>
+    </module>
+
 </modules>
diff --git a/modules/etc/smartics/other-modules.xml b/modules/etc/smartics/other-modules.xml
@@ -179,13 +179,6 @@
         </dependencies>
     </module>
 
-    <module name="org.bouncycastle.pgp">
-        <include artifact="org.bouncycastle:bcpg-jdk15on" />
-        <dependencies>
-            <module name="javax.api" />
-        </dependencies>
-    </module>
-
     <module name="org.fusesource.hawtbuf">
         <include artifact="org.fusesource.hawtbuf:hawtbuf" />
     </module>

diff --git a/modules/etc/smartics/wildfly-modules.xml b/modules/etc/smartics/wildfly-modules.xml
@@ -20,7 +20,7 @@
   -->
 
 <!--
-  This file holds all the module definitions that come with wildfly.  Here
+  This file holds all module definitions that come with wildfly. Here
   we map maven artifacts to those modules, but skip generating the modules since
   they are provided for us.
 -->