Author: ffang
Date: Mon Dec 17 21:18:43 2007
New Revision: 605091
URL: http://svn.apache.org/viewvc?rev=605091&view=rev
Log:
[SM-1168]Redeploy of CXF SE fails
[SM-1174]update cxf version used in servicemix
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
servicemix/smx3/branches/servicemix-3.2/pom.xml
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml?rev=605091&r1=605090&r2=605091&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml
(original)
+++ servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml Mon
Dec 17 21:18:43 2007
@@ -76,6 +76,12 @@
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml?rev=605091&r1=605090&r2=605091&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
Mon Dec 17 21:18:43 2007
@@ -257,7 +257,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
<scope>provided</scope>
</dependency>
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=605091&r1=605090&r2=605091&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
Mon Dec 17 21:18:43 2007
@@ -254,7 +254,12 @@
public void stop() throws Exception {
ReflectionUtils.callLifecycleMethod(getPojo(), PreDestroy.class);
JBIDispatcherUtil.clean();
- getBus().shutdown(true);
+ //getBus().shutdown(true);
+ JBITransportFactory jbiTransportFactory = (JBITransportFactory)
getBus()
+ .getExtension(ConduitInitiatorManager.class)
+ .getConduitInitiator(CxfSeComponent.JBI_TRANSPORT_ID);
+ jbiTransportFactory.removeDestination(getService().toString()
+ + getInterfaceName().toString());
super.stop();
}
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java?rev=605091&r1=605090&r2=605091&view=diff
==============================================================================
---
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
(original)
+++
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-cxf-se/src/test/java/org/apache/servicemix/cxfse/CxfSeClientProxyTest.java
Mon Dec 17 21:18:43 2007
@@ -73,6 +73,15 @@
component.getServiceUnitManager().init("proxy",
getServiceUnitPath("proxy"));
component.getServiceUnitManager().start("proxy");
+ //test redepoly su
+ component.getServiceUnitManager().stop("target");
+ component.getServiceUnitManager().shutDown("target");
+ component.getServiceUnitManager().undeploy("target",
getServiceUnitPath("proxytarget"));
+
+
+ component.getServiceUnitManager().init("target",
getServiceUnitPath("proxytarget"));
+ component.getServiceUnitManager().start("target");
+
LOG.info("test clientProxy");
io.getInMessage().setContent(new StringSource(
"<message
xmlns='http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper'>"
@@ -85,6 +94,7 @@
client.sendSync(io);
assertTrue(new SourceTransformer().contentToString(
io.getOutMessage()).indexOf("Hello ffang 3") > 0);
+
}
protected void tearDown() throws Exception {
Modified: servicemix/smx3/branches/servicemix-3.2/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=605091&r1=605090&r2=605091&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Mon Dec 17 21:18:43 2007
@@ -209,7 +209,7 @@
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
<camel-version>1.2.0</camel-version>
<jencks-version>2.1</jencks-version>
- <jetty-version>6.1.5</jetty-version>
+ <jetty-version>6.1.6</jetty-version>
<geronimo-version>2.0.1</geronimo-version>
<servicemix-version>3.2.2-SNAPSHOT</servicemix-version>
<wsdl4j-version>1.6.1</wsdl4j-version>
@@ -220,7 +220,7 @@
<oro-version>2.0.8</oro-version>
<sitemesh-version>2.2.1</sitemesh-version>
<woden-version>1.0.0M6</woden-version>
- <cxf-version>2.0.2-incubator</cxf-version>
+ <cxf-version>2.0.4-incubator-SNAPSHOT</cxf-version>
<derby-version>10.2.2.0</derby-version>
<saxon-version>8.9</saxon-version>
@@ -906,7 +906,7 @@
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<exclusions>
<exclusion>
<groupId>javax.xml</groupId>
@@ -1821,9 +1821,9 @@
<version>1.1.2</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
+ <groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.1</version>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>lucene</groupId>
