SMXCOMP-911: Add shared-library bundles to JBI component Require-Bund…

…le header git-svn-id: https://svn.apache.org/repos/asf/servicemix/components/trunk@1190042 13f79535-47bb-0310-9956-ffa450edef68
apache · Oct 27, 2011 · f03c6c0 · f03c6c0
1 parent 6a3417b
commit f03c6c0
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 121 deletions.
diff --git a/bindings/pom.xml b/bindings/pom.xml
@@ -33,6 +33,18 @@
 
     <name>Apache ServiceMix :: Components :: Binding Components</name>
 
+    <!-- configure required bundles to mimic ServiceMix 3 JBI component classloader in OSGi environment -->
+    <properties>
+        <servicemix.osgi.bundles>
+            org.springframework.core,
+            org.springframework.beans,
+            org.springframework.context,
+            servicemix-common,
+            servicemix-soap,
+            servicemix-soap2
+        </servicemix.osgi.bundles>
+    </properties>
+
     <modules>
         <module>servicemix-cxf-bc</module>
         <module>servicemix-file</module>

diff --git a/bindings/servicemix-cxf-bc/pom.xml b/bindings/servicemix-cxf-bc/pom.xml
@@ -72,7 +72,10 @@
             org.apache.cxf.bundle,
             org.springframework.core,
             org.springframework.beans,
-            org.springframework.context
+            org.springframework.context,
+            servicemix-common,
+            servicemix-soap,
+            servicemix-soap2
         </servicemix.osgi.bundles>
     </properties>
 

diff --git a/bindings/servicemix-file/pom.xml b/bindings/servicemix-file/pom.xml
@@ -60,11 +60,6 @@
             org.apache.servicemix.file*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.file
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-ftp/pom.xml b/bindings/servicemix-ftp/pom.xml
@@ -55,11 +55,6 @@
             org.apache.servicemix.ftp*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.ftp
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-http/pom.xml b/bindings/servicemix-http/pom.xml
@@ -63,11 +63,6 @@
             org.apache.servicemix.http*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.http
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-jms/pom.xml b/bindings/servicemix-jms/pom.xml
@@ -57,11 +57,6 @@
             org.apache.servicemix.jms*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.jms
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-ldap/pom.xml b/bindings/servicemix-ldap/pom.xml
@@ -57,6 +57,9 @@
             org.springframework.core,
             org.springframework.beans,
             org.springframework.context,
+            servicemix-common,
+            servicemix-soap,
+            servicemix-soap2
         </servicemix.osgi.bundles>
     </properties>
 

diff --git a/bindings/servicemix-mail/pom.xml b/bindings/servicemix-mail/pom.xml
@@ -51,11 +51,6 @@
             org.apache.servicemix.mail*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.mail
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-rmi/pom.xml b/bindings/servicemix-rmi/pom.xml
@@ -56,11 +56,6 @@
             org.apache.servicemix.rmi*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.rmi
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context,
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-smpp/pom.xml b/bindings/servicemix-smpp/pom.xml
@@ -55,11 +55,6 @@
             org.apache.servicemix.smpp*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.smpp.servicemix.apache.org.smpp
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <repositories>

diff --git a/bindings/servicemix-snmp/pom.xml b/bindings/servicemix-snmp/pom.xml
@@ -59,11 +59,6 @@
             org.apache.servicemix.snmp*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.snmp
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-truezip/pom.xml b/bindings/servicemix-truezip/pom.xml
@@ -63,11 +63,6 @@
             org.apache.servicemix.truezip*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.truezip
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-vfs/pom.xml b/bindings/servicemix-vfs/pom.xml
@@ -57,11 +57,6 @@
             org.apache.servicemix.vfs*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.vfs
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/bindings/servicemix-xmpp/pom.xml b/bindings/servicemix-xmpp/pom.xml
@@ -53,11 +53,6 @@
             org.apache.servicemix.xmpp*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.xmpp
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/pom.xml b/engines/pom.xml
@@ -33,6 +33,18 @@
 
     <name>Apache ServiceMix :: Components :: Service Engines</name>
 
+    <!-- configure required bundles to mimic ServiceMix 3 JBI component classloader in OSGi environment -->
+    <properties>
+        <servicemix.osgi.bundles>
+            org.springframework.core,
+            org.springframework.beans,
+            org.springframework.context,
+            servicemix-common,
+            servicemix-soap,
+            servicemix-soap2
+        </servicemix.osgi.bundles>
+    </properties>
+
     <modules>
         <module>servicemix-bean</module>
         <module>servicemix-camel</module>

diff --git a/engines/servicemix-bean/pom.xml b/engines/servicemix-bean/pom.xml
@@ -56,11 +56,6 @@
             org.apache.servicemix.bean*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.bean
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-camel/pom.xml b/engines/servicemix-camel/pom.xml
@@ -59,11 +59,6 @@
             org.apache.servicemix.camel*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.camel
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-cxf-se/pom.xml b/engines/servicemix-cxf-se/pom.xml
@@ -70,6 +70,9 @@
             org.springframework.core,
             org.springframework.beans,
             org.springframework.context,
+            servicemix-common,
+            servicemix-soap,
+            servicemix-soap2
             org.apache.servicemix.bundles.xmlbeans
         </servicemix.osgi.bundles>
     </properties>

diff --git a/engines/servicemix-drools/pom.xml b/engines/servicemix-drools/pom.xml
@@ -63,11 +63,6 @@
             org.apache.servicemix.drools*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.drools
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-exec/pom.xml b/engines/servicemix-exec/pom.xml
@@ -53,11 +53,6 @@
             org.apache.servicemix.exec*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.exec
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-jsr181/pom.xml b/engines/servicemix-jsr181/pom.xml
@@ -56,11 +56,6 @@
             org.apache.servicemix.jsr181*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.jsr181
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-osworkflow/pom.xml b/engines/servicemix-osworkflow/pom.xml
@@ -53,11 +53,6 @@
             org.apache.servicemix.osworkflow*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.osworkflow
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-pdf/pom.xml b/engines/servicemix-pdf/pom.xml
@@ -58,11 +58,6 @@
             org.apache.servicemix.pdf*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.pdf
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context,
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-quartz/pom.xml b/engines/servicemix-quartz/pom.xml
@@ -51,11 +51,6 @@
             org.apache.servicemix.quartz*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.quartz
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-saxon/pom.xml b/engines/servicemix-saxon/pom.xml
@@ -62,11 +62,6 @@
             org.apache.servicemix.saxon*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.saxon
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-script/pom.xml b/engines/servicemix-script/pom.xml
@@ -59,11 +59,6 @@
             org.apache.servicemix.script*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.script
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-scripting/pom.xml b/engines/servicemix-scripting/pom.xml
@@ -67,11 +67,6 @@
             org.apache.servicemix.scripting*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.scripting
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-validation/pom.xml b/engines/servicemix-validation/pom.xml
@@ -51,11 +51,6 @@
             org.apache.servicemix.validation*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.validation
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>

diff --git a/engines/servicemix-wsn2005/pom.xml b/engines/servicemix-wsn2005/pom.xml
@@ -55,11 +55,6 @@
             org.apache.servicemix.wsn*;version=${project.version},
             META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.wsn
         </servicemix.osgi.export>
-        <servicemix.osgi.bundles>
-            org.springframework.core,
-            org.springframework.beans,
-            org.springframework.context
-        </servicemix.osgi.bundles>
     </properties>
 
     <dependencies>