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 2008/07/22 21:46:47 UTC
svn commit: r678872 - 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/
src/main/java/org/apache/servic...
Author: gnodet
Date: Tue Jul 22 12:46:46 2008
New Revision: 678872
URL: http://svn.apache.org/viewvc?rev=678872&view=rev
Log:
Remove unneeded classes (bootstrap, configuration) and use servicemix-common classes instead of servicemix-core classes when possible
Removed:
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPBootstrap.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPConfiguration.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPConfigurationMBean.java
Modified:
servicemix/components/engines/servicemix-eip/trunk/pom.xml
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPComponent.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/ContentEnricher.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/MessageFilter.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/StaticRecipientList.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.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/AbstractAggregator.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java
servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/ExchangeTarget.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=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-eip/trunk/pom.xml Tue Jul 22 12:46:46 2008
@@ -123,7 +123,6 @@
<artifactId>jbi-maven-plugin</artifactId>
<configuration>
<type>service-engine</type>
- <bootstrap>org.apache.servicemix.eip.EIPBootstrap</bootstrap>
<component>org.apache.servicemix.eip.EIPComponent</component>
<serviceUnitAnalyzer>org.apache.servicemix.eip.packaging.EipServiceUnitAnalyzer</serviceUnitAnalyzer>
</configuration>
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPComponent.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPComponent.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPComponent.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/EIPComponent.java Tue Jul 22 12:46:46 2008
@@ -29,27 +29,11 @@
public class EIPComponent extends DefaultComponent {
private EIPEndpoint[] endpoints;
- private EIPConfiguration configuration;
public EIPComponent() {
- configuration = new EIPConfiguration();
}
/**
- * @return the configuration
- */
- protected EIPConfiguration getConfiguration() {
- return configuration;
- }
-
- /**
- * @param configuration the configuration to set
- */
- protected void setConfiguration(EIPConfiguration configuration) {
- this.configuration = configuration;
- }
-
- /**
* @return Returns the endpoints.
*/
public EIPEndpoint[] getEndpoints() {
@@ -63,19 +47,6 @@
this.endpoints = endpoints;
}
- /* (non-Javadoc)
- * @see org.servicemix.common.BaseComponentLifeCycle#getExtensionMBean()
- */
- protected Object getExtensionMBean() throws Exception {
- return configuration;
- }
-
- protected void doInit() throws Exception {
- super.doInit();
- configuration.setRootDir(context.getWorkspaceRoot());
- configuration.load();
- }
-
protected List getConfiguredEndpoints() {
return asList(endpoints);
}
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/AsyncBridge.java Tue Jul 22 12:46:46 2008
@@ -29,11 +29,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
import org.apache.servicemix.expression.Expression;
import org.apache.servicemix.expression.PropertyExpression;
-import org.apache.servicemix.jbi.util.MessageUtil;
import org.apache.servicemix.timers.Timer;
import org.apache.servicemix.timers.TimerListener;
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/ContentEnricher.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/ContentEnricher.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/ContentEnricher.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/ContentEnricher.java Tue Jul 22 12:46:46 2008
@@ -31,10 +31,10 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+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.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.util.MessageUtil;
/**
* Implementation of the
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/MessageFilter.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/MessageFilter.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/MessageFilter.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/MessageFilter.java Tue Jul 22 12:46:46 2008
@@ -24,10 +24,10 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
+import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
import org.apache.servicemix.eip.support.Predicate;
-import org.apache.servicemix.jbi.util.MessageUtil;
/**
* MessageFilter allows filtering incoming JBI exchanges.
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=678872&r1=678871&r2=678872&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 Tue Jul 22 12:46:46 2008
@@ -29,14 +29,12 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.MessagingException;
import javax.wsdl.Definition;
-import javax.activation.DataHandler;
+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.messaging.PojoMarshaler;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.util.MessageUtil;
/**
* The Pipeline component is a bridge between an In-Only (or Robust-In-Only) MEP and
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRecipientList.java Tue Jul 22 12:46:46 2008
@@ -27,7 +27,7 @@
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
/**
* The StaticRecipientList component will forward an input In-Only or Robust-In-Only
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/patterns/StaticRoutingSlip.java Tue Jul 22 12:46:46 2008
@@ -24,7 +24,7 @@
import org.apache.servicemix.eip.EIPEndpoint;
import org.apache.servicemix.eip.support.ExchangeTarget;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
/**
* A RoutingSlip component can be used to route an incoming In-Out exchange
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=678872&r1=678871&r2=678872&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 Tue Jul 22 12:46:46 2008
@@ -24,7 +24,7 @@
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.servicemix.JbiConstants;
+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;
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractAggregator.java Tue Jul 22 12:46:46 2008
@@ -30,10 +30,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.eip.EIPEndpoint;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.JbiConstants;
+import org.apache.servicemix.common.util.MessageUtil;
import org.apache.servicemix.timers.Timer;
import org.apache.servicemix.timers.TimerListener;
-import org.apache.servicemix.JbiConstants;
/**
* Aggregator can be used to wait and combine several messages.
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/AbstractSplitter.java Tue Jul 22 12:46:46 2008
@@ -30,7 +30,7 @@
import javax.xml.transform.Source;
import org.apache.servicemix.eip.EIPEndpoint;
-import org.apache.servicemix.jbi.util.MessageUtil;
+import org.apache.servicemix.common.util.MessageUtil;
/**
* The AbstractSplitter is an abstract base class for Splitters.
Modified: servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/ExchangeTarget.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/ExchangeTarget.java?rev=678872&r1=678871&r2=678872&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/ExchangeTarget.java (original)
+++ servicemix/components/engines/servicemix-eip/trunk/src/main/java/org/apache/servicemix/eip/support/ExchangeTarget.java Tue Jul 22 12:46:46 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-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=678872&r1=678871&r2=678872&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 Tue Jul 22 12:46:46 2008
@@ -25,10 +25,10 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
+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.util.MessageUtil;
public abstract class ResequencerBase extends EIPEndpoint {