cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r666813 - in /cxf/branches/2.0.x-fixes: ./ distribution/bundle/ rt/bindings/http/src/main/resources/META-INF/ rt/bindings/http/src/main/resources/META-INF/cxf/ rt/bindings/jbi/src/main/resources/META-INF/ rt/bindings/jbi/src/main/resources/...
Date Wed, 11 Jun 2008 19:57:09 GMT
Author: dkulp
Date: Wed Jun 11 12:57:08 2008
New Revision: 666813

URL: http://svn.apache.org/viewvc?rev=666813&view=rev
Log:
Merged revisions 666803 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r666803 | dkulp | 2008-06-11 15:43:58 -0400 (Wed, 11 Jun 2008) | 2 lines
  
  [CXF-1643] Move runtime extension information into META-INF/cxf so OSGi will find it
........

Added:
    cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/cxf/extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/extensions.xml
    cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/cxf/extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/cxf/extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/extensions.xml
    cxf/branches/2.0.x-fixes/rt/ws/addr/src/main/resources/META-INF/cxf/extensions.xml
      - copied unchanged from r666803, cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/extensions.xml
Removed:
    cxf/branches/2.0.x-fixes/rt/bindings/http/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/jbi/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/object/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/soap/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/resources/META-INF/extensions.xml
    cxf/branches/2.0.x-fixes/rt/core/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/management/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/http/src/main/resources/META-INF/extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jbi/src/main/resources/META-INF/extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/bus-extensions.xml
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/resources/META-INF/extensions.xml
Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
    cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=666813&r1=666812&r2=666813&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Wed Jun 11 12:57:08 2008
@@ -323,8 +323,23 @@
                                     <resource>META-INF/extensions.xml</resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+                                    <resource>META-INF/cxf/extensions.xml</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
                                     <resource>META-INF/bus-extensions.xml</resource>
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+                                    <resource>META-INF/cxf/bus-extensions.xml</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+                                    <resource>META-INF/service.validator.xml</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+                                    <resource>META-INF/wsdl.plugin.xml</resource>
+                                </transformer>                     
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
+                                    <resource>META-INF/tools.service.validator.xml</resource>
+                                </transformer>                                    
      
                                 <transformer implementation="org.apache.cxf.maven.PluginTransformer">
                                     <resource>META-INF/tools-plugin.xml</resource>
                                 </transformer>

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=666813&r1=666812&r2=666813&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
Wed Jun 11 12:57:08 2008
@@ -54,8 +54,6 @@
     private static final String BUS_ID_PROPERTY_NAME = "org.apache.cxf.bus.id";
     
     
-    private static final String BUS_EXTENSION_RESOURCE = "META-INF/bus-extensions.xml";
-
     public ExtensionManagerBus(Map<Class, Object> e, Map<String, Object> properties)
{
         super(e);
 
@@ -85,7 +83,7 @@
         
         extensions.put(ResourceManager.class, resourceManager);
 
-        ExtensionManagerImpl em = new ExtensionManagerImpl(BUS_EXTENSION_RESOURCE, 
+        ExtensionManagerImpl em = new ExtensionManagerImpl(
                                  Thread.currentThread().getContextClassLoader(),
                                  extensions,
                                  resourceManager);

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=666813&r1=666812&r2=666813&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Wed Jun 11 12:57:08 2008
@@ -42,7 +42,8 @@
     public static final String EXTENSIONMANAGER_PROPERTY_NAME = "extensionManager";
     public static final String ACTIVATION_NAMESPACES_PROPERTY_NAME = "activationNamespaces";
     public static final String ACTIVATION_NAMESPACES_SETTER_METHOD_NAME = "setActivationNamespaces";
-    public static final String BUS_EXTENSION_RESOURCE = "META-INF/bus-extensions.xml";
+    public static final String BUS_EXTENSION_RESOURCE_COMPAT = "META-INF/bus-extensions.xml";
+    public static final String BUS_EXTENSION_RESOURCE = "META-INF/cxf/bus-extensions.xml";
     
     private final ClassLoader loader;
     private ResourceManager resourceManager;
@@ -53,11 +54,18 @@
 
     public ExtensionManagerImpl(ClassLoader cl, Map<Class, Object> initialExtensions,

                                 ResourceManager rm) {
-        this(BUS_EXTENSION_RESOURCE, cl, initialExtensions, rm);
+        this(new String[] {BUS_EXTENSION_RESOURCE, BUS_EXTENSION_RESOURCE_COMPAT}, cl, initialExtensions,
rm);
     }
-    
-    public ExtensionManagerImpl(String resource, ClassLoader cl, Map<Class, Object>
initialExtensions, 
-        ResourceManager rm) {
+    public ExtensionManagerImpl(String resource, 
+                                ClassLoader cl, 
+                                Map<Class, Object> initialExtensions, 
+                                ResourceManager rm) {
+        this(new String[] {resource}, cl, initialExtensions, rm);
+    }    
+    public ExtensionManagerImpl(String resources[], 
+                                ClassLoader cl, 
+                                Map<Class, Object> initialExtensions, 
+                                ResourceManager rm) {
 
         loader = cl;
         activated = initialExtensions;
@@ -71,7 +79,9 @@
         deferred = new ConcurrentHashMap<String, Collection<Extension>>();
 
         try {
-            load(resource);
+            for (String resource : resources) {
+                load(resource);
+            }
         } catch (IOException ex) {
             throw new ExtensionException(ex);
         }

Modified: cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java?rev=666813&r1=666812&r2=666813&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLManagerImpl.java
Wed Jun 11 12:57:08 2008
@@ -69,7 +69,8 @@
 
     private static final Logger LOG = LogUtils.getL7dLogger(WSDLManagerImpl.class);
 
-    private static final String EXTENSIONS_RESOURCE = "META-INF/extensions.xml";
+    private static final String EXTENSIONS_RESOURCE = "META-INF/cxf/extensions.xml";
+    private static final String EXTENSIONS_RESOURCE_COMPAT = "META-INF/extensions.xml";
 
     final ExtensionRegistry registry;
     final WSDLFactory factory;
@@ -215,9 +216,13 @@
     }
 
     private void registerInitialExtensions() throws BusException {
+        registerInitialExtensions(EXTENSIONS_RESOURCE_COMPAT);
+        registerInitialExtensions(EXTENSIONS_RESOURCE);
+    }
+    private void registerInitialExtensions(String resource) throws BusException {
         Properties initialExtensions = null;
         try {
-            initialExtensions = PropertiesLoaderUtils.loadAllProperties(EXTENSIONS_RESOURCE,

+            initialExtensions = PropertiesLoaderUtils.loadAllProperties(resource, 
                                                                         Thread.currentThread()
                                                                               .getContextClassLoader());
         } catch (IOException ex) {



Mime
View raw message