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 14:30:56 UTC
svn commit: r690207 - in
/servicemix/components/engines/servicemix-eip/trunk: ./
src/main/java/org/apache/servicemix/eip/
src/main/java/org/apache/servicemix/eip/patterns/
src/main/java/org/apache/servicemix/eip/support/resequence/
Author: gertv
Date: Fri Aug 29 05:30:56 2008
New Revision: 690207
URL: http://svn.apache.org/viewvc?rev=690207&view=rev
Log:
SM-1455: servicemix-eip can now be built using servicemix-core only as a test dependency
Modified:
servicemix/components/engines/servicemix-eip/trunk/pom.xml
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Pipeline.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Resequencer.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/WireTap.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerBase.java
Modified: servicemix/components/engines/servicemix-eip/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/pom.xml?rev=690207&r1=690206&r2=690207&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-eip/trunk/pom.xml Fri Aug 29 05:30:56 2008
@@ -115,6 +115,25 @@
<version>${spring-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </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-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java?rev=690207&r1=690206&r2=690207&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPEndpoint.java Fri Aug 29 05:30:56 2008
@@ -19,35 +19,34 @@
import java.net.URL;
import java.util.Set;
+import javax.activation.DataHandler;
import javax.jbi.JBIException;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.MessageExchange.Role;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
-import javax.activation.DataHandler;
-
-import org.w3c.dom.Document;
-import com.ibm.wsdl.Constants;
-
-import org.apache.servicemix.JbiConstants;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.common.endpoints.ProviderEndpoint;
import org.apache.servicemix.common.locks.LockManager;
import org.apache.servicemix.common.locks.impl.SimpleLockManager;
import org.apache.servicemix.eip.support.ExchangeTarget;
+import org.apache.servicemix.jbi.marshaler.PojoMarshaler;
import org.apache.servicemix.store.Store;
import org.apache.servicemix.store.StoreFactory;
import org.apache.servicemix.store.memory.MemoryStoreFactory;
import org.apache.servicemix.timers.TimerManager;
import org.apache.servicemix.timers.impl.TimerManagerImpl;
import org.springframework.core.io.Resource;
+import org.w3c.dom.Document;
+
+import com.ibm.wsdl.Constants;
/**
* @author gnodet
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Pipeline.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Pipeline.java?rev=690207&r1=690206&r2=690207&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Pipeline.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Pipeline.java Fri Aug 29 05:30:56 2008
@@ -17,7 +17,6 @@
package org.apache.servicemix.eip.patterns;
import java.net.URI;
-import java.util.Set;
import javax.jbi.management.DeploymentException;
import javax.jbi.messaging.ExchangeStatus;
@@ -25,15 +24,15 @@
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.InOut;
import javax.jbi.messaging.MessageExchange;
-import javax.jbi.messaging.RobustInOnly;
-import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.messaging.RobustInOnly;
import javax.wsdl.Definition;
import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
-import org.apache.servicemix.jbi.FaultException;
+import org.apache.servicemix.jbi.exception.FaultException;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
/**
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Resequencer.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Resequencer.java?rev=690207&r1=690206&r2=690207&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Resequencer.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/Resequencer.java Fri Aug 29 05:30:56 2008
@@ -122,7 +122,7 @@
private void processMessage(MessageExchange sourceExchange) throws MessagingException, InterruptedException {
NormalizedMessage source = sourceExchange.getMessage("in");
- NormalizedMessage copy = getMessageCopier().copy(source);
+ NormalizedMessage copy = getMessageCopier().transform(sourceExchange, source);
MessageExchange targetExchange = createTargetExchange(copy, sourceExchange.getPattern());
// add target exchange to resequencer (blocking if capacity is reached)
reseq.put(targetExchange);
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/WireTap.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/WireTap.java?rev=690207&r1=690206&r2=690207&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/WireTap.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/WireTap.java Fri Aug 29 05:30:56 2008
@@ -27,7 +27,7 @@
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.jbi.helper.MessageUtil;
import org.apache.servicemix.store.Store;
/**
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerBase.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerBase.java?rev=690207&r1=690206&r2=690207&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerBase.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/resequence/ResequencerBase.java Fri Aug 29 05:30:56 2008
@@ -28,15 +28,16 @@
import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
-import org.apache.servicemix.jbi.util.MessageCopier;
+import org.apache.servicemix.jbi.transformer.CopyTransformer;
+import org.apache.servicemix.jbi.transformer.MessageTransformer;
public abstract class ResequencerBase extends EIPEndpoint {
- private MessageCopier messageCopier = new MessageCopier();
+ private MessageTransformer messageCopier = new CopyTransformer();
private ExchangeTarget target;
- public MessageCopier getMessageCopier() {
+ public MessageTransformer getMessageCopier() {
return messageCopier;
}