You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/09 06:41:09 UTC
svn commit: r384438 - in /incubator/activemq/trunk: activemq-core/
activemq-core/src/main/java/org/apache/activemq/broker/jmx/
activemq-core/src/test/eclipse-resources/ activemq-jaas/ activemq-systest/
assembly/ assembly/src/release/conf/ etc/
Author: chirino
Date: Wed Mar 8 21:41:08 2006
New Revision: 384438
URL: http://svn.apache.org/viewcvs?rev=384438&view=rev
Log:
- Fix NPE due to JMX problem
- Made the maven setting a little more eclipse freindly.
Added:
incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/
incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/log4j.properties (with props)
Modified:
incubator/activemq/trunk/activemq-core/project.properties
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
incubator/activemq/trunk/activemq-jaas/project.properties
incubator/activemq/trunk/activemq-systest/project.properties
incubator/activemq/trunk/assembly/project.properties
incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
incubator/activemq/trunk/etc/project.properties
Modified: incubator/activemq/trunk/activemq-core/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/project.properties?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/project.properties (original)
+++ incubator/activemq/trunk/activemq-core/project.properties Wed Mar 8 21:41:08 2006
@@ -2,7 +2,13 @@
# Build Properties
# -------------------------------------------------------------------
maven.multiproject.type=jar
-maven.eclipse.classpath.include=src/main/resources,src/test/resources,src/gram/java,target/generated
+
+maven.eclipse.classpath.include=\
+${basedir}/src/main/resources,\
+${basedir}/src/test/eclipse-resources,\
+${basedir}/src/test/resources,\
+${basedir}/src/gram/java,\
+${basedir}/target/generated
openwire.version=1
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Wed Mar 8 21:41:08 2006
@@ -13,8 +13,27 @@
*/
package org.apache.activemq.broker.jmx;
-import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
-import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.CompositeType;
+import javax.management.openmbean.OpenDataException;
+import javax.management.openmbean.TabularData;
+import javax.management.openmbean.TabularDataSupport;
+import javax.management.openmbean.TabularType;
import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.BrokerService;
@@ -44,28 +63,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.CompositeDataSupport;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.TabularData;
-import javax.management.openmbean.TabularDataSupport;
-import javax.management.openmbean.TabularType;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
+import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
+import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
public class ManagedRegionBroker extends RegionBroker{
private static final Log log=LogFactory.getLog(ManagedRegionBroker.class);
@@ -167,7 +166,7 @@
public void registerSubscription(ConnectionContext context,Subscription sub){
SubscriptionKey key = new SubscriptionKey(context.getClientId(),sub.getConsumerInfo().getSubcriptionName());
Hashtable map=brokerObjectName.getKeyPropertyList();
- String name = key.toString() + ":" + sub.getConsumerInfo().getConsumerId().toString();
+ String name = key.toString();
try{
ObjectName objectName = new ObjectName(
Added: incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/log4j.properties?rev=384438&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/log4j.properties (added)
+++ incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/log4j.properties Wed Mar 8 21:41:08 2006
@@ -0,0 +1,12 @@
+#
+# The logging properties used for eclipse testing, We want to see debug output on the console.
+#
+log4j.rootLogger=DEBUG, out
+
+log4j.logger.org.apache.activemq.spring=WARN
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
Propchange: incubator/activemq/trunk/activemq-core/src/test/eclipse-resources/log4j.properties
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/activemq/trunk/activemq-jaas/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/project.properties?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/project.properties (original)
+++ incubator/activemq/trunk/activemq-jaas/project.properties Wed Mar 8 21:41:08 2006
@@ -7,6 +7,6 @@
# Build Properties
# -------------------------------------------------------------------
maven.multiproject.type=jar
-maven.eclipse.classpath.include=src/test/resources
+maven.eclipse.classpath.include=${basedir}/src/test/resources
maven.junit.jvmargs=-Djava.security.auth.login.config=src/test/resources/login.config
Modified: incubator/activemq/trunk/activemq-systest/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/project.properties?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/project.properties (original)
+++ incubator/activemq/trunk/activemq-systest/project.properties Wed Mar 8 21:41:08 2006
@@ -7,7 +7,7 @@
# Build Properties
# -------------------------------------------------------------------
maven.multiproject.type=jar
-maven.eclipse.classpath.include=src/test/resources
+maven.eclipse.classpath.include=${basedir}/src/test/resources
maven.changelog.range=730
Modified: incubator/activemq/trunk/assembly/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/project.properties?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/project.properties (original)
+++ incubator/activemq/trunk/assembly/project.properties Wed Mar 8 21:41:08 2006
@@ -20,4 +20,4 @@
maven.jar.mainclass = org.apache.activemq.console.Main
-maven.eclipse.classpath.include=src/test/resources
\ No newline at end of file
+maven.eclipse.classpath.include=${basedir}/src/test/resources
Modified: incubator/activemq/trunk/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/conf/activemq.xml?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/activemq.xml Wed Mar 8 21:41:08 2006
@@ -29,16 +29,15 @@
</persistenceAdapter>
<transportConnectors>
- <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-
- <transportConnector uri="stomp://localhost:61617"/>
+ <transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+ <transportConnector name="stomp" uri="stomp://localhost:61617"/>
</transportConnectors>
<networkConnectors>
<!-- by default just auto discover the other brokers -->
- <networkConnector uri="multicast://default"/>
+ <networkConnector name="default" uri="multicast://default"/>
<!--
- <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+ <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
-->
</networkConnectors>
Modified: incubator/activemq/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/etc/project.properties?rev=384438&r1=384437&r2=384438&view=diff
==============================================================================
--- incubator/activemq/trunk/etc/project.properties (original)
+++ incubator/activemq/trunk/etc/project.properties Wed Mar 8 21:41:08 2006
@@ -43,6 +43,12 @@
maven.javadoc.additionalparam = -linksource
# -------------------------------------------------------------------
+# Eclipse IDE Properties
+# -------------------------------------------------------------------
+maven.eclipse.output.dir=${basedir}/target/eclipse
+maven.eclipse.test.output.dir=${basedir}target/eclipse
+
+# -------------------------------------------------------------------
# Checkstyle Properties
# -------------------------------------------------------------------
maven.checkstyle.properties = ${basedir}/checkstyle.xml