servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r359943 - in /incubator/servicemix/trunk: servicemix-components/src/test/java/org/apache/servicemix/components/http/ servicemix-components/src/test/resources/ servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/...
Date Fri, 30 Dec 2005 00:20:35 GMT
Author: gnodet
Date: Thu Dec 29 16:19:46 2005
New Revision: 359943

URL: http://svn.apache.org/viewcvs?rev=359943&view=rev
Log:
Upgrade to new org.apache.activemq package name for ActiveMQ 4

Modified:
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml
    incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContext.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/AsyncReceiverPojo.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/resources/jndi.properties
    incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j.properties
    incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/remoting/example.xml
    incubator/servicemix/trunk/servicemix-http/src/test/resources/log4j.properties
    incubator/servicemix/trunk/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
    incubator/servicemix/trunk/servicemix-jms/src/test/resources/log4j.properties
    incubator/servicemix/trunk/servicemix-jsr181/src/test/resources/log4j.properties
    incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerEndpoint.java
    incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
    incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java
    incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java
    incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
    incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j.properties

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java Thu Dec 29 16:19:46 2005
@@ -28,8 +28,8 @@
 
 import junit.framework.TestCase;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.servicemix.components.saaj.SaajBinding;
 import org.apache.servicemix.components.util.MockServiceComponent;
 import org.apache.servicemix.jbi.container.ActivationSpec;

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties Thu Dec 29 16:19:46 2005
@@ -3,9 +3,9 @@
 #
 log4j.rootLogger=DEBUG, out
 
-log4j.logger.org.activemq=INFO
-log4j.logger.org.activemq.spring=WARN
-log4j.logger.org.activemq.store.journal=INFO
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
 log4j.logger.org.activeio.journal=INFO
 
 # CONSOLE appender not used by default

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/activemqAsServer.xml Thu Dec 29 16:19:46 2005
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- lets run an embedded broker -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/example.xml Thu Dec 29 16:19:46 2005
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- lets run an embedded broker -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/group-example.xml Thu Dec 29 16:19:46 2005
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- lets run an embedded broker -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/example.xml Thu Dec 29 16:19:46 2005
@@ -6,7 +6,7 @@
   <!--
   || ActiveMQ Broker
   -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -23,7 +23,7 @@
 
     <!-- the JCA Resource Adapter -->
     <property name="resourceAdapter">
-      <bean id="activeMQResourceAdapter" class="org.activemq.ra.ActiveMQResourceAdapter">
+      <bean id="activeMQResourceAdapter" class="org.apache.activemq.ra.ActiveMQResourceAdapter">
         <property name="serverUrl" value="tcp://localhost:61626"/>
       </bean>
     </property>
@@ -53,7 +53,7 @@
           <property name="jcaContainer" ref="jencks"/>
 
           <property name="activationSpec">
-            <bean class="org.activemq.ra.ActiveMQActivationSpec">
+            <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
               <property name="destination" value="test.org.apache.servicemix.example.jca"/>
               <property name="destinationType" value="javax.jms.Topic"/>
             </bean>
@@ -73,7 +73,7 @@
           <property name="jcaContainer" ref="jencks"/>
 
           <property name="activationSpec">
-            <bean class="org.activemq.ra.ActiveMQActivationSpec">
+            <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
               <property name="destination" value="test.org.apache.servicemix.example.jca"/>
               <property name="destinationType" value="javax.jms.Topic"/>
             </bean>
@@ -100,9 +100,9 @@
     <constructor-arg ref="jbi"/>
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/exampleWithXA.xml Thu Dec 29 16:19:46 2005
@@ -5,7 +5,7 @@
   <!--
   || ActiveMQ Broker
   -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -22,7 +22,7 @@
 
     <!-- the JCA Resource Adapter -->
     <property name="resourceAdapter">
-      <bean id="activeMQResourceAdapter" class="org.activemq.ra.ActiveMQResourceAdapter">
+      <bean id="activeMQResourceAdapter" class="org.apache.activemq.ra.ActiveMQResourceAdapter">
         <property name="serverUrl" value="tcp://localhost:61626"/>
       </bean>
     </property>
