You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2010/12/29 06:35:26 UTC
svn commit: r1053533 - in
/cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main:
java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
Author: ffang
Date: Wed Dec 29 05:35:25 2010
New Revision: 1053533
URL: http://svn.apache.org/viewvc?rev=1053533&view=rev
Log:
[CXF-3222]OsgiTransportFactory can't fully initialized problem
Modified:
cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
Modified: cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java?rev=1053533&r1=1053532&r2=1053533&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiTransportFactory.java Wed Dec 29 05:35:25 2010
@@ -21,6 +21,9 @@ package org.apache.cxf.transport.http_os
import java.io.IOException;
import java.net.URI;
+import javax.annotation.Resource;
+
+import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
@@ -29,6 +32,10 @@ import org.apache.cxf.transport.http.Abs
public class OsgiTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory {
private OsgiDestinationRegistryIntf registry;
+
+ public OsgiTransportFactory() {
+ super();
+ }
public void setRegistry(OsgiDestinationRegistryIntf registry) {
this.registry = registry;
@@ -48,8 +55,10 @@ public class OsgiTransportFactory extend
return d;
}
- public void init() {
-
+
+ @Resource(name = "cxf")
+ public void setBus(Bus bus) {
+ super.setBus(bus);
}
}
Modified: cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml?rev=1053533&r1=1053532&r2=1053533&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-osgi/src/main/resources/META-INF/cxf/osgi/cxf-extension-osgi.xml Wed Dec 29 05:35:25 2010
@@ -26,19 +26,17 @@ http://www.springframework.org/schema/os
<bean id="org.apache.cxf.transport.http_osgi.OsgiTransportFactory"
class="org.apache.cxf.transport.http_osgi.OsgiTransportFactory"
- init-method="init">
+ lazy-init="true">
<property name="bus" ref="cxf"/>
<property name="registry" ref="osgiDestinationRegistry" />
<property name="transportIds">
- <set>
- <value>http://cxf.apache.org/bindings/xformat</value>
- <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>
+ <list>
+ <value>http://cxf.apache.org/transports/http</value>
<value>http://cxf.apache.org/transports/http/configuration</value>
- </set>
+ <value>http://schemas.xmlsoap.org/wsdl/http</value>
+ <value>http://schemas.xmlsoap.org/wsdl/http/</value>
+ </list>
</property>
</bean>