cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1187609 - in /cxf/trunk: osgi/bundle/all/ osgi/bundle/minimal/ osgi/karaf/features/src/main/resources/ rt/core/src/main/java/org/apache/cxf/bus/extension/ services/wsn/wsn-api/ services/wsn/wsn-core/ services/wsn/wsn-osgi/
Date Sat, 22 Oct 2011 00:36:14 GMT
Author: dkulp
Date: Sat Oct 22 00:36:13 2011
New Revision: 1187609

URL: http://svn.apache.org/viewvc?rev=1187609&view=rev
Log:
Opt into geronimo-specs SPI things so we can remove the DynamicImport *
things from the wsn bundles.

Modified:
    cxf/trunk/osgi/bundle/all/pom.xml
    cxf/trunk/osgi/bundle/minimal/pom.xml
    cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
    cxf/trunk/services/wsn/wsn-api/pom.xml
    cxf/trunk/services/wsn/wsn-core/pom.xml
    cxf/trunk/services/wsn/wsn-osgi/pom.xml

Modified: cxf/trunk/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/all/pom.xml?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/all/pom.xml (original)
+++ cxf/trunk/osgi/bundle/all/pom.xml Sat Oct 22 00:36:13 2011
@@ -308,6 +308,7 @@
                         <Specification-Title>Apache CXF</Specification-Title>
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
                         <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+                        <SPI-Provider>true</SPI-Provider>
                         <DynamicImport-Package>
                             com.sun.xml.bind,
                             com.sun.xml.bind.*,

Modified: cxf/trunk/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/minimal/pom.xml?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/minimal/pom.xml (original)
+++ cxf/trunk/osgi/bundle/minimal/pom.xml Sat Oct 22 00:36:13 2011
@@ -157,6 +157,7 @@
                         <Specification-Title>Apache CXF</Specification-Title>
                         <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
                         <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+                        <SPI-Provider>true</SPI-Provider>
                         <DynamicImport-Package>
                             com.ctc.wstx.*,
                             com.sun.xml.bind.api,

Modified: cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/karaf/features/src/main/resources/features.xml?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Sat Oct 22 00:36:13 2011
@@ -43,6 +43,7 @@
 
 
     <feature name="cxf-specs" version="${project.version}" resolver='(obr)'>
+        <bundle start-level='9' dependency="true">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle>
         <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${cxf.geronimo.annotation.version}</bundle>
         <bundle start-level='10'>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${cxf.geronimo.ws.metadata.version}</bundle>

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Sat Oct 22 00:36:13 2011
@@ -140,9 +140,16 @@ public class ExtensionManagerImpl implem
             }
         }        
     }
-
     final void load(String resource) throws IOException {
-        Enumeration<URL> urls = loader.getResources(resource);
+        load(resource, loader);
+        if (loader != getClass().getClassLoader()) {
+            load(resource, getClass().getClassLoader());
+        }
+    }
+    final void load(String resource, ClassLoader l) throws IOException {
+        
+        Enumeration<URL> urls = l.getResources(resource);
+        
         while (urls.hasMoreElements()) {
             URL url = urls.nextElement();
             InputStream is = url.openStream();
@@ -156,6 +163,9 @@ public class ExtensionManagerImpl implem
                     exts = new ExtensionFragmentParser().getExtensionsFromText(is);
                 }
                 for (Extension e : exts) {
+                    if (loader != l) {
+                        e.classloader = l;
+                    }
                     all.put(e.getName(), e);
                 }
             } finally {

Modified: cxf/trunk/services/wsn/wsn-api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-api/pom.xml?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-api/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-api/pom.xml Sat Oct 22 00:36:13 2011
@@ -88,7 +88,6 @@
                             org.apache.cxf.wsn.wsdl;version=${project.version},
                             org.apache.cxf.wsn.jaxws;version=${project.version}
                         </Export-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
                         <_nouses>true</_nouses>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>

Modified: cxf/trunk/services/wsn/wsn-core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/pom.xml?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-core/pom.xml Sat Oct 22 00:36:13 2011
@@ -144,7 +144,6 @@
                         <Export-Package>
                             org.apache.cxf.wsn.services;version=${project.version}
                         </Export-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
                         <_nouses>true</_nouses>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>

Modified: cxf/trunk/services/wsn/wsn-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-osgi/pom.xml?rev=1187609&r1=1187608&r2=1187609&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-osgi/pom.xml (original)
+++ cxf/trunk/services/wsn/wsn-osgi/pom.xml Sat Oct 22 00:36:13 2011
@@ -77,7 +77,6 @@
                             org.apache.cxf.wsn.*,
                             org.apache.cxf.common.logging
                         </Private-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>
                 </configuration>



Mime
View raw message