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 2011/11/23 21:54:24 UTC
svn commit: r1205587 - in /cxf/branches/2.4.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
Author: dkulp
Date: Wed Nov 23 20:54:24 2011
New Revision: 1205587
URL: http://svn.apache.org/viewvc?rev=1205587&view=rev
Log:
Merged revisions 1205538 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1205538 | dkulp | 2011-11-23 14:07:15 -0500 (Wed, 23 Nov 2011) | 3 lines
Updates to CXF's namespace handler to support the other namespaces that
may be encountered. More or less requires ARIES-626 to actually work
though.
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
cxf/branches/2.4.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java?rev=1205587&r1=1205586&r2=1205587&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/blueprint/CXFCoreNamespaceHandler.java Wed Nov 23 20:54:24 2011
@@ -30,19 +30,23 @@ import org.apache.aries.blueprint.Parser
import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser;
import org.apache.cxf.feature.FastInfosetFeature;
import org.apache.cxf.feature.LoggingFeature;
-import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
/**
*
*/
-public class CXFCoreNamespaceHandler implements NamespaceHandler {
- private BlueprintContainer blueprintContainer;
-
+public class CXFCoreNamespaceHandler implements NamespaceHandler {
public URL getSchemaLocation(String namespace) {
- return getClass().getClassLoader().getResource("/schemas/blueprint/core.xsd");
+ if ("http://cxf.apache.org/blueprint/core".equals(namespace)) {
+ return getClass().getClassLoader().getResource("/schemas/blueprint/core.xsd");
+ } else if ("http://cxf.apache.org/configuration/beans".equals(namespace)) {
+ return getClass().getClassLoader().getResource("/schemas/configuration/cxf-beans.xsd");
+ } else if ("http://cxf.apache.org/configuration/parameterized-types".equals(namespace)) {
+ return getClass().getClassLoader().getResource("/schemas/configuration/parameterized-types.xsd");
+ }
+ return null;
}
@@ -69,13 +73,4 @@ public class CXFCoreNamespaceHandler imp
return null;
}
-
- public BlueprintContainer getBlueprintContainer() {
- return blueprintContainer;
- }
-
- public void setBlueprintContainer(BlueprintContainer blueprintContainer) {
- this.blueprintContainer = blueprintContainer;
- }
-
}
Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml?rev=1205587&r1=1205586&r2=1205587&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml Wed Nov 23 20:54:24 2011
@@ -24,7 +24,13 @@
<service interface="org.apache.aries.blueprint.NamespaceHandler">
<service-properties>
- <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/core"/>
+ <entry key="osgi.service.blueprint.namespace">
+ <list>
+ <value>http://cxf.apache.org/blueprint/core</value>
+ <value>http://cxf.apache.org/configuration/beans</value>
+ <value>http://cxf.apache.org/configuration/parameterized-types</value>
+ </list>
+ </entry>
</service-properties>
<bean class="org.apache.cxf.bus.blueprint.CXFCoreNamespaceHandler"/>
</service>