Author: dkulp
Date: Mon Oct 24 18:42:01 2011
New Revision: 1188283
URL: http://svn.apache.org/viewvc?rev=1188283&view=rev
Log:
Merged revisions 1187609 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1187609 | dkulp | 2011-10-21 20:36:13 -0400 (Fri, 21 Oct 2011) | 2 lines
Opt into geronimo-specs SPI things so we can remove the DynamicImport *
things from the wsn bundles.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml?rev=1188283&r1=1188282&r2=1188283&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml Mon Oct 24 18:42:01 2011
@@ -303,6 +303,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/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml?rev=1188283&r1=1188282&r2=1188283&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml Mon Oct 24 18:42:01
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/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1188283&r1=1188282&r2=1188283&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Mon Oct 24 18:42:01 2011
@@ -19,6 +19,7 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";
name="cxf-${project.version}">
<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/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1188283&r1=1188282&r2=1188283&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Mon Oct 24 18:42:01 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 {
