You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2007/07/19 22:57:46 UTC
svn commit: r557769 [1/2] - in
/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms:
./ src/main/java/org/apache/servicemix/jms/
src/main/java/org/apache/servicemix/jms/endpoints/
src/main/java/org/apache/servicemix/jms/jca/ src/mai...
Author: gertv
Date: Thu Jul 19 13:57:42 2007
New Revision: 557769
URL: http://svn.apache.org/viewvc?view=rev&rev=557769
Log:
Fix for SM-932: PMD/CheckStyle for servicemix-jms
Modified:
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/ (props changed)
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsComponent.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfigurationMBean.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpointType.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerMarshaler.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerMarshaler.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/packaging/JmsServiceUnitAnalyzer.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddress.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddressDeserializer.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsBindingDeserializer.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsExtension.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/AbstractJmsTestSupport.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderEndpointTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsStandardTest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsURITest.java
incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsXBeanDeployerTest.java
Propchange: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 19 13:57:42 2007
@@ -5,3 +5,4 @@
.wtpmodules
.settings
cobertura.ser
+activemq-data
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/AbstractJmsProcessor.java Thu Jul 19 13:57:42 2007
@@ -20,9 +20,9 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Date;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
import javax.jbi.messaging.ExchangeStatus;
import javax.jbi.messaging.Fault;
@@ -103,13 +103,13 @@
}
protected InitialContext getInitialContext() throws NamingException {
- Hashtable props = new Hashtable();
+ Properties props = new Properties();
if (endpoint.getInitialContextFactory() != null && endpoint.getJndiProviderURL() != null) {
props.put(InitialContext.INITIAL_CONTEXT_FACTORY, endpoint.getInitialContextFactory());
props.put(InitialContext.PROVIDER_URL, endpoint.getJndiProviderURL());
return new InitialContext(props);
- } else if (endpoint.getConfiguration().getJndiInitialContextFactory() != null &&
- endpoint.getConfiguration().getJndiProviderUrl() != null) {
+ } else if (endpoint.getConfiguration().getJndiInitialContextFactory() != null
+ && endpoint.getConfiguration().getJndiProviderUrl() != null) {
props.put(InitialContext.INITIAL_CONTEXT_FACTORY, endpoint.getConfiguration().getJndiInitialContextFactory());
props.put(InitialContext.PROVIDER_URL, endpoint.getConfiguration().getJndiProviderUrl());
return new InitialContext(props);
@@ -224,13 +224,17 @@
private static boolean isJavaIdentifier(String s) {
int n = s.length();
- if (n == 0)
+ if (n == 0) {
return false;
- if (!Character.isJavaIdentifierStart(s.charAt(0)))
+ }
+ if (!Character.isJavaIdentifierStart(s.charAt(0))) {
return false;
- for (int i = 1; i < n; i++)
- if (!Character.isJavaIdentifierPart(s.charAt(i)))
+ }
+ for (int i = 1; i < n; i++) {
+ if (!Character.isJavaIdentifierPart(s.charAt(i))) {
return false;
+ }
+ }
return true;
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsComponent.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsComponent.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsComponent.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsComponent.java Thu Jul 19 13:57:42 2007
@@ -52,9 +52,9 @@
}
protected Class[] getEndpointClasses() {
- return new Class[] { JmsEndpoint.class,
- JmsConsumerEndpoint.class,
- JmsProviderEndpoint.class };
+ return new Class[] {JmsEndpoint.class,
+ JmsConsumerEndpoint.class,
+ JmsProviderEndpoint.class};
}
/**
@@ -116,8 +116,8 @@
* @see org.apache.servicemix.common.BaseComponent#createServiceUnitManager()
*/
public BaseServiceUnitManager createServiceUnitManager() {
- Deployer[] deployers = new Deployer[] { new BaseXBeanDeployer(this, getEndpointClasses()),
- new JmsWsdl1Deployer(this) };
+ Deployer[] deployers = new Deployer[] {new BaseXBeanDeployer(this, getEndpointClasses()),
+ new JmsWsdl1Deployer(this)};
return new BaseServiceUnitManager(this, deployers);
}
@@ -160,7 +160,7 @@
jmsEp.setRole(MessageExchange.Role.PROVIDER);
URI uri = new URI(ep.getEndpointName());
Map map = URISupport.parseQuery(uri.getQuery());
- if( IntrospectionSupport.setProperties(jmsEp, map, "jms.") ) {
+ if (IntrospectionSupport.setProperties(jmsEp, map, "jms.")) {
uri = URISupport.createRemainingURI(uri, map);
}
if (uri.getPath() != null) {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfiguration.java Thu Jul 19 13:57:42 2007
@@ -34,7 +34,7 @@
*/
public class JmsConfiguration implements JmsConfigurationMBean {
- public final static String CONFIG_FILE = "component.properties";
+ public static final String CONFIG_FILE = "component.properties";
private String rootDir;
private String componentName = "servicemix-jms";
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfigurationMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfigurationMBean.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfigurationMBean.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsConfigurationMBean.java Thu Jul 19 13:57:42 2007
@@ -21,58 +21,69 @@
/**
* @return Returns the password.
*/
- public String getPassword();
+ String getPassword();
+
/**
* @param password The password to set.
*/
- public void setPassword(String password);
+ void setPassword(String password);
+
/**
* @return Returns the userName.
*/
- public String getUserName();
+ String getUserName();
+
/**
* @param userName The userName to set.
*/
- public void setUserName(String userName);
+ void setUserName(String userName);
+
/**
* @return Returns the jndiConnectionFactoryName.
*/
- public String getJndiConnectionFactoryName();
+ String getJndiConnectionFactoryName();
+
/**
* @param jndiConnectionFactoryName The jndiName to set.
*/
- public void setJndiConnectionFactoryName(String jndiConnectionFactoryName);
+ void setJndiConnectionFactoryName(String jndiConnectionFactoryName);
+
/**
* @return Returns the jndiInitialContextFactory.
*/
- public String getJndiInitialContextFactory();
+ String getJndiInitialContextFactory();
+
/**
* @param jndiInitialContextFactory The jndiInitialContextFactory to set.
*/
- public void setJndiInitialContextFactory(String jndiInitialContextFactory);
+ void setJndiInitialContextFactory(String jndiInitialContextFactory);
+
/**
* @return Returns the jndiProviderUrl.
*/
- public String getJndiProviderUrl();
+ String getJndiProviderUrl();
+
/**
* @param jndiProviderUrl The jndiProviderUrl to set.
*/
- public void setJndiProviderUrl(String jndiProviderUrl);
+ void setJndiProviderUrl(String jndiProviderUrl);
+
/**
* @return Returns the processName.
*/
- public String getProcessorName();
+ String getProcessorName();
+
/**
* @param processorName The processorName to set.
*/
- public void setProcessorName(String processorName);
+ void setProcessorName(String processorName);
- public String getKeystoreManagerName();
+ String getKeystoreManagerName();
- public void setKeystoreManagerName(String name);
+ void setKeystoreManagerName(String name);
- public String getAuthenticationServiceName();
+ String getAuthenticationServiceName();
- public void setAuthenticationServiceName(String name);
+ void setAuthenticationServiceName(String name);
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpoint.java Thu Jul 19 13:57:42 2007
@@ -336,8 +336,8 @@
props.load(in);
String className = props.getProperty(type);
Class cl = loadClass(className);
- Constructor cns = cl.getConstructor(new Class[] { getClass() });
- return (ExchangeProcessor) cns.newInstance(new Object[] { this });
+ Constructor cns = cl.getConstructor(new Class[] {getClass()});
+ return (ExchangeProcessor) cns.newInstance(new Object[] {this});
} catch (Exception e) {
throw new RuntimeException("Could not create processor of type " + type + " and name " + processorName, e);
}
@@ -352,8 +352,8 @@
if (contextClassLoader != null) {
try {
return contextClassLoader.loadClass(name);
- }
- catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
+ //thread context class loader didn't work out
}
}
return getClass().getClassLoader().loadClass(name);
@@ -433,10 +433,10 @@
}
public String toString() {
- return "JMSEndpoint[service: " + service + ", " +
- "endpoint: " + endpoint + ", " +
- "address: " + jndiDestinationName + "(" + destinationStyle + "), " +
- "soap: " + soap + "]";
+ return "JMSEndpoint[service: " + service + ", "
+ + "endpoint: " + endpoint + ", "
+ + "address: " + jndiDestinationName + "(" + destinationStyle + "), "
+ + "soap: " + soap + "]";
}
/**
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpointType.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpointType.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpointType.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/JmsEndpointType.java Thu Jul 19 13:57:42 2007
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.servicemix.jms;
public interface JmsEndpointType {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/AbstractConsumerEndpoint.java Thu Jul 19 13:57:42 2007
@@ -51,7 +51,7 @@
private boolean synchronous = true;
private DestinationChooser destinationChooser;
private DestinationResolver destinationResolver = new DynamicDestinationResolver();
- private boolean pubSubDomain = false;
+ private boolean pubSubDomain;
private ConnectionFactory connectionFactory;
private JmsTemplate template;
@@ -59,7 +59,7 @@
private Boolean useMessageIdInResponse;
private Destination replyDestination;
private String replyDestinationName;
- private boolean replyExplicitQosEnabled = false;
+ private boolean replyExplicitQosEnabled;
private int replyDeliveryMode = Message.DEFAULT_DELIVERY_MODE;
private int replyPriority = Message.DEFAULT_PRIORITY;
private long replyTimeToLive = Message.DEFAULT_TIME_TO_LIVE;
@@ -417,7 +417,8 @@
}
}
- protected Destination getReplyDestination(MessageExchange exchange, Object message, Session session, JmsContext context) throws JMSException {
+ protected Destination getReplyDestination(
+ MessageExchange exchange, Object message, Session session, JmsContext context) throws JMSException {
// If a JMS ReplyTo property is set, use it
if (context.getMessage().getJMSReplyTo() != null) {
return context.getMessage().getJMSReplyTo();
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/DefaultConsumerMarshaler.java Thu Jul 19 13:57:42 2007
@@ -72,14 +72,12 @@
public Message createOut(MessageExchange exchange, NormalizedMessage outMsg, Session session, JmsContext context) throws Exception {
String text = new SourceTransformer().contentToString(outMsg);
- TextMessage msg = session.createTextMessage(text);
- return msg;
+ return session.createTextMessage(text);
}
public Message createFault(MessageExchange exchange, Fault fault, Session session, JmsContext context) throws Exception {
String text = new SourceTransformer().contentToString(fault);
- TextMessage msg = session.createTextMessage(text);
- return msg;
+ return session.createTextMessage(text);
}
public Message createError(MessageExchange exchange, Exception error, Session session, JmsContext context) throws Exception {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerEndpoint.java Thu Jul 19 13:57:42 2007
@@ -61,7 +61,7 @@
// type of listener
private String listenerType = LISTENER_TYPE_DEFAULT;
- private boolean jms102 = false;
+ private boolean jms102;
private String transacted = TRANSACTED_NONE;
// Standard jms properties
@@ -75,7 +75,7 @@
private boolean subscriptionDurable;
// simple and default listener properties
- private boolean pubSubNoLocal = false;
+ private boolean pubSubNoLocal;
private int concurrentConsumers = 1;
// default listener properties
@@ -339,7 +339,7 @@
/**
* @param serverSessionFactory the serverSessionFactory to set
- * @see org.springframework.jms.listener.serversession.ServerSessionMessageListenerContainer#setServerSessionFactory(ServerSessionFactory)
+ * @see ServerSessionMessageListenerContainer#setServerSessionFactory(ServerSessionFactory)
*/
public void setServerSessionFactory(ServerSessionFactory serverSessionFactory) {
this.serverSessionFactory = serverSessionFactory;
@@ -409,18 +409,18 @@
if (destination == null && destinationName == null) {
throw new DeploymentException("destination or destinationName is required");
}
- if (!LISTENER_TYPE_DEFAULT.equals(listenerType) &&
- !LISTENER_TYPE_SIMPLE.equals(listenerType) &&
- !LISTENER_TYPE_SERVER.equals(listenerType)) {
+ if (!LISTENER_TYPE_DEFAULT.equals(listenerType)
+ && !LISTENER_TYPE_SIMPLE.equals(listenerType)
+ && !LISTENER_TYPE_SERVER.equals(listenerType)) {
throw new DeploymentException("listenerType must be default, simple or server");
}
- if (TRANSACTED_XA.equals(transacted) &&
- !LISTENER_TYPE_DEFAULT.equals(listenerType)) {
+ if (TRANSACTED_XA.equals(transacted)
+ && !LISTENER_TYPE_DEFAULT.equals(listenerType)) {
throw new DeploymentException("XA transactions are only supported on default listener");
}
- if (!TRANSACTED_NONE.equals(transacted) &&
- !TRANSACTED_JMS.equals(transacted) &&
- !TRANSACTED_XA.equals(transacted)) {
+ if (!TRANSACTED_NONE.equals(transacted)
+ && !TRANSACTED_JMS.equals(transacted)
+ && !TRANSACTED_XA.equals(transacted)) {
throw new DeploymentException("transacted must be none, jms or xa");
}
}
@@ -428,62 +428,11 @@
protected AbstractMessageListenerContainer createListenerContainer() {
final AbstractMessageListenerContainer container;
if (LISTENER_TYPE_DEFAULT.equals(listenerType)) {
- final DefaultMessageListenerContainer cont;
- if (jms102) {
- cont = new DefaultMessageListenerContainer102();
- } else {
- cont = new DefaultMessageListenerContainer();
- }
- cont.setCacheLevel(cacheLevel);
- cont.setConcurrentConsumers(concurrentConsumers);
- cont.setMaxMessagesPerTask(maxMessagesPerTask);
- cont.setPubSubNoLocal(pubSubNoLocal);
- cont.setReceiveTimeout(receiveTimeout);
- cont.setRecoveryInterval(recoveryInterval);
- if (TRANSACTED_XA.equals(transacted)) {
- TransactionManager tm = (TransactionManager) getContext().getTransactionManager();
- if (tm == null) {
- throw new IllegalStateException("No TransactionManager available");
- } else if (tm instanceof PlatformTransactionManager) {
- cont.setTransactionManager((PlatformTransactionManager) tm);
- } else {
- cont.setTransactionManager(new JtaTransactionManager(tm));
- }
- } else if (TRANSACTED_JMS.equals(transacted)) {
- if (jms102) {
- cont.setTransactionManager(new JmsTransactionManager102(getConnectionFactory(), isPubSubDomain()));
- } else {
- cont.setTransactionManager(new JmsTransactionManager(getConnectionFactory()));
- }
- }
- container = cont;
+ container = createDefaultMessageListenerContainer();
} else if (LISTENER_TYPE_SIMPLE.equals(listenerType)) {
- final SimpleMessageListenerContainer cont;
- if (jms102) {
- cont = new SimpleMessageListenerContainer102();
- } else {
- cont = new SimpleMessageListenerContainer();
- }
- cont.setConcurrentConsumers(concurrentConsumers);
- cont.setPubSubNoLocal(pubSubNoLocal);
- cont.setTaskExecutor(null); // TODO: value ?
- if (TRANSACTED_JMS.equals(transacted)) {
- cont.setSessionTransacted(true);
- }
- container = cont;
+ container = createSimpleMessageListenerContainer();
} else if (LISTENER_TYPE_SERVER.equals(listenerType)) {
- final ServerSessionMessageListenerContainer cont;
- if (jms102) {
- cont = new ServerSessionMessageListenerContainer102();
- } else {
- cont = new ServerSessionMessageListenerContainer();
- }
- cont.setMaxMessagesPerTask(maxMessagesPerTask > 0 ? maxMessagesPerTask : 1);
- cont.setServerSessionFactory(serverSessionFactory);
- if (TRANSACTED_JMS.equals(transacted)) {
- cont.setSessionTransacted(true);
- }
- container = cont;
+ container = createServerSessionMessageListenerContainer();
} else {
throw new IllegalStateException();
}
@@ -511,6 +460,69 @@
container.setSessionAcknowledgeMode(sessionAcknowledgeMode);
container.setSubscriptionDurable(subscriptionDurable);
return container;
+ }
+
+ private AbstractMessageListenerContainer createServerSessionMessageListenerContainer() {
+ final ServerSessionMessageListenerContainer cont;
+ if (jms102) {
+ cont = new ServerSessionMessageListenerContainer102();
+ } else {
+ cont = new ServerSessionMessageListenerContainer();
+ }
+ cont.setMaxMessagesPerTask(maxMessagesPerTask > 0 ? maxMessagesPerTask : 1);
+ cont.setServerSessionFactory(serverSessionFactory);
+ if (TRANSACTED_JMS.equals(transacted)) {
+ cont.setSessionTransacted(true);
+ }
+ return cont;
+ }
+
+ private AbstractMessageListenerContainer createSimpleMessageListenerContainer() {
+ final SimpleMessageListenerContainer cont;
+ if (jms102) {
+ cont = new SimpleMessageListenerContainer102();
+ } else {
+ cont = new SimpleMessageListenerContainer();
+ }
+ cont.setConcurrentConsumers(concurrentConsumers);
+ cont.setPubSubNoLocal(pubSubNoLocal);
+ cont.setTaskExecutor(null); // TODO: value ?
+ if (TRANSACTED_JMS.equals(transacted)) {
+ cont.setSessionTransacted(true);
+ }
+ return cont;
+ }
+
+ private AbstractMessageListenerContainer createDefaultMessageListenerContainer() {
+ final DefaultMessageListenerContainer cont;
+ if (jms102) {
+ cont = new DefaultMessageListenerContainer102();
+ } else {
+ cont = new DefaultMessageListenerContainer();
+ }
+ cont.setCacheLevel(cacheLevel);
+ cont.setConcurrentConsumers(concurrentConsumers);
+ cont.setMaxMessagesPerTask(maxMessagesPerTask);
+ cont.setPubSubNoLocal(pubSubNoLocal);
+ cont.setReceiveTimeout(receiveTimeout);
+ cont.setRecoveryInterval(recoveryInterval);
+ if (TRANSACTED_XA.equals(transacted)) {
+ TransactionManager tm = (TransactionManager) getContext().getTransactionManager();
+ if (tm == null) {
+ throw new IllegalStateException("No TransactionManager available");
+ } else if (tm instanceof PlatformTransactionManager) {
+ cont.setTransactionManager((PlatformTransactionManager) tm);
+ } else {
+ cont.setTransactionManager(new JtaTransactionManager(tm));
+ }
+ } else if (TRANSACTED_JMS.equals(transacted)) {
+ if (jms102) {
+ cont.setTransactionManager(new JmsTransactionManager102(getConnectionFactory(), isPubSubDomain()));
+ } else {
+ cont.setTransactionManager(new JmsTransactionManager(getConnectionFactory()));
+ }
+ }
+ return cont;
}
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerMarshaler.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerMarshaler.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsConsumerMarshaler.java Thu Jul 19 13:57:42 2007
@@ -26,7 +26,7 @@
public interface JmsConsumerMarshaler {
public interface JmsContext {
- public Message getMessage();
+ Message getMessage();
}
JmsContext createContext(Message message, ComponentContext context) throws Exception;
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsProviderEndpoint.java Thu Jul 19 13:57:42 2007
@@ -44,17 +44,17 @@
private DestinationChooser destinationChooser = new SimpleDestinationChooser();
private JmsTemplate template;
- private boolean jms102 = false;
+ private boolean jms102;
private ConnectionFactory connectionFactory;
- private boolean pubSubDomain = false;
+ private boolean pubSubDomain;
private DestinationResolver destinationResolver;
private Destination destination;
private String destinationName;
private boolean messageIdEnabled = true;
private boolean messageTimestampEnabled = true;
- private boolean pubSubNoLocal = false;
+ private boolean pubSubNoLocal;
private long receiveTimeout = JmsTemplate.DEFAULT_RECEIVE_TIMEOUT;
- private boolean explicitQosEnabled = false;
+ private boolean explicitQosEnabled;
private int deliveryMode = Message.DEFAULT_DELIVERY_MODE;
private int priority = Message.DEFAULT_PRIORITY;
private long timeToLive = Message.DEFAULT_TIME_TO_LIVE;
@@ -298,8 +298,7 @@
logger.trace("Sending message to: " + template.getDefaultDestinationName() + " message: " + message);
}
return message;
- }
- catch (Exception e) {
+ } catch (Exception e) {
JMSException jmsEx = new JMSException("Failed to create JMS Message: " + e);
jmsEx.setLinkedException(e);
jmsEx.initCause(e);
@@ -345,30 +344,30 @@
}
protected JmsTemplate createTemplate() {
- JmsTemplate template;
+ JmsTemplate tplt;
if (isJms102()) {
- template = new JmsTemplate102();
+ tplt = new JmsTemplate102();
} else {
- template = new JmsTemplate();
+ tplt = new JmsTemplate();
}
- template.setConnectionFactory(getConnectionFactory());
+ tplt.setConnectionFactory(getConnectionFactory());
if (getDestination() != null) {
- template.setDefaultDestination(getDestination());
+ tplt.setDefaultDestination(getDestination());
} else if (getDestinationName() != null) {
- template.setDefaultDestinationName(getDestinationName());
+ tplt.setDefaultDestinationName(getDestinationName());
}
- template.setDeliveryMode(getDeliveryMode());
+ tplt.setDeliveryMode(getDeliveryMode());
if (getDestinationResolver() != null) {
- template.setDestinationResolver(getDestinationResolver());
+ tplt.setDestinationResolver(getDestinationResolver());
}
- template.setExplicitQosEnabled(isExplicitQosEnabled());
- template.setMessageIdEnabled(isMessageIdEnabled());
- template.setMessageTimestampEnabled(isMessageTimestampEnabled());
- template.setPriority(getPriority());
- template.setPubSubDomain(isPubSubDomain());
- template.setPubSubNoLocal(isPubSubNoLocal());
- template.setTimeToLive(getTimeToLive());
- template.setReceiveTimeout(getReceiveTimeout());
- return template;
+ tplt.setExplicitQosEnabled(isExplicitQosEnabled());
+ tplt.setMessageIdEnabled(isMessageIdEnabled());
+ tplt.setMessageTimestampEnabled(isMessageTimestampEnabled());
+ tplt.setPriority(getPriority());
+ tplt.setPubSubDomain(isPubSubDomain());
+ tplt.setPubSubNoLocal(isPubSubNoLocal());
+ tplt.setTimeToLive(getTimeToLive());
+ tplt.setReceiveTimeout(getReceiveTimeout());
+ return tplt;
}
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerEndpoint.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerEndpoint.java Thu Jul 19 13:57:42 2007
@@ -16,15 +16,20 @@
*/
package org.apache.servicemix.jms.endpoints;
+import java.io.IOException;
+
import javax.jbi.management.DeploymentException;
import javax.jbi.servicedesc.ServiceEndpoint;
import javax.wsdl.Definition;
import javax.wsdl.Port;
import javax.wsdl.Service;
+import javax.wsdl.WSDLException;
import javax.wsdl.extensions.soap.SOAPAddress;
import javax.wsdl.extensions.soap12.SOAP12Address;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.ServiceUnit;
import org.apache.servicemix.soap.api.Policy;
@@ -39,7 +44,6 @@
import org.apache.woden.wsdl20.Endpoint;
import org.apache.woden.wsdl20.xml.DescriptionElement;
import org.springframework.core.io.Resource;
-import org.w3c.dom.Element;
/**
*
@@ -108,77 +112,9 @@
description = DomUtil.parse(wsdl.getInputStream());
Element elem = description.getDocumentElement();
if (WSDLUtils.WSDL1_NAMESPACE.equals(elem.getNamespaceURI())) {
- Definition def = WSDLUtils.createWSDL11Reader().readWSDL(wsdl.getURL().toString());
- if (validateWsdl) {
- WSIBPValidator validator = new WSIBPValidator(def);
- if (!validator.isValid()) {
- throw new DeploymentException("WSDL is not WS-I BP compliant: " + validator.getErrors());
- }
- }
- Service svc;
- if (getService() != null) {
- svc = def.getService(getService());
- if (svc == null) {
- throw new DeploymentException("Could not find service '" + getService() + "' in wsdl");
- }
- } else if (def.getServices().size() == 1) {
- svc = (Service) def.getServices().values().iterator().next();
- setService(svc.getQName());
- } else {
- throw new DeploymentException("If service is not set, the WSDL must contain a single service definition");
- }
- Port port;
- if (getEndpoint() != null) {
- port = svc.getPort(getEndpoint());
- if (port == null) {
- throw new DeploymentException("Cound not find port '" + getEndpoint() + "' in wsdl for service '" + getService() + "'");
- }
- } else if (svc.getPorts().size() == 1) {
- port = (Port) svc.getPorts().values().iterator().next();
- setEndpoint(port.getName());
- } else {
- throw new DeploymentException("If endpoint is not set, the WSDL service '" + getService() + "' must contain a single port definition");
- }
- SOAPAddress soapAddress = WSDLUtils.getExtension(port, SOAPAddress.class);
- if (soapAddress != null) {
- soapAddress.setLocationURI(getLocationURI());
- } else {
- SOAP12Address soap12Address = WSDLUtils.getExtension(port, SOAP12Address.class);
- if (soap12Address != null) {
- soap12Address.setLocationURI(getLocationURI());
- }
- }
- description = WSDLUtils.getWSDL11Factory().newWSDLWriter().getDocument(def);
- marshaler.setBinding(BindingFactory.createBinding(port));
+ validateWsdl1(marshaler);
} else if (WSDLUtils.WSDL2_NAMESPACE.equals(elem.getNamespaceURI())) {
- WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
- DescriptionElement descElement = reader.readWSDL(wsdl.getURL().toString());
- Description desc = descElement.toComponent();
- org.apache.woden.wsdl20.Service svc;
- if (getService() != null) {
- svc = desc.getService(getService());
- if (svc == null) {
- throw new DeploymentException("Could not find service '" + getService() + "' in wsdl");
- }
- } else if (desc.getServices().length == 1) {
- svc = desc.getServices()[0];
- setService(svc.getName());
- } else {
- throw new DeploymentException("If service is not set, the WSDL must contain a single service definition");
- }
- Endpoint endpoint;
- if (getEndpoint() != null) {
- endpoint = svc.getEndpoint(new NCName(getEndpoint()));
- if (endpoint == null) {
- throw new DeploymentException("Cound not find endpoint '" + getEndpoint() + "' in wsdl for service '" + getService() + "'");
- }
- } else if (svc.getEndpoints().length == 1) {
- endpoint = svc.getEndpoints()[0];
- setEndpoint(endpoint.getName().toString());
- } else {
- throw new DeploymentException("If endpoint is not set, the WSDL service '" + getService() + "' must contain a single port definition");
- }
- marshaler.setBinding(BindingFactory.createBinding(endpoint));
+ validateWsdl2(marshaler);
} else {
throw new DeploymentException("Unrecognized wsdl namespace: " + elem.getNamespaceURI());
}
@@ -195,6 +131,87 @@
setTargetEndpoint(getEndpoint());
}
super.validate();
+ }
+
+ private void validateWsdl2(JmsSoapConsumerMarshaler marshaler) throws org.apache.woden.WSDLException, IOException,
+ DeploymentException {
+ WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
+ DescriptionElement descElement = reader.readWSDL(wsdl.getURL().toString());
+ Description desc = descElement.toComponent();
+ org.apache.woden.wsdl20.Service svc;
+ if (getService() != null) {
+ svc = desc.getService(getService());
+ if (svc == null) {
+ throw new DeploymentException("Could not find service '" + getService() + "' in wsdl");
+ }
+ } else if (desc.getServices().length == 1) {
+ svc = desc.getServices()[0];
+ setService(svc.getName());
+ } else {
+ throw new DeploymentException("If service is not set, the WSDL must contain a single service definition");
+ }
+ Endpoint endpoint;
+ if (getEndpoint() != null) {
+ endpoint = svc.getEndpoint(new NCName(getEndpoint()));
+ if (endpoint == null) {
+ throw new DeploymentException(
+ "Could not find endpoint '" + getEndpoint() + "' in wsdl for service '" + getService() + "'");
+ }
+ } else if (svc.getEndpoints().length == 1) {
+ endpoint = svc.getEndpoints()[0];
+ setEndpoint(endpoint.getName().toString());
+ } else {
+ throw new DeploymentException(
+ "If endpoint is not set, the WSDL service '" + getService() + "' must contain a single port definition");
+ }
+ marshaler.setBinding(BindingFactory.createBinding(endpoint));
+ }
+
+ private void validateWsdl1(JmsSoapConsumerMarshaler marshaler) throws WSDLException, IOException, DeploymentException {
+ Definition def = WSDLUtils.createWSDL11Reader().readWSDL(wsdl.getURL().toString());
+ if (validateWsdl) {
+ WSIBPValidator validator = new WSIBPValidator(def);
+ if (!validator.isValid()) {
+ throw new DeploymentException("WSDL is not WS-I BP compliant: " + validator.getErrors());
+ }
+ }
+ Service svc;
+ if (getService() != null) {
+ svc = def.getService(getService());
+ if (svc == null) {
+ throw new DeploymentException("Could not find service '" + getService() + "' in wsdl");
+ }
+ } else if (def.getServices().size() == 1) {
+ svc = (Service) def.getServices().values().iterator().next();
+ setService(svc.getQName());
+ } else {
+ throw new DeploymentException("If service is not set, the WSDL must contain a single service definition");
+ }
+ Port port;
+ if (getEndpoint() != null) {
+ port = svc.getPort(getEndpoint());
+ if (port == null) {
+ throw new DeploymentException(
+ "Could not find port '" + getEndpoint() + "' in wsdl for service '" + getService() + "'");
+ }
+ } else if (svc.getPorts().size() == 1) {
+ port = (Port) svc.getPorts().values().iterator().next();
+ setEndpoint(port.getName());
+ } else {
+ throw new DeploymentException(
+ "If endpoint is not set, the WSDL service '" + getService() + "' must contain a single port definition");
+ }
+ SOAPAddress soapAddress = WSDLUtils.getExtension(port, SOAPAddress.class);
+ if (soapAddress != null) {
+ soapAddress.setLocationURI(getLocationURI());
+ } else {
+ SOAP12Address soap12Address = WSDLUtils.getExtension(port, SOAP12Address.class);
+ if (soap12Address != null) {
+ soap12Address.setLocationURI(getLocationURI());
+ }
+ }
+ description = WSDLUtils.getWSDL11Factory().newWSDLWriter().getDocument(def);
+ marshaler.setBinding(BindingFactory.createBinding(port));
}
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerMarshaler.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerMarshaler.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapConsumerMarshaler.java Thu Jul 19 13:57:42 2007
@@ -31,8 +31,8 @@
import javax.xml.namespace.QName;
import org.apache.servicemix.soap.api.InterceptorChain;
-import org.apache.servicemix.soap.api.Policy;
import org.apache.servicemix.soap.api.InterceptorProvider.Phase;
+import org.apache.servicemix.soap.api.Policy;
import org.apache.servicemix.soap.api.model.Binding;
import org.apache.servicemix.soap.bindings.soap.SoapFault;
import org.apache.servicemix.soap.bindings.soap.SoapVersion;
@@ -98,8 +98,7 @@
msg.setContent(InputStream.class, new ByteArrayInputStream(((TextMessage) context.getMessage()).getText().getBytes()));
InterceptorChain phase = getChain(Phase.ServerIn);
phase.doIntercept(msg);
- MessageExchange me = msg.getContent(MessageExchange.class);
- return me;
+ return msg.getContent(MessageExchange.class);
}
public Message createOut(MessageExchange exchange, NormalizedMessage outMsg, Session session, JmsContext context) throws Exception {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/endpoints/JmsSoapProviderEndpoint.java Thu Jul 19 13:57:42 2007
@@ -32,7 +32,7 @@
return (JmsSoapProviderMarshaler) getMarshaler();
}
- public void setMarshaler(JmsProviderMarshaler marshaler) {
+ public final void setMarshaler(JmsProviderMarshaler marshaler) {
if (marshaler instanceof JmsSoapProviderMarshaler) {
super.setMarshaler(marshaler);
} else {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaConsumerProcessor.java Thu Jul 19 13:57:42 2007
@@ -34,6 +34,8 @@
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.transaction.TransactionManager;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.common.AsyncBaseLifeCycle;
@@ -43,15 +45,13 @@
import org.apache.servicemix.soap.Context;
import org.jencks.SingletonEndpointFactory;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-
/**
*
* @author <a href="mailto:gnodet [at] gmail.com">Guillaume Nodet</a>
*/
public class JcaConsumerProcessor extends AbstractJmsProcessor implements MessageListener {
- private static final Log log = LogFactory.getLog(JcaConsumerProcessor.class);
+ private static final Log LOG = LogFactory.getLog(JcaConsumerProcessor.class);
protected Map pendingMessages = new ConcurrentHashMap();
protected DeliveryChannel channel;
@@ -103,12 +103,12 @@
public void onMessage(final Message message) {
try {
- if (log.isDebugEnabled()) {
- log.debug("Received jms message " + message);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Received jms message " + message);
}
Context context = createContext();
MessageExchange exchange = toNMS(message, context);
- if (exchange instanceof InOnly == false) {
+ if (!(exchange instanceof InOnly)) {
throw new UnsupportedOperationException("JCA consumer endpoints can only use InOnly MEP");
}
exchange.setProperty(MessageExchange.JTA_TRANSACTION_PROPERTY_NAME, transactionManager.getTransaction());
@@ -121,7 +121,7 @@
lf.sendConsumerExchange(exchange, JcaConsumerProcessor.this.endpoint);
}
} catch (Throwable e) {
- log.error("Error while handling jms message", e);
+ LOG.error("Error while handling jms message", e);
}
}
@@ -135,11 +135,12 @@
return;
} else if (exchange.getStatus() == ExchangeStatus.ERROR) {
if (endpoint.isRollbackOnError()) {
- TransactionManager tm = (TransactionManager) endpoint.getServiceUnit().getComponent().getComponentContext().getTransactionManager();
+ TransactionManager tm =
+ (TransactionManager) endpoint.getServiceUnit().getComponent().getComponentContext().getTransactionManager();
tm.setRollbackOnly();
return;
} else if (exchange instanceof InOnly) {
- log.info("Exchange in error: " + exchange, exchange.getError());
+ LOG.info("Exchange in error: " + exchange, exchange.getError());
return;
} else {
connection = connectionFactory.createConnection();
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/jca/JcaProviderProcessor.java Thu Jul 19 13:57:42 2007
@@ -74,8 +74,8 @@
} else if (exchange.getStatus() == ExchangeStatus.ERROR) {
return;
}
- if (exchange instanceof InOnly == false &&
- exchange instanceof RobustInOnly == false) {
+ if (!(exchange instanceof InOnly
+ || exchange instanceof RobustInOnly)) {
exchange.setError(new UnsupportedOperationException("Use an InOnly or RobustInOnly MEP"));
channel.send(exchange);
return;
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingConsumerProcessor.java Thu Jul 19 13:57:42 2007
@@ -30,12 +30,12 @@
import javax.jms.Session;
import javax.naming.InitialContext;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+
import org.apache.servicemix.common.BaseLifeCycle;
import org.apache.servicemix.jms.AbstractJmsProcessor;
import org.apache.servicemix.jms.JmsEndpoint;
import org.apache.servicemix.soap.Context;
-
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
public class MultiplexingConsumerProcessor extends AbstractJmsProcessor implements MessageListener {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/multiplexing/MultiplexingProviderProcessor.java Thu Jul 19 13:57:42 2007
@@ -39,12 +39,12 @@
import javax.jms.TextMessage;
import javax.naming.InitialContext;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+
import org.apache.servicemix.jms.AbstractJmsProcessor;
import org.apache.servicemix.jms.JmsEndpoint;
import org.apache.servicemix.soap.marshalers.SoapMessage;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-
public class MultiplexingProviderProcessor extends AbstractJmsProcessor implements MessageListener {
protected Session session;
@@ -127,8 +127,7 @@
} else {
throw new IllegalArgumentException("JMS message should be a text or bytes message");
}
- String contentType = message.getStringProperty(CONTENT_TYPE);
- SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, contentType);
+ SoapMessage soap = soapHelper.getSoapMarshaler().createReader().read(is, message.getStringProperty(CONTENT_TYPE));
NormalizedMessage out = exchange.createMessage();
soapHelper.getJBIMarshaler().toNMS(out, soap);
((InOut) exchange).setOutMessage(out);
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/packaging/JmsServiceUnitAnalyzer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/packaging/JmsServiceUnitAnalyzer.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/packaging/JmsServiceUnitAnalyzer.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/packaging/JmsServiceUnitAnalyzer.java Thu Jul 19 13:57:42 2007
@@ -28,35 +28,35 @@
public class JmsServiceUnitAnalyzer extends AbstractXBeanServiceUnitAnalyzer {
- protected List getConsumes(Endpoint endpoint) {
- List consumesList = new ArrayList();
- Consumes consumes;
- if (endpoint.getRole().equals(MessageExchange.Role.CONSUMER)) {
- consumes = new Consumes();
- JmsEndpoint httpEndpoint = (JmsEndpoint) endpoint;
- consumes.setEndpointName(httpEndpoint.getTargetEndpoint());
- consumes.setInterfaceName(httpEndpoint.getTargetInterfaceName());
- consumes.setServiceName(httpEndpoint.getTargetService());
- if (consumes.isValid())
- consumesList.add(consumes);
- else {
- consumes = new Consumes();
- consumes.setEndpointName(endpoint.getEndpoint());
- consumes.setInterfaceName(endpoint.getInterfaceName());
- consumes.setServiceName(endpoint.getService());
- consumesList.add(consumes);
- }
- }
+ protected List getConsumes(Endpoint endpoint) {
+ List consumesList = new ArrayList();
+ Consumes consumes;
+ if (endpoint.getRole().equals(MessageExchange.Role.CONSUMER)) {
+ consumes = new Consumes();
+ JmsEndpoint httpEndpoint = (JmsEndpoint) endpoint;
+ consumes.setEndpointName(httpEndpoint.getTargetEndpoint());
+ consumes.setInterfaceName(httpEndpoint.getTargetInterfaceName());
+ consumes.setServiceName(httpEndpoint.getTargetService());
+ if (consumes.isValid()) {
+ consumesList.add(consumes);
+ } else {
+ consumes = new Consumes();
+ consumes.setEndpointName(endpoint.getEndpoint());
+ consumes.setInterfaceName(endpoint.getInterfaceName());
+ consumes.setServiceName(endpoint.getService());
+ consumesList.add(consumes);
+ }
+ }
- return consumesList;
- }
+ return consumesList;
+ }
- protected String getXBeanFile() {
- return "xbean.xml";
- }
+ protected String getXBeanFile() {
+ return "xbean.xml";
+ }
- protected boolean isValidEndpoint(Object bean) {
- return (bean instanceof JmsEndpoint);
- }
+ protected boolean isValidEndpoint(Object bean) {
+ return bean instanceof JmsEndpoint;
+ }
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/standard/StandardConsumerProcessor.java Thu Jul 19 13:57:42 2007
@@ -26,11 +26,11 @@
import javax.jms.Session;
import javax.naming.InitialContext;
+import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
+
import org.apache.servicemix.jms.AbstractJmsProcessor;
import org.apache.servicemix.jms.JmsEndpoint;
import org.apache.servicemix.soap.Context;
-
-import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
public class StandardConsumerProcessor extends AbstractJmsProcessor {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddress.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddress.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddress.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddress.java Thu Jul 19 13:57:42 2007
@@ -143,15 +143,15 @@
}
public String toString() {
- return "JmsAddress[" +
- "required=" + required + ", " +
- "elementType=" + elementType + ", " +
- "initialContextFactory=" + initialContextFactory + ", " +
- "jndiProviderURL=" + jndiProviderURL + ", " +
- "destinationStyle=" + destinationStyle + ", " +
- "jndiConnectionFactoryName=" + jndiConnectionFactoryName + ", " +
- "jndiDestinationName=" + jndiDestinationName + ", " +
- "jmsProviderDestinationName=" + jmsProviderDestinationName + "]";
+ return "JmsAddress["
+ + "required=" + required + ", "
+ + "elementType=" + elementType + ", "
+ + "initialContextFactory=" + initialContextFactory + ", "
+ + "jndiProviderURL=" + jndiProviderURL + ", "
+ + "destinationStyle=" + destinationStyle + ", "
+ + "jndiConnectionFactoryName=" + jndiConnectionFactoryName + ", "
+ + "jndiDestinationName=" + jndiDestinationName + ", "
+ + "jmsProviderDestinationName=" + jmsProviderDestinationName + "]";
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddressDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddressDeserializer.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddressDeserializer.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsAddressDeserializer.java Thu Jul 19 13:57:42 2007
@@ -30,12 +30,9 @@
public class JmsAddressDeserializer implements ExtensionDeserializer {
public ExtensibilityElement unmarshall(
- Class parentType,
- QName elementType,
- Element el,
- Definition def,
- ExtensionRegistry extReg)
- throws WSDLException {
+ Class parentType, QName elementType, Element el,
+ Definition def, ExtensionRegistry extReg)
+ throws WSDLException {
JmsAddress jmsAddress = (JmsAddress) extReg.createExtension(parentType, elementType);
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsBindingDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsBindingDeserializer.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsBindingDeserializer.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsBindingDeserializer.java Thu Jul 19 13:57:42 2007
@@ -28,12 +28,9 @@
public class JmsBindingDeserializer implements ExtensionDeserializer {
public ExtensibilityElement unmarshall(
- Class parentType,
- QName elementType,
- Element el,
- Definition def,
- ExtensionRegistry extReg)
- throws WSDLException {
+ Class parentType, QName elementType, Element el,
+ Definition def, ExtensionRegistry extReg)
+ throws WSDLException {
JmsBinding jmsBinding = (JmsBinding) extReg.createExtension(parentType, elementType);
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsExtension.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsExtension.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsExtension.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/main/java/org/apache/servicemix/jms/wsdl/JmsExtension.java Thu Jul 19 13:57:42 2007
@@ -21,7 +21,7 @@
import com.ibm.wsdl.Constants;
-public class JmsExtension {
+public final class JmsExtension {
public static final String NS_URI_JMS = "http://servicemix.org/wsdl/jms/";
@@ -38,9 +38,12 @@
public static final String JMS_PROVIDER_DESTINATION_NAME = "jmsProviderDestinationName";
public static final String WSDL2_NS = "http://www.w3.org/2004/08/wsdl/";
+
+ private JmsExtension() {
+ }
public static void register(ExtensionRegistry registry) {
- registry.registerDeserializer(
+ registry.registerDeserializer(
javax.wsdl.Port.class,
Q_ELEM_JMS_ADDRESS,
new JmsAddressDeserializer());
@@ -48,7 +51,7 @@
javax.wsdl.Port.class,
Q_ELEM_JMS_ADDRESS,
JmsAddress.class);
- registry.registerDeserializer(
+ registry.registerDeserializer(
javax.wsdl.Binding.class,
Q_ELEM_JMS_BINDING,
new JmsBindingDeserializer());
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/AbstractJmsTestSupport.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/AbstractJmsTestSupport.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/AbstractJmsTestSupport.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/AbstractJmsTestSupport.java Thu Jul 19 13:57:42 2007
@@ -1,5 +1,4 @@
-/**
- *
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,21 +16,22 @@
*/
package org.apache.servicemix.jms;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
import junit.framework.TestCase;
-import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.client.ServiceMixClient;
-import org.apache.servicemix.client.DefaultServiceMixClient;
-import org.apache.activemq.broker.BrokerService;
+
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
import org.apache.activemq.pool.PooledConnectionFactory;
import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.core.io.ClassPathResource;
+import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.client.ServiceMixClient;
+import org.apache.servicemix.jbi.container.JBIContainer;
import org.jencks.GeronimoPlatformTransactionManager;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.jms.core.JmsTemplate;
public abstract class AbstractJmsTestSupport extends TestCase {
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java Thu Jul 19 13:57:42 2007
@@ -23,13 +23,15 @@
import javax.jbi.messaging.InOnly;
import javax.jbi.messaging.InOut;
import javax.jbi.messaging.NormalizedMessage;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.jms.Message;
import javax.jms.JMSException;
+import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.jms.JmsReceiverComponent;
import org.apache.servicemix.components.jms.JmsServiceComponent;
import org.apache.servicemix.components.util.EchoComponent;
@@ -38,19 +40,17 @@
import org.apache.servicemix.jbi.jaxp.StringSource;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.jms.core.MessageCreator;
public class JMSComponentTest extends AbstractJmsTestSupport {
- private static Log logger = LogFactory.getLog(JMSComponentTest.class);
-
+ private static Log logger = LogFactory.getLog(JMSComponentTest.class);
+
public void testProviderInOnly() throws Exception {
// JMS Component
JmsComponent component = new JmsComponent();
container.activateComponent(component, "JMSComponent");
-
+
// Add a jms receiver
JmsReceiverComponent jmsReceiver = new JmsReceiverComponent();
jmsTemplate.setDefaultDestinationName("queue/A");
@@ -59,7 +59,7 @@
ActivationSpec asJmsReceiver = new ActivationSpec("jmsReceiver", jmsReceiver);
asJmsReceiver.setDestinationService(new QName("test", "receiver"));
container.activateComponent(asJmsReceiver);
-
+
// Add a receiver component
Receiver receiver = new ReceiverComponent();
ActivationSpec asReceiver = new ActivationSpec("receiver", receiver);
@@ -72,22 +72,22 @@
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
-
+
// Call it
InOnly in = client.createInOnlyExchange();
in.setInterfaceName(new QName("http://jms.servicemix.org/Test", "ProviderInterface"));
in.getInMessage().setContent(new StringSource("<hello>world</hello>"));
client.send(in);
-
+
// Check we received the message
receiver.getMessageList().assertMessagesReceived(1);
}
-
+
public void testProviderInOut() throws Exception {
- // JMS Component
+ // JMS Component
JmsComponent component = new JmsComponent();
container.activateComponent(component, "JMSComponent");
-
+
// Add a jms receiver
JmsServiceComponent jmsReceiver = new JmsServiceComponent();
jmsTemplate.setDefaultDestinationName("queue/A");
@@ -96,7 +96,7 @@
ActivationSpec asJmsReceiver = new ActivationSpec("jmsReceiver", jmsReceiver);
asJmsReceiver.setDestinationService(new QName("test", "receiver"));
container.activateComponent(asJmsReceiver);
-
+
// Add an echo component
EchoComponent echo = new EchoComponent();
ActivationSpec asEcho = new ActivationSpec("receiver", echo);
@@ -109,7 +109,7 @@
path = path.getParentFile();
component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
component.getServiceUnitManager().start("provider");
-
+
// Call it
InOut inout = client.createInOutExchange();
inout.setInterfaceName(new QName("http://jms.servicemix.org/Test", "ProviderInterface"));
@@ -122,7 +122,7 @@
assertNotNull(src);
logger.info(new SourceTransformer().toString(src));
}
-
+
public void testConsumerInOut() throws Exception {
// JMS Component
JmsComponent component = new JmsComponent();
@@ -133,14 +133,14 @@
ActivationSpec asEcho = new ActivationSpec("receiver", echo);
asEcho.setService(new QName("http://jms.servicemix.org/Test", "Echo"));
container.activateComponent(asEcho);
-
+
// Deploy Consumer SU
URL url = getClass().getClassLoader().getResource("consumer/jms.wsdl");
File path = new File(new URI(url.toString()));
path = path.getParentFile();
component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
component.getServiceUnitManager().start("consumer");
-
+
// Send test message
jmsTemplate.setDefaultDestinationName("queue/A");
jmsTemplate.afterPropertiesSet();
@@ -153,41 +153,38 @@
});
// Receive echo message
- TextMessage reply = (TextMessage)jmsTemplate.receive("queue/B");
+ TextMessage reply = (TextMessage) jmsTemplate.receive("queue/B");
assertNotNull(reply);
logger.info(reply.getText());
}
-
public void testProviderConsumerInOut() throws Exception {
// JMS Component
JmsComponent component = new JmsComponent();
container.activateComponent(component, "JMSComponent");
-
+
// Add an echo component
EchoComponent echo = new EchoComponent();
ActivationSpec asEcho = new ActivationSpec("receiver", echo);
asEcho.setService(new QName("http://jms.servicemix.org/Test", "Echo"));
container.activateComponent(asEcho);
-
+
// Deploy Provider SU
- {
- URL url = getClass().getClassLoader().getResource("provider/jms.wsdl");
- File path = new File(new URI(url.toString()));
- path = path.getParentFile();
- component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
- component.getServiceUnitManager().start("provider");
- }
-
+
+ URL url = getClass().getClassLoader().getResource("provider/jms.wsdl");
+ File path = new File(new URI(url.toString()));
+ path = path.getParentFile();
+ component.getServiceUnitManager().deploy("provider", path.getAbsolutePath());
+ component.getServiceUnitManager().start("provider");
+
// Deploy Consumer SU
- {
- URL url = getClass().getClassLoader().getResource("consumer/jms.wsdl");
- File path = new File(new URI(url.toString()));
- path = path.getParentFile();
- component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
- component.getServiceUnitManager().start("consumer");
- }
-
+
+ url = getClass().getClassLoader().getResource("consumer/jms.wsdl");
+ path = new File(new URI(url.toString()));
+ path = path.getParentFile();
+ component.getServiceUnitManager().deploy("consumer", path.getAbsolutePath());
+ component.getServiceUnitManager().start("consumer");
+
// Call it
InOut inout = client.createInOutExchange();
inout.setInterfaceName(new QName("http://jms.servicemix.org/Test", "ProviderInterface"));
@@ -200,5 +197,5 @@
assertNotNull(src);
logger.info(new SourceTransformer().toString(src));
}
-
+
}
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsConsumerEndpointTest.java Thu Jul 19 13:57:42 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.jms;
+package org.apache.servicemix.jms;
import java.io.ByteArrayOutputStream;
@@ -22,7 +22,10 @@
import javax.jms.TextMessage;
import javax.xml.namespace.QName;
+import org.w3c.dom.Element;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.servicemix.components.util.EchoComponent;
import org.apache.servicemix.components.util.MockServiceComponent;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
@@ -34,10 +37,7 @@
import org.apache.servicemix.jms.endpoints.JmsSoapConsumerEndpoint;
import org.apache.servicemix.tck.Receiver;
import org.apache.servicemix.tck.ReceiverComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource;
-import org.w3c.dom.Element;
public class JmsConsumerEndpointTest extends AbstractJmsTestSupport {
@@ -70,7 +70,7 @@
endpoint.setListenerType("simple");
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -87,7 +87,7 @@
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
endpoint.setTransacted("jms");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
container.start();
@@ -105,7 +105,7 @@
endpoint.setListenerType("default");
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
container.start();
@@ -125,7 +125,7 @@
endpoint.setDestinationName("destination");
endpoint.setReplyDestinationName("replyDestination");
endpoint.setMarshaler(new DefaultConsumerMarshaler(MessageExchangeSupport.IN_OUT));
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -145,7 +145,7 @@
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
endpoint.setTransacted("jms");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -164,7 +164,7 @@
endpoint.setReplyDestinationName("replyDestination");
endpoint.setTransacted("jms");
endpoint.setMarshaler(new DefaultConsumerMarshaler(MessageExchangeSupport.IN_OUT));
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -184,7 +184,7 @@
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
endpoint.setTransacted("xa");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -200,7 +200,7 @@
endpoint.setListenerType("server");
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -217,7 +217,7 @@
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
endpoint.setTransacted("jms");
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
@@ -235,13 +235,14 @@
endpoint.setDestinationName("destination");
endpoint.setReplyDestinationName("reply");
endpoint.setWsdl(new ClassPathResource("org/apache/servicemix/jms/HelloWorld-RPC.wsdl"));
- component.setEndpoints(new JmsConsumerEndpoint[] { endpoint });
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
MockServiceComponent mock = new MockServiceComponent();
mock.setService(new QName("mock"));
mock.setEndpoint("endpoint");
- mock.setResponseXml("<jbi:message xmlns:jbi=\"http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper\"><jbi:part>hello</jbi:part></jbi:message>");
+ mock.setResponseXml(
+ "<jbi:message xmlns:jbi=\"http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper\"><jbi:part>hello</jbi:part></jbi:message>");
container.activateComponent(mock, "mock");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderEndpointTest.java?view=diff&rev=557769&r1=557768&r2=557769
==============================================================================
--- incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderEndpointTest.java (original)
+++ incubator/servicemix/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsProviderEndpointTest.java Thu Jul 19 13:57:42 2007
@@ -33,7 +33,7 @@
endpoint.setEndpoint("endpoint");
endpoint.setConnectionFactory(connectionFactory);
endpoint.setDestinationName("destination");
- component.setEndpoints(new JmsProviderEndpoint[] { endpoint });
+ component.setEndpoints(new JmsProviderEndpoint[] {endpoint});
container.activateComponent(component, "servicemix-jms");
InOnly me = client.createInOnlyExchange();