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 2007/08/09 22:33:52 UTC
svn commit: r564374 [1/7] - in
/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix:
./ client/ components/util/ components/util/xstream/
components/varscheduler/ expression/ jbi/ jbi/container/ jbi/deployment/
jbi/event...
Author: gnodet
Date: Thu Aug 9 13:33:26 2007
New Revision: 564374
URL: http://svn.apache.org/viewvc?view=rev&rev=564374
Log:
Fix some checkstyle violations
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JavaSource.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ClientFactory.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultNamespaceContext.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/Message.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/MessageListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/RemoteServiceMixClient.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/XPathHelper.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/BinaryFileMarshaler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ChainedComponent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ColumnExtractor.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptor.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptorMEListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentSupport.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ContentConverter.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DateConverter.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DefaultFileMarshaler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/EchoComponent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileExtensionPropertyExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileMarshaler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageHelper.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MockServiceComponent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NoConversion.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NumberConverter.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/OutBinding.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PipelineComponent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PojoLifecycleAdaptor.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PojoSupport.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PollingComponentSupport.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/SpringBootstrap.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/TextStripConverter.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/TraceComponent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/TransformComponent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/TransformComponentSupport.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/VariableFixedLengthColumnExtractor.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamMarshaler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamSource.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/varscheduler/ScheduleIterator.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/varscheduler/Scheduler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/varscheduler/SchedulerTask.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/Expression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/ExpressionHelper.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPBooleanXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPNodeSetXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPStringXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JAXPXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JaxenVariableContext.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/JaxenXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/MessageVariableResolver.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/XMLBeansStringXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/expression/XMLBeansXPathExpression.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/ExchangeTimeoutException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/FaultException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/MissingPropertyException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoFaultAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInMessageAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoInterfaceAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoMessageContentAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoOutMessageAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoServiceEndpointAvailableException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/NoSuchOperationException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/RuntimeJBIException.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/ActivationSpec.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/EnvironmentContext.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SubscriptionSpec.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/ClassPath.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Connections.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/DescriptorFactory.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/Provides.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/ServiceAssembly.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/deployment/SharedLibraryList.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ComponentEvent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ComponentListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ContainerAware.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/DeploymentEvent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/DeploymentListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/EndpointEvent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/EndpointListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ExchangeEvent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ExchangeListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ServiceAssemblyEvent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ServiceAssemblyListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ServiceMixListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ServiceUnitEvent.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/event/ServiceUnitListener.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsService.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AdminCommandsServiceMBean.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AutoDeploymentService.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ClientFactory.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentContextImpl.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBean.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentMBeanImpl.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ComponentRegistry.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/DeploymentService.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Endpoint.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointMBean.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/EndpointRegistry.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationContextImpl.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallationService.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/InstallerMBeanImpl.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ManagementSupport.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/Registry.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyLifeCycle.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyMBean.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceAssemblyRegistry.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitLifeCycle.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/ServiceUnitMBean.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/BytesSource.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ResourceSource.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceMarshaler.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/SourceTransformer.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/StAXSourceTransformer.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/NormalizedMessageImpl.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageCopier.java
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/util/MessageUtil.java
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JavaSource.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JavaSource.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JavaSource.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/JavaSource.java Thu Aug 9 13:33:26 2007
@@ -28,10 +28,11 @@
/**
* Returns the POJO equivalent of the Source
*/
- public Object getObject();
+ Object getObject();
/**
* Sets the POJO equivalent of the Source
*/
- public void setObject(Object object);
+ void setObject(Object object);
+
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ClientFactory.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ClientFactory.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ClientFactory.java Thu Aug 9 13:33:26 2007
@@ -29,7 +29,7 @@
/**
* Default location to where the object should be looked for in JNDI
*/
- public static final String DEFAULT_JNDI_NAME = "java:comp/env/jbi/ClientFactory";
+ String DEFAULT_JNDI_NAME = "java:comp/env/jbi/ClientFactory";
/**
* Create a new client to interact with the JBI bus
@@ -37,6 +37,6 @@
* @return a client
* @throws JBIException if an error occurs
*/
- public ServiceMixClient createClient() throws JBIException;
+ ServiceMixClient createClient() throws JBIException;
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultNamespaceContext.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultNamespaceContext.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultNamespaceContext.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultNamespaceContext.java Thu Aug 9 13:33:26 2007
@@ -16,10 +16,14 @@
*/
package org.apache.servicemix.client;
-import javax.xml.xpath.*;
-import javax.xml.namespace.NamespaceContext;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
-import java.util.*;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPathFactory;
/**
* An implementation of {@link NamespaceContext} which uses a simple Map where
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/DefaultServiceMixClient.java Thu Aug 9 13:33:26 2007
@@ -16,18 +16,10 @@
*/
package org.apache.servicemix.client;
-import org.apache.servicemix.components.util.ComponentSupport;
-import org.apache.servicemix.jbi.FaultException;
-import org.apache.servicemix.jbi.NoOutMessageAvailableException;
-import org.apache.servicemix.jbi.container.ActivationSpec;
-import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.apache.servicemix.jbi.resolver.*;
-import org.w3c.dom.DocumentFragment;
+import java.util.Iterator;
+import java.util.Map;
import javax.jbi.JBIException;
-import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jbi.component.ComponentContext;
import javax.jbi.messaging.DeliveryChannel;
import javax.jbi.messaging.Fault;
@@ -39,11 +31,27 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
+import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import java.util.Iterator;
-import java.util.Map;
+import org.w3c.dom.DocumentFragment;
+
+import org.apache.servicemix.components.util.ComponentSupport;
+import org.apache.servicemix.jbi.FaultException;
+import org.apache.servicemix.jbi.NoOutMessageAvailableException;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
+import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+import org.apache.servicemix.jbi.resolver.EndpointFilter;
+import org.apache.servicemix.jbi.resolver.EndpointResolver;
+import org.apache.servicemix.jbi.resolver.ExternalInterfaceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.ExternalServiceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.InterfaceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.NullEndpointFilter;
+import org.apache.servicemix.jbi.resolver.ServiceAndEndpointNameResolver;
+import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.URIResolver;
/**
* The default implementation of the {@link ServiceMixClient} API.
@@ -203,7 +211,8 @@
send(exchange);
}
- public boolean sendSync(EndpointResolver resolver, Map exchangeProperties, Map inMessageProperties, Object content) throws JBIException {
+ public boolean sendSync(EndpointResolver resolver, Map exchangeProperties,
+ Map inMessageProperties, Object content) throws JBIException {
InOnly exchange = createInOnlyExchange(resolver);
populateMessage(exchange, exchangeProperties, inMessageProperties, content);
return sendSync(exchange);
@@ -261,8 +270,8 @@
return new ServiceAndEndpointNameResolver(service, endpoint);
}
- public void close() throws JBIException{
- if(container!=null){
+ public void close() throws JBIException {
+ if (container != null) {
container.deactivateComponent(activationSpec.getComponentName());
}
}
@@ -307,7 +316,8 @@
}
}
- protected void populateMessage(MessageExchange exchange, Map exchangeProperties, Map inMessageProperties, Object content) throws MessagingException {
+ protected void populateMessage(MessageExchange exchange, Map exchangeProperties,
+ Map inMessageProperties, Object content) throws MessagingException {
NormalizedMessage in = exchange.getMessage("in");
populateExchangeProperties(exchange, exchangeProperties);
populateMessageProperties(in, inMessageProperties);
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/Message.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/Message.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/Message.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/Message.java Thu Aug 9 13:33:26 2007
@@ -34,20 +34,20 @@
* Returns the body as a POJO. Depending on the implementation this could be
* a Java POJO, a DOM tree or a byte[]
*/
- public Object getBody() throws MessagingException;
+ Object getBody() throws MessagingException;
/**
* Sets the body as a POJO
*/
- public void setBody(Object body) throws MessagingException;
+ void setBody(Object body) throws MessagingException;
/**
* Returns the message exchange
*/
- public MessageExchange getExchange();
+ MessageExchange getExchange();
/**
* Helper method to create a new fault for this message exchange
*/
- public Fault createFault() throws MessagingException;
+ Fault createFault() throws MessagingException;
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/MessageListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/MessageListener.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/MessageListener.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/MessageListener.java Thu Aug 9 13:33:26 2007
@@ -34,5 +34,5 @@
* @param message
* @throws Exception if the message could not be processed correctly
*/
- public void onMessage(MessageExchange exchange, Message message) throws Exception;
+ void onMessage(MessageExchange exchange, Message message) throws Exception;
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/RemoteServiceMixClient.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/RemoteServiceMixClient.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/RemoteServiceMixClient.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/RemoteServiceMixClient.java Thu Aug 9 13:33:26 2007
@@ -46,7 +46,7 @@
* transport for the JMSFlow to be peer://
*
*/
- public RemoteServiceMixClient(){
+ public RemoteServiceMixClient() {
this("peer://org.apache.servicemix?persistent=false");
}
@@ -55,7 +55,7 @@
* @param uri
*
*/
- public RemoteServiceMixClient(String uri){
+ public RemoteServiceMixClient(String uri) {
this(uri, new ActivationSpec());
}
@@ -64,7 +64,7 @@
* @param uri
* @param activationSpec
*/
- public RemoteServiceMixClient(String uri, ActivationSpec activationSpec){
+ public RemoteServiceMixClient(String uri, ActivationSpec activationSpec) {
container = new JBIContainer();
container.setEmbedded(true);
container.setUseMBeanServer(false);
@@ -114,8 +114,8 @@
// This is very ugly but we have no way yet to be notified
// of cluster events.
long start = System.currentTimeMillis();
- while (jmsFlow.numberInNetwork() == 0 &&
- System.currentTimeMillis() - start < timeout) {
+ while (jmsFlow.numberInNetwork() == 0
+ && System.currentTimeMillis() - start < timeout) {
try {
Thread.sleep(50);
} catch (InterruptedException e) {
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClient.java Thu Aug 9 13:33:26 2007
@@ -16,14 +16,23 @@
*/
package org.apache.servicemix.client;
-import org.apache.servicemix.jbi.resolver.EndpointResolver;
+import java.util.Map;
import javax.jbi.JBIException;
-import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jbi.component.ComponentContext;
-import javax.jbi.messaging.*;
+import javax.jbi.messaging.DeliveryChannel;
+import javax.jbi.messaging.Fault;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.InOptionalOut;
+import javax.jbi.messaging.InOut;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessageExchangeFactory;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.RobustInOnly;
+import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import java.util.Map;
+
+import org.apache.servicemix.jbi.resolver.EndpointResolver;
/**
* Represents a client API which allows users to programatically send messages into the JBI
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/ServiceMixClientFacade.java Thu Aug 9 13:33:26 2007
@@ -16,18 +16,10 @@
*/
package org.apache.servicemix.client;
-import org.apache.servicemix.components.util.PojoSupport;
-import org.apache.servicemix.jbi.FaultException;
-import org.apache.servicemix.jbi.NoOutMessageAvailableException;
-import org.apache.servicemix.jbi.container.ActivationSpec;
-import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.apache.servicemix.jbi.resolver.*;
-import org.w3c.dom.DocumentFragment;
+import java.util.Iterator;
+import java.util.Map;
import javax.jbi.JBIException;
-import javax.jbi.servicedesc.ServiceEndpoint;
import javax.jbi.component.ComponentContext;
import javax.jbi.messaging.DeliveryChannel;
import javax.jbi.messaging.ExchangeStatus;
@@ -40,11 +32,26 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.jbi.messaging.RobustInOnly;
+import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import java.util.Iterator;
-import java.util.Map;
+import org.w3c.dom.DocumentFragment;
+
+import org.apache.servicemix.jbi.FaultException;
+import org.apache.servicemix.jbi.NoOutMessageAvailableException;
+import org.apache.servicemix.jbi.container.ActivationSpec;
+import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
+import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+import org.apache.servicemix.jbi.resolver.EndpointFilter;
+import org.apache.servicemix.jbi.resolver.EndpointResolver;
+import org.apache.servicemix.jbi.resolver.ExternalInterfaceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.ExternalServiceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.InterfaceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.NullEndpointFilter;
+import org.apache.servicemix.jbi.resolver.ServiceAndEndpointNameResolver;
+import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
+import org.apache.servicemix.jbi.resolver.URIResolver;
/**
* A Facade around the {@link ComponentContext} to provide the {@link ServiceMixClient} API which is useful for
@@ -235,7 +242,8 @@
send(exchange);
}
- public boolean sendSync(EndpointResolver resolver, Map exchangeProperties, Map inMessageProperties, Object content) throws JBIException {
+ public boolean sendSync(EndpointResolver resolver, Map exchangeProperties,
+ Map inMessageProperties, Object content) throws JBIException {
InOnly exchange = createInOnlyExchange(resolver);
populateMessage(exchange, exchangeProperties, inMessageProperties, content);
return sendSync(exchange);
@@ -333,7 +341,8 @@
}
}
- protected void populateMessage(MessageExchange exchange, Map exchangeProperties, Map inMessageProperties, Object content) throws MessagingException {
+ protected void populateMessage(MessageExchange exchange, Map exchangeProperties,
+ Map inMessageProperties, Object content) throws MessagingException {
NormalizedMessage in = exchange.getMessage("in");
populateExchangeProperties(exchange, exchangeProperties);
populateMessageProperties(in, inMessageProperties);
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/XPathHelper.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/XPathHelper.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/XPathHelper.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/client/XPathHelper.java Thu Aug 9 13:33:26 2007
@@ -16,6 +16,8 @@
*/
package org.apache.servicemix.client;
+import java.util.Map;
+
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
@@ -25,8 +27,6 @@
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFunctionResolver;
import javax.xml.xpath.XPathVariableResolver;
-
-import java.util.Map;
/**
* A helper class for working with XPath and {@link Message} instances.
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/BinaryFileMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/BinaryFileMarshaler.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/BinaryFileMarshaler.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/BinaryFileMarshaler.java Thu Aug 9 13:33:26 2007
@@ -32,49 +32,54 @@
import org.apache.servicemix.jbi.util.StreamDataSource;
/**
- * A FileMarshaler that converts the given input stream into a binary attachment.
+ * A FileMarshaler that converts the given input stream into a binary
+ * attachment.
*
* @org.apache.xbean.XBean
- *
+ *
* @author Guillaume Nodet
* @since 3.0
*/
public class BinaryFileMarshaler extends DefaultFileMarshaler {
- private String attachment = "content";
- private String contentType = null;
+ private String attachment = "content";
+
+ private String contentType;
+
+ public String getAttachment() {
+ return attachment;
+ }
+
+ public void setAttachment(String attachment) {
+ this.attachment = attachment;
+ }
- public String getAttachment() {
- return attachment;
- }
-
- public void setAttachment(String attachment) {
- this.attachment = attachment;
- }
-
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- public void readMessage(MessageExchange exchange, NormalizedMessage message, InputStream in, String path) throws IOException, JBIException {
- DataSource ds = new StreamDataSource(in, contentType);
- DataHandler handler = new DataHandler(ds);
- message.addAttachment(attachment, handler);
+ public String getContentType() {
+ return contentType;
+ }
+
+ public void setContentType(String contentType) {
+ this.contentType = contentType;
+ }
+
+ public void readMessage(MessageExchange exchange, NormalizedMessage message,
+ InputStream in, String path) throws IOException, JBIException {
+ DataSource ds = new StreamDataSource(in, contentType);
+ DataHandler handler = new DataHandler(ds);
+ message.addAttachment(attachment, handler);
message.setProperty(FILE_NAME_PROPERTY, new File(path).getName());
message.setProperty(FILE_PATH_PROPERTY, path);
}
- public void writeMessage(MessageExchange exchange, NormalizedMessage message, OutputStream out, String path) throws IOException, JBIException {
- DataHandler handler = message.getAttachment(attachment);
- if (handler == null) {
- throw new MessagingException("Could not find attachment: " + attachment);
- }
- InputStream is = handler.getInputStream();
- FileUtil.copyInputStream(is, out);
- }
+ public void writeMessage(MessageExchange exchange, NormalizedMessage message,
+ OutputStream out, String path) throws IOException, JBIException {
+ DataHandler handler = message.getAttachment(attachment);
+ if (handler == null) {
+ throw new MessagingException("Could not find attachment: "
+ + attachment);
+ }
+ InputStream is = handler.getInputStream();
+ FileUtil.copyInputStream(is, out);
+ }
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ChainedComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ChainedComponent.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ChainedComponent.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ChainedComponent.java Thu Aug 9 13:33:26 2007
@@ -26,7 +26,6 @@
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
-import org.apache.servicemix.components.util.TransformComponentSupport;
import org.apache.servicemix.jbi.FaultException;
/**
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ColumnExtractor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ColumnExtractor.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ColumnExtractor.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ColumnExtractor.java Thu Aug 9 13:33:26 2007
@@ -22,5 +22,7 @@
* @since 3.2
*/
public interface ColumnExtractor {
- public abstract String[] extractColumns(String lineText);
+
+ String[] extractColumns(String lineText);
+
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptor.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptor.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptor.java Thu Aug 9 13:33:26 2007
@@ -16,9 +16,6 @@
*/
package org.apache.servicemix.components.util;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-
import javax.jbi.JBIException;
import javax.jbi.component.Component;
import javax.jbi.component.ComponentContext;
@@ -28,6 +25,9 @@
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+
/**
* A simple adaptor which can be used to turn any instance of
* a {@link ComponentLifeCycle} into a fully fledged JBI {@link Component}
@@ -56,13 +56,13 @@
/**
* Called when the Component is initialized
*
- * @param context
+ * @param ctx
* @throws javax.jbi.JBIException
*/
- public void init(ComponentContext context) throws JBIException {
- this.context = context;
+ public void init(ComponentContext ctx) throws JBIException {
+ this.context = ctx;
if (service != null && endpoint != null) {
- context.activateEndpoint(service, endpoint);
+ ctx.activateEndpoint(service, endpoint);
}
}
@@ -102,19 +102,19 @@
}
- public Document getServiceDescription(ServiceEndpoint endpoint) {
+ public Document getServiceDescription(ServiceEndpoint ep) {
// TODO Auto-generated method stub
return null;
}
- public boolean isExchangeWithConsumerOkay(ServiceEndpoint endpoint, MessageExchange exchange) {
+ public boolean isExchangeWithConsumerOkay(ServiceEndpoint ep, MessageExchange exchange) {
// TODO Auto-generated method stub
return true;
}
- public boolean isExchangeWithProviderOkay(ServiceEndpoint endpoint, MessageExchange exchange) {
+ public boolean isExchangeWithProviderOkay(ServiceEndpoint ep, MessageExchange exchange) {
// TODO Auto-generated method stub
return true;
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptorMEListener.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptorMEListener.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptorMEListener.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentAdaptorMEListener.java Thu Aug 9 13:33:26 2007
@@ -16,12 +16,12 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.servicemix.MessageExchangeListener;
-
import javax.jbi.component.ComponentLifeCycle;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.xml.namespace.QName;
+
+import org.apache.servicemix.MessageExchangeListener;
/**
* A {@link ComponentAdaptor} which also supports the direct
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentSupport.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentSupport.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentSupport.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ComponentSupport.java Thu Aug 9 13:33:26 2007
@@ -16,18 +16,27 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.servicemix.jbi.NoInMessageAvailableException;
-import org.apache.servicemix.JbiConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-
import javax.jbi.component.Component;
import javax.jbi.component.ComponentLifeCycle;
import javax.jbi.component.ServiceUnitManager;
-import javax.jbi.messaging.*;
+import javax.jbi.messaging.DeliveryChannel;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.InOptionalOut;
+import javax.jbi.messaging.InOut;
+import javax.jbi.messaging.MessageExchange;
+import javax.jbi.messaging.MessageExchangeFactory;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.messaging.RobustInOnly;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.xml.namespace.QName;
+import org.w3c.dom.Document;
+import org.w3c.dom.DocumentFragment;
+
+import org.apache.servicemix.JbiConstants;
+import org.apache.servicemix.jbi.NoInMessageAvailableException;
+
/**
* A useful base class for developers wishing to implement a JBI Component.
*
@@ -169,7 +178,8 @@
* @param interfaceName
* @param operation
*/
- public void invoke(MessageExchange exchange, NormalizedMessage in, QName service, QName interfaceName, QName operation) throws MessagingException {
+ public void invoke(MessageExchange exchange, NormalizedMessage in,
+ QName service, QName interfaceName, QName operation) throws MessagingException {
InOnly outExchange = createInOnlyExchange(service, interfaceName, operation);
forwardToExchange(exchange, outExchange, in, operation);
}
@@ -200,7 +210,8 @@
return outExchange;
}
- public InOnly createInOnlyExchange(QName service, QName interfaceName, QName operation, MessageExchange beforeExchange) throws MessagingException {
+ public InOnly createInOnlyExchange(QName service, QName interfaceName,
+ QName operation, MessageExchange beforeExchange) throws MessagingException {
InOnly inOnly = createInOnlyExchange(service, interfaceName, operation);
propagateCorrelationId(beforeExchange, inOnly);
return inOnly;
@@ -232,7 +243,8 @@
return outExchange;
}
- public InOut creatInOutExchange(QName service, QName interfaceName, QName operation, MessageExchange srcExchange) throws MessagingException {
+ public InOut creatInOutExchange(QName service, QName interfaceName,
+ QName operation, MessageExchange srcExchange) throws MessagingException {
InOut inOut = createInOutExchange(service, interfaceName, operation);
propagateCorrelationId(srcExchange, inOut);
return inOut;
@@ -319,7 +331,8 @@
}
}
- protected void forwardToExchange(MessageExchange exchange, InOnly outExchange, NormalizedMessage in, QName operationName) throws MessagingException {
+ protected void forwardToExchange(MessageExchange exchange, InOnly outExchange,
+ NormalizedMessage in, QName operationName) throws MessagingException {
if (operationName != null) {
exchange.setOperation(operationName);
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ContentConverter.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ContentConverter.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ContentConverter.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/ContentConverter.java Thu Aug 9 13:33:26 2007
@@ -29,12 +29,12 @@
* @param contents contents of the flat file column
* @return contents for the XML element
*/
- public abstract String convertToXml(String contents);
+ String convertToXml(String contents);
/**
* Converts the contents of a XML element to the contents of the flat file column
* @param contents contents of the XML element
* @return contents for the flat file
*/
- public abstract String convertToFlatFileContent(String contents);
+ String convertToFlatFileContent(String contents);
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/CopyTransformer.java Thu Aug 9 13:33:26 2007
@@ -16,12 +16,8 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.servicemix.jbi.jaxp.BytesSource;
-import org.apache.servicemix.jbi.jaxp.ResourceSource;
-import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.xml.sax.SAXException;
+import java.io.IOException;
+import java.util.Iterator;
import javax.activation.DataHandler;
import javax.jbi.messaging.MessageExchange;
@@ -33,8 +29,13 @@
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
-import java.io.IOException;
-import java.util.Iterator;
+import org.xml.sax.SAXException;
+
+import org.apache.servicemix.jbi.jaxp.BytesSource;
+import org.apache.servicemix.jbi.jaxp.ResourceSource;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.jbi.messaging.PojoMarshaler;
/**
* A simple transformer which copies the properties and content from the source message to the destination message.
@@ -43,12 +44,14 @@
*/
public class CopyTransformer implements MessageTransformer {
- private static final CopyTransformer instance = new CopyTransformer();
+ private static final CopyTransformer INSTANCE = new CopyTransformer();
private SourceTransformer sourceTransformer = new SourceTransformer();
-
+
private boolean copyProperties = true;
+
private boolean copyAttachments = true;
+
private boolean copySecuritySubject = true;
/**
@@ -99,47 +102,43 @@
* @return the singleton instance
*/
public static CopyTransformer getInstance() {
- return instance;
+ return INSTANCE;
}
- public boolean transform(MessageExchange exchange, NormalizedMessage from, NormalizedMessage to) throws MessagingException {
+ public boolean transform(MessageExchange exchange, NormalizedMessage from,
+ NormalizedMessage to) throws MessagingException {
if (copyProperties) {
copyProperties(from, to);
}
Source content = from.getContent();
- if ((content instanceof StreamSource ||
- content instanceof SAXSource) &&
- !(content instanceof StringSource) &&
- !(content instanceof BytesSource) &&
- !(content instanceof ResourceSource)) {
+ if ((content instanceof StreamSource || content instanceof SAXSource)
+ && !(content instanceof StringSource)
+ && !(content instanceof BytesSource)
+ && !(content instanceof ResourceSource)) {
// lets avoid stream open exceptions by using a temporary format
try {
content = sourceTransformer.toDOMSource(from);
- }
- catch (TransformerException e) {
+ } catch (TransformerException e) {
throw new MessagingException(e);
- }
- catch (ParserConfigurationException e) {
+ } catch (ParserConfigurationException e) {
throw new MessagingException(e);
- }
- catch (IOException e) {
+ } catch (IOException e) {
throw new MessagingException(e);
- }
- catch (SAXException e) {
+ } catch (SAXException e) {
throw new MessagingException(e);
}
}
to.setContent(content);
-
+
if (copyAttachments) {
copyAttachments(from, to);
}
-
+
if (copySecuritySubject) {
copySecuritySubject(from, to);
}
-
+
return true;
}
@@ -149,12 +148,12 @@
* @param from the message containing the properties
* @param to the destination messages where the properties are set
*/
- public static void copyProperties(NormalizedMessage from, NormalizedMessage to) {
+ public static void copyProperties(NormalizedMessage from,
+ NormalizedMessage to) {
for (Iterator iter = from.getPropertyNames().iterator(); iter.hasNext();) {
String name = (String) iter.next();
// Do not copy transient properties
- if (!PojoMarshaler.BODY.equals(name))
- {
+ if (!PojoMarshaler.BODY.equals(name)) {
Object value = from.getProperty(name);
to.setProperty(name, value);
}
@@ -168,8 +167,10 @@
* @param to the message to which attachments are added
* @throws MessagingException if an attachment could not be added
*/
- public static void copyAttachments(NormalizedMessage from, NormalizedMessage to) throws MessagingException {
- for (Iterator iter = from.getAttachmentNames().iterator(); iter.hasNext();) {
+ public static void copyAttachments(NormalizedMessage from,
+ NormalizedMessage to) throws MessagingException {
+ for (Iterator iter = from.getAttachmentNames().iterator(); iter
+ .hasNext();) {
String name = (String) iter.next();
DataHandler value = from.getAttachment(name);
to.addAttachment(name, value);
@@ -183,8 +184,9 @@
* @param to the message to which the subject is added
* @throws MessagingException if an attachment could not be added
*/
- public static void copySecuritySubject(NormalizedMessage from, NormalizedMessage to) throws MessagingException {
+ public static void copySecuritySubject(NormalizedMessage from,
+ NormalizedMessage to) throws MessagingException {
to.setSecuritySubject(from.getSecuritySubject());
}
-
+
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DateConverter.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DateConverter.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DateConverter.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DateConverter.java Thu Aug 9 13:33:26 2007
@@ -34,93 +34,94 @@
public static final String DEFAULT_OUTPUT_FORMATSTRING = "yyyy-MM-dd'T'HH:mm:ss'.'SSS";
/**
- * Flat file date format
- */
+ * Flat file date format
+ */
private DateFormat inputformat;
/**
- * XML Element date format to use
- */
- private DateFormat outputformat = new SimpleDateFormat(
- DEFAULT_OUTPUT_FORMATSTRING);
+ * XML Element date format to use
+ */
+ private DateFormat outputformat = new SimpleDateFormat(DEFAULT_OUTPUT_FORMATSTRING);
private boolean blankValueIsNull = true;
public DateConverter(DateFormat inputformat) {
- super();
+ super();
- this.inputformat = inputformat;
+ this.inputformat = inputformat;
}
public DateConverter(DateFormat inputformat, DateFormat outputformat) {
- super();
+ super();
- this.inputformat = inputformat;
- this.outputformat = outputformat;
+ this.inputformat = inputformat;
+ this.outputformat = outputformat;
}
public DateConverter(String inputformat) {
- super();
+ super();
- this.inputformat = new SimpleDateFormat(inputformat);
+ this.inputformat = new SimpleDateFormat(inputformat);
}
public DateConverter(String inputformat, String outputformat) {
- super();
+ super();
- this.inputformat = new SimpleDateFormat(inputformat);
- this.outputformat = new SimpleDateFormat(outputformat);
+ this.inputformat = new SimpleDateFormat(inputformat);
+ this.outputformat = new SimpleDateFormat(outputformat);
}
// Implementation methods
// -------------------------------------------------------------------------
public String convertToXml(String contents) {
- if (contents != null) {
- if (StringUtils.isNotBlank(contents)) {
- try {
- return this.outputformat.format(this.inputformat
- .parse(contents));
- } catch (ParseException e) {
- return contents;
- }
- } else {
- if (this.blankValueIsNull)
- return StringUtils.EMPTY;
- else
- return contents;
- }
- } else
- return null;
+ if (contents != null) {
+ if (StringUtils.isNotBlank(contents)) {
+ try {
+ return this.outputformat.format(this.inputformat
+ .parse(contents));
+ } catch (ParseException e) {
+ return contents;
+ }
+ } else {
+ if (this.blankValueIsNull) {
+ return StringUtils.EMPTY;
+ } else {
+ return contents;
+ }
+ }
+ } else {
+ return null;
+ }
}
public String convertToFlatFileContent(String contents) {
- if (contents != null) {
- try {
- return this.inputformat.format(this.outputformat
- .parse(contents));
- } catch (ParseException e) {
- return contents;
- }
- } else
- return null;
+ if (contents != null) {
+ try {
+ return this.inputformat.format(this.outputformat.parse(contents));
+ } catch (ParseException e) {
+ return contents;
+ }
+ } else {
+ return null;
+ }
}
// Properties
// -------------------------------------------------------------------------
public final void setInputformat(String format) {
- this.inputformat = new SimpleDateFormat(format);
+ this.inputformat = new SimpleDateFormat(format);
}
public final void setOutpuformat(String format) {
- this.outputformat = new SimpleDateFormat(format);
+ this.outputformat = new SimpleDateFormat(format);
}
public boolean isBlankValueIsNull() {
- return blankValueIsNull;
+ return blankValueIsNull;
}
public void setBlankValueIsNull(boolean blankValueIsNull) {
- this.blankValueIsNull = blankValueIsNull;
+ this.blankValueIsNull = blankValueIsNull;
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DefaultFileMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DefaultFileMarshaler.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DefaultFileMarshaler.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/DefaultFileMarshaler.java Thu Aug 9 13:33:26 2007
@@ -16,9 +16,12 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.servicemix.expression.Expression;
-import org.apache.servicemix.expression.PropertyExpression;
-import org.apache.servicemix.jbi.NoMessageContentAvailableException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
import javax.jbi.JBIException;
import javax.jbi.messaging.MessageExchange;
@@ -29,12 +32,9 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import org.apache.servicemix.expression.Expression;
+import org.apache.servicemix.expression.PropertyExpression;
+import org.apache.servicemix.jbi.NoMessageContentAvailableException;
/**
* A default file transformer which assumes the file is already in XML format and
@@ -55,7 +55,8 @@
private Expression fileName = FILE_NAME_EXPRESSION;
private Expression content = FILE_CONTENT_EXPRESSION;
- public void readMessage(MessageExchange exchange, NormalizedMessage message, InputStream in, String path) throws IOException, JBIException {
+ public void readMessage(MessageExchange exchange, NormalizedMessage message,
+ InputStream in, String path) throws IOException, JBIException {
message.setContent(new StreamSource(in, path));
message.setProperty(FILE_NAME_PROPERTY, new File(path).getName());
message.setProperty(FILE_PATH_PROPERTY, path);
@@ -65,17 +66,16 @@
return asString(fileName.evaluate(exchange, message));
}
- public void writeMessage(MessageExchange exchange, NormalizedMessage message, OutputStream out, String path) throws IOException, JBIException {
+ public void writeMessage(MessageExchange exchange, NormalizedMessage message,
+ OutputStream out, String path) throws IOException, JBIException {
try {
Object value = content.evaluate(exchange, message);
if (value != null) {
writeValue(value, out);
- }
- else {
+ } else {
writeMessageContent(exchange, message, out, path);
}
- }
- catch (IOException e) {
+ } catch (IOException e) {
throw new MessagingException(e);
}
}
@@ -112,11 +112,9 @@
OutputStreamWriter writer = new OutputStreamWriter(out);
writer.write((String) value);
writer.flush();
- }
- else if (value instanceof byte[]) {
+ } else if (value instanceof byte[]) {
out.write((byte[]) value);
- }
- else {
+ } else {
ObjectOutputStream objectOut = new ObjectOutputStream(out);
objectOut.writeObject(value);
}
@@ -129,15 +127,16 @@
* @param out the destination of the output
* @param path the name of the output resource (file, uri, url)
*/
- protected void writeMessageContent(MessageExchange exchange, NormalizedMessage message, OutputStream out, String path) throws MessagingException {
- Source content = message.getContent();
- if (content == null) {
+ protected void writeMessageContent(MessageExchange exchange, NormalizedMessage message,
+ OutputStream out, String path) throws MessagingException {
+ Source src = message.getContent();
+ if (src == null) {
throw new NoMessageContentAvailableException(exchange);
}
try {
- getTransformer().toResult(content, new StreamResult(out));
+ getTransformer().toResult(src, new StreamResult(out));
} catch (TransformerException e) {
- throw new MessagingException(e);
+ throw new MessagingException(e);
}
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/EchoComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/EchoComponent.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/EchoComponent.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/EchoComponent.java Thu Aug 9 13:33:26 2007
@@ -16,22 +16,23 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.MessageExchangeListener;
-
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.namespace.QName;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.MessageExchangeListener;
+
/**
* A simple, yet useful component for testing synchronous flows. Echos back Exchanges
*
* @version $Revision$
*/
public class EchoComponent extends TransformComponentSupport implements MessageExchangeListener {
- private static final Log log = LogFactory.getLog(EchoComponent.class);
+
+ private static final Log LOG = LogFactory.getLog(EchoComponent.class);
public EchoComponent() {
}
@@ -42,7 +43,7 @@
protected boolean transform(MessageExchange exchange, NormalizedMessage in, NormalizedMessage out) throws MessagingException {
getMessageTransformer().transform(exchange, in, out);
- log.info("Echoed back message: " + out);
+ LOG.info("Echoed back message: " + out);
return true;
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileExtensionPropertyExpression.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileExtensionPropertyExpression.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileExtensionPropertyExpression.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileExtensionPropertyExpression.java Thu Aug 9 13:33:26 2007
@@ -20,60 +20,57 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-import org.apache.servicemix.components.util.DefaultFileMarshaler;
import org.apache.servicemix.expression.PropertyExpression;
/**
- * Expression that returns the 'org.apache.servicemix.file.name' property on
- * the message added by a file extensions. Existing file extensions are by
- * default removed
+ * Expression that returns the 'org.apache.servicemix.file.name' property on the
+ * message added by a file extensions. Existing file extensions are by default
+ * removed
+ *
* @author Mayrbaeurl
* @since 3.2
*/
public class FileExtensionPropertyExpression extends PropertyExpression {
-
+
private final String extension;
private boolean deleteExistingExtension = true;
public FileExtensionPropertyExpression(String fileExtension) {
- super(DefaultFileMarshaler.FILE_NAME_PROPERTY);
+ super(DefaultFileMarshaler.FILE_NAME_PROPERTY);
- this.extension = fileExtension;
+ this.extension = fileExtension;
}
public FileExtensionPropertyExpression(String extension,
- boolean deleteExistingExtension) {
- super(DefaultFileMarshaler.FILE_NAME_PROPERTY);
+ boolean deleteExistingExtension) {
+ super(DefaultFileMarshaler.FILE_NAME_PROPERTY);
- this.extension = extension;
- this.deleteExistingExtension = deleteExistingExtension;
+ this.extension = extension;
+ this.deleteExistingExtension = deleteExistingExtension;
}
// Implementation methods
- //-------------------------------------------------------------------------
- public Object evaluate(MessageExchange exchange, NormalizedMessage message)
- throws MessagingException {
- Object result = super.evaluate(exchange, message);
-
- if ((result != null) && (result instanceof String)) {
- return this.removeExtension((String) result) + this.extension;
- } else
- return result;
+ // -------------------------------------------------------------------------
+ public Object evaluate(MessageExchange exchange, NormalizedMessage message) throws MessagingException {
+ Object result = super.evaluate(exchange, message);
+ if ((result != null) && (result instanceof String)) {
+ return this.removeExtension((String) result) + this.extension;
+ } else {
+ return result;
+ }
}
private String removeExtension(String fileName) {
- String result = fileName;
-
- if (this.deleteExistingExtension) {
- if ((fileName != null) && (fileName.length() > 1)) {
- int index = fileName.lastIndexOf('.');
- if (index != -1) {
- result = fileName.substring(0, index);
- }
- }
- }
-
- return result;
+ String result = fileName;
+ if (this.deleteExistingExtension) {
+ if ((fileName != null) && (fileName.length() > 1)) {
+ int index = fileName.lastIndexOf('.');
+ if (index != -1) {
+ result = fileName.substring(0, index);
+ }
+ }
+ }
+ return result;
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileMarshaler.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileMarshaler.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/FileMarshaler.java Thu Aug 9 13:33:26 2007
@@ -16,14 +16,14 @@
*/
package org.apache.servicemix.components.util;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
import javax.jbi.JBIException;
import javax.jbi.messaging.MessageExchange;
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
/**
* A pluggable strategy for turning a file or URL input source into
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageHelper.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageHelper.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageHelper.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MessageHelper.java Thu Aug 9 13:33:26 2007
@@ -16,20 +16,23 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.servicemix.JavaSource;
-import org.apache.servicemix.jbi.messaging.NormalizedMessageImpl;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
import javax.xml.transform.Source;
+import org.apache.servicemix.JavaSource;
+import org.apache.servicemix.jbi.messaging.NormalizedMessageImpl;
+import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+
/**
* Some helper methods for working with messages
*
* @version $Revision: $
*/
-public class MessageHelper {
+public final class MessageHelper {
+
+ private MessageHelper() {
+ }
/**
* A helper method to return the body of the message as a POJO which could be a
@@ -86,11 +89,9 @@
if (content instanceof JavaSource) {
JavaSource source = (JavaSource) content;
source.setObject(body);
- }
- else if (message instanceof NormalizedMessageImpl) {
+ } else if (message instanceof NormalizedMessageImpl) {
((NormalizedMessageImpl) message).setBody(body);
- }
- else {
+ } else {
message.setProperty(PojoMarshaler.BODY, body);
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MockServiceComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MockServiceComponent.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MockServiceComponent.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/MockServiceComponent.java Thu Aug 9 13:33:26 2007
@@ -16,10 +16,8 @@
*/
package org.apache.servicemix.components.util;
-import org.apache.servicemix.MessageExchangeListener;
-import org.apache.servicemix.jbi.jaxp.ResourceSource;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.springframework.core.io.Resource;
+import java.util.Iterator;
+import java.util.Map;
import javax.jbi.JBIException;
import javax.jbi.messaging.MessageExchange;
@@ -28,8 +26,10 @@
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.servicemix.MessageExchangeListener;
+import org.apache.servicemix.jbi.jaxp.ResourceSource;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.springframework.core.io.Resource;
/**
* A simple mock service component which is hard coded with a response to give
@@ -40,6 +40,7 @@
* @version $Revision$
*/
public class MockServiceComponent extends TransformComponentSupport implements MessageExchangeListener {
+
private Source responseContent;
private String responseXml;
private Resource responseResource;
@@ -56,8 +57,7 @@
if (responseContent == null) {
if (responseXml != null) {
responseContent = new StringSource(responseXml);
- }
- else if (responseResource != null) {
+ } else if (responseResource != null) {
return new ResourceSource(responseResource);
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NoConversion.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NoConversion.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NoConversion.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NoConversion.java Thu Aug 9 13:33:26 2007
@@ -30,7 +30,7 @@
* @return parameter contents
*/
public final String convertToXml(String contents) {
- return contents;
+ return contents;
}
/**
@@ -39,6 +39,6 @@
* @return parameter contents
*/
public String convertToFlatFileContent(String contents) {
- return contents;
+ return contents;
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NumberConverter.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NumberConverter.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NumberConverter.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/NumberConverter.java Thu Aug 9 13:33:26 2007
@@ -19,57 +19,59 @@
import org.apache.commons.lang.StringUtils;
/**
- * Column converter for SimpleFlatFileMarshaler that converts string representations
- * of numbers. Zero values and blank columns in flat files can be converted
- * to empty strings (default setting)
+ * Column converter for SimpleFlatFileMarshaler that converts string
+ * representations of numbers. Zero values and blank columns in flat files can
+ * be converted to empty strings (default setting)
+ *
* @author Mayrbaeurl
* @since 3.2
*/
public class NumberConverter implements ContentConverter {
-
+
private boolean zeroValueIsNull = true;
private boolean blankValueIsNull = true;
// Implementation methods
- //-------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
public String convertToXml(String contents) {
- if (contents != null) {
- int number = 0;
-
- if (StringUtils.isNotBlank(contents)) {
- try {
- number = Integer.parseInt(contents);
- } catch (NumberFormatException e) {
- return contents;
- }
- } else {
- if (this.blankValueIsNull)
- return StringUtils.EMPTY;
- else
- return contents;
- }
-
- if ((this.zeroValueIsNull) && (number == 0))
- return StringUtils.EMPTY;
- else
- return String.valueOf(number);
- } else
- return null;
+ if (contents != null) {
+ int number = 0;
+ if (StringUtils.isNotBlank(contents)) {
+ try {
+ number = Integer.parseInt(contents);
+ } catch (NumberFormatException e) {
+ return contents;
+ }
+ } else {
+ if (this.blankValueIsNull) {
+ return StringUtils.EMPTY;
+ } else {
+ return contents;
+ }
+ }
+ if ((this.zeroValueIsNull) && (number == 0)) {
+ return StringUtils.EMPTY;
+ } else {
+ return String.valueOf(number);
+ }
+ } else {
+ return null;
+ }
}
public String convertToFlatFileContent(String contents) {
- return contents;
+ return contents;
}
// Properties
- //-------------------------------------------------------------------------
- public final void setZeroValueIsNull(boolean zeroValueIsNull) {
- this.zeroValueIsNull = zeroValueIsNull;
+ // -------------------------------------------------------------------------
+ public final void setZeroValueIsNull(boolean zeroValueIsNull) {
+ this.zeroValueIsNull = zeroValueIsNull;
}
public final void setBlankValueIsNull(boolean blankValueIsNull) {
- this.blankValueIsNull = blankValueIsNull;
+ this.blankValueIsNull = blankValueIsNull;
}
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/OutBinding.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/OutBinding.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/OutBinding.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/OutBinding.java Thu Aug 9 13:33:26 2007
@@ -18,10 +18,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.MessageExchangeListener;
-
import javax.jbi.JBIException;
import javax.jbi.messaging.DeliveryChannel;
import javax.jbi.messaging.ExchangeStatus;
@@ -29,13 +25,19 @@
import javax.jbi.messaging.MessagingException;
import javax.jbi.messaging.NormalizedMessage;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.MessageExchangeListener;
+
/**
* A base class for bindings which process inbound JBI messages
*
* @version $Revision$
*/
public abstract class OutBinding extends ComponentSupport implements Runnable, MessageExchangeListener {
- private static final Log log = LogFactory.getLog(OutBinding.class);
+
+ private static final Log LOG = LogFactory.getLog(OutBinding.class);
+
private AtomicBoolean stop = new AtomicBoolean(true);
private Thread runnable;
@@ -47,10 +49,9 @@
try {
NormalizedMessage message = getInMessage(exchange);
process(exchange, message);
- }
- catch (Exception e) {
- if (log.isDebugEnabled()) {
- log.debug("Exchange failed", e);
+ } catch (Exception e) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Exchange failed", e);
}
fail(exchange, e);
}
@@ -69,17 +70,16 @@
try {
onMessageExchange(exchange);
} catch (MessagingException e) {
- log.error("MessageExchange processing failed", e);
+ LOG.error("MessageExchange processing failed", e);
}
}
}
- }
- catch (MessagingException e) {
+ } catch (MessagingException e) {
// Only log exception if the component really fails
// i.e. the exception has not been thrown to interrupt
// this thread
if (!stop.get()) {
- log.error("run failed", e);
+ LOG.error("run failed", e);
}
}
}
@@ -104,7 +104,7 @@
try {
runnable.join();
} catch (InterruptedException e) {
- log.warn("Unable to stop component polling thread", e);
+ LOG.warn("Unable to stop component polling thread", e);
}
runnable = null;
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PipelineComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PipelineComponent.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PipelineComponent.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PipelineComponent.java Thu Aug 9 13:33:26 2007
@@ -92,13 +92,11 @@
inOnly.setInMessage(rpc.getOutMessage());
deliveryChannel.send(inOnly);
done(exchange);
- }
- else if (exchange instanceof InOnly == false) {
+ } else if (!(exchange instanceof InOnly)) {
inOnly.setError(rpc.getError());
Fault fault = rpc.getFault();
fail(exchange, fault);
- }
- else {
+ } else {
// terminate the exchange
done(exchange);
}
@@ -154,7 +152,6 @@
if (endpoints == null || endpoints.length == 0) {
throw new NoServiceAvailableException(serviceName);
}
-
// TODO how should we choose?
return endpoints[0];
}
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PojoLifecycleAdaptor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PojoLifecycleAdaptor.java?view=diff&rev=564374&r1=564373&r2=564374
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PojoLifecycleAdaptor.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/components/util/PojoLifecycleAdaptor.java Thu Aug 9 13:33:26 2007
@@ -16,14 +16,14 @@
*/
package org.apache.servicemix.components.util;
-import org.springframework.beans.factory.DisposableBean;
-
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
import javax.jbi.component.ComponentLifeCycle;
import javax.management.ObjectName;
import javax.xml.namespace.QName;
+import org.springframework.beans.factory.DisposableBean;
+
/**
* Adapts a POJO to a {@link ComponentLifeCycle} without performing any activation
*
@@ -47,10 +47,10 @@
return extensionMBeanName;
}
- public void init(ComponentContext context) throws JBIException {
- this.context = context;
+ public void init(ComponentContext ctx) throws JBIException {
+ this.context = ctx;
if (service != null && endpoint != null) {
- context.activateEndpoint(service, endpoint);
+ ctx.activateEndpoint(service, endpoint);
}
}
@@ -60,8 +60,7 @@
DisposableBean disposableBean = (DisposableBean) pojo;
try {
disposableBean.destroy();
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new JBIException(e);
}
}