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/07/04 16:17:49 UTC
svn commit: r419014 - in /incubator/activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/transport/stomp/
main/java/org/apache/activemq/transport/stomp2/
main/resources/META-INF/services/org/apache/activemq/transport/
main/resources/META-INF...
Author: chirino
Date: Tue Jul 4 07:17:48 2006
New Revision: 419014
URL: http://svn.apache.org/viewvc?rev=419014&view=rev
Log:
Moved the stomp2 package to stomp.
Added:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/
- copied from r419008, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolConverter.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolException.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolException.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseHandler.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ResponseHandler.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/Stomp.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrame.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrameError.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrameError.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompSubscription.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFactory.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFilter.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormat.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java
- copied, changed from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormatFactory.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/package.html
- copied unchanged from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/package.html
Removed:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/
Modified:
incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp
incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolConverter.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolConverter.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolConverter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolConverter.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.io.IOException;
import java.io.OutputStreamWriter;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolException.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolException.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolException.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolException.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolException.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ProtocolException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ProtocolException.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.io.IOException;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseHandler.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ResponseHandler.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseHandler.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseHandler.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ResponseHandler.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/ResponseHandler.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/ResponseHandler.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.io.IOException;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/Stomp.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/Stomp.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/Stomp.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/Stomp.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
public interface Stomp {
String NULL = "\u0000";
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrame.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrame.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrame.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrame.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.util.Collections;
import java.util.HashMap;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrameError.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrameError.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrameError.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrameError.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrameError.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompFrameError.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompFrameError.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
/**
* Command indicating that an invalid Stomp Frame was received.
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompSubscription.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompSubscription.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompSubscription.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompSubscription.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.io.IOException;
import java.util.Iterator;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFactory.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFactory.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFactory.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.util.Map;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFilter.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFilter.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompTransportFilter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompTransportFilter.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.io.IOException;
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormat.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormat.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormat.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormat.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -60,7 +60,7 @@
}
public void marshal(Object command, DataOutputStream os) throws IOException {
- StompFrame stomp = (org.apache.activemq.transport.stomp2.StompFrame) command;
+ StompFrame stomp = (org.apache.activemq.transport.stomp.StompFrame) command;
StringBuffer buffer = new StringBuffer();
buffer.append(stomp.getAction());
Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java (from r419013, incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormatFactory.java)
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormatFactory.java&r1=419013&r2=419014&rev=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp2/StompWireFormatFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/stomp/StompWireFormatFactory.java Tue Jul 4 07:17:48 2006
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.transport.stomp2;
+package org.apache.activemq.transport.stomp;
import org.apache.activeio.command.WireFormat;
import org.apache.activeio.command.WireFormatFactory;
Modified: incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp?rev=419014&r1=419013&r2=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp (original)
+++ incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/transport/stomp Tue Jul 4 07:17:48 2006
@@ -1 +1 @@
-class=org.apache.activemq.transport.stomp2.StompTransportFactory
+class=org.apache.activemq.transport.stomp.StompTransportFactory
Modified: incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp?rev=419014&r1=419013&r2=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp (original)
+++ incubator/activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/activemq/wireformat/stomp Tue Jul 4 07:17:48 2006
@@ -1 +1 @@
-class=org.apache.activemq.transport.stomp2.StompWireFormatFactory
\ No newline at end of file
+class=org.apache.activemq.transport.stomp.StompWireFormatFactory
\ No newline at end of file
Modified: incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java?rev=419014&r1=419013&r2=419014&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java (original)
+++ incubator/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/stomp/StompTest.java Tue Jul 4 07:17:48 2006
@@ -22,7 +22,7 @@
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTextMessage;
-import org.apache.activemq.transport.stomp2.Stomp;
+import org.apache.activemq.transport.stomp.Stomp;
import javax.jms.Connection;
import javax.jms.JMSException;