You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/26 03:40:49 UTC
svn commit: r1236026 - in /cxf/trunk:
osgi/karaf/features/src/main/resources/features.xml
rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
rt/databinding/xmlbeans/pom.xml
Author: dkulp
Date: Thu Jan 26 02:40:49 2012
New Revision: 1236026
URL: http://svn.apache.org/viewvc?rev=1236026&view=rev
Log:
Update some more things to get some additional test cases working
Modified:
cxf/trunk/osgi/karaf/features/src/main/resources/features.xml
cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
cxf/trunk/rt/databinding/xmlbeans/pom.xml
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=1236026&r1=1236025&r2=1236026&view=diff
==============================================================================
--- cxf/trunk/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/osgi/karaf/features/src/main/resources/features.xml Thu Jan 26 02:40:49 2012
@@ -53,8 +53,11 @@
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
<bundle start-level='10'>mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${cxf.servicemix.specs.version}</bundle>
+
<bundle start-level='20'>mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
<bundle start-level='20'>mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
+ <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
+ <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
</feature>
<!-- Current the abdera bundle is not working as we expect -->
@@ -76,9 +79,9 @@
<feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-specs</feature>
- <bundle>mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
- <bundle start-level='25'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
+ <bundle start-level='25' dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle>
+ <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle>
+ <bundle start-level='25' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle>
<bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle>
@@ -92,8 +95,6 @@
<bundle start-level='30' dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle>
<bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle>
<bundle start-level='30' dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle>
- <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle>
- <bundle start-level='20'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-common-utilities/${project.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-api/${project.version}</bundle>
@@ -154,6 +155,9 @@
<feature name="cxf-jaxrs" version="${project.version}" resolver='(obr)'>
<feature version="${project.version}">cxf-core</feature>
<feature version="${project.version}">cxf-http</feature>
+
+ <bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle>
+
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle>
<bundle start-level='40'>mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle>
</feature>
@@ -218,6 +222,7 @@
<feature version="${project.version}">cxf-jaxws</feature>
<feature version="${project.version}">cxf-javascript</feature>
+ <bundle>mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle>
<bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle>
@@ -246,6 +251,8 @@
<feature version="${project.version}">cxf-bindings-coloc</feature>
<feature version="${project.version}">cxf-bindings-object</feature>
+ <feature version="${project.version}">cxf-http-jetty</feature>
+
<feature version="${project.version}">cxf-transports-local</feature>
<feature version="${project.version}">cxf-transports-jms</feature>
@@ -259,6 +266,9 @@
<bundle>mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle>
+ <!-- Compatibility bundle for the Require-Bundle use cases -->
+ <bundle>mvn:org.apache.cxf/cxf-bundle-compatible/${project.version}</bundle>
+
<!-- needs jra
<bundle>mvn:org.apache.cxf/cxf-rt-bindings-http/${project.version}</bundle-->
<!-- need msv
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java?rev=1236026&r1=1236025&r2=1236026&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java Thu Jan 26 02:40:49 2012
@@ -20,6 +20,7 @@ package org.apache.cxf.bus.osgi;
import java.io.IOException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -78,7 +79,13 @@ public class CXFExtensionBundleListener
if (orig.isEmpty()) {
return;
}
- LOG.info("Adding the extension from bundle " + bundle.getBundleId());
+
+ List<String> names = new ArrayList<String>(orig.size());
+ for (Extension ext : orig) {
+ names.add(ext.getName());
+ }
+ LOG.info("Adding the extensions from bundle " + bundle.getSymbolicName()
+ + " (" + bundle.getBundleId() + ") " + names);
List<Extension> list = extensions.get(bundle.getBundleId());
if (list == null) {
list = new CopyOnWriteArrayList<Extension>();
Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=1236026&r1=1236025&r2=1236026&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Thu Jan 26 02:40:49 2012
@@ -55,14 +55,13 @@
<artifactId>cxf-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${project.version}</version>
+ <optional>true</optional>
</dependency>
-
-
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-wsdlto-core</artifactId>