Diff
Modified: trunk/components/base/src/main/java/org/servicemix/components/xfire/XFireBinding.java (753 => 754)
--- trunk/components/base/src/main/java/org/servicemix/components/xfire/XFireBinding.java 2005-11-05 17:38:02 UTC (rev 753)
+++ trunk/components/base/src/main/java/org/servicemix/components/xfire/XFireBinding.java 2005-11-07 11:41:26 UTC (rev 754)
@@ -1,13 +1,22 @@
+/**
+ *
+ * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ **/
package org.servicemix.components.xfire;
-import java.io.ByteArrayOutputStream;
-
-import javax.jbi.JBIException;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.xml.stream.XMLStreamReader;
-
import org.codehaus.xfire.MessageContext;
import org.codehaus.xfire.XFire;
import org.codehaus.xfire.exchange.InMessage;
@@ -15,8 +24,15 @@
import org.codehaus.xfire.transport.Transport;
import org.codehaus.xfire.transport.local.LocalTransport;
import org.servicemix.components.util.OutBinding;
-import org.servicemix.jbi.messaging.MessageExchangeImpl;
+import javax.jbi.JBIException;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.stream.XMLStreamReader;
+
+import java.io.ByteArrayOutputStream;
+
public class XFireBinding extends OutBinding {
private XMarshaler marshaler;
@@ -49,7 +65,7 @@
context.setProperty(Channel.BACKCHANNEL_URI, buffer);
Transport transport =
- xfire.getTransportManager().getTransport(LocalTransport.NAME);
+ xfire.getTransportManager().getTransport(LocalTransport.BINDING_ID);
Channel channel = transport.createChannel();
channel.receive(context, in);
Modified: trunk/components/base/src/main/java/org/servicemix/components/xfire/XFireOutBinding.java (753 => 754)
--- trunk/components/base/src/main/java/org/servicemix/components/xfire/XFireOutBinding.java 2005-11-05 17:38:02 UTC (rev 753)
+++ trunk/components/base/src/main/java/org/servicemix/components/xfire/XFireOutBinding.java 2005-11-07 11:41:26 UTC (rev 754)
@@ -1,11 +1,22 @@
+/**
+ *
+ * Copyright 2005 LogicBlaze, Inc. http://www.logicblaze.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ **/
package org.servicemix.components.xfire;
-import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessagingException;
-import javax.jbi.messaging.NormalizedMessage;
-import javax.xml.stream.XMLStreamReader;
-
import org.codehaus.xfire.MessageContext;
import org.codehaus.xfire.XFire;
import org.codehaus.xfire.exchange.InMessage;
@@ -14,6 +25,11 @@
import org.codehaus.xfire.transport.local.LocalTransport;
import org.servicemix.components.util.OutBinding;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.stream.XMLStreamReader;
+
public class XFireOutBinding extends OutBinding {
private XMarshaler marshaller;
@@ -37,7 +53,7 @@
context.setService(xfire.getServiceRegistry().getService(getService().getLocalPart()));
Transport transport =
- xfire.getTransportManager().getTransport(LocalTransport.NAME);
+ xfire.getTransportManager().getTransport(LocalTransport.BINDING_ID);
Channel channel = transport.createChannel();
channel.receive(context, in);
Modified: trunk/components/xfire/src/main/java/org/servicemix/components/xfire/XFireComponent.java (753 => 754)
--- trunk/components/xfire/src/main/java/org/servicemix/components/xfire/XFireComponent.java 2005-11-05 17:38:02 UTC (rev 753)
+++ trunk/components/xfire/src/main/java/org/servicemix/components/xfire/XFireComponent.java 2005-11-07 11:41:26 UTC (rev 754)
@@ -101,7 +101,7 @@
throw new NoInMessageAvailableException(me);
}
- Transport t = xfire.getTransportManager().getTransport(JbiTransport.NAME);
+ Transport t = xfire.getTransportManager().getTransport(JbiTransport.JBI_BINDING);
ByteArrayOutputStream out = new ByteArrayOutputStream();
Channel c = t.createChannel();
MessageContext ctx = new MessageContext();
@@ -198,16 +198,21 @@
private static final Log log = LogFactory.getLog(JbiTransport.class);
- public final static String NAME = "Jbi";
-
public final static String JBI_TRANSPORT_NS = "http://java.sun.com/xml/ns/jbi/binding/service+engine";
-
+
+ public final static String JBI_BINDING = "http://java.sun.com/xml/ns/jbi/binding/service+engine";
+
private final static String URI_PREFIX = "urn:xfire:transport:jbi:";
public JbiTransport() {
addInHandler(new PrepareHandler());
}
+ protected String getName()
+ {
+ return "JBI";
+ }
+
public String getServiceURL(Service service) {
return "jbi://" + service.getName();
}
@@ -227,8 +232,9 @@
return URI_PREFIX;
}
- public String getName() {
- return NAME;
+ public String[] getSupportedBindings()
+ {
+ return new String[] { JBI_BINDING };
}
public String[] getKnownUriSchemes() {
Modified: trunk/components/xfire/src/main/java/org/servicemix/components/xfire/XFireServiceUnit.java (753 => 754)
--- trunk/components/xfire/src/main/java/org/servicemix/components/xfire/XFireServiceUnit.java 2005-11-05 17:38:02 UTC (rev 753)
+++ trunk/components/xfire/src/main/java/org/servicemix/components/xfire/XFireServiceUnit.java 2005-11-07 11:41:26 UTC (rev 754)
@@ -21,6 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.xfire.service.Service;
+import org.codehaus.xfire.transport.Transport;
import org.servicemix.components.xbean.EndpointSpec;
import org.servicemix.components.xbean.XBeanServiceUnit;
import org.servicemix.components.xfire.XFireComponent.JbiTransport;
@@ -53,7 +54,8 @@
Service svc = component.getFactory().create(es.getPojo().getClass());
component.getXFire().getServiceRegistry().register(svc);
component.getXFire().getTransportManager().disableAll(svc.getName());
- component.getXFire().getTransportManager().enable(JbiTransport.NAME, svc.getName());
+ Transport jbiT = component.getXFire().getTransportManager().getTransport(JbiTransport.JBI_BINDING);
+ component.getXFire().getTransportManager().enable(jbiT, svc.getName());
QName serviceName = svc.getServiceInfo().getName();
String endpointName = null;
