cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1076798 - in /cxf/trunk: common/wstx-msv-validation/src/main/resources/META-INF/cxf/ common/xerces-xsd-validation/src/main/resources/META-INF/cxf/ distribution/bundle/all/ distribution/bundle/jaxrs/ distribution/bundle/minimal/ rt/bindings...
Date Thu, 03 Mar 2011 21:17:59 GMT
Author: dkulp
Date: Thu Mar  3 21:17:58 2011
New Revision: 1076798

URL: http://svn.apache.org/viewvc?rev=1076798&view=rev
Log:
Change extension bus to use simple text files to load extensions but
keep support for the old xml files for now.   Change all of our
xml versions to text.

Added:
    cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
  (with props)
    cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
  (with props)
    cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
  (with props)
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt   (with
props)
    cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
    cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt   (with props)
Removed:
    cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.xml
    cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.xml
Modified:
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
    cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java

Added: cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
(added)
+++ cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
Thu Mar  3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.wstx_msv_validation.WoodstoxValidationImpl:org.apache.cxf.io.StaxValidationManager:true

Propchange: cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
(added)
+++ cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
Thu Mar  3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.xsdvalidation.XercesXsdValidationImpl:org.apache.cxf.common.xmlschema.XmlSchemaValidationManager:true

Propchange: cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/common/xerces-xsd-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=1076798&r1=1076797&r2=1076798&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Thu Mar  3 21:17:58 2011
@@ -398,8 +398,8 @@
                                 <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 implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/cxf/bus-extensions.txt</resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
                                     <resource>META-INF/cxf/bus-extensions.xml</resource>

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=1076798&r1=1076797&r2=1076798&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Thu Mar  3 21:17:58 2011
@@ -218,8 +218,8 @@
                                 <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 implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/cxf/bus-extensions.txt</resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
                                     <resource>META-INF/cxf/bus-extensions.xml</resource>

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=1076798&r1=1076797&r2=1076798&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Thu Mar  3 21:17:58 2011
@@ -272,8 +272,8 @@
                                 <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 implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/cxf/bus-extensions.txt</resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.XmlAppendingTransformer">
                                     <resource>META-INF/cxf/bus-extensions.xml</resource>

Added: cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1,2 @@
+org.apache.cxf.binding.corba.CorbaBindingFactory::true
+org.apache.cxf.binding.corba.wsdl.WSDLExtensionRegister::true

Propchange: cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/corba/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.binding.http.HttpBindingFactory::true

Propchange: cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/http/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar 
3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.binding.jbi.JBIBindingFactory::true

Propchange: cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.binding.object.ObjectBindingFactory::true

Propchange: cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1,3 @@
+org.apache.cxf.binding.soap.SoapBindingFactory::true
+org.apache.cxf.binding.soap.SoapTransportFactory::true
+

Propchange: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar 
3 21:17:58 2011
@@ -0,0 +1,3 @@
+org.apache.cxf.binding.xml.XMLBindingFactory::true
+org.apache.cxf.binding.xml.wsdl11.XMLWSDLExtensionLoader::true
+