@@ -56,7 +56,7 @@
           <property name="jcaContainer" ref="jencks"/>
 
           <property name="activationSpec">
-            <bean class="org.activemq.ra.ActiveMQActivationSpec">
+            <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
               <property name="destination" value="test.org.apache.servicemix.example.jca"/>
               <property name="destinationType" value="javax.jms.Topic"/>
             </bean>
@@ -80,7 +80,7 @@
           <property name="jcaContainer" ref="jencks"/>
 
           <property name="activationSpec">
-            <bean class="org.activemq.ra.ActiveMQActivationSpec">
+            <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
               <property name="destination" value="test.org.apache.servicemix.example.jca"/>
               <property name="destinationType" value="javax.jms.Topic"/>
             </bean>
@@ -109,9 +109,9 @@
     <constructor-arg ref="jbi"/>
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jca/xa-on-jca-flow.xml Thu Dec 29 16:19:46 2005
@@ -5,7 +5,7 @@
   <!--
   || ActiveMQ Broker
   -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -22,7 +22,7 @@
 
     <!-- the JCA Resource Adapter -->
     <property name="resourceAdapter">
-      <bean id="activeMQResourceAdapter" class="org.activemq.ra.ActiveMQResourceAdapter">
+      <bean id="activeMQResourceAdapter" class="org.apache.activemq.ra.ActiveMQResourceAdapter">
         <property name="serverUrl" value="tcp://localhost:61626"/>
       </bean>
     </property>
@@ -70,7 +70,7 @@
           <property name="jcaContainer" ref="jencks"/>
 
           <property name="activationSpec">
-            <bean class="org.activemq.ra.ActiveMQActivationSpec">
+            <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
               <property name="destination" value="test.org.apache.servicemix.example.jca"/>
               <property name="destinationType" value="javax.jms.Topic"/>
             </bean>
@@ -94,7 +94,7 @@
           <property name="jcaContainer" ref="jencks"/>
 
           <property name="activationSpec">
-            <bean class="org.activemq.ra.ActiveMQActivationSpec">
+            <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
               <property name="destination" value="test.org.apache.servicemix.example.jca"/>
               <property name="destinationType" value="javax.jms.Topic"/>
             </bean>
@@ -122,9 +122,9 @@
     <constructor-arg ref="jbi"/>
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-endpoint-subscription.xml Thu Dec 29 16:19:46 2005
@@ -2,7 +2,7 @@
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
 	   xmlns:foo="http://servicemix.org/cheese/">
 
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -74,9 +74,9 @@
     <constructor-arg ref="jbi" />
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626" />
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example.xml Thu Dec 29 16:19:46 2005
@@ -2,7 +2,7 @@
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
 	   xmlns:foo="http://servicemix.org/cheese/">
 
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -83,9 +83,9 @@
     <constructor-arg ref="jbi"/>
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626" />
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example.xml Thu Dec 29 16:19:46 2005
@@ -39,9 +39,9 @@
     <constructor-arg ref="jbi"/>
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="vm://localhost"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/example.xml Thu Dec 29 16:19:46 2005
@@ -3,7 +3,7 @@
 	   xmlns:foo="http://servicemix.org/cheese/">
 
   <!-- ActiveMQ message broker -->
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -20,7 +20,7 @@
 
     <!-- the JCA Resource Adapter -->
     <property name="resourceAdapter">
-      <bean id="activeMQResourceAdapter" class="org.activemq.ra.ActiveMQResourceAdapter">
+      <bean id="activeMQResourceAdapter" class="org.apache.activemq.ra.ActiveMQResourceAdapter">
         <property name="serverUrl" value="tcp://localhost:61626"/>
       </bean>
     </property>
@@ -49,7 +49,7 @@
 
     <!-- subscription details -->
     <property name="activationSpec">
