You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/09 11:41:08 UTC
svn commit: r376251 - in /incubator/servicemix/trunk/servicemix-jsr181/src:
main/java/org/apache/servicemix/jsr181/
main/java/org/apache/servicemix/jsr181/xfire/
test/java/org/apache/servicemix/jsr181/xfire/
Author: gnodet
Date: Thu Feb 9 02:41:06 2006
New Revision: 376251
URL: http://svn.apache.org/viewcvs?rev=376251&view=rev
Log:
Fix jsr181 proxy tests
Modified:
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181LifeCycle.java
incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java
incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/xfire/JbiProxyTest.java
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181LifeCycle.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181LifeCycle.java?rev=376251&r1=376250&r2=376251&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181LifeCycle.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181LifeCycle.java Thu Feb 9 02:41:06 2006
@@ -15,6 +15,8 @@
*/
package org.apache.servicemix.jsr181;
+import javax.jbi.component.ComponentContext;
+
import org.apache.servicemix.common.BaseComponent;
import org.apache.servicemix.common.BaseLifeCycle;
import org.apache.servicemix.jsr181.xfire.JbiTransport;
@@ -60,12 +62,17 @@
super.doInit();
configuration.setRootDir(context.getWorkspaceRoot());
configuration.load();
- xfire = new DefaultXFire();
+ xfire = createXFire(this.context);
+ }
+
+ public static XFire createXFire(ComponentContext context) {
+ XFire xfire = new DefaultXFire();
Object[] transports = xfire.getTransportManager().getTransports().toArray();
for (int i = 0; i < transports.length; i++) {
xfire.getTransportManager().unregister((Transport) transports[i]);
}
- xfire.getTransportManager().register(new JbiTransport(this.context));
+ xfire.getTransportManager().register(new JbiTransport(context));
+ return xfire;
}
}
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java?rev=376251&r1=376250&r2=376251&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxy.java Thu Feb 9 02:41:06 2006
@@ -75,7 +75,7 @@
public Object getProxy() throws Exception {
if (proxy == null) {
- Client client = new Client(JbiTransport.JBI_BINDING, getDescription(), serviceClass);
+ JBIClient client = new JBIClient(xfire, getDescription(), serviceClass);
if (interfaceName != null) {
client.getService().setProperty(JbiChannel.JBI_INTERFACE_NAME, interfaceName);
}
@@ -137,5 +137,15 @@
}
}
return null;
+ }
+
+ protected static class JBIClient extends Client {
+
+ public JBIClient(XFire xfire, Definition description, Class serviceClass) throws Exception {
+ super();
+ setXFire(xfire);
+ initFromDefinition(JbiTransport.JBI_BINDING, description, serviceClass);
+ }
+
}
}
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/xfire/JbiProxyTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/xfire/JbiProxyTest.java?rev=376251&r1=376250&r2=376251&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/xfire/JbiProxyTest.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/xfire/JbiProxyTest.java Thu Feb 9 02:41:06 2006
@@ -29,6 +29,7 @@
import org.apache.servicemix.jbi.container.JBIContainer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jsr181.Jsr181Endpoint;
+import org.apache.servicemix.jsr181.Jsr181LifeCycle;
import org.apache.servicemix.jsr181.Jsr181SpringComponent;
import org.apache.servicemix.jsr181.xfire.JbiProxy;
@@ -74,6 +75,9 @@
me.setInterfaceName(new QName("http://xfire.jsr181.servicemix.apache.org", "ProxyPojoPortType"));
me.getInMessage().setContent(new StringSource("<echo xmlns='http://jsr181.servicemix.apache.org'><echoin0>world</echoin0></echo>"));
client.sendSync(me);
+ if (me.getError() != null) {
+ throw me.getError();
+ }
assertTrue(me.getStatus() == ExchangeStatus.ACTIVE);
client.done(me);
}
@@ -104,7 +108,7 @@
this.context = context;
if (context != null) {
try {
- XFire xfire = XFireFactory.newInstance().getXFire();
+ XFire xfire = Jsr181LifeCycle.createXFire(context);
QName service = new QName("http://xfire.jsr181.servicemix.apache.org", "EchoService");
proxy = (Echo) JbiProxy.create(xfire, context, null, service, null, Echo.class);
} catch (Exception e) {