You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2007/11/23 09:42:50 UTC
svn commit: r597597 - in /servicemix/branches/servicemix-4.0: activemq/
activemq/src/main/resources/META-INF/servicemix/
activemq/src/main/resources/META-INF/spring/ apache-servicemix/
apache-servicemix/src/main/descriptors/ apache-servicemix/src/main/...
Author: ffang
Date: Fri Nov 23 00:42:49 2007
New Revision: 597597
URL: http://svn.apache.org/viewvc?rev=597597&view=rev
Log:
[SM-1065] apply patch on behalf of Jeff Yu
Added:
servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/
servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml (with props)
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties (with props)
Modified:
servicemix/branches/servicemix-4.0/activemq/pom.xml
servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/spring/servicemix-activemq.xml
servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/IntegrationTest.java
Modified: servicemix/branches/servicemix-4.0/activemq/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/activemq/pom.xml?rev=597597&r1=597596&r2=597597&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/activemq/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/activemq/pom.xml Fri Nov 23 00:42:49 2007
@@ -36,6 +36,8 @@
<properties>
<commons-pool.version>1.3</commons-pool.version>
+ <jencks.version>2.1</jencks.version>
+ <xbean.version>3.2</xbean.version>
</properties>
<dependencies>
@@ -75,6 +77,20 @@
<artifactId>commons-logging</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jencks</groupId>
+ <artifactId>jencks-amqpool</artifactId>
+ <version>${jencks.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -89,10 +105,13 @@
<DynamicImport-Package>*</DynamicImport-Package>
<Private-Package>
org.apache.commons.pool*,
- javax.transaction*
+ javax.transaction*,
+ org.jencks.amqpool*,
+ org.apache.xbean.spring*
</Private-Package>
<Export-Package>
- org.apache.commons.pool
+ org.apache.commons.pool,
+ org.apache.xbean.spring.context*
</Export-Package>
</instructions>
</configuration>
Added: servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml?rev=597597&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml (added)
+++ servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml Fri Nov 23 00:42:49 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:amq="http://activemq.org/config/1.0"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd">
+
+ <bean id="broker" class="org.apache.activemq.xbean.XBeanBrokerService">
+ <property name="transportConnectorURIs">
+ <list>
+ <value>tcp://localhost:61616</value>
+ </list>
+ </property>
+ <property name="useJmx">
+ <value>false</value>
+ </property>
+ <property name="persistent">
+ <value>false</value>
+ </property>
+ </bean>
+</beans>
\ No newline at end of file
Propchange: servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/servicemix/activemq.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/spring/servicemix-activemq.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/spring/servicemix-activemq.xml?rev=597597&r1=597596&r2=597597&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/spring/servicemix-activemq.xml (original)
+++ servicemix/branches/servicemix-4.0/activemq/src/main/resources/META-INF/spring/servicemix-activemq.xml Fri Nov 23 00:42:49 2007
@@ -32,44 +32,35 @@
http://www.springframework.org/schema/osgi-compendium
http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd
">
-
- <bean id="broker" class="org.apache.activemq.broker.BrokerService" init-method="start">
- <property name="transportConnectorURIs">
- <list>
- <value>${brokerURL}</value>
- </list>
- </property>
- <property name="useJmx">
- <value>${useJmx}</value>
- </property>
- <property name="persistent">
- <value>${persistent}</value>
- </property>
- </bean>
- <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL">
- <value>${brokerURL}</value>
- </property>
+ <bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
+ <property name="config" value="${configFile}" />
+ <property name="start" value="${brokerStart}" />
</bean>
- <bean id="pooledConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory" destroy-method="stop">
- <property name="connectionFactory">
- <ref bean="connectionFactory" />
+ <bean id="pooledConnectionFactory" class="org.jencks.amqpool.JcaPooledConnectionFactory">
+ <constructor-arg value="${brokerURL}" />
+ <property name="maxConnections" value="${maxConnections}" />
+ <property name="transactionManager">
+ <ref bean="brokerTransaction" />
</property>
</bean>
+ <osgi:reference id="brokerTransaction" interface="javax.transaction.TransactionManager"
+ cardinality="0..1"/>
+
<osgi:service ref="pooledConnectionFactory">
<osgi:interfaces>
<value>javax.jms.ConnectionFactory</value>
</osgi:interfaces>
</osgi:service>
- <osgix:property-placeholder persistent-id="org.apache.servicemix.jms.activemq">
+ <osgix:property-placeholder persistent-id="org.apache.servicemix.activemq">
<osgix:default-properties>
<prop key="brokerURL">tcp://localhost:61616</prop>
- <prop key="persistent">false</prop>
- <prop key="useJmx">false</prop>
+ <prop key="configFile">classpath:/META-INF/servicemix/activemq.xml</prop>
+ <prop key="maxConnections">10</prop>
+ <prop key="brokerStart">true</prop>
</osgix:default-properties>
</osgix:property-placeholder>
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=597597&r1=597596&r2=597597&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Fri Nov 23 00:42:49 2007
@@ -119,6 +119,10 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>org.apache.servicemix.transaction</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.activemq</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.gshell</groupId>
<artifactId>org.apache.servicemix.gshell.core</artifactId>
@@ -156,6 +160,10 @@
<artifactId>camel-core</artifactId>
<version>${camel.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
@@ -222,15 +230,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=597597&r1=597596&r2=597597&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Fri Nov 23 00:42:49 2007
@@ -168,6 +168,18 @@
<include>org.apache.servicemix:org.apache.servicemix.transaction</include>
</includes>
</dependencySet>
+
+ <!-- ActiveMQ -->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.servicemix:org.apache.servicemix.activemq</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ </includes>
+ </dependencySet>
<!-- Management -->
<dependencySet>
Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=597597&r1=597596&r2=597597&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml Fri Nov 23 00:42:49 2007
@@ -168,6 +168,18 @@
<include>org.apache.servicemix:org.apache.servicemix.transaction</include>
</includes>
</dependencySet>
+
+ <!-- ActiveMQ-->
+ <dependencySet>
+ <outputDirectory>/system</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.servicemix:org.apache.servicemix.activemq</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ </includes>
+ </dependencySet>
<!-- Management -->
<dependencySet>
Added: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties?rev=597597&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties (added)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties Fri Nov 23 00:42:49 2007
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+#
+configFile=classpath:/META-INF/servicemix/activemq.xml
+maxConnections=10
+brokerStart=true
+brokerURL=tcp://localhost:61616
+maxConnections=10
\ No newline at end of file
Propchange: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/release/conf/services/org.apache.servicemix.activemq.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/IntegrationTest.java?rev=597597&r1=597596&r2=597597&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/IntegrationTest.java (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/IntegrationTest.java Fri Nov 23 00:42:49 2007
@@ -127,7 +127,7 @@
ConnectionFactory connFactory = (ConnectionFactory)bundleContext.getService(connectionFactoryRef);
assertNotNull(connFactory);
- assertEquals(connFactory.getClass().getName(), "org.apache.activemq.pool.PooledConnectionFactory");
+ assertEquals(connFactory.getClass().getName(), "org.jencks.amqpool.JcaPooledConnectionFactory");
} finally {
bundleContext.ungetService(ref);
}