You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/09/02 09:43:54 UTC
svn commit: r691138 - in
/servicemix/components/engines/servicemix-jsr181/trunk: ./
src/main/java/org/apache/servicemix/jsr181/
src/main/java/org/apache/servicemix/jsr181/xfire/
src/test/java/org/apache/servicemix/jsr181/
Author: gertv
Date: Tue Sep 2 00:43:54 2008
New Revision: 691138
URL: http://svn.apache.org/viewvc?rev=691138&view=rev
Log:
SM-1455: servicemix-jsr181 now only needs servicemix-core as test dependency
Modified:
servicemix/components/engines/servicemix-jsr181/trunk/pom.xml
servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxyFactoryBean.java
servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java
Modified: servicemix/components/engines/servicemix-jsr181/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/pom.xml?rev=691138&r1=691137&r2=691138&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/pom.xml Tue Sep 2 00:43:54 2008
@@ -208,7 +208,7 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
<version>${servicemix-version}</version>
- <scope>provided</scope>
+ <scope>test</scope>
<optional>true</optional>
<exclusions>
<exclusion>
Modified: servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java?rev=691138&r1=691137&r2=691138&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java Tue Sep 2 00:43:54 2008
@@ -46,16 +46,12 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import com.ibm.wsdl.Constants;
-import org.apache.servicemix.JbiConstants;
import org.apache.servicemix.common.EndpointDeliveryChannel;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.ManagementSupport;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.common.tools.wsdl.WSDLFlattener;
-import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.api.Container;
import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.jsr181.xfire.JbiFaultSerializer;
@@ -79,6 +75,10 @@
import org.codehaus.xfire.transport.Channel;
import org.codehaus.xfire.transport.Transport;
import org.springframework.core.io.Resource;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import com.ibm.wsdl.Constants;
/**
*
@@ -228,7 +228,7 @@
super.stop();
}
- protected void injectPojo(ComponentContext context, JBIContainer container) {
+ protected void injectPojo(ComponentContext context, Container container) {
try {
Method mth = pojo.getClass().getMethod("setContext", new Class[] {ComponentContext.class });
mth.invoke(pojo, new Object[] {context });
@@ -236,19 +236,19 @@
logger.debug("Unable to inject ComponentContext: " + e.getMessage());
}
try {
- Method mth = pojo.getClass().getMethod("setContainer", new Class[] {JBIContainer.class });
+ Method mth = pojo.getClass().getMethod("setContainer", new Class[] {Container.class });
mth.invoke(pojo, new Object[] {container });
} catch (Exception e) {
logger.debug("Unable to inject JBIContainer: " + e.getMessage());
}
}
- protected JBIContainer getContainer() {
+ protected Container getContainer() {
try {
ComponentContext ctx = getServiceUnit().getComponent().getComponentContext();
Field field = ctx.getClass().getDeclaredField("container");
field.setAccessible(true);
- return (JBIContainer) field.get(ctx);
+ return (Container) field.get(ctx);
} catch (Exception e) {
logger.debug("Unable to retrieve JBIContainer: " + e.getMessage());
return null;
Modified: servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java?rev=691138&r1=691137&r2=691138&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiChannel.java Tue Sep 2 00:43:54 2008
@@ -36,7 +36,7 @@
import org.apache.servicemix.jbi.jaxp.StAXSourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.messaging.MessageExchangeSupport;
+import org.apache.servicemix.jbi.helper.MessageExchangePattern;
import org.apache.servicemix.jsr181.JBIContext;
import org.codehaus.xfire.MessageContext;
import org.codehaus.xfire.XFireException;
@@ -99,11 +99,11 @@
MessageExchangeFactory factory = channel.createExchangeFactory();
URI mep = null;
if (context.getExchange().getOperation().getOutputMessage() != null) {
- mep = MessageExchangeSupport.IN_OUT;
+ mep = MessageExchangePattern.IN_OUT;
} else if (context.getExchange().getOperation().getFaults().size() > 0) {
- mep = MessageExchangeSupport.ROBUST_IN_ONLY;
+ mep = MessageExchangePattern.ROBUST_IN_ONLY;
} else {
- mep = MessageExchangeSupport.IN_ONLY;
+ mep = MessageExchangePattern.IN_ONLY;
}
MessageExchange me = factory.createExchange(mep);
me.setInterfaceName((QName) context.getService().getProperty(JBI_INTERFACE_NAME));
Modified: servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxyFactoryBean.java?rev=691138&r1=691137&r2=691138&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxyFactoryBean.java (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/src/main/java/org/apache/servicemix/jsr181/xfire/JbiProxyFactoryBean.java Tue Sep 2 00:43:54 2008
@@ -24,9 +24,9 @@
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
-import org.apache.servicemix.client.ClientFactory;
-import org.apache.servicemix.client.ServiceMixClient;
-import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.api.ClientFactory;
+import org.apache.servicemix.jbi.api.Container;
+import org.apache.servicemix.jbi.api.ServiceMixClient;
import org.apache.servicemix.jsr181.Jsr181Component;
import org.codehaus.xfire.XFire;
import org.springframework.beans.factory.DisposableBean;
@@ -45,7 +45,7 @@
public class JbiProxyFactoryBean implements FactoryBean, InitializingBean, DisposableBean {
private String name = ClientFactory.DEFAULT_JNDI_NAME;
- private JBIContainer container;
+ private Container container;
private ClientFactory factory;
private ComponentContext context;
private Class type;
@@ -158,14 +158,14 @@
/**
* @return the container
*/
- public JBIContainer getContainer() {
+ public Container getContainer() {
return container;
}
/**
* @param container the container to set
*/
- public void setContainer(JBIContainer container) {
+ public void setContainer(Container container) {
this.container = container;
}
Modified: servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java?rev=691138&r1=691137&r2=691138&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/src/test/java/org/apache/servicemix/jsr181/Jsr181ComplexTypeTest.java Tue Sep 2 00:43:54 2008
@@ -39,7 +39,9 @@
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.servicemix.jbi.api.Container;
import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.framework.ClientFactory;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.view.DotViewEndpointListener;
import org.apache.servicemix.jbi.view.DotViewFlowListener;
@@ -111,11 +113,11 @@
// Create interface based proxy
JbiProxyFactoryBean pf = new JbiProxyFactoryBean();
- pf.setContainer(container);
+ pf.setContext(orderEndpoint.getContext());
pf.setInterfaceName(orderEndpoint.getInterfaceName());
pf.setEndpoint(orderEndpoint.getEndpoint());
pf.setType(OrderService.class);
- OrderService orderService = (OrderService) pf.getObject();
+ OrderService orderService = (OrderService) pf.getObject();
// Prepare cart for order request
Cart cart = new Cart();
@@ -171,6 +173,6 @@
.contains(modelNameSpace));
// The WSDL should be abstract so we should have no bindings
- assertEquals("Bindings count ", 0, definition.getBindings().size());
+ assertEquals("Bindings count ", 0, definition.getBindings().size());
}
}