-      <bean class="org.activemq.ra.ActiveMQActivationSpec">
+      <bean class="org.apache.activemq.ra.ActiveMQActivationSpec">
         <property name="destination" value="test.org.apache.servicemix.example.wsif"/>
         <property name="destinationType" value="javax.jms.Queue"/>
       </bean>
@@ -71,9 +71,9 @@
   </bean>
 
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/wsif/service.wsdl Thu Dec 29 16:19:46 2005
@@ -49,7 +49,7 @@
       <jms:address destinationStyle="queue"
         jndiDestinationName="dynamicQueues/test.org.apache.servicemix.example.wsif"
         jndiConnectionFactoryName="ConnectionFactory"
-        initialContextFactory="org.activemq.jndi.ActiveMQInitialContextFactory"
+        initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"
         jndiProviderURL="tcp://localhost:61626"/>
     </port>
   </service>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/example.xml Thu Dec 29 16:19:46 2005
@@ -2,7 +2,7 @@
 <beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
 	   xmlns:foo="http://servicemix.org/cheese/">
 
-  <bean id="broker" class="org.activemq.xbean.BrokerFactoryBean" singleton="true">
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
     <property name="config" value="classpath:broker.xml"/>
   </bean>
 
@@ -114,9 +114,9 @@
     <constructor-arg ref="jbi"/>
   </bean>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61626"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/pipeline.xml Thu Dec 29 16:19:46 2005
@@ -44,9 +44,9 @@
     </sm:activationSpecs>
   </sm:container>
 
-  <bean id="jmsFactory" class="org.activemq.pool.PooledConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
     <property name="connectionFactory">
-      <bean class="org.activemq.ActiveMQConnectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
         <property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
       </bean>
     </property>

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/JBIContainer.java Thu Dec 29 16:19:46 2005
@@ -42,7 +42,7 @@
 import javax.transaction.TransactionManager;
 import javax.xml.namespace.QName;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.JbiConstants;

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContext.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContext.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContext.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ManagementContext.java Thu Dec 29 16:19:46 2005
@@ -652,14 +652,31 @@
                         connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, null, result);
                         connectorServer.start();
                     }
+                    /*
+                    // Now, make sure a registry is loaded
+                    try {
+                        LocateRegistry.createRegistry(namingPort);
+                    }
+                    catch (Throwable t) {
+                        // proably exists already
+                        log.debug("Failed to create local registry", t);
+                    }
+                    // Create and start the RMIConnectorServer
+                    JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:" + namingPort
+                            + jndiPath);
+                    connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, null, result);
+                    connectorServer.start();
+                    */
                 }
             }
             catch (NoClassDefFoundError e) {
                 log.error("Could not load MBeanServer", e);
             }
+            /*
             catch (JMException e) {
                 log.error("Could not start the remote: JMX ConnectorServer", e);
             }
+            */
             catch (MalformedURLException e) {
                 log.error("Bad URL:", e);
             }

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/DeliveryChannelImpl.java Thu Dec 29 16:19:46 2005
@@ -18,7 +18,7 @@
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.JbiConstants;

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessageExchangeFactoryImpl.java Thu Dec 29 16:19:46 2005
@@ -17,7 +17,7 @@
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.apache.servicemix.JbiConstants;
 import org.apache.servicemix.jbi.framework.ComponentContextImpl;
 

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/messaging/MessagingStats.java Thu Dec 29 16:19:46 2005
@@ -15,10 +15,10 @@
  */
 package org.apache.servicemix.jbi.messaging;
 
