Author: ningjiang
Date: Sun Apr 27 07:44:19 2008
New Revision: 651961
URL: http://svn.apache.org/viewvc?rev=651961&view=rev
Log:
CXF-1552 Fixed the bus resource injection error when not using Spring, also
changed the comment in CXFNonSpringServlet
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java?rev=651961&r1=651960&r2=651961&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
Sun Apr 27 07:44:19 2008
@@ -28,7 +28,7 @@
import org.apache.cxf.resource.ResourceManager;
public class CXFNonSpringServlet extends AbstractCXFServlet {
-
+
public static Logger getLogger() {
return LogUtils.getL7dLogger(CXFNonSpringServlet.class);
}
@@ -36,11 +36,11 @@
@Override
public void loadBus(ServletConfig servletConfig) throws ServletException {
loadBusNoConfig(servletConfig);
- //TODO do we need to privde the SUN's endpoint discription file
supporting
+ // You could add the endpoint publish codes here
}
-
+
private void loadBusNoConfig(ServletConfig servletConfig) throws
ServletException {
-
+
if (bus == null) {
LOG.info("LOAD_BUS_WITHOUT_APPLICATION_CONTEXT");
bus = BusFactory.newInstance().createBus();
@@ -48,11 +48,11 @@
ResourceManager resourceManager =
bus.getExtension(ResourceManager.class);
resourceManager.addResourceResolver(new ServletContextResourceResolver(
servletConfig.getServletContext()));
-
+
replaceDestinationFactory();
// Set up the ServletController
controller = createServletController(servletConfig);
-
+
}
}
Modified:
cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java?rev=651961&r1=651960&r2=651961&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
(original)
+++
cxf/trunk/rt/transports/jbi/src/main/java/org/apache/cxf/transport/jbi/JBITransportFactory.java
Sun Apr 27 07:44:19 2008
@@ -46,33 +46,33 @@
public class JBITransportFactory extends AbstractTransportFactory implements
ConduitInitiator,
DestinationFactory {
-
+
public static final String TRANSPORT_ID =
"http://cxf.apache.org/transports/jbi";;
-
+
private static final Logger LOG =
LogUtils.getL7dLogger(JBITransportFactory.class);
private DeliveryChannel deliveryChannel;
private Bus bus;
private final Map<String, JBIDestination> destinationMap = new
HashMap<String, JBIDestination>();
-
+
private Collection<String> activationNamespaces;
-
- @Resource
+
+ @Resource(name = "bus")
public void setBus(Bus b) {
bus = b;
}
-
+
public Bus getBus() {
return bus;
}
-
+
public Set<String> getUriPrefixes() {
return Collections.singleton("jbi");
}
- @Resource
+
public void setActivationNamespaces(Collection<String> ans) {
activationNamespaces = ans;
}
@@ -97,9 +97,9 @@
}
}
-
-
+
+
public DeliveryChannel getDeliveryChannel() {
return deliveryChannel;
}
@@ -124,8 +124,8 @@
}
public Destination getDestination(EndpointInfo ei) throws IOException {
- JBIDestination destination = new JBIDestination(ei,
- JBIDispatcherUtil.getInstance(this,
getDeliveryChannel()),
+ JBIDestination destination = new JBIDestination(ei,
+ JBIDispatcherUtil.getInstance(this,
getDeliveryChannel()),
getDeliveryChannel());
Configurer configurer = bus.getExtension(Configurer.class);
if (null != configurer) {
@@ -139,10 +139,10 @@
}
return destination;
}
-
+
public void putDestination(String epName, JBIDestination destination)
throws JBIException {
if (destinationMap.containsKey(epName)) {
- throw new JBIException("JBIDestination for Endpoint "
+ throw new JBIException("JBIDestination for Endpoint "
+ epName + " already be created");
} else {
destinationMap.put(epName, destination);
@@ -152,9 +152,9 @@
public JBIDestination getDestination(String epName) {
return destinationMap.get(epName);
}
-
+
public void removeDestination(String epName) {
destinationMap.remove(epName);
}
-
+
}
Modified:
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java?rev=651961&r1=651960&r2=651961&view=diff
==============================================================================
---
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
(original)
+++
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSTransportFactory.java
Sun Apr 27 07:44:19 2008
@@ -42,24 +42,24 @@
static {
URI_PREFIXES.add("jms://");
}
-
+
private Bus bus;
-
- @Resource
+
+ @Resource(name = "bus")
public void setBus(Bus b) {
bus = b;
}
-
+
public Bus getBus() {
return bus;
}
-
- public Conduit getConduit(EndpointInfo targetInfo) throws IOException {
+
+ public Conduit getConduit(EndpointInfo targetInfo) throws IOException {
return getConduit(targetInfo, targetInfo.getTarget());
}
public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType
target) throws IOException {
- JMSConduit conduit =
+ JMSConduit conduit =
target == null ? new JMSConduit(bus, endpointInfo) : new
JMSConduit(bus, endpointInfo, target);
return conduit;
}
