activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r359567 [6/13] - in /incubator/activemq/trunk/activemq-core: ./ src/gram/java/org/activemq/openwire/tool/ src/gram/script/ src/main/grammar/ src/main/java/org/activemq/ src/main/java/org/activemq/advisory/ src/main/java/org/activemq/broker/...
Date Wed, 28 Dec 2005 17:28:57 GMT
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/network/ForwardingBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java Wed Dec 28 09:24:02 2005
@@ -14,29 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network;
+package org.apache.activemq.network;
 
 import java.io.IOException;
 
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.command.BrokerId;
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.Command;
-import org.activemq.command.ConnectionId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.ShutdownInfo;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportListener;
-import org.activemq.util.IdGenerator;
-import org.activemq.util.ServiceStopper;
-import org.activemq.util.ServiceSupport;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.BrokerId;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportListener;
+import org.apache.activemq.util.IdGenerator;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.activemq.util.ServiceSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/network/NetworkConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java Wed Dec 28 09:24:02 2005
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network;
+package org.apache.activemq.network;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.activemq.Service;
-import org.activemq.command.DiscoveryEvent;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportFactory;
-import org.activemq.transport.discovery.DiscoveryAgent;
-import org.activemq.transport.discovery.DiscoveryAgentFactory;
-import org.activemq.transport.discovery.DiscoveryListener;
-import org.activemq.util.ServiceSupport;
+import org.apache.activemq.Service;
+import org.apache.activemq.command.DiscoveryEvent;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.discovery.DiscoveryAgent;
+import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
+import org.apache.activemq.transport.discovery.DiscoveryListener;
+import org.apache.activemq.util.ServiceSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -22,7 +22,8 @@
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
-import org.activemq.Service;
+
+import org.apache.activemq.Service;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java Wed Dec 28 09:24:02 2005
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.Service;
-import org.activemq.broker.BrokerService;
-import org.activemq.util.LRUCache;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.util.LRUCache;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.jndi.JndiTemplate;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import javax.jms.JMSException;
 import javax.jms.Message;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/QueueBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import javax.jms.JMSException;
 import javax.jms.Message;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/TopicBridge.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.network.jms;
+package org.apache.activemq.network.jms;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/BooleanStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/BooleanStream.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire;
+package org.apache.activemq.openwire;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/DataStreamMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/DataStreamMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire;
+package org.apache.activemq.openwire;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -22,7 +22,7 @@
 import java.lang.reflect.Constructor;
 
 import org.activeio.command.ClassLoading;