-import org.activemq.management.CountStatisticImpl;
-import org.activemq.management.StatsImpl;
-import org.activemq.management.TimeStatisticImpl;
-import org.activemq.util.IndentPrinter;
+import org.apache.activemq.management.CountStatisticImpl;
+import org.apache.activemq.management.StatsImpl;
+import org.apache.activemq.management.TimeStatisticImpl;
+import org.apache.activemq.util.IndentPrinter;
 
 /**
  * Basic J2EE stats for the messaging in the NMR

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/FlowProvider.java Thu Dec 29 16:19:46 2005
@@ -20,10 +20,11 @@
 import java.util.Map;
 import javax.jbi.JBIException;
 import org.activeio.FactoryFinder;
-import org.activemq.util.IntrospectionSupport;
-import org.activemq.util.URISupport;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.URISupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 /**
  * Find a Flow by Name
  * 

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java Thu Dec 29 16:19:46 2005
@@ -20,15 +20,15 @@
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
 
-import org.activemq.advisory.AdvisorySupport;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.RemoveInfo;
-import org.activemq.ra.ActiveMQActivationSpec;
-import org.activemq.ra.ActiveMQManagedConnectionFactory;
-import org.activemq.ra.ActiveMQResourceAdapter;
+import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.RemoveInfo;
+import org.apache.activemq.ra.ActiveMQActivationSpec;
+import org.apache.activemq.ra.ActiveMQManagedConnectionFactory;
+import org.apache.activemq.ra.ActiveMQResourceAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.connector.BootstrapContextImpl;

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlow.java Thu Dec 29 16:19:46 2005
@@ -19,13 +19,13 @@
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.advisory.AdvisorySupport;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.RemoveInfo;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.RemoveInfo;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/AsyncReceiverPojo.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/AsyncReceiverPojo.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/AsyncReceiverPojo.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/tck/AsyncReceiverPojo.java Thu Dec 29 16:19:46 2005
@@ -87,9 +87,9 @@
         while (running) {
             try {
                 DeliveryChannel deliveryChannel = context.getDeliveryChannel();
-                System.out.println("about to do an accept on deliveryChannel: " + deliveryChannel);
+                log.info("about to do an accept on deliveryChannel: " + deliveryChannel);
                 MessageExchange messageExchange = deliveryChannel.accept();
-                System.out.println("received me: " + messageExchange);
+                log.info("received me: " + messageExchange);
                 onMessageExchange(messageExchange);
             }
             catch (MessagingException e) {

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java Thu Dec 29 16:19:46 2005
@@ -140,7 +140,7 @@
 
         assertNotNull("Should have returned a non-null response!", response);
 
-        System.out.println("Received result: " + response);
+        log.info("Received result: " + response);
     }
 
 
@@ -162,8 +162,8 @@
         assertNotNull("outMessage is null!", outMessage);
 
         assertEquals("foo header", "hello", outMessage.getProperty("foo"));
-        System.out.println("Received result: " + outMessage.getContent());
-        System.out.println("XML is: " + transformer.toString(outMessage.getContent()));
+        log.info("Received result: " + outMessage.getContent());
+        log.info("XML is: " + transformer.toString(outMessage.getContent()));
     }
 
     protected void assertRequestUsingMapAndPOJOByServiceName(QName service) throws Exception {
@@ -175,7 +175,7 @@
 
         assertNotNull("Should have returned a non-null response!", response);
         
-        System.out.println("Received result: " + response);
+        log.info("Received result: " + response);
     }
 
     protected void setUp() throws Exception {

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/AdminServiceTest.java Thu Dec 29 16:19:46 2005
@@ -15,9 +15,6 @@
  */
 package org.apache.servicemix.jbi.management;
 
-import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.jbi.management.ManagementContext;
-
 import javax.jbi.management.AdminServiceMBean;
 import javax.management.MBeanServerConnection;
 import javax.management.MBeanServerInvocationHandler;
@@ -28,14 +25,27 @@
 
 import junit.framework.TestCase;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.jbi.container.JBIContainer;
+
 /**
  * ManagementContextTest
  */
 public class AdminServiceTest extends TestCase {
-    JBIContainer container;
-
+    
+	private Log log = LogFactory.getLog(getClass());
+	
+	private JBIContainer container;
+
+    // The host, port and path where the rmiregistry runs.
+	private String namingHost = "localhost";
+	private int namingPort = 1982;
+	private String jndiPath = "/" + JBIContainer.DEFAULT_NAME + "JMX";
+    
     protected void setUp() throws Exception {
     	container = new JBIContainer();
+    	container.setRmiPort(namingPort);
     	container.setCreateMBeanServer(true);
     	container.init();
     }
@@ -45,10 +55,6 @@
     }
 
     public void testAdminService() throws Exception {
-        // The host, port and path where the rmiregistry runs.
-        String namingHost = "localhost";
-        int namingPort = 1099;
-        String jndiPath = "/" + JBIContainer.DEFAULT_NAME + "JMX";
         // The address of the connector server
         JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"
                 + namingHost + ":" + namingPort + jndiPath);