Propchange: cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java?rev=1076798&r1=1076797&r2=1076798&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java
Thu Mar  3 21:17:58 2011
@@ -19,7 +19,10 @@
 
 package org.apache.cxf.bus.extension;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,7 +42,7 @@ public class ExtensionFragmentParser {
     private static final String INTERFACE_ATTR_NAME = "interface";
     private static final String DEFERRED_ATTR_NAME = "deferred";
     
-    List<Extension> getExtensions(InputStream is) {
+    List<Extension> getExtensionsFromXML(InputStream is) {
         Document document = null;
         try {
             document = StaxUtils.read(is);
@@ -49,7 +52,44 @@ public class ExtensionFragmentParser {
         
         return deserialiseExtensions(document);
     }
-    
+    List<Extension> getExtensionsFromText(InputStream is) throws IOException {
+        List<Extension> extensions = new ArrayList<Extension>();
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+        String line = reader.readLine();
+        while (line != null) {
+            line = line.trim();
+            if (line.length() > 0 && line.charAt(0) != '#') {
+                Extension ext = new Extension();
+                int idx = line.indexOf(':');
+                if (idx != -1) {
+                    ext.setClassname(line.substring(0, idx));
+                    line = line.substring(idx + 1);
+                } else {
+                    ext.setClassname(line);
+                    line = null;
+                }
+                if (line != null) {
+                    idx = line.indexOf(':');
+                    if (idx != -1) {
+                        ext.setInterfaceName(line.substring(0, idx));
+                        line = line.substring(idx + 1);
+                    } else {
+                        ext.setInterfaceName(line);
+                        line = null;
+                    }
+                }
+                if (line != null) {
+                    ext.setDeferred(Boolean.parseBoolean(line));
+                }
+                if (ext.getClassname() != null) {
+                    extensions.add(ext);
+                }
+            }
+            
+            line = reader.readLine();
+        }
+        return extensions;
+    }
     
     List<Extension> deserialiseExtensions(Document document) {
         List<Extension> extensions = new ArrayList<Extension>();

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java?rev=1076798&r1=1076797&r2=1076798&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
(original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
Thu Mar  3 21:17:58 2011
@@ -125,7 +125,7 @@ public class ExtensionManagerBus extends
         }
         extensionManager.load(new String[] {
             ExtensionManagerImpl.BUS_EXTENSION_RESOURCE,
-            ExtensionManagerImpl.BUS_EXTENSION_RESOURCE_COMPAT});
+            ExtensionManagerImpl.BUS_EXTENSION_RESOURCE_XML});
         
         extensionManager.activateAllByType(ResourceResolver.class);
         

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=1076798&r1=1076797&r2=1076798&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
Thu Mar  3 21:17:58 2011
@@ -46,8 +46,8 @@ public class ExtensionManagerImpl implem
     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_COMPAT = "META-INF/bus-extensions.xml";
-    public static final String BUS_EXTENSION_RESOURCE = "META-INF/cxf/bus-extensions.xml";
+    public static final String BUS_EXTENSION_RESOURCE_XML = "META-INF/cxf/bus-extensions.xml";
+    public static final String BUS_EXTENSION_RESOURCE = "META-INF/cxf/bus-extensions.txt";
     
     private static final String NO_NAMESPACES = "NO_NAMESPACE_BEANS";
     
@@ -62,7 +62,7 @@ public class ExtensionManagerImpl implem
 
     public ExtensionManagerImpl(ClassLoader cl, Map<Class, Object> initialExtensions,

                                 ResourceManager rm, Bus b) {
-        this(new String[] {BUS_EXTENSION_RESOURCE, BUS_EXTENSION_RESOURCE_COMPAT},
+        this(new String[] {BUS_EXTENSION_RESOURCE, BUS_EXTENSION_RESOURCE_XML},
                  cl, initialExtensions, rm, b);
     }
     public ExtensionManagerImpl(String resource, 
@@ -151,7 +151,11 @@ public class ExtensionManagerImpl implem
             URL url = urls.nextElement();
             
             InputStream is = url.openStream();
-            all.addAll(new ExtensionFragmentParser().getExtensions(is));       
+            if (resource.endsWith("xml")) {
+                all.addAll(new ExtensionFragmentParser().getExtensionsFromXML(is));
+            } else {
+                all.addAll(new ExtensionFragmentParser().getExtensionsFromText(is));
+            }
         }
         for (Extension e : all) {
             if (e.isDeferred()) {

Added: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar  3 21:17:58
2011
@@ -0,0 +1,12 @@
+org.apache.cxf.wsdl11.WSDLManagerImpl:org.apache.cxf.wsdl.WSDLManager:true
+org.apache.cxf.phase.PhaseManagerImpl:org.apache.cxf.phase.PhaseManager:true
+org.apache.cxf.workqueue.WorkQueueManagerImpl:org.apache.cxf.workqueue.WorkQueueManager:true
+org.apache.cxf.buslifecycle.CXFBusLifeCycleManager:org.apache.cxf.buslifecycle.BusLifeCycleManager:true
  	   
+org.apache.cxf.endpoint.ServerRegistryImpl:org.apache.cxf.endpoint.ServerRegistry:true
+org.apache.cxf.transport.http.QueryHandlerRegistryImpl:org.apache.cxf.transports.http.QueryHandlerRegistry:true

+org.apache.cxf.endpoint.EndpointResolverRegistryImpl:org.apache.cxf.endpoint.EndpointResolverRegistry:true
+org.apache.cxf.headers.HeaderManagerImpl:org.apache.cxf.headers.HeaderManager:true
+org.apache.cxf.catalog.OASISCatalogManager:org.apache.cxf.catalog.OASISCatalogManager:true
+org.apache.cxf.service.factory.FactoryBeanListenerManager::true
+org.apache.cxf.endpoint.ServerLifeCycleManagerImpl:org.apache.cxf.endpoint.ServerLifeCycleManager:true
+org.apache.cxf.endpoint.ClientLifeCycleManagerImpl:org.apache.cxf.endpoint.ClientLifeCycleManager:true

Propchange: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/core/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java?rev=1076798&r1=1076797&r2=1076798&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java
(original)
+++ cxf/trunk/rt/core/src/test/java/org/apache/cxf/bus/extension/ExtensionFragmentParserTest.java
Thu Mar  3 21:17:58 2011
@@ -31,7 +31,7 @@ public class ExtensionFragmentParserTest
     @Test
     public void testGetExtensions() {
         InputStream is = ExtensionFragmentParserTest.class.getResourceAsStream("extension1.xml");
-        List<Extension> extensions = new ExtensionFragmentParser().getExtensions(is);
+        List<Extension> extensions = new ExtensionFragmentParser().getExtensionsFromXML(is);
         assertEquals("Unexpected number of Extension elements.", 3, extensions.size());
         
         Extension e = extensions.get(0);

Added: cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.jaxws.context.WebServiceContextResourceResolver::true

Propchange: cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/frontend/jaxws/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar  3
21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.management.jmx.InstrumentationManagerImpl:org.apache.cxf.management.InstrumentationManager:false
          

Propchange: cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/management/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
(added)
+++ cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
Thu Mar  3 21:17:58 2011
@@ -0,0 +1,3 @@
+org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory::false
+org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory::true
+

Propchange: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1,6 @@
+org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory::true
+org.apache.cxf.transport.http.HTTPWSDLExtensionLoader::true
+org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder::true
+org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder::true
+org.apache.cxf.transport.http.policy.NoOpPolicyInterceptorProvider::true
+

Propchange: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1,4 @@
+org.apache.cxf.transport.jbi.JBITransportFactory::true
+org.apache.cxf.transport.jbi.wsdl11.JBIWSDLExtensionLoader::true
+
+

Propchange: cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1,4 @@
+org.apache.cxf.transport.jms.JMSTransportFactory::true
+org.apache.cxf.transport.jms.wsdl11.JMSWSDLExtensionLoader::true
+
+

Propchange: cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar
 3 21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.transport.local.LocalTransportFactory::true

Propchange: cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar  3 21:17:58
2011
@@ -0,0 +1,4 @@
+org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder::true
+org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder::true
+org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider::true
+org.apache.cxf.ws.addressing.AddressingWSDLExtensionLoader::true

Propchange: cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar  3 21:17:58
2011
@@ -0,0 +1,13 @@
+org.apache.cxf.ws.policy.PolicyEngineImpl:org.apache.cxf.ws.policy.PolicyEngine:false
+org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl:org.apache.cxf.ws.policy.AssertionBuilderRegistry:true

+org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl:org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry:true
+org.apache.cxf.ws.policy.PolicyBuilderImpl:org.apache.cxf.ws.policy.PolicyBuilder:true
+org.apache.cxf.ws.policy.PolicyAnnotationListener::true
+
+org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider::true
+org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry::true
+org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder::true
+org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider::true
+# MTOM Policy Support
+org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder::true
+org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider::true

Propchange: cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar  3 21:17:58
2011
@@ -0,0 +1,4 @@
+org.apache.cxf.ws.rm.RMManager::true
+org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider::true
+org.apache.cxf.ws.rm.policy.RMAssertionBuilder::true
+

Propchange: cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt?rev=1076798&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt (added)
+++ cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt Thu Mar  3
21:17:58 2011
@@ -0,0 +1 @@
+org.apache.cxf.ws.security.policy.WSSecurityPolicyLoader::true

Propchange: cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/security/src/main/resources/META-INF/cxf/bus-extensions.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message