-import org.activemq.command.DataStructure;
+import org.apache.activemq.command.DataStructure;
 
 abstract public class DataStreamMarshaller {
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire;
+package org.apache.activemq.openwire;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -29,9 +29,9 @@
 import org.activeio.command.ClassLoading;
 import org.activeio.command.WireFormat;
 import org.activeio.packet.ByteArrayPacket;
-import org.activemq.command.CommandTypes;
-import org.activemq.command.DataStructure;
-import org.activemq.command.MarshallAware;
+import org.apache.activemq.command.CommandTypes;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.MarshallAware;
 
 /**
  * 
@@ -186,7 +186,7 @@
      * @param version
      */
     public void setVersion(int version) {
-        String mfName = "org.activemq.openwire.v"+version+".MarshallerFactory";
+        String mfName = "org.apache.activemq.openwire.v"+version+".MarshallerFactory";
         Class mfClass;
         try {
             mfClass = ClassLoading.loadClass(mfName, getClass().getClassLoader());

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/openwire/OpenWireFormatFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire;
+package org.apache.activemq.openwire;
 
 import org.activeio.command.WireFormat;
 import org.activeio.command.WireFormatFactory;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQBytesMessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQDestinationMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public abstract class ActiveMQDestinationMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public abstract class ActiveMQDestinationMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Un-marshal an object instance from the data input stream

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMapMessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQMessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQObjectMessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQQueueMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQStreamMessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempDestinationMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempQueueMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTempTopicMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTextMessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ActiveMQTopicMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BaseCommandMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public abstract class BaseCommandMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public abstract class BaseCommandMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Un-marshal an object instance from the data input stream

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class BrokerIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class BrokerIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/BrokerInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,21 +63,21 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-        info.setBrokerId((org.activemq.command.BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setBrokerId((org.apache.activemq.command.BrokerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrokerURL(readString(dataIn, bs));
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.BrokerInfo value[] = new org.activemq.command.BrokerInfo[size];
+		            org.apache.activemq.command.BrokerInfo value[] = new org.apache.activemq.command.BrokerInfo[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.BrokerInfo)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.BrokerInfo)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setPeerBrokerInfos(value);
 		        } else {
 		            info.setPeerBrokerInfos(null);
 		        }
         			
-        info.setRedeliveryPolicy((org.activemq.command.RedeliveryPolicy) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setRedeliveryPolicy((org.apache.activemq.command.RedeliveryPolicy) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setBrokerName(readString(dataIn, bs));
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class ConnectionIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class ConnectionIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConnectionInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,16 +63,16 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setClientId(readString(dataIn, bs));
         info.setPassword(readString(dataIn, bs));
         info.setUserName(readString(dataIn, bs));
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size];
+		            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setBrokerPath(value);
 		        } else {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class ConsumerIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class ConsumerIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ConsumerInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,9 +63,9 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.setConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setBrowser(bs.readBoolean());
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setPrefetchSize(dataIn.readInt());
         info.setDispatchAsync(bs.readBoolean());
         info.setSelector(readString(dataIn, bs));
@@ -77,9 +77,9 @@
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size];
+		            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setBrokerPath(value);
 		        } else {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ControlCommandMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataArrayResponseMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -66,9 +66,9 @@
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.DataStructure value[] = new org.activemq.command.DataStructure[size];
+		            org.apache.activemq.command.DataStructure value[] = new org.apache.activemq.command.DataStructure[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.DataStructure)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.DataStructure)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setData(value);
 		        } else {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DataResponseMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,7 +63,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         DataResponse info = (DataResponse)o;
-        info.setData((org.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setData((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/DestinationInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,16 +63,16 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setOperationType(dataIn.readByte());
         info.setTimeout(unmarshalLong(wireFormat, dataIn, bs));
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size];
+		            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setBrokerPath(value);
 		        } else {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ExceptionResponseMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/FlushCommandMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/IntegerResponseMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalQueueAckMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class JournalQueueAckMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class JournalQueueAckMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
@@ -63,8 +63,8 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageAck((org.activemq.command.MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageAck((org.apache.activemq.command.MessageAck) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTopicAckMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class JournalTopicAckMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class JournalTopicAckMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
@@ -63,12 +63,12 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageSequenceId(unmarshalLong(wireFormat, dataIn, bs));
         info.setSubscritionName(readString(dataIn, bs));
         info.setClientId(readString(dataIn, bs));
-        info.setTransactionId((org.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
 
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTraceMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class JournalTraceMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class JournalTraceMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/JournalTransactionMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class JournalTransactionMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class JournalTransactionMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
@@ -63,7 +63,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.setTransactionId((org.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
         info.setWasPrepared(bs.readBoolean());
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/KeepAliveInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class KeepAliveInfoMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class KeepAliveInfoMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/LocalTransactionIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -64,7 +64,7 @@
 
         LocalTransactionId info = (LocalTransactionId)o;
         info.setTransactionId(unmarshalLong(wireFormat, dataIn, bs));
-        info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MarshallerFactory.java Wed Dec 28 09:24:02 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
-import org.activemq.openwire.DataStreamMarshaller;
-import org.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.DataStreamMarshaller;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
  * MarshallerFactory for Open Wire Format.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageAckMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,12 +63,12 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageAck info = (MessageAck)o;
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setAckType(dataIn.readByte());
-        info.setFirstMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setLastMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setFirstMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setLastMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setMessageCount(dataIn.readInt());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageDispatchMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,9 +63,9 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-        info.setConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessage((org.activemq.command.Message) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessage((org.apache.activemq.command.Message) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setRedeliveryCounter(dataIn.readInt());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class MessageIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class MessageIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
@@ -63,7 +63,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         MessageId info = (MessageId)o;
-        info.setProducerId((org.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setProducerSequenceId(unmarshalLong(wireFormat, dataIn, bs));
         info.setBrokerSequenceId(unmarshalLong(wireFormat, dataIn, bs));
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/MessageMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -51,19 +51,19 @@
 
         info.beforeUnmarshall(wireFormat);
         
-        info.setProducerId((org.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setOriginalDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setMessageId((org.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setOriginalTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setOriginalDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setMessageId((org.apache.activemq.command.MessageId) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setOriginalTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setGroupID(readString(dataIn, bs));
         info.setGroupSequence(dataIn.readInt());
         info.setCorrelationId(readString(dataIn, bs));
         info.setPersistent(bs.readBoolean());
         info.setExpiration(unmarshalLong(wireFormat, dataIn, bs));
         info.setPriority(dataIn.readByte());
-        info.setReplyTo((org.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setReplyTo((org.apache.activemq.command.ActiveMQDestination) unmarsalNestedObject(wireFormat, dataIn, bs));
         info.setTimestamp(unmarshalLong(wireFormat, dataIn, bs));
         info.setType(readString(dataIn, bs));
         
@@ -86,16 +86,16 @@
         		info.setMarshalledProperties(null);
     		}
     		
-        info.setDataStructure((org.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
-        info.setTargetConsumerId((org.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDataStructure((org.apache.activemq.command.DataStructure) unmarsalNestedObject(wireFormat, dataIn, bs));
+        info.setTargetConsumerId((org.apache.activemq.command.ConsumerId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setCompressed(bs.readBoolean());
         info.setRedeliveryCounter(dataIn.readInt());
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size];
+		            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setBrokerPath(value);
 		        } else {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class ProducerIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class ProducerIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ProducerInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,14 +63,14 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-        info.setProducerId((org.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setProducerId((org.apache.activemq.command.ProducerId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         
 		        if( bs.readBoolean() ) {
 		            short size = dataIn.readShort();
-		            org.activemq.command.BrokerId value[] = new org.activemq.command.BrokerId[size];
+		            org.apache.activemq.command.BrokerId value[] = new org.apache.activemq.command.BrokerId[size];
 		            for( int i=0; i < size; i++ ) {
-		                value[i] = (org.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
+		                value[i] = (org.apache.activemq.command.BrokerId)unmarsalNestedObject(wireFormat,dataIn, bs);
 		            }
 		            info.setBrokerPath(value);
 		        } else {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RedeliveryPolicyMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class RedeliveryPolicyMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class RedeliveryPolicyMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,7 +63,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-        info.setObjectId((org.activemq.command.DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setObjectId((org.apache.activemq.command.DataStructure) unmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 



Mime
View raw message