[resolves wildfly-extras#271, wildfly-extras#272, wildfly-extras#290, w…

…ildfly-extras#299] Fixes rss, mail, script TCCL issues

[resolves wildfly-extras#271] Module camel-script exposes bsh
[resolves wildfly-extras#272] Module camel-rss exposes com.sun.syndication
[resolves wildfly-extras#290] Usage of camel-mail depends on TCCL
[resolves wildfly-extras#299] Usage of camel-script depends on TCCL

itests/standalone/pom.xml

@@ -103,6 +103,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-script</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-rss</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jboss-dmr</artifactId>

itests/standalone/src/test/java/org/wildfly/camel/test/mail/MailIntegrationTest.java

@@ -60,13 +60,10 @@ public static WebArchive createdeployment() {
     public void before() {
         Mailbox.clearAll();
     }
-    
+
     @Test
     public void testSendEmail() throws Exception {
 
-        // [FIXME #290] Usage of camel-mail depends on TCCL
-        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(new RouteBuilder() {
             @Override

itests/standalone/src/test/java/org/wildfly/camel/test/script/BeanShellIntegrationTest.java

@@ -46,9 +46,6 @@ public static JavaArchive deployment() {
     @Test
     public void testSendMatchingMessage() throws Exception {
 
-        // [FIXME #299] Usage of camel-script depends on TCCL
-        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(getRouteBuilder());
         camelctx.start();
@@ -61,9 +58,6 @@ public void testSendMatchingMessage() throws Exception {
     @Test
     public void testSendNonMatchingMessage() throws Exception {
 
-        // [FIXME #299] Usage of camel-script depends on TCCL
-        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(getRouteBuilder());
         camelctx.start();

modules/etc/baseline/exported-paths.txt

@@ -96,13 +96,6 @@ META-INF/services/org/apache/camel/component
 META-INF/services/org/apache/camel/dataformat
 META-INF/services/org/apache/camel/language
 META-INF/services/org/apache/camel/language/resolver
-bsh/classpath
-bsh/collection
-bsh/commands
-bsh/engine
-bsh/reflect
-bsh/util
-bsh/util/lib
 ca/uhn/hl7v2
 ca/uhn/hl7v2/app
 ca/uhn/hl7v2/concurrent
@@ -154,17 +147,6 @@ ca/uhn/hl7v2/validation/builder
 ca/uhn/hl7v2/validation/builder/support
 ca/uhn/hl7v2/validation/impl
 ca/uhn/hl7v2/view
-com/sun/syndication
-com/sun/syndication/feed
-com/sun/syndication/feed/atom
-com/sun/syndication/feed/impl
-com/sun/syndication/feed/module
-com/sun/syndication/feed/module/impl
-com/sun/syndication/feed/rss
-com/sun/syndication/feed/synd
-com/sun/syndication/feed/synd/impl
-com/sun/syndication/io
-com/sun/syndication/io/impl
 org/apache/abdera
 org/apache/abdera/factory
 org/apache/abdera/filter

modules/etc/baseline/module-list.txt

@@ -12,46 +12,46 @@
 /org/apache/activemq/main/activemq-ra-5.10.0.jar
 /org/apache/activemq/main/activemq-spring-5.10.0.jar
 /org/apache/camel/component/activemq/main/activemq-camel-5.10.0.jar
-/org/apache/camel/component/atom/main/camel-atom-2.14.1.jar
-/org/apache/camel/component/bindy/main/camel-bindy-2.14.1.jar
-/org/apache/camel/component/cdi/main/camel-cdi-2.14.1.jar
-/org/apache/camel/component/cxf/main/camel-cxf-2.14.1.jar
-/org/apache/camel/component/cxf/main/camel-cxf-transport-2.14.1.jar
-/org/apache/camel/component/ftp/main/camel-ftp-2.14.1.jar
-/org/apache/camel/component/hl7/main/camel-hl7-2.14.1.jar
+/org/apache/camel/component/atom/main/camel-atom-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/bindy/main/camel-bindy-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/cdi/main/camel-cdi-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/cxf/main/camel-cxf-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/cxf/main/camel-cxf-transport-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/ftp/main/camel-ftp-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/hl7/main/camel-hl7-2.14.2-SNAPSHOT.jar
 /org/apache/camel/component/hl7/main/hapi-base-2.2.jar
 /org/apache/camel/component/hl7/main/hapi-structures-v24-2.2.jar
 /org/apache/camel/component/hl7/main/hapi-structures-v25-2.2.jar
-/org/apache/camel/component/http4/main/camel-http4-2.14.1.jar
-/org/apache/camel/component/jaxb/main/camel-jaxb-2.14.1.jar
-/org/apache/camel/component/jms/main/camel-jms-2.14.1.jar
-/org/apache/camel/component/jmx/main/camel-jmx-2.14.1.jar
-/org/apache/camel/component/jpa/main/camel-jpa-2.14.1.jar
-/org/apache/camel/component/lucene/main/camel-lucene-2.14.1.jar
-/org/apache/camel/component/mail/main/camel-mail-2.14.1.jar
-/org/apache/camel/component/mina2/main/camel-mina2-2.14.1.jar
-/org/apache/camel/component/mqtt/main/camel-mqtt-2.14.1.jar
+/org/apache/camel/component/http4/main/camel-http4-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/jaxb/main/camel-jaxb-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/jms/main/camel-jms-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/jmx/main/camel-jmx-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/jpa/main/camel-jpa-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/lucene/main/camel-lucene-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/mail/main/camel-mail-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/mina2/main/camel-mina2-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/mqtt/main/camel-mqtt-2.14.2-SNAPSHOT.jar
 /org/apache/camel/component/mqtt/main/hawtdispatch-1.21.jar
 /org/apache/camel/component/mqtt/main/hawtdispatch-transport-1.21.jar
 /org/apache/camel/component/mqtt/main/mqtt-client-1.10.jar
-/org/apache/camel/component/mvel/main/camel-mvel-2.14.1.jar
-/org/apache/camel/component/netty4/main/camel-netty4-2.14.1.jar
-/org/apache/camel/component/ognl/main/camel-ognl-2.14.1.jar
+/org/apache/camel/component/mvel/main/camel-mvel-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/netty4/main/camel-netty4-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/ognl/main/camel-ognl-2.14.2-SNAPSHOT.jar
 /org/apache/camel/component/quartz2/main/c3p0-0.9.1.2.jar
-/org/apache/camel/component/quartz2/main/camel-quartz2-2.14.1.jar
+/org/apache/camel/component/quartz2/main/camel-quartz2-2.14.2-SNAPSHOT.jar
 /org/apache/camel/component/quartz2/main/quartz-2.2.1.jar
-/org/apache/camel/component/rss/main/camel-rss-2.14.1.jar
+/org/apache/camel/component/rss/main/camel-rss-2.14.2-SNAPSHOT.jar
 /org/apache/camel/component/rss/main/rome-1.0.jar
 /org/apache/camel/component/saxon/main/Saxon-HE-9.5.1-5.jar
-/org/apache/camel/component/saxon/main/camel-saxon-2.14.1.jar
+/org/apache/camel/component/saxon/main/camel-saxon-2.14.2-SNAPSHOT.jar
 /org/apache/camel/component/script/main/bsh-2.0b5.jar
-/org/apache/camel/component/script/main/camel-script-2.14.1.jar
-/org/apache/camel/component/soap/main/camel-soap-2.14.1.jar
-/org/apache/camel/component/sql/main/camel-sql-2.14.1.jar
-/org/apache/camel/component/weather/main/camel-weather-2.14.1.jar
-/org/apache/camel/core/main/camel-core-2.14.1.jar
-/org/apache/camel/core/xml/main/camel-core-xml-2.14.1.jar
-/org/apache/camel/spring/main/camel-spring-2.14.1.jar
+/org/apache/camel/component/script/main/camel-script-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/soap/main/camel-soap-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/sql/main/camel-sql-2.14.2-SNAPSHOT.jar
+/org/apache/camel/component/weather/main/camel-weather-2.14.2-SNAPSHOT.jar
+/org/apache/camel/core/main/camel-core-2.14.2-SNAPSHOT.jar
+/org/apache/camel/core/xml/main/camel-core-xml-2.14.2-SNAPSHOT.jar
+/org/apache/camel/spring/main/camel-spring-2.14.2-SNAPSHOT.jar
 /org/apache/commons/net/main/commons-net-3.3.jar
 /org/apache/deltaspike/cdictrl/api/main/deltaspike-cdictrl-api-1.0.2.jar
 /org/apache/deltaspike/core/api/main/deltaspike-core-api-1.0.2.jar

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/atom/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.atom">
   <resources>
-    <resource-root path="camel-atom-2.14.1.jar" />
+    <resource-root path="camel-atom-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="org.apache.camel.core" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/bindy/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.bindy">
   <resources>
-    <resource-root path="camel-bindy-2.14.1.jar" />
+    <resource-root path="camel-bindy-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.enterprise.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/cdi/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.cdi">
   <resources>
-    <resource-root path="camel-cdi-2.14.1.jar" />
+    <resource-root path="camel-cdi-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.annotation.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/cxf/main/module.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.cxf">
   <resources>
-    <resource-root path="camel-cxf-2.14.1.jar" />
-    <resource-root path="camel-cxf-transport-2.14.1.jar" />
+    <resource-root path="camel-cxf-2.14.2-SNAPSHOT.jar" />
+    <resource-root path="camel-cxf-transport-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/ftp/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.ftp">
   <resources>
-    <resource-root path="camel-ftp-2.14.1.jar" />
+    <resource-root path="camel-ftp-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/hl7/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.hl7">
   <resources>
-    <resource-root path="camel-hl7-2.14.1.jar" />
+    <resource-root path="camel-hl7-2.14.2-SNAPSHOT.jar" />
     <resource-root path="hapi-base-2.2.jar" />
     <resource-root path="hapi-structures-v24-2.2.jar" />
     <resource-root path="hapi-structures-v25-2.2.jar" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/http4/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.http4">
   <resources>
-    <resource-root path="camel-http4-2.14.1.jar" />
+    <resource-root path="camel-http4-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.servlet.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/jaxb/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.jaxb">
   <resources>
-    <resource-root path="camel-jaxb-2.14.1.jar" />
+    <resource-root path="camel-jaxb-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/jms/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.jms">
   <resources>
-    <resource-root path="camel-jms-2.14.1.jar" />
+    <resource-root path="camel-jms-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/jmx/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.jmx">
   <resources>
-    <resource-root path="camel-jmx-2.14.1.jar" />
+    <resource-root path="camel-jmx-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/jpa/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.jpa">
   <resources>
-    <resource-root path="camel-jpa-2.14.1.jar" />
+    <resource-root path="camel-jpa-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/lucene/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.lucene">
   <resources>
-    <resource-root path="camel-lucene-2.14.1.jar" />
+    <resource-root path="camel-lucene-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="org.apache.lucene" slot="4.10" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/mail/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.mail">
   <resources>
-    <resource-root path="camel-mail-2.14.1.jar" />
+    <resource-root path="camel-mail-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/mina2/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.mina2">
   <resources>
-    <resource-root path="camel-mina2-2.14.1.jar" />
+    <resource-root path="camel-mina2-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="org.apache.camel.core" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/mqtt/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.mqtt">
   <resources>
-    <resource-root path="camel-mqtt-2.14.1.jar" />
+    <resource-root path="camel-mqtt-2.14.2-SNAPSHOT.jar" />
     <resource-root path="hawtdispatch-1.21.jar" />
     <resource-root path="hawtdispatch-transport-1.21.jar" />
     <resource-root path="mqtt-client-1.10.jar" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/mvel/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.mvel">
   <resources>
-    <resource-root path="camel-mvel-2.14.1.jar" />
+    <resource-root path="camel-mvel-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/netty4/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.netty4">
   <resources>
-    <resource-root path="camel-netty4-2.14.1.jar" />
+    <resource-root path="camel-netty4-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/ognl/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.ognl">
   <resources>
-    <resource-root path="camel-ognl-2.14.1.jar" />
+    <resource-root path="camel-ognl-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="org.apache.camel.core" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/quartz2/main/module.xml

@@ -2,7 +2,7 @@
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.quartz2">
   <resources>
     <resource-root path="c3p0-0.9.1.2.jar" />
-    <resource-root path="camel-quartz2-2.14.1.jar" />
+    <resource-root path="camel-quartz2-2.14.2-SNAPSHOT.jar" />
     <resource-root path="quartz-2.2.1.jar" />
   </resources>
   <dependencies>

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/rss/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.rss">
   <resources>
-    <resource-root path="camel-rss-2.14.1.jar" />
+    <resource-root path="camel-rss-2.14.2-SNAPSHOT.jar" />
     <resource-root path="rome-1.0.jar" />
   </resources>
   <dependencies>
@@ -12,6 +12,6 @@
     <module name="org.jdom" />
   </dependencies>
   <exports>
-    <exclude path="com/sun" />
+    <exclude path="com/sun**" />
   </exports>
 </module>

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/saxon/main/module.xml

@@ -2,7 +2,7 @@
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.saxon">
   <resources>
     <resource-root path="Saxon-HE-9.5.1-5.jar" />
-    <resource-root path="camel-saxon-2.14.1.jar" />
+    <resource-root path="camel-saxon-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/script/main/module.xml

@@ -2,7 +2,7 @@
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.script">
   <resources>
     <resource-root path="bsh-2.0b5.jar" />
-    <resource-root path="camel-script-2.14.1.jar" />
+    <resource-root path="camel-script-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />
@@ -11,7 +11,6 @@
     <module name="org.apache.camel.core" />
   </dependencies>
   <exports>
-    <exclude path="bsh/org**" />
-    <exclude path="bsh/servlet" />
+    <exclude path="bsh**" />
   </exports>
 </module>

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/soap/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.soap">
   <resources>
-    <resource-root path="camel-soap-2.14.1.jar" />
+    <resource-root path="camel-soap-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/sql/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.sql">
   <resources>
-    <resource-root path="camel-sql-2.14.1.jar" />
+    <resource-root path="camel-sql-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />

modules/etc/generated/wildfly/modules/system/layers/fuse/org/apache/camel/component/weather/main/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module xmlns="urn:jboss:module:1.1" name="org.apache.camel.component.weather">
   <resources>
-    <resource-root path="camel-weather-2.14.1.jar" />
+    <resource-root path="camel-weather-2.14.2-SNAPSHOT.jar" />
   </resources>
   <dependencies>
     <module name="javax.api" />