You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/03/25 00:42:08 UTC
svn commit: r388677 [2/3] - in /incubator/activemq/trunk: ./ activecluster/
activeio/ activeio/activeio-aio/ activeio/activeio-core/
activeio/activeio-core/src/main/java/org/apache/activeio/
activeio/activeio-jxta/ activeio/activeio-oneport-jetty/ acti...
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/ActivityMonitor.java Fri Mar 24 15:41:23 2006
@@ -18,9 +18,9 @@
import java.io.IOException;
-import org.activeio.AsyncChannel;
-import org.activeio.FilterAsyncChannel;
-import org.activeio.Packet;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.async.FilterAsyncChannel;
import org.apache.activemq.management.CountStatisticImpl;
/**
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/activeio/PacketAggregatingAsyncChannel.java Fri Mar 24 15:41:23 2006
@@ -18,12 +18,12 @@
import java.io.IOException;
-import org.activeio.AsyncChannel;
-import org.activeio.FilterAsyncChannel;
-import org.activeio.Packet;
-import org.activeio.PacketData;
-import org.activeio.packet.AppendedPacket;
-import org.activeio.packet.EOSPacket;
+import org.apache.activeio.packet.AppendedPacket;
+import org.apache.activeio.packet.EOSPacket;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.packet.PacketData;
+import org.apache.activeio.packet.async.AsyncChannel;
+import org.apache.activeio.packet.async.FilterAsyncChannel;
/**
* This PacketAggregatingAsyncChannel can be used when the client is sending a
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/discovery/DiscoveryAgentFactory.java Fri Mar 24 15:41:23 2006
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.net.URI;
-import org.activeio.FactoryFinder;
+import org.apache.activeio.util.FactoryFinder;
import org.apache.activemq.util.IOExceptionSupport;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/multicast/MulticastTransportFactory.java Fri Mar 24 15:41:23 2006
@@ -16,14 +16,14 @@
*/
package org.apache.activemq.transport.multicast;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.udp.UdpTransportFactory;
-
import java.io.IOException;
import java.net.URI;
import java.net.UnknownHostException;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.udp.UdpTransportFactory;
/**
* A factory of multicast transport classes
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Send.java Fri Mar 24 15:41:23 2006
@@ -16,20 +16,20 @@
*/
package org.apache.activemq.transport.stomp;
-import org.activeio.ByteSequence;
-import org.apache.activemq.command.ActiveMQBytesMessage;
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQTextMessage;
-import org.apache.activemq.command.TransactionId;
-
-import javax.jms.JMSException;
-
import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.IOException;
import java.net.ProtocolException;
import java.util.Properties;
+
+import javax.jms.JMSException;
+
+import org.apache.activeio.packet.ByteSequence;
+import org.apache.activemq.command.ActiveMQBytesMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQTextMessage;
+import org.apache.activemq.command.TransactionId;
class Send implements StompCommand {
private final HeaderParser parser = new HeaderParser();
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java Fri Mar 24 15:41:23 2006
@@ -28,11 +28,11 @@
import javax.jms.JMSException;
-import org.activeio.ByteArrayOutputStream;
-import org.activeio.Packet;
-import org.activeio.adapter.PacketInputStream;
-import org.activeio.command.WireFormat;
-import org.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.adapter.PacketInputStream;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteArrayPacket;
+import org.apache.activeio.packet.Packet;
+import org.apache.activeio.util.ByteArrayOutputStream;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.CommandTypes;
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java Fri Mar 24 15:41:23 2006
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.transport.stomp;
-import org.activeio.command.WireFormat;
-import org.activeio.command.WireFormatFactory;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormatFactory;
/**
* Creates WireFormat objects that implement the <a href="http://stomp.codehaus.org/">Stomp</a> protocol.
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java Fri Mar 24 15:41:23 2006
@@ -16,15 +16,6 @@
*/
package org.apache.activemq.transport.tcp;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.Service;
-import org.apache.activemq.command.Command;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportThreadSupport;
-import org.apache.activemq.util.ServiceStopper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -37,6 +28,15 @@
import java.net.SocketTimeoutException;
import java.net.URI;
import java.net.UnknownHostException;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activemq.Service;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportThreadSupport;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* An implementation of the {@link Transport} interface using raw tcp/ip
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportFactory.java Fri Mar 24 15:41:23 2006
@@ -22,9 +22,11 @@
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
+
import javax.net.ServerSocketFactory;
import javax.net.SocketFactory;
-import org.activeio.command.WireFormat;
+
+import org.apache.activeio.command.WireFormat;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.transport.InactivityMonitor;
import org.apache.activemq.transport.MutexTransport;
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java Fri Mar 24 15:41:23 2006
@@ -16,16 +16,6 @@
*/
package org.apache.activemq.transport.tcp;
-import org.activeio.command.WireFormat;
-import org.activeio.command.WireFormatFactory;
-import org.apache.activemq.command.BrokerInfo;
-import org.apache.activemq.openwire.OpenWireFormatFactory;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportServerThreadSupport;
-import org.apache.activemq.util.ServiceStopper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -36,6 +26,17 @@
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.HashMap;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormatFactory;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.openwire.OpenWireFormatFactory;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.transport.TransportServerThreadSupport;
+import org.apache.activemq.util.ServiceStopper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* A TCP based implementation of {@link TransportServer}
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramChannel.java Fri Mar 24 15:41:23 2006
@@ -16,8 +16,15 @@
*/
package org.apache.activemq.transport.udp;
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.DatagramChannel;
+
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.Endpoint;
import org.apache.activemq.command.LastPartialCommand;
@@ -27,13 +34,6 @@
import org.apache.activemq.transport.reliable.ReplayBuffer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.SocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.DatagramChannel;
/**
* A strategy for reading datagrams and de-fragmenting them together.
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/CommandDatagramSocket.java Fri Mar 24 15:41:23 2006
@@ -16,8 +16,15 @@
*/
package org.apache.activemq.transport.udp;
-import org.activeio.ByteArrayInputStream;
-import org.activeio.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.SocketAddress;
+
+import org.apache.activeio.util.ByteArrayInputStream;
+import org.apache.activeio.util.ByteArrayOutputStream;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.Endpoint;
import org.apache.activemq.command.LastPartialCommand;
@@ -27,13 +34,6 @@
import org.apache.activemq.transport.reliable.ReplayBuffer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.SocketAddress;
/**
* A strategy for reading datagrams and de-fragmenting them together.
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransportFactory.java Fri Mar 24 15:41:23 2006
@@ -16,7 +16,14 @@
*/
package org.apache.activemq.transport.udp;
-import org.activeio.command.WireFormat;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.activeio.command.WireFormat;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.transport.CommandJoiner;
import org.apache.activemq.transport.InactivityMonitor;
@@ -30,16 +37,8 @@
import org.apache.activemq.transport.reliable.ReplayStrategy;
import org.apache.activemq.transport.reliable.Replayer;
import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.util.IntSequenceGenerator;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.URISupport;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
public class UdpTransportFactory extends TransportFactory {
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java Fri Mar 24 15:41:23 2006
@@ -20,7 +20,7 @@
import junit.framework.Test;
-import org.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormat;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.Response;
import org.apache.activemq.openwire.OpenWireFormat;
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java Fri Mar 24 15:41:23 2006
@@ -27,15 +27,8 @@
import junit.framework.TestCase;
-import org.activeio.ByteSequence;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.command.ActiveMQBytesMessage;
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQTempTopic;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.command.CommandTypes;
-import org.apache.activemq.command.Response;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.ByteSequence;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.state.CommandVisitor;
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java Fri Mar 24 15:41:23 2006
@@ -25,10 +25,7 @@
import junit.framework.TestCase;
import junit.textui.TestRunner;
-import org.activeio.ByteSequence;
-import org.apache.activemq.command.ActiveMQTextMessage;
-import org.apache.activemq.command.CommandTypes;
-import org.apache.activemq.command.Message;
+import org.apache.activeio.packet.ByteSequence;
/**
* @version $Revision$
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java Fri Mar 24 15:41:23 2006
@@ -16,12 +16,6 @@
*/
package org.apache.activemq.command;
-import org.activeio.Packet;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.CombinationTestSupport;
-import org.apache.activemq.command.Command;
-import org.apache.activemq.openwire.OpenWireFormat;
-
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -29,6 +23,11 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.Packet;
+import org.apache.activemq.CombinationTestSupport;
+import org.apache.activemq.openwire.OpenWireFormat;
public class DataStructureTestSupport extends CombinationTestSupport {
public boolean cacheEnabled;
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java Fri Mar 24 15:41:23 2006
@@ -16,17 +16,11 @@
*/
package org.apache.activemq.command;
-import org.activeio.ByteSequence;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ConnectionId;
-import org.apache.activemq.command.MessageId;
-import org.apache.activemq.command.ProducerId;
-import org.apache.activemq.command.SessionId;
-
import java.io.IOException;
import junit.framework.Test;
+
+import org.apache.activeio.packet.ByteSequence;
public class MessageSendTest extends DataStructureTestSupport {
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageTest.java Fri Mar 24 15:41:23 2006
@@ -16,12 +16,6 @@
*/
package org.apache.activemq.command;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.MessageId;
-import org.apache.activemq.openwire.OpenWireFormat;
-
import java.io.IOException;
import junit.framework.Test;
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/DataFileGeneratorTestSupport.java Fri Mar 24 15:41:23 2006
@@ -34,7 +34,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.activeio.ByteSequence;
+import org.apache.activeio.packet.ByteSequence;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTextMessage;
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/MessageTestSupport.java Fri Mar 24 15:41:23 2006
@@ -59,13 +59,13 @@
{
byte data[] = "Content:11".getBytes();
- info.setContent(new org.activeio.ByteSequence(data,0,data.length));
+ info.setContent(new org.apache.activeio.packet.ByteSequence(data,0,data.length));
}
{
byte data[] = "MarshalledProperties:12".getBytes();
- info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,data.length));
+ info.setMarshalledProperties(new org.apache.activeio.packet.ByteSequence(data,0,data.length));
}
info.setDataStructure(createDataStructure("DataStructure:13"));
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/openwire/v1/WireFormatInfoTest.java Fri Mar 24 15:41:23 2006
@@ -54,7 +54,7 @@
{
byte data[] = "MarshalledProperties:1".getBytes();
- info.setMarshalledProperties(new org.activeio.ByteSequence(data,0,data.length));
+ info.setMarshalledProperties(new org.apache.activeio.packet.ByteSequence(data,0,data.length));
}
Modified: incubator/activemq/trunk/activemq-dotnet/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/pom.xml (original)
+++ incubator/activemq/trunk/activemq-dotnet/pom.xml Fri Mar 24 15:41:23 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs Fri Mar 24 15:41:23 2006
@@ -29,20 +29,20 @@
namespace ActiveMQ.Commands
{
- /// <summary>
+ /// <summary>
/// The ActiveMQ KeepAliveInfo Command
- /// </summary>
- public class KeepAliveInfo : BaseCommand, Command
+ /// </summary>
+ public class KeepAliveInfo : BaseDataStructure, Command
{
public const byte ID_KeepAliveInfo = 10;
-
+
- public override string ToString() {
+ public override string ToString() {
return GetType().Name + "["
+ " ]";
- }
-
+ }
+
public override byte GetDataStructureType() {
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LastPartialCommand.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LastPartialCommand.cs?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LastPartialCommand.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LastPartialCommand.cs Fri Mar 24 15:41:23 2006
@@ -32,7 +32,7 @@
/// <summary>
/// The ActiveMQ LastPartialCommand Command
/// </summary>
- public class LastPartialCommand : BaseCommand
+ public class LastPartialCommand : PartialCommand
{
public const byte ID_LastPartialCommand = 61;
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs Fri Mar 24 15:41:23 2006
@@ -38,20 +38,20 @@
{
- public override DataStructure CreateObject()
+ public override DataStructure CreateObject()
{
return new ActiveMQTempQueue();
}
- public override byte GetDataStructureType()
+ public override byte GetDataStructureType()
{
return ActiveMQTempQueue.ID_ActiveMQTempQueue;
}
- //
+ //
// Un-marshal an object instance from the data input stream
- //
- public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ //
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
base.TightUnmarshal(wireFormat, o, dataIn, bs);
@@ -68,7 +68,7 @@
return rc + 0;
}
- //
+ //
// Write a object instance to data output stream
//
public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
@@ -76,16 +76,16 @@
}
- //
+ //
// Un-marshal an object instance from the data input stream
- //
- public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
{
base.LooseUnmarshal(wireFormat, o, dataIn);
}
- //
+ //
// Write a object instance to data output stream
//
public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs Fri Mar 24 15:41:23 2006
@@ -38,20 +38,20 @@
{
- public override DataStructure CreateObject()
+ public override DataStructure CreateObject()
{
return new ActiveMQTempTopic();
}
- public override byte GetDataStructureType()
+ public override byte GetDataStructureType()
{
return ActiveMQTempTopic.ID_ActiveMQTempTopic;
}
- //
+ //
// Un-marshal an object instance from the data input stream
- //
- public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ //
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
base.TightUnmarshal(wireFormat, o, dataIn, bs);
@@ -68,7 +68,7 @@
return rc + 0;
}
- //
+ //
// Write a object instance to data output stream
//
public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
@@ -76,16 +76,16 @@
}
- //
+ //
// Un-marshal an object instance from the data input stream
- //
- public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
{
base.LooseUnmarshal(wireFormat, o, dataIn);
}
- //
+ //
// Write a object instance to data output stream
//
public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs Fri Mar 24 15:41:23 2006
@@ -38,20 +38,20 @@
{
- public override DataStructure CreateObject()
+ public override DataStructure CreateObject()
{
return new ActiveMQTopic();
}
- public override byte GetDataStructureType()
+ public override byte GetDataStructureType()
{
return ActiveMQTopic.ID_ActiveMQTopic;
}
- //
+ //
// Un-marshal an object instance from the data input stream
- //
- public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
+ //
+ public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs)
{
base.TightUnmarshal(wireFormat, o, dataIn, bs);
@@ -68,7 +68,7 @@
return rc + 0;
}
- //
+ //
// Write a object instance to data output stream
//
public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
@@ -76,16 +76,16 @@
}
- //
+ //
// Un-marshal an object instance from the data input stream
- //
- public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
+ //
+ public override void LooseUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn)
{
base.LooseUnmarshal(wireFormat, o, dataIn);
}
- //
+ //
// Write a object instance to data output stream
//
public override void LooseMarshal(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut) {
Modified: incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LastPartialCommandMarshaller.cs Fri Mar 24 15:41:23 2006
@@ -34,7 +34,7 @@
/// <summary>
/// Marshalling code for Open Wire Format for LastPartialCommand
/// </summary>
- class LastPartialCommandMarshaller : BaseCommandMarshaller
+ class LastPartialCommandMarshaller : PartialCommandMarshaller
{
Modified: incubator/activemq/trunk/activemq-gbean/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/project.xml (original)
+++ incubator/activemq/trunk/activemq-gbean/project.xml Fri Mar 24 15:41:23 2006
@@ -32,6 +32,12 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>${activeio_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>activemq-gbean-management</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -65,11 +71,6 @@
<version>${geronimo_j2ee_version}</version>
</dependency>
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- <version>${activeio_version}</version>
- </dependency>
<dependency>
<groupId>mx4j</groupId>
Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Fri Mar 24 15:41:23 2006
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
Modified: incubator/activemq/trunk/activemq-jaas/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/project.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/project.xml Fri Mar 24 15:41:23 2006
@@ -38,8 +38,8 @@
<dependencies>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
</dependency>
Modified: incubator/activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/pom.xml (original)
+++ incubator/activemq/trunk/activemq-optional/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
Modified: incubator/activemq/trunk/activemq-optional/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/project.xml (original)
+++ incubator/activemq/trunk/activemq-optional/project.xml Fri Mar 24 15:41:23 2006
@@ -54,8 +54,8 @@
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
</dependency>
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/http/HttpTransportFactory.java Fri Mar 24 15:41:23 2006
@@ -16,7 +16,11 @@
*/
package org.apache.activemq.transport.http;
-import org.activeio.command.WireFormat;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+
+import org.apache.activeio.command.WireFormat;
import org.apache.activemq.transport.Transport;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
@@ -24,10 +28,6 @@
import org.apache.activemq.transport.xstream.XStreamWireFormat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
/**
* @version $Revision$
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/https/HttpsTransportFactory.java Fri Mar 24 15:41:23 2006
@@ -16,14 +16,14 @@
*/
package org.apache.activemq.transport.https;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.transport.Transport;
-import org.apache.activemq.transport.TransportServer;
-import org.apache.activemq.transport.http.HttpTransportFactory;
-
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportServer;
+import org.apache.activemq.transport.http.HttpTransportFactory;
/**
* Factory of HTTPS based transports
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/util/TextWireFormat.java Fri Mar 24 15:41:23 2006
@@ -16,12 +16,12 @@
*/
package org.apache.activemq.transport.util;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.command.Command;
-
import java.io.DataInputStream;
import java.io.IOException;
import java.io.Reader;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activemq.command.Command;
/**
* Adds the extra methods available to text based wire format implementations
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormat.java Fri Mar 24 15:41:23 2006
@@ -16,21 +16,21 @@
*/
package org.apache.activemq.transport.xstream;
-import com.thoughtworks.xstream.XStream;
-
-import org.activeio.Packet;
-import org.activeio.command.WireFormat;
-import org.apache.activemq.command.Command;
-import org.apache.activemq.transport.util.TextWireFormat;
-
-import javax.jms.JMSException;
-
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.Reader;
+
+import javax.jms.JMSException;
+
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.packet.Packet;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.transport.util.TextWireFormat;
+
+import com.thoughtworks.xstream.XStream;
/**
* A {@link WireFormat} implementation which uses the <a
Modified: incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/main/java/org/apache/activemq/transport/xstream/XStreamWireFormatFactory.java Fri Mar 24 15:41:23 2006
@@ -16,8 +16,8 @@
*/
package org.apache.activemq.transport.xstream;
-import org.activeio.command.WireFormat;
-import org.activeio.command.WireFormatFactory;
+import org.apache.activeio.command.WireFormat;
+import org.apache.activeio.command.WireFormatFactory;
/**
*
Modified: incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java (original)
+++ incubator/activemq/trunk/activemq-optional/src/test/java/org/apache/activemq/transport/xstream/XStreamWireFormatTest.java Fri Mar 24 15:41:23 2006
@@ -16,12 +16,11 @@
*/
package org.apache.activemq.transport.xstream;
-import org.activeio.command.WireFormat;
+import java.io.IOException;
+
+import org.apache.activeio.command.WireFormat;
import org.apache.activemq.command.Command;
import org.apache.activemq.command.MessageTest;
-import org.apache.activemq.transport.xstream.XStreamWireFormat;
-
-import java.io.IOException;
/**
* @version $Revision$
Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/activemq/trunk/activemq-ra/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/project.xml (original)
+++ incubator/activemq/trunk/activemq-ra/project.xml Fri Mar 24 15:41:23 2006
@@ -86,8 +86,8 @@
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
<properties>
<rar.bundle>true</rar.bundle>
Modified: incubator/activemq/trunk/activemq-soaktest/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-soaktest/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-soaktest/project.xml (original)
+++ incubator/activemq/trunk/activemq-soaktest/project.xml Fri Mar 24 15:41:23 2006
@@ -38,17 +38,15 @@
</properties>
</dependency>
-
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
<properties>
<activemq.module>true</activemq.module>
<lib>true</lib>
</properties>
</dependency>
-
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: incubator/activemq/trunk/activemq-systest/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/pom.xml (original)
+++ incubator/activemq/trunk/activemq-systest/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
@@ -37,7 +37,7 @@
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/activemq/trunk/activemq-systest/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/project.xml (original)
+++ incubator/activemq/trunk/activemq-systest/project.xml Fri Mar 24 15:41:23 2006
@@ -90,8 +90,8 @@
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
<properties>
<rar.bundle>true</rar.bundle>
Modified: incubator/activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/activemq/trunk/activemq-web/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/project.xml (original)
+++ incubator/activemq/trunk/activemq-web/project.xml Fri Mar 24 15:41:23 2006
@@ -88,8 +88,8 @@
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
</dependency>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
Modified: incubator/activemq/trunk/assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/project.xml (original)
+++ incubator/activemq/trunk/assembly/project.xml Fri Mar 24 15:41:23 2006
@@ -49,15 +49,14 @@
</dependency>
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
<properties>
<activemq.module>true</activemq.module>
<lib>true</lib>
</properties>
</dependency>
-
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/jdbc-example.xml Fri Mar 24 15:41:23 2006
@@ -13,7 +13,7 @@
<property name="cleanupPeriod" value="60000"/>
<property name="dataSource" ref="embedded-ds"/>
<property name="wireFormat">
- <bean id="myWireFormat" class="org.activeio.command.DefaultWireFormat"/>
+ <bean id="myWireFormat" class="org.apache.activeio.command.DefaultWireFormat"/>
</property>
</amq:jdbcPersistenceAdapter>
</amq:persistenceAdapter>
Modified: incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml Fri Mar 24 15:41:23 2006
@@ -30,7 +30,7 @@
</amq:broker>
<!-- The journal implementation that will be used -->
- <bean id="myJournalImpl" class="org.activeio.journal.active.JournalImpl">
+ <bean id="myJournalImpl" class="org.apache.activeio.journal.active.JournalImpl">
<constructor-arg index="0">
<bean id="myFile" class="java.io.File">
<constructor-arg index="0">
Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java Fri Mar 24 15:41:23 2006
@@ -16,32 +16,37 @@
*/
package org.apache.activemq.config;
+import java.io.File;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.apache.activeio.command.DefaultWireFormat;
+import org.apache.activeio.command.WireFormat;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
-import org.apache.activemq.broker.region.policy.*;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.transport.activeio.ActiveIOTransportServer;
-import org.apache.activemq.transport.tcp.TcpTransportServer;
+import org.apache.activemq.broker.region.policy.FixedSizedSubscriptionRecoveryPolicy;
+import org.apache.activemq.broker.region.policy.LastImageSubscriptionRecoveryPolicy;
+import org.apache.activemq.broker.region.policy.NoSubscriptionRecoveryPolicy;
+import org.apache.activemq.broker.region.policy.RoundRobinDispatchPolicy;
+import org.apache.activemq.broker.region.policy.SimpleDispatchPolicy;
+import org.apache.activemq.broker.region.policy.StrictOrderDispatchPolicy;
+import org.apache.activemq.broker.region.policy.SubscriptionRecoveryPolicy;
+import org.apache.activemq.broker.region.policy.TimedSubscriptionRecoveryPolicy;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.memory.UsageManager;
import org.apache.activemq.openwire.OpenWireFormat;
import org.apache.activemq.store.PersistenceAdapter;
-import org.apache.activemq.store.PersistenceAdapterFactory;
-import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
-import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
import org.apache.activemq.store.journal.JournalPersistenceAdapter;
-import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.transport.activeio.ActiveIOTransportServer;
+import org.apache.activemq.transport.tcp.TcpTransportServer;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.derby.jdbc.EmbeddedDataSource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
-import org.activeio.command.WireFormat;
-import org.activeio.command.DefaultWireFormat;
-import org.apache.derby.jdbc.EmbeddedDataSource;
-
-import java.io.File;
-import java.util.List;
-
-import junit.framework.TestCase;
/**
* @version $Revision: 1.2 $
Modified: incubator/activemq/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/etc/project.properties?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/etc/project.properties (original)
+++ incubator/activemq/trunk/etc/project.properties Fri Mar 24 15:41:23 2006
@@ -85,7 +85,7 @@
commons_beanutils_version=1.6.1
javacc_version=2.1
activecluster_version=1.1-SNAPSHOT
-activeio_version=2.1
+activeio_version=3.0-SNAPSHOT
drools_core_version=2.0-beta-13
xerces_version=2.6.2
xml_parser_apis_version=2.2.1
@@ -95,8 +95,10 @@
axis_version=1.2-RC1
<!-- used by gbean module -->
-geronimo_kernel_version=1.0-SNAPSHOT
-geronimo_system_version=1.0-SNAPSHOT
+geronimo_kernel_version=1.1-SNAPSHOT
+geronimo_system_version=1.1-SNAPSHOT
+geronimo_management_version=1.1-SNAPSHOT
+geronimo_j2ee_version=1.1-SNAPSHOT
xmlbeans_version=1.0-DEV
<!-- used by spring module -->
Modified: incubator/activemq/trunk/jmeter/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/project.xml?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/project.xml (original)
+++ incubator/activemq/trunk/jmeter/project.xml Fri Mar 24 15:41:23 2006
@@ -52,10 +52,9 @@
</properties>
</dependency>
- <!-- an optional discovery agent -->
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>activeio-core</artifactId>
<version>${activeio_version}</version>
<properties>
<jmeter.module>true</jmeter.module>
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.c Fri Mar 24 15:41:23 2006
@@ -84,6 +84,7 @@
switch(object->structType) {
case OW_PARTIALCOMMAND_TYPE:
+ case OW_LASTPARTIALCOMMAND_TYPE:
return 1;
}
return 0;
@@ -1585,20 +1586,20 @@
apr_status_t ow_marshal1_LastPartialCommand(ow_bit_buffer *buffer, ow_LastPartialCommand *object)
{
- ow_marshal1_BaseCommand(buffer, (ow_BaseCommand*)object);
+ ow_marshal1_PartialCommand(buffer, (ow_PartialCommand*)object);
return APR_SUCCESS;
}
apr_status_t ow_marshal2_LastPartialCommand(ow_byte_buffer *buffer, ow_bit_buffer *bitbuffer, ow_LastPartialCommand *object)
{
- ow_marshal2_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object);
+ ow_marshal2_PartialCommand(buffer, bitbuffer, (ow_PartialCommand*)object);
return APR_SUCCESS;
}
apr_status_t ow_unmarshal_LastPartialCommand(ow_byte_array *buffer, ow_bit_buffer *bitbuffer, ow_LastPartialCommand *object, apr_pool_t *pool)
{
- ow_unmarshal_BaseCommand(buffer, bitbuffer, (ow_BaseCommand*)object, pool);
+ ow_unmarshal_PartialCommand(buffer, bitbuffer, (ow_PartialCommand*)object, pool);
return APR_SUCCESS;
}
@@ -2377,7 +2378,6 @@
case OW_CONSUMERINFO_TYPE:
case OW_ACTIVEMQTEXTMESSAGE_TYPE:
case OW_CONTROLCOMMAND_TYPE:
- case OW_LASTPARTIALCOMMAND_TYPE:
case OW_ACTIVEMQBYTESMESSAGE_TYPE:
case OW_REPLAYCOMMAND_TYPE:
case OW_BROKERINFO_TYPE:
Modified: incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h (original)
+++ incubator/activemq/trunk/openwire-c/src/libopenwire/ow_commands_v1.h Fri Mar 24 15:41:23 2006
@@ -478,7 +478,7 @@
ow_byte structType;
ow_int commandId;
- ow_boolean responseRequired;
+ ow_byte_array *data;
} ow_LastPartialCommand;
ow_LastPartialCommand *ow_LastPartialCommand_create(apr_pool_t *pool);
Modified: incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/BrokerId.hpp Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
#define BrokerId_hpp_
#include <string>
-#include "command/AbstractCommand.hpp"
+#include "command/BaseDataStructure.hpp"
#include "util/ifr/ap.hpp"
@@ -46,7 +46,7 @@
* activemq-core module
*
*/
-class BrokerId : public AbstractCommand
+class BrokerId : public BaseDataStructure
{
private:
p<string> value ;
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConnectionId.hpp Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
#define ConnectionId_hpp_
#include <string>
-#include "command/AbstractCommand.hpp"
+#include "command/BaseDataStructure.hpp"
#include "util/ifr/ap.hpp"
@@ -46,7 +46,7 @@
* activemq-core module
*
*/
-class ConnectionId : public AbstractCommand
+class ConnectionId : public BaseDataStructure
{
private:
p<string> value ;
Modified: incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/ConsumerId.hpp Fri Mar 24 15:41:23 2006
@@ -18,7 +18,7 @@
#define ConsumerId_hpp_
#include <string>
-#include "command/AbstractCommand.hpp"
+#include "command/BaseDataStructure.hpp"
#include "util/ifr/ap.hpp"
@@ -46,7 +46,7 @@
* activemq-core module
*
*/
-class ConsumerId : public AbstractCommand
+class ConsumerId : public BaseDataStructure
{
private:
p<string> connectionId ;
Modified: incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/DiscoveryEvent.hpp Fri Mar 24 15:41:23 2006
@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef DiscoveryEvent_hpp_
#define DiscoveryEvent_hpp_
#include <string>
#include "command/AbstractCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using names
pace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for DiscoveryEvent
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class DiscoveryEvent : public AbstractCommand
{
private:
p<string> serviceName ;
p<string> brokerName ;
public:
const static int TYPE = 40;
public:
DiscoveryEvent() ;
virtual ~DiscoveryEvent() ;
virtual int getCommandType() ;
virtual p<string> getServiceName() ;
virtual void setServiceName(p<string> serviceName) ;
virtual p<string> getBrokerName() ;
virtual void setBrokerName(p<string> brokerName) ;
} ;
/* namespace */
}
}
}
}
#endif /*DiscoveryEvent_hpp_*/
\ No newline at end of file
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef DiscoveryEvent_hpp_
#define DiscoveryEvent_hpp_
#include <string>
#include "command/BaseDataStructure.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using nam
espace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for DiscoveryEvent
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class DiscoveryEvent : public BaseDataStructure
{
private:
p<string> serviceName ;
p<string> brokerName ;
public:
const static int TYPE = 40;
public:
DiscoveryEvent() ;
virtual ~DiscoveryEvent() ;
virtual int getCommandType() ;
virtual p<string> getServiceName() ;
virtual void setServiceName(p<string> serviceName) ;
virtual p<string> getBrokerName() ;
virtual void setBrokerName(p<string> brokerName) ;
} ;
/* namespace */
}
}
}
}
#endif /*DiscoveryEvent_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalQueueAck.hpp Fri Mar 24 15:41:23 2006
@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef JournalQueueAck_hpp_
#define JournalQueueAck_hpp_
#include <string>
#include "command/AbstractCommand.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageAck.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalQueueAck
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalQueueAck : public AbstractCommand
{
private:
p<ActiveMQDestination> destination ;
p<MessageAck> messageAck ;
public:
const static int TYPE = 52;
public:
JournalQueueAck() ;
virtual ~JournalQueueAck() ;
virtual int getCommandType() ;
virtual p<ActiveMQDestination> getDestination() ;
virtual void setDestination(p<ActiveMQDestination> destination) ;
virtual p<MessageAck> getMessageAck() ;
virtual void setMessageAck(p<MessageAck> messageAck) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalQueueAck_hpp_*/
\ No newline at end of file
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef JournalQueueAck_hpp_
#define JournalQueueAck_hpp_
#include <string>
#include "command/BaseDataStructure.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageAck.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalQueueAck
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalQueueAck : public BaseDataStructure
{
private:
p<ActiveMQDestination> destination ;
p<MessageAck> messageAck ;
public:
const static int TYPE = 52;
public:
JournalQueueAck() ;
virtual ~JournalQueueAck() ;
virtual int getCommandType() ;
virtual p<ActiveMQDestination> getDestination() ;
virtual void setDestination(p<ActiveMQDestination> destination) ;
virtual p<MessageAck> getMessageAck() ;
virtual void setMessageAck(p<MessageAck> messageAck) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalQueueAck_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTopicAck.hpp Fri Mar 24 15:41:23 2006
@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef JournalTopicAck_hpp_
#define JournalTopicAck_hpp_
#include <string>
#include "command/AbstractCommand.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageId.hpp"
#include "command/TransactionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTopicAck
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTopicAck : public AbstractCommand
{
private:
p<ActiveMQDestination> destination ;
p<MessageId> messageId ;
long long messageSequenceId ;
p<string> subscritionName ;
p<string> clientId ;
p<TransactionId> transactionId ;
public:
const static int TYPE = 50;
public:
JournalTopicAck() ;
virtual ~JournalTopicAck() ;
virtual int getCommandType() ;
virtual p<ActiveMQDestination> getDestination() ;
virtual void setDestination(p<ActiveMQDestination> destination) ;
virtual p<MessageId> getMessageId() ;
virtual void setMessageId
(p<MessageId> messageId) ;
virtual long long getMessageSequenceId() ;
virtual void setMessageSequenceId(long long messageSequenceId) ;
virtual p<string> getSubscritionName() ;
virtual void setSubscritionName(p<string> subscritionName) ;
virtual p<string> getClientId() ;
virtual void setClientId(p<string> clientId) ;
virtual p<TransactionId> getTransactionId() ;
virtual void setTransactionId(p<TransactionId> transactionId) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTopicAck_hpp_*/
\ No newline at end of file
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef JournalTopicAck_hpp_
#define JournalTopicAck_hpp_
#include <string>
#include "command/BaseDataStructure.hpp"
#include "command/ActiveMQDestination.hpp"
#include "command/MessageId.hpp"
#include "command/TransactionId.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace clien
t
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTopicAck
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTopicAck : public BaseDataStructure
{
private:
p<ActiveMQDestination> destination ;
p<MessageId> messageId ;
long long messageSequenceId ;
p<string> subscritionName ;
p<string> clientId ;
p<TransactionId> transactionId ;
public:
const static int TYPE = 50;
public:
JournalTopicAck() ;
virtual ~JournalTopicAck() ;
virtual int getCommandType() ;
virtual p<ActiveMQDestination> getDestination() ;
virtual void setDestination(p<ActiveMQDestination> destination) ;
virtual p<MessageId> getMessageId() ;
virtual void setMessa
geId(p<MessageId> messageId) ;
virtual long long getMessageSequenceId() ;
virtual void setMessageSequenceId(long long messageSequenceId) ;
virtual p<string> getSubscritionName() ;
virtual void setSubscritionName(p<string> subscritionName) ;
virtual p<string> getClientId() ;
virtual void setClientId(p<string> clientId) ;
virtual p<TransactionId> getTransactionId() ;
virtual void setTransactionId(p<TransactionId> transactionId) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTopicAck_hpp_*/
\ No newline at end of file
Modified: incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp?rev=388677&r1=388676&r2=388677&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp (original)
+++ incubator/activemq/trunk/openwire-cpp/src/command/JournalTrace.hpp Fri Mar 24 15:41:23 2006
@@ -1 +1 @@
-/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef JournalTrace_hpp_
#define JournalTrace_hpp_
#include <string>
#include "command/AbstractCommand.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespace
apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTrace
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTrace : public AbstractCommand
{
private:
p<string> message ;
public:
const static int TYPE = 53;
public:
JournalTrace() ;
virtual ~JournalTrace() ;
virtual int getCommandType() ;
virtual p<string> getMessage() ;
virtual void setMessage(p<string> message) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTrace_hpp_*/
\ No newline at end of file
+/*
* Copyright 2006 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef JournalTrace_hpp_
#define JournalTrace_hpp_
#include <string>
#include "command/BaseDataStructure.hpp"
#include "util/ifr/ap.hpp"
#include "util/ifr/p.hpp"
namespace apache
{
namespace activemq
{
namespace client
{
namespace command
{
using namespace ifr;
using namespace std;
using namespa
ce apache::activemq::client;
/*
*
* Marshalling code for Open Wire Format for JournalTrace
*
*
* NOTE!: This file is autogenerated - do not modify!
* if you need to make a change, please see the Groovy scripts in the
* activemq-core module
*
*/
class JournalTrace : public BaseDataStructure
{
private:
p<string> message ;
public:
const static int TYPE = 53;
public:
JournalTrace() ;
virtual ~JournalTrace() ;
virtual int getCommandType() ;
virtual p<string> getMessage() ;
virtual void setMessage(p<string> message) ;
} ;
/* namespace */
}
}
}
}
#endif /*JournalTrace_hpp_*/
\ No newline at end of file