You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/01/28 16:58:07 UTC

svn commit: r1439458 - in /activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp: XmppTransport.java XmppTransportFactory.java XmppTransportServer.java

Author: tabish
Date: Mon Jan 28 15:58:07 2013
New Revision: 1439458

URL: http://svn.apache.org/viewvc?rev=1439458&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4278

Tagged the Transport classes as deprecated. 

Modified:
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java
    activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java

Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java?rev=1439458&r1=1439457&r2=1439458&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java (original)
+++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransport.java Mon Jan 28 15:58:07 2013
@@ -47,13 +47,14 @@ import org.apache.activemq.transport.tcp
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.wireformat.WireFormat;
+import org.jabber.etherx.streams.Features;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.jabber.etherx.streams.Features;
 
 /**
- * 
+ * @deprecated
  */
+@Deprecated
 public class XmppTransport extends TcpTransport {
     protected static final QName ATTRIBUTE_TO = new QName("to");
 
@@ -141,6 +142,7 @@ public class XmppTransport extends TcpTr
         try {
             XMLInputFactory xif = XMLInputFactory.newInstance();
             xif.setXMLReporter(new XMLReporter() {
+                @Override
                 public void report(String message, String errorType, Object relatedInformation, Location location) throws XMLStreamException {
                     LOG.warn(message + " errorType: " + errorType + " relatedInfo: " + relatedInformation);
                 }

Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java?rev=1439458&r1=1439457&r2=1439458&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java (original)
+++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportFactory.java Mon Jan 28 15:58:07 2013
@@ -31,10 +31,12 @@ import org.apache.activemq.transport.tcp
 import org.apache.activemq.wireformat.WireFormat;
 
 /**
- * 
+ * @deprecated
  */
+@Deprecated
 public class XmppTransportFactory extends TcpTransportFactory {
 
+    @Override
     protected String getDefaultWireFormatType() {
         return "xmpp";
     }

Modified: activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java?rev=1439458&r1=1439457&r2=1439458&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java (original)
+++ activemq/trunk/activemq-xmpp/src/main/java/org/apache/activemq/transport/xmpp/XmppTransportServer.java Mon Jan 28 15:58:07 2013
@@ -29,8 +29,9 @@ import org.apache.activemq.transport.tcp
 import org.apache.activemq.wireformat.WireFormat;
 
 /**
- * 
+ * @deprecated
  */
+@Deprecated
 public class XmppTransportServer extends TcpTransportServer {
 
     public XmppTransportServer(TcpTransportFactory transportFactory, URI location, ServerSocketFactory serverSocketFactory) throws IOException, URISyntaxException {