Author: gnodet
Date: Thu Jun 12 06:44:21 2008
New Revision: 667088
URL: http://svn.apache.org/viewvc?rev=667088&view=rev
Log:
Fix the distribution which does not start
Added:
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsNewTxConsumerEndpointTest.java
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
Modified:
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java?rev=667088&r1=667087&r2=667088&view=diff
==============================================================================
---
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
(original)
+++
servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
Thu Jun 12 06:44:21 2008
@@ -20,7 +20,6 @@
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -110,17 +109,6 @@
}
/**
- * Set the <code>ObjectName</code> used to register the
<code>JMXConnectorServer</code>
- * itself with the <code>MBeanServer</code>.
- * @param objectName
- * @throws MalformedObjectNameException if the <code>ObjectName</code> is
malformed
- * @see
org.springframework.jmx.support.ConnectorServerFactoryBean#setObjectName(java.lang.String)
- */
- public void setObjectName(ObjectName objectName) throws
MalformedObjectNameException {
- this.objectName = objectName;
- }
-
- /**
* Specify what action should be taken when attempting to register an
MBean
* under an [EMAIL PROTECTED] javax.management.ObjectName} that already
exists.
* <p>Default is REGISTRATION_FAIL_ON_EXISTING.
Added:
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsNewTxConsumerEndpointTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsNewTxConsumerEndpointTest.java?rev=667088&view=auto
==============================================================================
---
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsNewTxConsumerEndpointTest.java
(added)
+++
servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-jms/src/test/java/org/apache/servicemix/jms/JmsNewTxConsumerEndpointTest.java
Thu Jun 12 06:44:21 2008
@@ -0,0 +1,88 @@
+/*
+ * 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;
+
+import javax.xml.namespace.QName;
+
+import org.apache.servicemix.components.util.EchoComponent;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jms.endpoints.JmsConsumerEndpoint;
+import org.apache.servicemix.tck.Receiver;
+import org.apache.servicemix.tck.ReceiverComponent;
+
+public class JmsNewTxConsumerEndpointTest extends AbstractJmsTestSupport {
+
+ protected Receiver receiver;
+ protected SourceTransformer sourceTransformer = new SourceTransformer();
+
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ ReceiverComponent rec = new ReceiverComponent();
+ rec.setService(new QName("receiver"));
+ rec.setEndpoint("endpoint");
+ container.activateComponent(rec, "receiver");
+ receiver = rec;
+
+ EchoComponent echo = new EchoComponent();
+ echo.setService(new QName("echo"));
+ echo.setEndpoint("endpoint");
+ container.activateComponent(echo, "echo");
+ }
+
+ protected void configureJbiContainer() throws Exception {
+ super.configureJbiContainer();
+ container.setUseNewTransactionModel(true);
+ }
+
+ public void testConsumerDefaultXaTxAsync() throws Exception {
+ JmsComponent component = new JmsComponent();
+ JmsConsumerEndpoint endpoint = new JmsConsumerEndpoint();
+ endpoint.setService(new QName("jms"));
+ endpoint.setEndpoint("endpoint");
+ endpoint.setTargetService(new QName("receiver"));
+ endpoint.setListenerType("default");
+ endpoint.setConnectionFactory(connectionFactory);
+ endpoint.setDestinationName("destination");
+ endpoint.setTransacted("xa");
+ endpoint.setSynchronous(false);
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
+ container.activateComponent(component, "servicemix-jms");
+
+ jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
+ receiver.getMessageList().assertMessagesReceived(1);
+ }
+
+ public void testConsumerDefaultXaTxSync() throws Exception {
+ JmsComponent component = new JmsComponent();
+ JmsConsumerEndpoint endpoint = new JmsConsumerEndpoint();
+ endpoint.setService(new QName("jms"));
+ endpoint.setEndpoint("endpoint");
+ endpoint.setTargetService(new QName("receiver"));
+ endpoint.setListenerType("default");
+ endpoint.setConnectionFactory(connectionFactory);
+ endpoint.setDestinationName("destination");
+ endpoint.setTransacted("xa");
+ endpoint.setSynchronous(true);
+ component.setEndpoints(new JmsConsumerEndpoint[] {endpoint});
+ container.activateComponent(component, "servicemix-jms");
+
+ jmsTemplate.convertAndSend("destination", "<hello>world</hello>");
+ receiver.getMessageList().assertMessagesReceived(1);
+ }
+
+}
Modified:
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml?rev=667088&r1=667087&r2=667088&view=diff
==============================================================================
---
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
(original)
+++
servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/activemq.xml
Thu Jun 12 06:44:21 2008
@@ -32,7 +32,7 @@
<!-- Use AMQ Message Store as default broker persistence adapter -->
<amq:persistenceAdapter>
- <amq:amqPersistenceAdapter directory="file://./data/amq"/>
+ <amq:amqPersistenceAdapter directory="file:./data/amq"/>
<!-- Examples for journaledJDBC if JDBC is required -->
<!--
