[resolves #530] Remove dependency on Felix SCR and Gravia Provisioner

wildfly-extras · Apr 13, 2015 · 6886718 · 6886718
1 parent c5b19e0
commit 6886718
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 534 deletions.
diff --git a/enricher/src/main/java/org/wildfly/camel/arquillian/CamelRemoteLoadableExtension.java b/enricher/src/main/java/org/wildfly/camel/arquillian/CamelRemoteLoadableExtension.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,6 @@ public class CamelRemoteLoadableExtension implements RemoteLoadableExtension, De
     public void register(ExtensionBuilder builder) {
         builder.service(ResourceProvider.class, CamelContextFactoryProvider.class);
         builder.service(ResourceProvider.class, CamelContextRegistryProvider.class);
-        builder.service(ResourceProvider.class, ProvisionerProvider.class);
     }
 
     @Override

diff --git a/enricher/src/main/java/org/wildfly/camel/arquillian/ProvisionerProvider.java b/enricher/src/main/java/org/wildfly/camel/arquillian/ProvisionerProvider.java
diff --git a/itests/common/pom.xml b/itests/common/pom.xml
@@ -38,10 +38,6 @@
             <groupId>org.jdom</groupId>
             <artifactId>jdom</artifactId>
         </dependency>            
-        <dependency>
-            <groupId>org.jboss.gravia</groupId>
-            <artifactId>gravia-provision</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/itests/common/src/main/java/org/wildfly/camel/test/common/ProvisionerSupport.java b/itests/common/src/main/java/org/wildfly/camel/test/common/ProvisionerSupport.java
diff --git a/itests/standalone/pom.xml b/itests/standalone/pom.xml
@@ -175,6 +175,10 @@
             <groupId>org.jboss</groupId>
             <artifactId>jboss-dmr</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.gravia</groupId>
+            <artifactId>gravia-resource</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-atom-provider</artifactId>

diff --git a/...alone/src/test/java/org/wildfly/camel/test/provision/RepositoryContentDeploymentTest.java b/...alone/src/test/java/org/wildfly/camel/test/provision/RepositoryContentDeploymentTest.java
diff --git a/modules/etc/baseline/module-list.txt b/modules/etc/baseline/module-list.txt
@@ -150,17 +150,11 @@
 /org/fusesource/hawtdispatch/main/hawtdispatch-1.21.jar
 /org/fusesource/hawtdispatch/main/hawtdispatch-transport-1.21.jar
 /org/jasypt/main/jasypt-1.9.2.jar
-/org/jboss/gravia/main/gravia-provision-1.1.2.jar
 /org/jboss/gravia/main/gravia-repository-1.1.2.jar
-/org/jboss/gravia/main/gravia-resolver-1.1.2.jar
 /org/jboss/gravia/main/gravia-resource-1.1.2.jar
 /org/jboss/gravia/main/gravia-runtime-api-1.1.2.jar
 /org/jboss/gravia/main/gravia-runtime-embedded-1.1.2.jar
 /org/jboss/gravia/main/org.apache.felix.configadmin-1.8.2.jar
-/org/jboss/gravia/main/org.apache.felix.http.bridge-2.2.1.jar
-/org/jboss/gravia/main/org.apache.felix.log-1.0.1.jar
-/org/jboss/gravia/main/org.apache.felix.metatype-1.0.8.jar
-/org/jboss/gravia/main/org.apache.felix.scr-1.8.2.jar
 /org/mvel/mvel2/main/mvel2-2.2.1.Final.jar
 /org/opensaml/2.6/joda-time-2.2.jar
 /org/opensaml/2.6/opensaml-2.6.1.jar