You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/12 10:44:51 UTC
svn commit: r667007 - in /servicemix/smx4/features/trunk: ./ activemq/
activemq/activemq-commands/
activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/
activemq/activemq-commands/src/main/resources/org/apache/servicemi...
Author: gnodet
Date: Thu Jun 12 01:44:50 2008
New Revision: 667007
URL: http://svn.apache.org/viewvc?rev=667007&view=rev
Log:
Fix amq integration
Added:
servicemix/smx4/features/trunk/activemq/activemq-rm/
- copied from r666820, servicemix/smx4/features/trunk/activemq/activemq-osgi/
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/ActiveMQResourceManager.java
- copied, changed from r666820, servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/PooledConnectionFactoryFactoryBean.java
- copied, changed from r666820, servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/Recovery.java
- copied, changed from r666820, servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java
Removed:
servicemix/smx4/features/trunk/activemq/activemq-osgi/
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/Recovery.java
servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/resources/META-INF/
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/unix-shell/bin/servicemix
servicemix/smx4/features/trunk/assembly/src/main/distribution/windows-text/bin/servicemix.bat
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml
servicemix/smx4/features/trunk/activemq/pom.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/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/pom.xml Thu Jun 12 01:44:50 2008
@@ -74,7 +74,13 @@
<artifactId>activemq-console</artifactId>
<version>${activemq.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.servicemix.activemq</groupId>
+ <artifactId>org.apache.servicemix.activemq.rm</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
</dependencies>
<build>
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/AdministrationCommand.java Thu Jun 12 01:44:50 2008
@@ -39,9 +39,10 @@
String[] args = Arguments.toStringArray(objArgs);
org.apache.activemq.console.CommandContext context2 = new org.apache.activemq.console.CommandContext();
context2.setFormatter(new CommandShellOutputFormatter(context.getIO().outputStream));
- try {
- command.setCommandContext(context2);
- command.execute(new ArrayList<String>(Arrays.asList(args)));
+ org.apache.activemq.console.command.Command currentCommand = command.getClass().newInstance();
+ try {
+ currentCommand.setCommandContext(context2);
+ currentCommand.execute(new ArrayList<String>(Arrays.asList(args)));
} catch (Throwable e) {
Throwable cur = e;
while( cur.getCause()!=null ) {
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/java/org/apache/servicemix/kernel/gshell/activemq/CreateBrokerCommand.java Thu Jun 12 01:44:50 2008
@@ -115,8 +115,8 @@
private String filter(String line, HashMap<String, String> props) {
for (Map.Entry<String, String> i : props.entrySet()) {
- int p1 = line.indexOf(i.getKey());
- if( p1 >= 0 ) {
+ int p1;
+ while ((p1 = line.indexOf(i.getKey())) >= 0) {
String l1 = line.substring(0, p1);
String l2 = line.substring(p1+i.getKey().length());
line = l1+i.getValue()+l2;
Modified: servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml Thu Jun 12 01:44:50 2008
@@ -18,9 +18,11 @@
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://www.springframework.org/schema/osgi"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
- http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+ http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
<!-- Allows us to use system properties as variables in this configuration file -->
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -97,6 +99,35 @@
</broker>
+ <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616" />
+ </bean>
+
+ <bean id="pooledConnectionFactory" class="org.apache.servicemix.activemq.rm.PooledConnectionFactoryFactoryBean">
+ <property name="maxConnections" value="8" />
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
+ <property name="resourceName" value="activemq.${name}" />
+ </bean>
+
+ <bean id="resourceManager" class="org.apache.servicemix.activemq.rm.ActiveMQResourceManager" init-method="recoverResource">
+ <property name="transactionManager" ref="transactionManager" />
+ <property name="connectionFactory" ref="activemqConnectionFactory" />
+ <property name="resourceName" value="activemq.${name}" />
+ </bean>
+
+ <osgi:reference id="transactionManager" interface="javax.transaction.TransactionManager"
+ cardinality="0..1"/>
+
+ <osgi:service ref="pooledConnectionFactory">
+ <osgi:interfaces>
+ <value>javax.jms.ConnectionFactory</value>
+ </osgi:interfaces>
+ <osgi:service-properties>
+ <entry key="name" value="${name}"/>
+ </osgi:service-properties>
+ </osgi:service>
+
</beans>
Modified: servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml?rev=667007&r1=666820&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml Thu Jun 12 01:44:50 2008
@@ -27,10 +27,10 @@
</parent>
<groupId>org.apache.servicemix.activemq</groupId>
- <artifactId>org.apache.servicemix.activemq</artifactId>
+ <artifactId>org.apache.servicemix.activemq.rm</artifactId>
<packaging>bundle</packaging>
<version>4.0-m2-SNAPSHOT</version>
- <name>Apache ServiceMix Features :: ActiveMQ</name>
+ <name>Apache ServiceMix Features :: ActiveMQ Resource Manager</name>
<properties>
<commons-pool.version>1.3</commons-pool.version>
@@ -101,6 +101,9 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>
+ org.apache.servicemix.activemq.rm*;version=${project.version}
+ </Export-Package>
<Import-Package>
org.apache.geronimo.transaction*;resolution:=optional,
org.apache.activemq.ra*;resolution:=optional,
@@ -109,6 +112,7 @@
org.apache.activemq.broker.jmx,
org.apache.activemq.store.kahadaptor,
org.apache.activemq.xbean,
+ org.apache.activemq.broker.jmx,
org.apache.xbean.spring,
org.springframework.core,
org.springframework.beans.factory.config,
@@ -119,7 +123,6 @@
org.jencks.amqpool*,
org.apache.servicemix.activemq*,
</Private-Package>
- <Export-Package />
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
Copied: servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/ActiveMQResourceManager.java (from r666820, 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-rm/src/main/java/org/apache/servicemix/activemq/rm/ActiveMQResourceManager.java?p2=servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/ActiveMQResourceManager.java&p1=servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/ActiveMQResourceManager.java&r1=666820&r2=667007&rev=667007&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-rm/src/main/java/org/apache/servicemix/activemq/rm/ActiveMQResourceManager.java Thu Jun 12 01:44:50 2008
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.activemq;
+package org.apache.servicemix.activemq.rm;
-import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
@@ -39,7 +38,7 @@
public void recoverResource() {
try {
- Class recoveryClass = getClass().getClassLoader().loadClass("org.apache.servicemix.activemq.Recovery");
+ Class recoveryClass = getClass().getClassLoader().loadClass("org.apache.servicemix.activemq.rm.Recovery");
Method mth = recoveryClass.getMethod("recover", ActiveMQResourceManager.class);
Object res = mth.invoke(null, this);
if (!Boolean.TRUE.equals(res)) {
Copied: servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/PooledConnectionFactoryFactoryBean.java (from r666820, 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-rm/src/main/java/org/apache/servicemix/activemq/rm/PooledConnectionFactoryFactoryBean.java?p2=servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/PooledConnectionFactoryFactoryBean.java&p1=servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java&r1=666820&r2=667007&rev=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/PooledConnectionFactoryFactoryBean.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/PooledConnectionFactoryFactoryBean.java Thu Jun 12 01:44:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.activemq;
+package org.apache.servicemix.activemq.rm;
import javax.jms.ConnectionFactory;
import javax.transaction.TransactionManager;
@@ -29,11 +29,22 @@
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.
+ * Simple factory bean used to create a jencks connection pool.
+ * Depending on the properties set, it will create a simple pool,
+ * a transaction aware connection pool, or a jca aware connection pool.
+ *
+ * <pre class="code">
+ * <bean id="pooledConnectionFactory" class="javax.script.ScriptEngineFactory.PooledConnectionFactoryFactoryBean">
+ * <property name="connectionFactory" ref="connectionFactory" />
+ * <property name="transactionManager" ref="transactionManager" />
+ * <property name="resourceName" value="ResourceName" />
+ * </bean>
+ * </pre>
+ *
+ * The <code>resourceName</code> property should be used along with the {@link ActiveMQResourceManager} and have
+ * the same value than its <code>resourceName</code> property. This will make sure the transaction manager
+ * maps correctly the connection factory to the recovery process.
+ *
*/
public class PooledConnectionFactoryFactoryBean implements FactoryBean, InitializingBean {
@@ -44,7 +55,7 @@
private int maxConnections;
private int maximumActive;
private Object transactionManager;
- private String name;
+ private String resourceName;
private ObjectPoolFactory poolFactory;
public Object getObject() throws Exception {
@@ -83,12 +94,12 @@
this.transactionManager = transactionManager;
}
- public String getName() {
- return name;
+ public String getResourceName() {
+ return resourceName;
}
- public void setName(String name) {
- this.name = name;
+ public void setResourceName(String resourceName) {
+ this.resourceName = resourceName;
}
public ConnectionFactory getConnectionFactory() {
@@ -108,11 +119,11 @@
}
public void afterPropertiesSet() throws Exception {
- if (pooledConnectionFactory == null && transactionManager != null && name != null) {
+ if (pooledConnectionFactory == null && transactionManager != null && resourceName != null) {
try {
LOGGER.debug("Trying to build a JcaPooledConnectionFactory");
JcaPooledConnectionFactory f = new JcaPooledConnectionFactory();
- f.setName(name);
+ f.setName(resourceName);
f.setTransactionManager((TransactionManager) transactionManager);
f.setMaxConnections(maxConnections);
f.setMaximumActive(maximumActive);
Copied: servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/Recovery.java (from r666820, 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-rm/src/main/java/org/apache/servicemix/activemq/rm/Recovery.java?p2=servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/Recovery.java&p1=servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java&r1=666820&r2=667007&rev=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-osgi/src/main/java/org/apache/servicemix/activemq/Recovery.java (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-rm/src/main/java/org/apache/servicemix/activemq/rm/Recovery.java Thu Jun 12 01:44:50 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.activemq;
+package org.apache.servicemix.activemq.rm;
import java.io.IOException;
@@ -30,11 +30,8 @@
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.
+ * This class will ensure the broker is properly recovered when wired with
+ * the Geronimo transaction manager.
*/
public class Recovery {
Modified: servicemix/smx4/features/trunk/activemq/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/pom.xml?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/pom.xml Thu Jun 12 01:44:50 2008
@@ -34,7 +34,7 @@
<name>Apache ServiceMix Features :: ActiveMQ</name>
<modules>
- <module>activemq-osgi</module>
+ <module>activemq-rm</module>
<module>activemq-commands</module>
</modules>
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Thu Jun 12 01:44:50 2008
@@ -269,7 +269,12 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.activemq</groupId>
- <artifactId>org.apache.servicemix.activemq</artifactId>
+ <artifactId>org.apache.servicemix.activemq.rm</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.activemq</groupId>
+ <artifactId>org.apache.servicemix.activemq.commands</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -355,6 +360,11 @@
<version>${activemq.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-console</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>${xbean.version}</version>
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=667007&r1=667006&r2=667007&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 Thu Jun 12 01:44:50 2008
@@ -142,8 +142,10 @@
<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.activemq:activemq-console</include>
<include>org.apache.xbean:xbean-spring</include>
- <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
+ <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.rm</include>
+ <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.commands</include>
<!-- WEB / WAR -->
<include>org.mortbay.jetty:jetty-util</include>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Thu Jun 12 01:44:50 2008
@@ -133,8 +133,10 @@
<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.activemq:activemq-console</include>
<include>org.apache.xbean:xbean-spring</include>
- <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq</include>
+ <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.rm</include>
+ <include>org.apache.servicemix.activemq:org.apache.servicemix.activemq.commands</include>
<!-- WEB / WAR -->
<include>org.mortbay.jetty:jetty-util</include>
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=667007&r1=667006&r2=667007&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 Thu Jun 12 01:44:50 2008
@@ -86,8 +86,10 @@
geronimo-jms_1.1_spec-${geronimo.jms.version}.jar=50
xbean-spring-${xbean.version}.jar=50
activemq-core-${activemq.version}.jar=50
+activemq-console-${activemq.version}.jar=50
spring-web-${spring.version}.jar=50
-org.apache.servicemix.activemq-${version}.jar=50
+org.apache.servicemix.activemq.rm-${version}.jar=50
+org.apache.servicemix.activemq.commands-${version}.jar=50
jetty-${jetty.version}.jar=50
jetty-util-${jetty.version}.jar=50
Modified: servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java (original)
+++ servicemix/smx4/features/trunk/camel/servicemix-camel/src/test/java/org/apache/servicemix/camel/ExceptionHandleTest.java Thu Jun 12 01:44:50 2008
@@ -29,8 +29,6 @@
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=667007&r1=667006&r2=667007&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Jun 12 01:44:50 2008
@@ -60,7 +60,7 @@
</prerequisites>
<properties>
- <activemq.version>5.1.0</activemq.version>
+ <activemq.version>5.2-SNAPSHOT</activemq.version>
<acegi.version>1.0.0</acegi.version>
<ant.version>1.7.0</ant.version>
<aopalliance.version>1.0</aopalliance.version>
@@ -113,13 +113,13 @@
<pax.web.version>0.4.1</pax.web.version>
<pax.web.extender.version>0.3.0</pax.web.extender.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
- <servicemix.kernel.version>1.0.0-rc1</servicemix.kernel.version>
+ <servicemix.kernel.version>1.0.0-SNAPSHOT</servicemix.kernel.version>
<servicemix.nmr.version>1.0-m2-SNAPSHOT</servicemix.nmr.version>
<servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
<spring.version>2.5.4</spring.version>
<spring.osgi.version>1.1.0-m2</spring.osgi.version>
<xstream.version>1.2.2</xstream.version>
- <xbean.version>3.4.1</xbean.version>
+ <xbean.version>3.5-SNAPSHOT</xbean.version>
<commons-io.version>1.3.2</commons-io.version>
<commons-jxpath.version>1.2</commons-jxpath.version>
</properties>