You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/09/27 14:14:59 UTC
svn commit: r1001699 - in /activemq/trunk: activemq-blueprint/pom.xml
activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java
pom.xml
Author: dejanb
Date: Mon Sep 27 12:14:59 2010
New Revision: 1001699
URL: http://svn.apache.org/viewvc?rev=1001699&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2885 - upgrading aries and karaf
Modified:
activemq/trunk/activemq-blueprint/pom.xml
activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-blueprint/pom.xml?rev=1001699&r1=1001698&r2=1001699&view=diff
==============================================================================
--- activemq/trunk/activemq-blueprint/pom.xml (original)
+++ activemq/trunk/activemq-blueprint/pom.xml Mon Sep 27 12:14:59 2010
@@ -37,20 +37,6 @@
</activemq.osgi.import.pkg>
</properties>
- <repositories>
- <repository>
- <id>servicemix</id>
- <name>Apache ServiceMix Repository</name>
- <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
Modified: activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java?rev=1001699&r1=1001698&r2=1001699&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java (original)
+++ activemq/trunk/activemq-karaf/src/main/java/org/apache/activemq/karaf/commands/ActiveMQCommand.java Mon Sep 27 12:14:59 2010
@@ -143,7 +143,7 @@ public class ActiveMQCommand extends Abs
}
}
- protected Action createNewAction() throws Exception {
+ public Action createNewAction() {
Action action = (Action) blueprintContainer.getComponentInstance(actionId);
if (action instanceof BlueprintContainerAware) {
((BlueprintContainerAware) action).setBlueprintContainer(blueprintContainer);
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1001699&r1=1001698&r2=1001699&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Sep 27 12:14:59 2010
@@ -42,7 +42,7 @@
<annogen-version>0.1.0</annogen-version>
<ant-version>1.7.1</ant-version>
<aopalliance-version>1.0</aopalliance-version>
- <aries-version>0.1-r964701</aries-version>
+ <aries-version>0.2-incubating</aries-version>
<axion-version>1.0-M3-dev</axion-version>
<axis-version>1.2-RC1</axis-version>
<camel-version>2.4.0</camel-version>
@@ -70,7 +70,7 @@
<jmock-version>2.5.1</jmock-version>
<junit-version>4.5</junit-version>
<jxta-version>2.0</jxta-version>
- <karaf-version>2.0.0</karaf-version>
+ <karaf-version>2.1.0</karaf-version>
<log4j-version>1.2.14</log4j-version>
<nlog4j-version>1.5.2</nlog4j-version>
<org-apache-derby-version>10.1.3.1</org-apache-derby-version>