You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2008/09/17 16:18:17 UTC
svn commit: r696312 - in /cxf/branches/2.0.x-fixes: ./
distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/
distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/
distribution/src/main/release/s...
Author: ningjiang
Date: Wed Sep 17 07:18:14 2008
New Revision: 696312
URL: http://svn.apache.org/viewvc?rev=696312&view=rev
Log:
Merged revisions 696260 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................
r696260 | ningjiang | 2008-09-17 19:39:50 +0800 (Wed, 17 Sep 2008) | 9 lines
Merged revisions 696227 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r696227 | ningjiang | 2008-09-17 18:07:25 +0800 (Wed, 17 Sep 2008) | 1 line
CXF-1801 applied patch with thanks to William
........
................
Added:
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/README.txt
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/cxf.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/cxf.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/ejb-jar.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/ejb-jar.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/ra.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/etc/ra.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/client/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/client/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/client/Client.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/client/Client.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/GreeterBean.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/GreeterBean.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/GreeterLocal.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/GreeterLocal.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/GreeterLocalHome.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/src/demo/ejb/GreeterLocalHome.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/wsdl/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/wsdl/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/wsdl/hello_world.wsdl
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/wsdl/hello_world.wsdl
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/README.txt
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/etc/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/etc/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/etc/ejb-jar.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/etc/ejb-jar.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/etc/ra.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/etc/ra.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/client/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/client/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/client/GreeterClient.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/client/GreeterClient.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterBean.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterBean.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterHome.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterHome.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterLocal.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterLocal.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterLocalHome.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterLocalHome.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterRemote.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/demo/ejb/GreeterRemote.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/apache/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/apache/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/apache/hello_world_soap_http/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/apache/hello_world_soap_http/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/apache/hello_world_soap_http/Greeter.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/src/org/apache/hello_world_soap_http/Greeter.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/README.txt
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/etc/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/etc/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/etc/ejb-jar.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/etc/ejb-jar.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/etc/ra.xml
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/etc/ra.xml
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/client/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/client/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/client/GreeterClient.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/client/GreeterClient.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/ejb/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/ejb/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/ejb/GreeterBean.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/demo/ejb/GreeterBean.java
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/apache/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/apache/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/apache/hello_world_soap_http/
- copied from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/apache/hello_world_soap_http/
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/apache/hello_world_soap_http/Greeter.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/integration/jca/inbound-mdb/src/org/apache/hello_world_soap_http/Greeter.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/
- copied from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
- copied unchanged from r696260, cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt
cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointUtils.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt?rev=696312&r1=696311&r2=696312&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt (original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/samples/integration/jca/inbound/README.txt Wed Sep 17 07:18:14 2008
@@ -5,6 +5,12 @@
This demo shows how to expose an Enterprise Java Bean over
SOAP/HTTP using CXF. This demo is based on JBoss4.0.5GA.
+Notice that a new CXF inbound resource adapter has been
+introduced. Please read "Introduction to the inbound-mdb*
+Samples" section in the inbound-mdb/README.txt. It contains
+important information.
+
+
Running the Demo
================
Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java?rev=696312&r1=696311&r2=696312&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java (original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java Wed Sep 17 07:18:14 2008
@@ -18,11 +18,13 @@
*/
package org.apache.cxf.jca.cxf;
-
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.resource.NotSupportedException;
@@ -32,18 +34,24 @@
import javax.resource.spi.ResourceAdapter;
import javax.resource.spi.ResourceAdapterInternalException;
import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.resource.spi.work.Work;
import javax.transaction.xa.XAResource;
import org.apache.cxf.Bus;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.resourceadapter.ResourceBean;
+import org.apache.cxf.jca.inbound.InboundEndpoint;
+import org.apache.cxf.jca.inbound.MDBActivationSpec;
+import org.apache.cxf.jca.inbound.MDBActivationWork;
+
public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter {
private static final Logger LOG = LogUtils.getL7dLogger(ResourceAdapterImpl.class);
private BootstrapContext ctx;
private Set <Bus> busCache = new HashSet<Bus>();
-
+ private Map<String, InboundEndpoint> endpoints = new ConcurrentHashMap<String, InboundEndpoint>();
+
public ResourceAdapterImpl() {
super();
}
@@ -83,6 +91,16 @@
bus.shutdown(true);
}
}
+
+ // shutdown all the inbound endpoints
+ for (Map.Entry<String, InboundEndpoint> entry : endpoints.entrySet()) {
+ try {
+ entry.getValue().shutdown();
+ } catch (Exception e) {
+ LOG.log(Level.WARNING, "Failed to stop endpoint " + entry.getKey(), e);
+ }
+ }
+ endpoints.clear();
}
public XAResource[] getXAResources(ActivationSpec as[])
@@ -92,10 +110,39 @@
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as)
throws ResourceException {
- throw new NotSupportedException();
+
+ if (!(as instanceof MDBActivationSpec)) {
+ LOG.fine("Ignored unknown activation spec " + as);
+ return;
+ }
+
+ MDBActivationSpec spec = (MDBActivationSpec)as;
+ LOG.info("CXF resource adapter is activating " + spec.getDisplayName());
+
+ Work work = new MDBActivationWork(spec, mef, endpoints);
+ ctx.getWorkManager().scheduleWork(work);
+
}
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
+
+ if (!(as instanceof MDBActivationSpec)) {
+ LOG.fine("Ignored unknown activation spec " + as);
+ return;
+ }
+
+ MDBActivationSpec spec = (MDBActivationSpec)as;
+ LOG.info("CXF resource adapter is deactivating " + spec.getDisplayName());
+
+ InboundEndpoint endpoint = endpoints.remove(spec.getDisplayName());
+ if (endpoint != null) {
+ try {
+ endpoint.shutdown();
+ } catch (Exception e) {
+ LOG.log(Level.WARNING, "Failed to stop endpoint "
+ + spec.getDisplayName(), e);
+ }
+ }
}
public BootstrapContext getBootstrapContext() {
@@ -118,3 +165,4 @@
+
Modified: cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointUtils.java?rev=696312&r1=696311&r2=696312&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointUtils.java (original)
+++ cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointUtils.java Wed Sep 17 07:18:14 2008
@@ -35,7 +35,7 @@
// Utility class - never constructed
}
- private static boolean hasWebServiceAnnotation(Class<?> cls) {
+ public static boolean hasWebServiceAnnotation(Class<?> cls) {
if (cls == null) {
return false;
}