activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r414444 - in /incubator/activemq/branches/activemq-4.0: activemq-core/src/main/java/org/apache/activemq/network/ activemq-core/src/main/java/org/apache/activemq/transport/failover/ assembly/ assembly/src/release/conf/
Date Thu, 15 Jun 2006 03:07:13 GMT
Author: chirino
Date: Wed Jun 14 20:07:12 2006
New Revision: 414444

URL: http://svn.apache.org/viewvc?rev=414444&view=rev
Log:
Applied http://issues.apache.org/activemq/browse/AMQ-608 thanks Kevin.

Modified:
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
    incubator/activemq/branches/activemq-4.0/assembly/project.xml
    incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml
    incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/log4j.properties

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=414444&r1=414443&r2=414444&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
Wed Jun 14 20:07:12 2006
@@ -357,20 +357,20 @@
             ConsumerInfo info=(ConsumerInfo) data;
             BrokerId[] path=info.getBrokerPath();
             if((path!=null&&path.length>= networkTTL)){
-                if(log.isTraceEnabled())
-                    log.trace("Ignoring Subscription " + info + " restricted to " + networkTTL
+ " network hops only");
+                if(log.isDebugEnabled())
+                    log.debug("Ignoring Subscription " + info + " restricted to " + networkTTL
+ " network hops only");
                 return;
             }
             if(contains(info.getBrokerPath(),localBrokerPath[0])){
                 // Ignore this consumer as it's a consumer we locally sent to the broker.
-                if(log.isTraceEnabled())
-                    log.trace("Ignoring sub " + info + " already routed through this broker
once");
+                if(log.isDebugEnabled())
+                    log.debug("Ignoring sub " + info + " already routed through this broker
once");
                 return;
             }
             if (!isPermissableDestination(info.getDestination())){
                 //ignore if not in the permited or in the excluded list
-                if(log.isTraceEnabled())
-                    log.trace("Ignoring sub " + info + " destination " + info.getDestination()
+ " is not permiited");
+                if(log.isDebugEnabled())
+                    log.debug("Ignoring sub " + info + " destination " + info.getDestination()
+ " is not permiited");
                 return;
             }
             // Update the packet to show where it came from.
@@ -379,11 +379,11 @@
             DemandSubscription sub=createDemandSubscription(info);
             if (sub != null){
                 addSubscription(sub);
-                if(log.isTraceEnabled())
-                    log.trace("Forwarding sub on "+localBroker+" from "+remoteBrokerName+"
:  "+info);
+                if(log.isDebugEnabled())
+                    log.debug("Forwarding sub on "+localBroker+" from "+remoteBrokerName+"
:  "+info);
             }else {
-                if(log.isTraceEnabled())
-                    log.trace("Ignoring sub " + info + " already subscribed to matching destination");
+                if(log.isDebugEnabled())
+                    log.debug("Ignoring sub " + info + " already subscribed to matching destination");
             }
         }
         else if (data.getClass()==DestinationInfo.class){
@@ -392,14 +392,14 @@
             DestinationInfo destInfo = (DestinationInfo) data;
             BrokerId[] path=destInfo.getBrokerPath();
             if((path!=null&&path.length>= networkTTL)){
-                if(log.isTraceEnabled())
-                    log.trace("Ignoring Subscription " + destInfo + " restricted to " + networkTTL
+ " network hops only");
+                if(log.isDebugEnabled())
+                    log.debug("Ignoring Subscription " + destInfo + " restricted to " + networkTTL
+ " network hops only");
                 return;
             }
             if(contains(destInfo.getBrokerPath(),localBrokerPath[0])){
                 // Ignore this consumer as it's a consumer we locally sent to the broker.
-                if(log.isTraceEnabled())
-                    log.trace("Ignoring sub " + destInfo + " already routed through this
broker once");
+                if(log.isDebugEnabled())
+                    log.debug("Ignoring sub " + destInfo + " already routed through this
broker once");
                 return;
             }
             

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?rev=414444&r1=414443&r2=414444&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Wed Jun 14 20:07:12 2006
@@ -194,8 +194,8 @@
                 }
 
                 if(!disposed){
-                    
-                        log.debug("Waiting "+reconnectDelay+" ms before attempting connection.
");
+                        if( log.isTraceEnabled() )
+                            log.trace("Waiting "+reconnectDelay+" ms before attempting connection.
");
                         synchronized(sleepMutex){
                             try{
                                 sleepMutex.wait(reconnectDelay);

Modified: incubator/activemq/branches/activemq-4.0/assembly/project.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/project.xml?rev=414444&r1=414443&r2=414444&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/project.xml (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/project.xml Wed Jun 14 20:07:12 2006
@@ -86,7 +86,7 @@
 
     <!--
     <dependency>
-      <groupId>activemq</groupId>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
       <version>${pom.currentVersion}</version>
       <type>jar</type>

Modified: incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml?rev=414444&r1=414443&r2=414444&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml Wed Jun
14 20:07:12 2006
@@ -1,21 +1,24 @@
 <!-- START SNIPPET: example -->
 <beans xmlns="http://activemq.org/config/1.0">
+
+  <!-- Allows us to use system properties as variables in this configuration file -->
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
   <broker useJmx="true">
   
     <!--  Use the following to set the broker memory limit (in bytes)
-  	<memoryManager>  
-	  	<usageManager id="memory-manager" limit="1048576"/>
-  	</memoryManager>
-  	-->
-  	
-	<!-- Use the following to configure how ActiveMQ is exposed in JMX
-	<managementContext>
-	   <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
-	</managementContext>
-	-->
+    <memoryManager>  
+        <usageManager id="memory-manager" limit="1048576"/>
+    </memoryManager>
+    -->
+    
+    <!-- Use the following to configure how ActiveMQ is exposed in JMX
+    <managementContext>
+       <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
+    </managementContext>
+    -->
 
-	<!-- In ActiveMQ 4, you can setup destination policies -->  
+    <!-- In ActiveMQ 4, you can setup destination policies -->  
     <destinationPolicy>
       <policyMap><policyEntries>
         
@@ -33,7 +36,7 @@
   
   
     <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data"/>
+        <journaledJDBC journalLogFiles="5" dataDirectory="${activemq.home}/activemq-data"/>
       <!-- To use a different datasource, use th following syntax : -->
       <!-- 
       <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/>

Modified: incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/log4j.properties?rev=414444&r1=414443&r2=414444&view=diff
==============================================================================
--- incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/log4j.properties (original)
+++ incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/log4j.properties Wed
Jun 14 20:07:12 2006
@@ -18,7 +18,7 @@
 
 # File appender
 log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.file=../data/activemq.log
+log4j.appender.out.file=${activemq.home}/data/activemq.log
 log4j.appender.out.maxFileSize=1024KB
 log4j.appender.out.maxBackupIndex=5
 log4j.appender.out.append=true



Mime
View raw message