@@ -63,8 +69,8 @@
         		AdminServiceMBean.class, true);
         AdminServiceMBean asm = (AdminServiceMBean) proxy;
 
-        System.out.println(asm.getBindingComponents()); 
-        System.out.println(asm.getComponentByName("toto")); 
+        log.info(asm.getBindingComponents()); 
+        log.info(asm.getComponentByName("toto")); 
     }
     
     protected  ObjectName getObjectName (Class systemClass){

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementAttributesTest.java Thu Dec 29 16:19:46 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.servicemix.jbi.management;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.container.JBIContainer;
 
 import javax.management.Attribute;
@@ -36,13 +38,21 @@
  * ManagementContextTest
  */
 public class ManagementAttributesTest extends TestCase {
-    JBIContainer container;
 
+	private Log log = LogFactory.getLog(getClass());
+	
+	private JBIContainer container;
+
+    // The host, port and path where the rmiregistry runs.
+	private String namingHost = "localhost";
+	private int namingPort = 1982;
+	private String jndiPath = "/" + JBIContainer.DEFAULT_NAME + "JMX";
+    
     protected void setUp() throws Exception {
-        container = new JBIContainer();
-        container.setCreateMBeanServer(true);
-        container.init();
-        container.start();
+    	container = new JBIContainer();
+    	container.setRmiPort(namingPort);
+    	container.setCreateMBeanServer(true);
+    	container.init();
     }
     
     protected void tearDown() throws Exception {
@@ -50,15 +60,6 @@
     }
 
     public void testRemote() throws Exception {
-        //      The JMXConnectorServer protocol, in this case is RMI.
-        String serverProtocol = "rmi";
-        // The RMI server's host: this is actually ignored by JSR 160
-        // since this information is stored in the RMI stub.
-        
-        // The host, port and path where the rmiregistry runs.
-        String namingHost = "localhost";
-        int namingPort = 1099;
-        String jndiPath = "/" + JBIContainer.DEFAULT_NAME + "JMX";
         // The address of the connector server
         JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"
                 + namingHost + ":" + namingPort + jndiPath);
@@ -68,25 +69,25 @@
         // connector server is bound to
         MBeanServerConnection connection = connector.getMBeanServerConnection();
         
-        System.out.println(connection.getMBeanCount());
+        log.info(connection.getMBeanCount());
 
 
         Set set = connection.queryNames(new ObjectName(connection.getDefaultDomain() + ":*"), null);
         for (Iterator iter = set.iterator(); iter.hasNext();) {
             ObjectName name = (ObjectName)iter.next();
-            System.out.println(name.toString());
+            log.info(name.toString());
             MBeanInfo info = connection.getMBeanInfo(name);
             MBeanAttributeInfo[] mia = info.getAttributes();
             String[] attrNames = new String[mia.length];
             for (int i = 0; i < mia.length; i++) {
                 attrNames[i] = mia[i].getName();
-                System.out.println("attr " + mia[i].getName() + " " + mia[i].getType() + " " + connection.getAttribute(name,mia[i].getName()));
+                log.info("attr " + mia[i].getName() + " " + mia[i].getType() + " " + connection.getAttribute(name,mia[i].getName()));
             }
 
             AttributeList attributeList = (AttributeList) connection.getAttributes(name,attrNames);
             for (int i = 0; i < attributeList.size(); i++) {
                 Attribute attribute = (Attribute) attributeList.get(i);
-                System.out.println("bulk " + attribute.getName() + " " + attribute.getValue() + " " + attribute.toString());
+                log.info("bulk " + attribute.getName() + " " + attribute.getValue() + " " + attribute.toString());
             }
 
         }

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java Thu Dec 29 16:19:46 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.servicemix.jbi.management;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.container.JBIContainer;
 import org.apache.servicemix.jbi.management.ManagementContext;
 
@@ -33,11 +35,20 @@
  * ManagementContextTest
  */
 public class ManagementContextTest extends TestCase {
-    ManagementContext context;
+
+	private Log log = LogFactory.getLog(getClass());
+	
+    // The host, port and path where the rmiregistry runs.
+	private String namingHost = "localhost";
+	private int namingPort = 1982;
+	private String jndiPath = "/" + JBIContainer.DEFAULT_NAME + "JMX";
+    
+	private ManagementContext context;
 
     protected void setUp() throws Exception {
         context = new ManagementContext();
         context.setCreateMBeanServer(true);
+        context.setNamingPort(namingPort);
         context.init(new JBIContainer(), null);
     }
     
@@ -46,15 +57,6 @@
     }
 
     public void testRemote() throws Exception {
-        //      The JMXConnectorServer protocol, in this case is RMI.
-        String serverProtocol = "rmi";
-        // The RMI server's host: this is actually ignored by JSR 160
-        // since this information is stored in the RMI stub.
-        
-        // The host, port and path where the rmiregistry runs.
-        String namingHost = "localhost";
-        int namingPort = 1099;
-        String jndiPath = "/" + JBIContainer.DEFAULT_NAME + "JMX";
         // The address of the connector server
         JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"
                 + namingHost + ":" + namingPort + jndiPath);
@@ -71,7 +73,7 @@
         // The magic of JDK 1.3 dynamic proxy and JSR 160:
         // delegate.getImplementationVendor() is actually a remote JMX call,
         // but it looks like a local, old-style, java call.
-        System.out.println(delegate.getImplementationVendor() + " is cool !");
+        log.info(delegate.getImplementationVendor() + " is cool !");
         
         ObjectName objName = context.createObjectName(context);
         
@@ -79,11 +81,11 @@
         proxy = MBeanServerInvocationHandler.newProxyInstance(connection, objName,
                 LifeCycleMBean.class, true);
         LifeCycleMBean mc = (LifeCycleMBean) proxy;
-        System.out.println("STATE = " + mc.getCurrentState());
+        log.info("STATE = " + mc.getCurrentState());
         mc.start();
-        System.out.println("STATE = " + mc.getCurrentState());
+        log.info("STATE = " + mc.getCurrentState());
         mc.stop();
-        System.out.println("STATE = " + mc.getCurrentState());
+        log.info("STATE = " + mc.getCurrentState());
         mc.shutDown();
     }
     

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java Thu Dec 29 16:19:46 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.servicemix.jbi.messaging;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.servicemix.jbi.nmr.flow.Flow;
 import org.apache.servicemix.jbi.nmr.flow.jca.JCAFlow;
 import org.springframework.core.io.ClassPathResource;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java Thu Dec 29 16:19:46 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.servicemix.jbi.messaging;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.servicemix.jbi.nmr.flow.Flow;
 import org.apache.servicemix.jbi.nmr.flow.jca.JCAFlow;
 import org.springframework.core.io.ClassPathResource;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/MessageExchangeImplTest.java Thu Dec 29 16:19:46 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.servicemix.jbi.messaging;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.jaxp.BytesSource;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
@@ -34,6 +36,8 @@
 
 public class MessageExchangeImplTest extends TestCase {
     
+	private static final Log log = LogFactory.getLog(MessageExchangeImplTest.class);
+	
     protected void testSerializeDeserialize(Source src) throws Exception {
         MessageExchange me = new InOnlyImpl("exchangeId");
         me.setProperty("myProp", "myValue");
@@ -63,7 +67,7 @@
         assertNotNull(outSrc);
         String outStr = new SourceTransformer().toString(outSrc);
         assertNotNull(outStr);
-        System.out.println(outStr);
+        log.info(outStr);
     }
 
     

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java Thu Dec 29 16:19:46 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.servicemix.jbi.nmr.flow.jca;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.geronimo.transaction.ExtendedTransactionManager;
 import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.servicemix.jbi.RuntimeJBIException;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/JMSFlowTest.java Thu Dec 29 16:19:46 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.servicemix.jbi.nmr.flow.jms;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.servicemix.jbi.container.ActivationSpec;
 import org.apache.servicemix.jbi.container.JBIContainer;
 import org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java Thu Dec 29 16:19:46 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.servicemix.jbi.nmr.flow.jms;
 
-import org.activemq.broker.BrokerService;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.servicemix.jbi.container.JBIContainer;
 import org.apache.servicemix.jbi.nmr.flow.Flow;
 import org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java Thu Dec 29 16:19:46 2005
@@ -15,6 +15,8 @@
  */
 package org.apache.servicemix.jbi.servicedesc;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.servicedesc.EndpointReferenceBuilder;
 import org.apache.servicemix.jbi.servicedesc.InternalEndpoint;
@@ -26,6 +28,8 @@
 
 public class EndpointReferenceBuilderTest extends TestCase {
 
+	private static final Log log = LogFactory.getLog(EndpointReferenceBuilderTest.class);
+	
     /*
      * Test method for 'org.apache.servicemix.jbi.servicedesc.EndpointReferenceBuilder.getReference(ServiceEndpoint)'
      */
@@ -33,7 +37,7 @@
         InternalEndpoint endpoint = new InternalEndpoint(null, "myEndpoint", new QName("http://foo.bar.com", "myService"));
         DocumentFragment df = EndpointReferenceBuilder.getReference(endpoint);
         assertNotNull(df);
-        System.out.println(new SourceTransformer().toString(df));
+        log.info(new SourceTransformer().toString(df));
     }
 
 }

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/jndi.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/jndi.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/jndi.properties (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/jndi.properties Thu Dec 29 16:19:46 2005
@@ -1,6 +1,6 @@
 # START SNIPPET: jndi
 
-java.naming.factory.initial = org.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
 
 # use the following property to configure the default connector
 java.naming.provider.url = tcp://localhost:61626

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j.properties Thu Dec 29 16:19:46 2005
@@ -3,9 +3,9 @@
 #
 log4j.rootLogger=DEBUG, out
 
-log4j.logger.org.activemq=INFO
-log4j.logger.org.activemq.spring=WARN
-log4j.logger.org.activemq.store.journal=INFO
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
 log4j.logger.org.activeio.journal=INFO
 
 # CONSOLE appender not used by default

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/remoting/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/remoting/example.xml?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/remoting/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/remoting/example.xml Thu Dec 29 16:19:46 2005
@@ -33,11 +33,11 @@
  
  
  <!-- JMS ConnectionFactory to use -->
-  <bean id="jmsFactory" class="org.activemq.ActiveMQConnectionFactory">
+  <bean id="jmsFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
     <property name="brokerURL" value="vm://localhost"/>
   </bean>
 
-  <bean id="exampleDestination" class="org.activemq.command.ActiveMQQueue">
+  <bean id="exampleDestination" class="org.apache.activemq.command.ActiveMQQueue">
     <constructor-arg index="0" value="test.org.logicblaze.lingo.example"/>
   </bean>
 

Modified: incubator/servicemix/trunk/servicemix-http/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/test/resources/log4j.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-http/src/test/resources/log4j.properties Thu Dec 29 16:19:46 2005
@@ -3,9 +3,9 @@
 #
 log4j.rootLogger=DEBUG, out
 
-log4j.logger.org.activemq=INFO
-log4j.logger.org.activemq.spring=WARN
-log4j.logger.org.activemq.store.journal=INFO
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
 log4j.logger.org.activeio.journal=INFO
 
 # CONSOLE appender not used by default

Modified: incubator/servicemix/trunk/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/test/java/org/apache/servicemix/jms/JMSComponentTest.java Thu Dec 29 16:19:46 2005
@@ -26,11 +26,11 @@
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import junit.framework.TestCase;
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.broker.BrokerService;
-import org.activemq.jndi.ActiveMQInitialContextFactory;
-import org.activemq.pool.PooledConnectionFactory;
-import org.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.jndi.ActiveMQInitialContextFactory;
+import org.apache.activemq.pool.PooledConnectionFactory;
+import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.servicemix.client.DefaultServiceMixClient;
 import org.apache.servicemix.components.jms.JmsReceiverComponent;
 import org.apache.servicemix.components.jms.JmsServiceComponent;

Modified: incubator/servicemix/trunk/servicemix-jms/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/src/test/resources/log4j.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-jms/src/test/resources/log4j.properties Thu Dec 29 16:19:46 2005
@@ -1,9 +1,9 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=DEBUG, out
 
-log4j.logger.org.activemq=WARN
+log4j.logger.org.apache.activemq=WARN
 log4j.logger.org.activeio=INFO
 
 # CONSOLE appender not used by default

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/test/resources/log4j.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/test/resources/log4j.properties Thu Dec 29 16:19:46 2005
@@ -3,9 +3,9 @@
 #
 log4j.rootLogger=DEBUG, out
 
-log4j.logger.org.activemq=INFO
-log4j.logger.org.activemq.spring=WARN
-log4j.logger.org.activemq.store.journal=INFO
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
 log4j.logger.org.activeio.journal=INFO
 
 # CONSOLE appender not used by default

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerEndpoint.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerEndpoint.java Thu Dec 29 16:19:46 2005
@@ -19,7 +19,7 @@
 import javax.jbi.messaging.MessageExchange.Role;
 import javax.xml.namespace.QName;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.apache.servicemix.common.Endpoint;
 import org.apache.servicemix.common.ExchangeProcessor;
 import org.apache.servicemix.jbi.container.ActivationSpec;

Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/AbstractNotificationBroker.java Thu Dec 29 16:19:46 2005
@@ -24,7 +24,7 @@
 import javax.jws.WebResult;
 import javax.jws.WebService;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.oasis_open.docs.wsn.b_1.CreatePullPoint;

Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsPublisher.java Thu Dec 29 16:19:46 2005
@@ -26,9 +26,9 @@
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 
-import org.activemq.advisory.ConsumerEvent;
-import org.activemq.advisory.ConsumerEventSource;
-import org.activemq.advisory.ConsumerListener;
+import org.apache.activemq.advisory.ConsumerEvent;
+import org.apache.activemq.advisory.ConsumerEventSource;
+import org.apache.activemq.advisory.ConsumerListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.wsn.AbstractPublisher;

Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/main/java/org/apache/servicemix/wsn/jms/JmsTopicExpressionConverter.java Thu Dec 29 16:19:46 2005
@@ -21,7 +21,7 @@
 import javax.jms.Topic;
 import javax.xml.namespace.QName;
 
-import org.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ActiveMQTopic;
 import org.oasis_open.docs.wsn.b_1.TopicExpressionType;
 
 public class JmsTopicExpressionConverter {

Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/java/org/apache/servicemix/wsn/component/WSNComponentTest.java Thu Dec 29 16:19:46 2005
@@ -31,8 +31,8 @@
 
 import junit.framework.TestCase;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.broker.BrokerService;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
 import org.oasis_open.docs.wsn.b_1.NotificationMessageHolderType;
 import org.oasis_open.docs.wsn.b_1.Notify;
 import org.oasis_open.docs.wsn.b_1.Subscribe;

Modified: incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j.properties?rev=359943&r1=359942&r2=359943&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/src/test/resources/log4j.properties Thu Dec 29 16:19:46 2005
@@ -3,9 +3,9 @@
 #
 log4j.rootLogger=DEBUG, out
 
-log4j.logger.org.activemq=INFO
-log4j.logger.org.activemq.spring=WARN
-log4j.logger.org.activemq.store.journal=INFO
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
 log4j.logger.org.activeio.journal=INFO
 
 # CONSOLE appender not used by default



Mime
View raw message