cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r530201 - in /incubator/cxf/trunk: bundle/ integration/jbi/src/main/resources/META-INF/cxf/ rt/bindings/jbi/src/main/resources/META-INF/cxf/ rt/bindings/object/src/main/resources/META-INF/cxf/ rt/bindings/soap/src/main/resources/META-INF/cx...
Date Wed, 18 Apr 2007 23:29:41 GMT
Author: dandiep
Date: Wed Apr 18 16:29:40 2007
New Revision: 530201

URL: http://svn.apache.org/viewvc?view=rev&rev=530201
Log:
Create a cxf.extension files for various modules which tells 
cxf which extensions to add. This gets around a longer classpath search.
It also makes the bundle jar work correctly. Two birds with one stone!

(Another way to do this would be to create a bunch of cxf-extension.xml
files which imported cxf-extension-*.xml. We need to avoid the * search
somehow though and we need to be able to have uniquely addressible spring
files (i.e. cxf-extension-foo.xml). Thoughts are welcome...)


Added:
    incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/cxf.extension   (with
props)
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi-binding.xml
      - copied unchanged from r530180, incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf.extension   (with
props)
    incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension 
 (with props)
    incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension   (with
props)
    incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension   (with
props)
    incubator/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf.extension   (with
props)
    incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension
  (with props)
    incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension 
 (with props)
    incubator/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf.extension  
(with props)
    incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf.extension  
(with props)
    incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf.extension
  (with props)
    incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf.extension   (with props)
    incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf.extension   (with
props)
    incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf.extension   (with props)
Removed:
    incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf-extension-jbi.xml
Modified:
    incubator/cxf/trunk/bundle/pom.xml
    incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java

Modified: incubator/cxf/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/bundle/pom.xml?view=diff&rev=530201&r1=530200&r2=530201
==============================================================================
--- incubator/cxf/trunk/bundle/pom.xml (original)
+++ incubator/cxf/trunk/bundle/pom.xml Wed Apr 18 16:29:40 2007
@@ -266,11 +266,17 @@
 							  <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
 							    <resource>META-INF/spring.schemas</resource>
 							  </transformer>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+							    <resource>META-INF/cxf/cxf.extension</resource>
+							  </transformer>
 							  <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
 							    <resource>META-INF/extensions.xml</resource>
 							  </transformer>
 							  <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
 							    <resource>META-INF/bus-extensions.xml</resource>
+							  </transformer>
+							  <transformer implementation="org.codehaus.mojo.shade.resource.XmlAppendingTransformer">
+							    <resource>META-INF/cxf/cxf-property-editors.xml</resource>
 							  </transformer>
 							  <transformer implementation="org.apache.cxf.maven.PluginTransformer">
 							    <resource>META-INF/tools-plugin.xml</resource>

Added: incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-jbi.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/integration/jbi/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-jbi-binding.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/bindings/jbi/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-object-binding.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-soap.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/bindings/soap/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-xml.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/bindings/xml/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?view=diff&rev=530201&r1=530200&r2=530201
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
(original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
Wed Apr 18 16:29:40 2007
@@ -19,7 +19,10 @@
 
 package org.apache.cxf.bus.spring;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -40,7 +43,7 @@
 public class BusApplicationContext extends JaxbClassPathXmlApplicationContext {
     
     private static final String DEFAULT_CXF_CFG_FILE = "META-INF/cxf/cxf.xml";
-    private static final String DEFAULT_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf-extension-*.xml";
+    private static final String DEFAULT_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf.extension";
     private static final String CXF_PROPERTY_EDITORS_CFG_FILE = 
         "classpath*:META-INF/cxf/cxf-property-editors.xml";
     private static final Logger LOG = LogUtils.getL7dLogger(BusApplicationContext.class);
@@ -80,8 +83,20 @@
                     .currentThread().getContextClassLoader());
                 
                 Collections.addAll(resources, resolver.getResources(DEFAULT_CXF_CFG_FILE));
-                Collections.addAll(resources, resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE));
                 Collections.addAll(resources, resolver.getResources(CXF_PROPERTY_EDITORS_CFG_FILE));
+
+                Resource[] exts = resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE);
+                for (Resource r : exts) {
+                    InputStream is = r.getInputStream();
+                    BufferedReader rd = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                    String line = rd.readLine();
+                    while (line != null) {
+                        resources.add(resolver.getResource(line));
+                        line = rd.readLine();
+                    }
+                    is.close();
+                }
+
             } catch (IOException ex) {
                 // ignore  
             }  

Added: incubator/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf.extension Wed Apr
18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-management.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/management/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension
(added)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension
Wed Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-http-jetty.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/http-jetty/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-http.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-jbi.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/jbi/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf.extension Wed
Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-http-jms.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/jms/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf.extension
(added)
+++ incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf.extension
Wed Apr 18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-local.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/transports/local/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf.extension Wed Apr 18
16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-addr.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/ws/addr/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf.extension Wed Apr
18 16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-policy.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/ws/policy/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf.extension
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf.extension?view=auto&rev=530201
==============================================================================
--- incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf.extension (added)
+++ incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf.extension Wed Apr 18
16:29:40 2007
@@ -0,0 +1 @@
+META-INF/cxf/cxf-extension-rm.xml
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/ws/rm/src/main/resources/META-INF/cxf/cxf.extension
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message