Author: gnodet
Date: Mon Jan 21 15:48:02 2008
New Revision: 614060
URL: http://svn.apache.org/viewvc?rev=614060&view=rev
Log:
Add activemq integration, upgrade to spring-osgi 1.0-rc2
Added:
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.activemq.cfg
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.management.cfg
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.transaction.cfg
Modified:
servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/resources/META-INF/spring/servicemix-activemq.xml
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/pom.xml
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-osgi/pom.xml Mon Jan 21
15:48:02 2008
@@ -92,7 +92,7 @@
<groupId>org.jencks</groupId>
<artifactId>jencks-amqpool</artifactId>
<version>${jencks.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -104,17 +104,21 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
-
org.apache.geronimo.transaction;resolution:=optional
+
org.apache.geronimo.transaction*;resolution:=optional,
+ org.apache.activemq.ra*;resolution:=optional,
+ javax.transaction,
+ org.apache.activemq.xbean,
+ org.apache.xbean.spring,
+ org.springframework.core,
+ *
</Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
<Private-Package>
org.apache.commons.pool*,
org.jencks.amqpool*,
- org.apache.servicemix.activemq
+ org.apache.servicemix.activemq*,
</Private-Package>
- <Export-Package>
- org.apache.commons.pool
- </Export-Package>
+ <Export-Package></Export-Package>
+
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified:
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java
(original)
+++
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java
Mon Jan 21 15:48:02 2008
@@ -16,20 +16,15 @@
*/
package org.apache.servicemix.activemq;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+
import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Session;
import javax.transaction.TransactionManager;
-import org.apache.activemq.ActiveMQConnection;
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.ActiveMQSession;
-import org.apache.activemq.util.IOExceptionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.transaction.manager.NamedXAResource;
-import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
-import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
public class ActiveMQResourceManager {
@@ -42,31 +37,27 @@
private ConnectionFactory connectionFactory;
- public void recoverResource() {
- if (isRecoverable()) {
- try {
- ActiveMQConnectionFactory connFactory =
(ActiveMQConnectionFactory)connectionFactory;
- ActiveMQConnection activeConn =
(ActiveMQConnection)connFactory.createConnection();
- ActiveMQSession session =
(ActiveMQSession)activeConn.createSession(true, Session.SESSION_TRANSACTED);
- NamedXAResource namedXaResource = new
WrapperNamedXAResource(session.getTransactionContext(), resourceName);
-
- RecoverableTransactionManager rtxManager =
(RecoverableTransactionManager) transactionManager;
- rtxManager.recoverResourceManager(namedXaResource);
-
- } catch (JMSException e) {
- IOExceptionSupport.create(e);
+ public void recoverResource() {
+ try {
+ Class recoveryClass =
getClass().getClassLoader().loadClass("org.apache.servicemix.activemq.Recovery");
+ Method mth = recoveryClass.getMethod("recover",
ActiveMQResourceManager.class);
+ Object res = mth.invoke(null, this);
+ if (!Boolean.TRUE.equals(res)) {
+ LOGGER.info("Resource manager is unrecoverable");
}
- } else {
- LOGGER.warn("The ActiveMQResourceManager did not recover resource
since it is unRecoverable");
+ } catch (ClassNotFoundException e) {
+ LOGGER.info("Resource manager is unrecoverable due to missing
classes: " + e);
+ } catch (NoClassDefFoundError e) {
+ LOGGER.info("Resource manager is unrecoverable due to missing
classes: " + e);
+ } catch (NoSuchMethodException e) {
+ throw new IllegalStateException(e);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException(e);
+ } catch (InvocationTargetException e) {
+ LOGGER.warn("Error while recovering resource manager", e);
}
}
- private boolean isRecoverable() {
- return connectionFactory instanceof ActiveMQConnectionFactory &&
- transactionManager instanceof RecoverableTransactionManager &&
- resourceName != null && !"".equals(resourceName);
- }
-
public String getResourceName() {
return resourceName;
}
Added:
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java?rev=614060&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java
(added)
+++
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java
Mon Jan 21 15:48:02 2008
@@ -0,0 +1,157 @@
+/*
+ * 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.activemq;
+
+import javax.jms.ConnectionFactory;
+import javax.transaction.TransactionManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.pool.ObjectPoolFactory;
+import org.jencks.amqpool.JcaPooledConnectionFactory;
+import org.jencks.amqpool.PooledConnectionFactory;
+import org.jencks.amqpool.XaPooledConnectionFactory;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Jan 21, 2008
+ * Time: 9:48:25 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class PooledConnectionFactoryFactoryBean implements FactoryBean,
InitializingBean {
+
+ private static final Log LOGGER =
LogFactory.getLog(PooledConnectionFactoryFactoryBean.class);
+
+ private ConnectionFactory pooledConnectionFactory;
+ private ConnectionFactory connectionFactory;
+ private int maxConnections;
+ private int maximumActive;
+ private Object transactionManager;
+ private String name;
+ private ObjectPoolFactory poolFactory;
+
+ public Object getObject() throws Exception {
+ return pooledConnectionFactory;
+ }
+
+ public Class getObjectType() {
+ return ConnectionFactory.class;
+ }
+
+ public boolean isSingleton() {
+ return true;
+ }
+
+ public int getMaxConnections() {
+ return maxConnections;
+ }
+
+ public void setMaxConnections(int maxConnections) {
+ this.maxConnections = maxConnections;
+ }
+
+ public int getMaximumActive() {
+ return maximumActive;
+ }
+
+ public void setMaximumActive(int maximumActive) {
+ this.maximumActive = maximumActive;
+ }
+
+ public Object getTransactionManager() {
+ return transactionManager;
+ }
+
+ public void setTransactionManager(Object transactionManager) {
+ this.transactionManager = transactionManager;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public ConnectionFactory getConnectionFactory() {
+ return connectionFactory;
+ }
+
+ public void setConnectionFactory(ConnectionFactory connectionFactory) {
+ this.connectionFactory = connectionFactory;
+ }
+
+ public ObjectPoolFactory getPoolFactory() {
+ return poolFactory;
+ }
+
+ public void setPoolFactory(ObjectPoolFactory poolFactory) {
+ this.poolFactory = poolFactory;
+ }
+
+ public void afterPropertiesSet() throws Exception {
+ if (pooledConnectionFactory == null && transactionManager != null &&
name != null) {
+ try {
+ LOGGER.debug("Trying to build a JcaPooledConnectionFactory");
+ JcaPooledConnectionFactory f = new
JcaPooledConnectionFactory();
+ f.setName(name);
+ f.setTransactionManager((TransactionManager)
transactionManager);
+ f.setMaxConnections(maxConnections);
+ f.setMaximumActive(maximumActive);
+ f.setConnectionFactory(connectionFactory);
+ f.setPoolFactory(poolFactory);
+ this.pooledConnectionFactory = f;
+ } catch (Throwable t) {
+ LOGGER.debug("Could not create JCA enabled connection factory:
" + t, t);
+ }
+ }
+ if (pooledConnectionFactory == null && transactionManager != null) {
+ try {
+ LOGGER.debug("Trying to build a XaPooledConnectionFactory");
+ XaPooledConnectionFactory f = new XaPooledConnectionFactory();
+ f.setTransactionManager((TransactionManager)
transactionManager);
+ f.setMaxConnections(maxConnections);
+ f.setMaximumActive(maximumActive);
+ f.setConnectionFactory(connectionFactory);
+ f.setPoolFactory(poolFactory);
+ this.pooledConnectionFactory = f;
+ } catch (Throwable t) {
+ LOGGER.debug("Could not create XA enabled connection factory:
" + t, t);
+ }
+ }
+ if (pooledConnectionFactory == null) {
+ try {
+ LOGGER.debug("Trying to build a PooledConnectionFactory");
+ PooledConnectionFactory f = new PooledConnectionFactory();
+ f.setMaxConnections(maxConnections);
+ f.setMaximumActive(maximumActive);
+ f.setConnectionFactory(connectionFactory);
+ f.setPoolFactory(poolFactory);
+ this.pooledConnectionFactory = f;
+ } catch (Throwable t) {
+ LOGGER.debug("Could not create pooled connection factory: " +
t, t);
+ }
+ }
+ if (pooledConnectionFactory == null) {
+ throw new IllegalStateException("Unable to create pooled
connection factory. Enable DEBUG log level for more informations");
+ }
+ }
+}
Added:
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java?rev=614060&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java
(added)
+++
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java
Mon Jan 21 15:48:02 2008
@@ -0,0 +1,65 @@
+/*
+ * 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.activemq;
+
+import java.io.IOException;
+
+import javax.jms.JMSException;
+import javax.jms.Session;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.geronimo.transaction.manager.NamedXAResource;
+import org.apache.geronimo.transaction.manager.RecoverableTransactionManager;
+import org.apache.geronimo.transaction.manager.WrapperNamedXAResource;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Jan 21, 2008
+ * Time: 10:30:24 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class Recovery {
+
+ public static boolean isRecoverable(ActiveMQResourceManager rm) {
+ return rm.getConnectionFactory() instanceof ActiveMQConnectionFactory
&&
+ rm.getTransactionManager() instanceof
RecoverableTransactionManager &&
+ rm.getResourceName() != null &&
!"".equals(rm.getResourceName());
+ }
+
+ public static boolean recover(ActiveMQResourceManager rm) throws
IOException {
+ if (isRecoverable(rm)) {
+ try {
+ ActiveMQConnectionFactory connFactory =
(ActiveMQConnectionFactory) rm.getConnectionFactory();
+ ActiveMQConnection activeConn =
(ActiveMQConnection)connFactory.createConnection();
+ ActiveMQSession session =
(ActiveMQSession)activeConn.createSession(true, Session.SESSION_TRANSACTED);
+ NamedXAResource namedXaResource = new
WrapperNamedXAResource(session.getTransactionContext(), rm.getResourceName());
+
+ RecoverableTransactionManager rtxManager =
(RecoverableTransactionManager) rm.getTransactionManager();
+ rtxManager.recoverResourceManager(namedXaResource);
+ return true;
+ } catch (JMSException e) {
+ throw IOExceptionSupport.create(e);
+ }
+ } else {
+ return false;
+ }
+ }
+}
Modified:
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/resources/META-INF/spring/servicemix-activemq.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/resources/META-INF/spring/servicemix-activemq.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/resources/META-INF/spring/servicemix-activemq.xml
(original)
+++
servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/resources/META-INF/spring/servicemix-activemq.xml
Mon Jan 21 15:48:02 2008
@@ -30,11 +30,11 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi/spring-osgi-compendium.xsd
+
http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
">
<bean id="activemqBroker"
class="org.apache.activemq.xbean.BrokerFactoryBean">
- <property name="config"
value="file:${servicemix.home}/conf/activemq.xml" />
+ <property name="config"
value="file:${servicemix.home}/etc/activemq.xml" />
<property name="start" value="${brokerStart}" />
</bean>
@@ -42,27 +42,19 @@
<property name="brokerURL" value="${brokerURL}" />
</bean>
- <bean id="pooledConnectionFactory"
class="org.jencks.amqpool.JcaPooledConnectionFactory">
- <constructor-arg>
- <ref bean="activemqConnectionFactory" />
- </constructor-arg>
+ <bean id="pooledConnectionFactory"
class="org.apache.servicemix.activemq.PooledConnectionFactoryFactoryBean">
<property name="maxConnections" value="${maxConnections}" />
- <property name="transactionManager">
- <ref bean="brokerTransaction" />
- </property>
- </bean>
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
+ </bean>
<bean id="resourceManager"
class="org.apache.servicemix.activemq.ActiveMQResourceManager"
init-method="recoverResource">
- <property name="transactionManager">
- <ref bean="brokerTransaction"/>
- </property>
- <property name="connectionFactory">
- <ref bean="activemqConnectionFactory" />
- </property>
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory"
ref="activemqConnectionFactory" />
<property name="resourceName" value="${resourceName}" />
</bean>
- <osgi:reference id="brokerTransaction"
interface="javax.transaction.TransactionManager"
+ <osgi:reference id="transactionManager"
interface="javax.transaction.TransactionManager"
cardinality="0..1"/>
<osgi:service ref="pooledConnectionFactory">
@@ -76,7 +68,7 @@
<prop key="brokerURL">tcp://localhost:61616</prop>
<prop key="maxConnections">10</prop>
<prop key="brokerStart">true</prop>
- <prop key="resourceName">activeMQResource</prop>
+ <prop key="resourceName">ActiveMQ</prop>
</osgix:default-properties>
</osgix:property-placeholder>
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Mon Jan 21 15:48:02 2008
@@ -111,9 +111,56 @@
</dependency>
<dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo.jms.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>${geronimo.j2ee.management.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.activemq</groupId>
+ <artifactId>org.apache.servicemix.activemq</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
</dependency>
</dependencies>
<build>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Mon Jan 21 15:48:02 2008
@@ -117,6 +117,15 @@
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
+
+
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+ <include>org.springframework:spring-web</include>
+ <include>org.apache.activemq:activemq-core</include>
+ <include>org.apache.xbean:xbean-spring</include>
+
<include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
+
</includes>
</dependencySet>
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml?rev=614060&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml
(added)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/activemq.xml
Mon Jan 21 15:48:02 2008
@@ -0,0 +1,38 @@
+<?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";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.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>
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.activemq.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.activemq.cfg?rev=614060&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.activemq.cfg
(added)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.activemq.cfg
Mon Jan 21 15:48:02 2008
@@ -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.
+#
+#
+maxConnections=10
+brokerStart=true
+brokerURL=tcp://localhost:61616
+maxConnections=10
+resourceName=activeMQResource
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.management.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.management.cfg?rev=614060&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.management.cfg
(added)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.management.cfg
Mon Jan 21 15:48:02 2008
@@ -0,0 +1,26 @@
+#
+# 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.
+#
+#
+rmiRegistryPort = 1099
+jmxLogin = smx
+jmxPassword = smx
+serviceUrl = service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi
+daemon = true
+threaded = true
+objectName = connector:name=rmi
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.transaction.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.transaction.cfg?rev=614060&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.transaction.cfg
(added)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/org.apache.servicemix.transaction.cfg
Mon Jan 21 15:48:02 2008
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+#
+defaultTransactionTimeoutSeconds=600
+transactionLogDir=data/txlog/
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Mon Jan 21 15:48:02 2008
@@ -65,6 +65,15 @@
org.apache.servicemix.jbi.osgi-${servicemix.nmr.version}.jar=50
org.apache.servicemix.jbi.runtime-${servicemix.nmr.version}.jar=50
+geronimo-j2ee-management_1.1_spec-${geronimo.j2ee.management.version}.jar=50
+geronimo-jms_1.1_spec-${geronimo.jms.version}.jar=50
+geronimo-jta_1.1_spec-${geronimo.jta.version}.jar=50
+xbean-spring-${xbean.version}.jar=50
+activemq-core-${activemq.version}.jar=50
+spring-web-${spring.version}.jar=50
+org.apache.servicemix.activemq-${version}.jar=50
+
+
#
# Start console last
#
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Jan 21 15:48:02 2008
@@ -73,8 +73,9 @@
<felix.osgi.version>1.0.0</felix.osgi.version>
<felix.plugin.version>1.1.0-r605854</felix.plugin.version>
<geronimo.activation.version>1.0.1</geronimo.activation.version>
- <geronimo.jms.version>1.1</geronimo.jms.version>
- <geronimo.jta.version>1.1</geronimo.jta.version>
+
<geronimo.j2ee.management.version>1.0.1-SNAPSHOT</geronimo.j2ee.management.version>
+ <geronimo.jms.version>1.1.1-SNAPSHOT</geronimo.jms.version>
+ <geronimo.jta.version>1.1.1-SNAPSHOT</geronimo.jta.version>
<geronimo.servlet.version>1.1.1</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
<geronimo.transaction.version>2.0.1</geronimo.transaction.version>
@@ -93,8 +94,9 @@
<servicemix.kernel.version>1.0-m1-SNAPSHOT</servicemix.kernel.version>
<servicemix.nmr.version>1.0-SNAPSHOT</servicemix.nmr.version>
<spring.version>2.5</spring.version>
- <spring.osgi.version>1.0-rc1</spring.osgi.version>
+ <spring.osgi.version>1.0-rc2</spring.osgi.version>
<xstream.version>1.2.2</xstream.version>
+ <xbean.version>3.4-SNAPSHOT</xbean.version>
</properties>
<repositories>
@@ -116,6 +118,12 @@
<name>Incubator Repository</name>
<url>http://people.apache.org/repo/m2-incubating-repository</url>
</repository>
+ <!-- Spring Milestone repo -->
+ <repository>
+ <id>spring-milestone</id>
+ <name>Spring Milestone Repository</name>
+
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
+ </repository>
</repositories>
<pluginRepositories>
@@ -153,6 +161,21 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>${spring.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Mon Jan 21 15:48:02 2008
@@ -80,7 +80,7 @@
<mina.version>1.1.6-r602102</mina.version>
<pax.logging.version>1.0-RC2</pax.logging.version>
<pax.runner.version>0.5.5</pax.runner.version>
- <spring.osgi.version>1.0-rc1</spring.osgi.version>
+ <spring.osgi.version>1.0-rc2</spring.osgi.version>
<spring.version>2.5</spring.version>
<xstream.version>1.2.2</xstream.version>
</properties>
@@ -97,6 +97,12 @@
<id>servicemix</id>
<name>ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ </repository>
+ <!-- Spring Milestone repo -->
+ <repository>
+ <id>spring-milestone</id>
+ <name>Spring Milestone Repository</name>
+
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
</repository>
</repositories>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=614060&r1=614059&r2=614060&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Jan 21 15:48:02 2008
@@ -81,7 +81,7 @@
<pax.logging.version>1.0-RC2</pax.logging.version>
<smx3.version>3.2.1</smx3.version>
<smx.kernel.version>1.0-m1-SNAPSHOT</smx.kernel.version>
- <spring.osgi.version>1.0-rc1</spring.osgi.version>
+ <spring.osgi.version>1.0-rc2</spring.osgi.version>
<spring.version>2.5</spring.version>
<woodstox.version>3.2.3</woodstox.version>
<xbean.version>3.3-SNAPSHOT</xbean.version>
@@ -112,6 +112,12 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
+ </repository>
+ <!-- Spring Milestone repo -->
+ <repository>
+ <id>spring-milestone</id>
+ <name>Spring Milestone Repository</name>
+
<url>http://s3.amazonaws.com/maven.springframework.org/milestone</url>
</repository>
</repositories>
