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/08/29 09:43:39 UTC
svn commit: r690139 - in
/servicemix/components/engines/servicemix-bean/trunk: ./
src/main/java/org/apache/servicemix/bean/
src/main/java/org/apache/servicemix/bean/support/
src/test/java/org/apache/servicemix/bean/beans/
Author: gertv
Date: Fri Aug 29 00:43:38 2008
New Revision: 690139
URL: http://svn.apache.org/viewvc?rev=690139&view=rev
Log:
SM-1455: servicemix-bean can now be built with a test-only dependency on servicemix-core
Modified:
servicemix/components/engines/servicemix-bean/trunk/pom.xml
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/Content.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/ExchangeTarget.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/Holder.java
servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java
servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerBean.java
servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java
servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
Modified: servicemix/components/engines/servicemix-bean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/pom.xml?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-bean/trunk/pom.xml Fri Aug 29 00:43:38 2008
@@ -76,6 +76,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -93,6 +99,19 @@
<artifactId>commons-jexl</artifactId>
<version>1.1</version>
</dependency>
+ <!-- for unit/integration testing -->
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>${servicemix-version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanComponent.java Fri Aug 29 00:43:38 2008
@@ -25,8 +25,8 @@
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.Endpoint;
-import org.apache.servicemix.jbi.util.IntrospectionSupport;
-import org.apache.servicemix.jbi.util.URISupport;
+import org.apache.servicemix.common.util.IntrospectionSupport;
+import org.apache.servicemix.common.util.URISupport;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/BeanEndpoint.java Fri Aug 29 00:43:38 2008
@@ -34,24 +34,20 @@
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.InOut;
import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.MessageExchange.Role;
import javax.jbi.messaging.MessageExchangeFactory;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.messaging.MessageExchange.Role;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.management.MBeanServer;
import javax.naming.InitialContext;
import javax.xml.namespace.QName;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-
import org.aopalliance.intercept.MethodInvocation;
import org.apache.commons.jexl.Expression;
import org.apache.commons.jexl.ExpressionFactory;
import org.apache.commons.jexl.JexlContext;
import org.apache.commons.jexl.JexlHelper;
-import org.apache.servicemix.MessageExchangeListener;
import org.apache.servicemix.bean.support.BeanInfo;
import org.apache.servicemix.bean.support.DefaultMethodInvocationStrategy;
import org.apache.servicemix.bean.support.DestinationImpl;
@@ -61,13 +57,16 @@
import org.apache.servicemix.bean.support.Request;
import org.apache.servicemix.common.EndpointComponentContext;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
+import org.apache.servicemix.common.util.MessageUtil;
+import org.apache.servicemix.common.util.URIResolver;
import org.apache.servicemix.expression.JAXPStringXPathExpression;
import org.apache.servicemix.expression.PropertyExpression;
-import org.apache.servicemix.jbi.resolver.URIResolver;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
/**
* Represents a bean endpoint which consists of a together with a {@link MethodInvocationStrategy}
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/Content.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/Content.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/Content.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/Content.java Fri Aug 29 00:43:38 2008
@@ -21,8 +21,8 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+import org.apache.servicemix.jbi.marshaler.DefaultMarshaler;
+import org.apache.servicemix.jbi.marshaler.PojoMarshaler;
/**
* Binds a method parameter to the payload of a message exchange
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanInfo.java Fri Aug 29 00:43:38 2008
@@ -34,12 +34,12 @@
import org.apache.servicemix.bean.Operation;
import org.apache.servicemix.bean.Property;
import org.apache.servicemix.bean.XPath;
-import org.apache.servicemix.client.DefaultNamespaceContext;
-import org.apache.servicemix.components.util.MessageHelper;
import org.apache.servicemix.expression.Expression;
import org.apache.servicemix.expression.JAXPStringXPathExpression;
import org.apache.servicemix.expression.PropertyExpression;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+import org.apache.servicemix.jbi.helper.MessageHelper;
+import org.apache.servicemix.jbi.jaxp.DefaultNamespaceContext;
+import org.apache.servicemix.jbi.marshaler.PojoMarshaler;
/**
* Represents the metadata about a bean type created via a combination of
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/BeanSupport.java Fri Aug 29 00:43:38 2008
@@ -35,12 +35,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.JbiConstants;
-import org.apache.servicemix.components.util.CopyTransformer;
-import org.apache.servicemix.components.util.MessageHelper;
-import org.apache.servicemix.components.util.MessageTransformer;
-import org.apache.servicemix.jbi.FaultException;
-import org.apache.servicemix.jbi.NoInMessageAvailableException;
+import org.apache.servicemix.common.JbiConstants;
+import org.apache.servicemix.jbi.exception.FaultException;
+import org.apache.servicemix.jbi.exception.NoInMessageAvailableException;
+import org.apache.servicemix.jbi.helper.MessageHelper;
+import org.apache.servicemix.jbi.transformer.CopyTransformer;
+import org.apache.servicemix.jbi.transformer.MessageTransformer;
/**
* A useful base class for servicemix-bean POJOs
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/DestinationImpl.java Fri Aug 29 00:43:38 2008
@@ -22,7 +22,7 @@
import org.apache.servicemix.bean.BeanEndpoint;
import org.apache.servicemix.bean.Destination;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
public class DestinationImpl implements Destination {
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/ExchangeTarget.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/ExchangeTarget.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/ExchangeTarget.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/ExchangeTarget.java Fri Aug 29 00:43:38 2008
@@ -22,7 +22,7 @@
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import org.apache.servicemix.jbi.resolver.URIResolver;
+import org.apache.servicemix.common.util.URIResolver;
import org.springframework.beans.factory.InitializingBean;
/**
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/Holder.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/Holder.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/Holder.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/Holder.java Fri Aug 29 00:43:38 2008
@@ -24,7 +24,7 @@
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.servicemix.jbi.FaultException;
+import org.apache.servicemix.jbi.exception.FaultException;
public class Holder implements Future<NormalizedMessage> {
Modified: servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/main/java/org/apache/servicemix/bean/support/TransformBeanSupport.java Fri Aug 29 00:43:38 2008
@@ -22,9 +22,9 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.servicemix.JbiConstants;
-import org.apache.servicemix.MessageExchangeListener;
-import org.apache.servicemix.components.util.CopyTransformer;
+import org.apache.servicemix.common.JbiConstants;
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
+import org.apache.servicemix.jbi.transformer.CopyTransformer;
/**
* A useful base class for a transform component.
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerBean.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerBean.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerBean.java Fri Aug 29 00:43:38 2008
@@ -30,7 +30,7 @@
import org.apache.servicemix.bean.Destination;
import org.apache.servicemix.bean.ExchangeTarget;
import org.apache.servicemix.bean.Operation;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
public class ConsumerBean {
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ConsumerListener.java Fri Aug 29 00:43:38 2008
@@ -25,8 +25,8 @@
import javax.jbi.messaging.MessagingException;
import javax.xml.namespace.QName;
-import org.apache.servicemix.MessageExchangeListener;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
public class ConsumerListener implements MessageExchangeListener {
Modified: servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java?rev=690139&r1=690138&r2=690139&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java (original)
+++ servicemix/components/engines/servicemix-bean/trunk/src/test/java/org/apache/servicemix/bean/beans/ListenerBean.java Fri Aug 29 00:43:38 2008
@@ -25,8 +25,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.MessageExchangeListener;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
+import org.apache.servicemix.jbi.listener.MessageExchangeListener;
/**
* A simple POJO which implements the {@link MessageExchangeListener} interface