geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r525878 - in /geronimo/server/trunk/modules/geronimo-cxf/src/main: java/org/apache/geronimo/cxf/ resources/ resources/META-INF/ resources/META-INF/cxf/
Date Thu, 05 Apr 2007 16:58:43 GMT
Author: gawor
Date: Thu Apr  5 09:58:42 2007
New Revision: 525878

URL: http://svn.apache.org/viewvc?view=rev&rev=525878
Log:
make spring-based bus as the default, and make clients work again (after cxf update)

Added:
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ResourceManager.java
    geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/
    geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/
    geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/cxf/
    geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/cxf/cxf-extension-geronimo.xml
Modified:
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java?view=diff&rev=525878&r1=525877&r2=525878
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainer.java
Thu Apr  5 09:58:42 2007
@@ -39,6 +39,7 @@
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.BindingFactoryManager;
 import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.bus.extension.ExtensionManagerBus;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.tools.common.extensions.soap.SoapAddress;
 import org.apache.cxf.tools.util.SOAPBindingUtil;
@@ -210,18 +211,9 @@
      * The very first bus created is set as a default bus which then can
      * be (re)used in other places.
      */
-    public static Bus getBus() {
-        CXFBusFactory busFactory = new CXFBusFactory();
-        Bus bus = busFactory.createBus();
-        Bus defaultBus = BusFactory.getDefaultBus(false);
-        if (defaultBus == null) {
-            BusFactory.setDefaultBus(bus);
-            return busFactory.createBus();
-        } else if (defaultBus == bus) {
-            return busFactory.createBus();
-        } else {
-            return bus;
-        }
+    public static Bus getBus() {        
+        BusFactory.getDefaultBus();
+        return new ExtensionManagerBus();
     }
 
 }

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java?view=diff&rev=525878&r1=525877&r2=525878
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/GeronimoDestinationFactory.java
Thu Apr  5 09:58:42 2007
@@ -25,6 +25,9 @@
 
 public class GeronimoDestinationFactory extends AbstractHTTPTransportFactory {
 
+    public GeronimoDestinationFactory() {       
+    }
+        
     public GeronimoDestinationFactory(Bus bus) {
         setBus(bus);
     }

Added: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ResourceManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ResourceManager.java?view=auto&rev=525878
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ResourceManager.java
(added)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ResourceManager.java
Thu Apr  5 09:58:42 2007
@@ -0,0 +1,29 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.cxf;
+
+import java.util.List;
+import org.apache.cxf.resource.ResourceResolver;
+import org.apache.cxf.bus.resource.ResourceManagerImpl;
+
+public class ResourceManager extends ResourceManagerImpl {
+
+    public ResourceManager(List<ResourceResolver> r) {
+        super(r);
+    }
+
+}

Added: geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/cxf/cxf-extension-geronimo.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/cxf/cxf-extension-geronimo.xml?view=auto&rev=525878
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/cxf/cxf-extension-geronimo.xml
(added)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/resources/META-INF/cxf/cxf-extension-geronimo.xml
Thu Apr  5 09:58:42 2007
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:foo="http://cxf.apache.org/configuration/foo"
+       xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.geronimo.cxf.ResourceManager">
+       <constructor-arg>
+            <list>
+                <bean class="org.apache.cxf.resource.ClasspathResolver"/>
+                <bean class="org.apache.cxf.resource.ClassLoaderResolver"/>
+            </list>
+       </constructor-arg>
+       <property name="bus" ref="cxf"/>
+    </bean>
+
+    <bean class="org.apache.geronimo.cxf.GeronimoDestinationFactory" lazy-init="true">
+        <property name="bus" ref="cxf"/>
+        <property name="transportIds">
+            <list>
+                <value>http://schemas.xmlsoap.org/soap/http</value>
+                <value>http://schemas.xmlsoap.org/wsdl/http/</value>
+                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
+                <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
+                <value>http://cxf.apache.org/transports/http/configuration</value>
+                <value>http://cxf.apache.org/bindings/xformat</value>
+            </list>
+        </property>
+    </bean>
+            
+</beans>



Mime
View raw message