Renamed smack-jingle to smack-jingle-old

Also renamed package name from

org.jivesoftware.smackx.jingle

to

org.jivesoftware.smackx.jingleold

settings.gradle

@@ -11,7 +11,7 @@ include 'smack-core',
 		'smack-sasl-provided',
 		'smack-compression-jzlib',
 		'smack-legacy',
-		'smack-jingle',
+		'smack-jingle-old',
 		'smack-bosh',
 		'smack-android',
 		'smack-java7'

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,17 +23,17 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.listeners.JingleListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.MediaNegotiator;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
-import org.jivesoftware.smackx.jingle.nat.TransportNegotiator;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.packet.JingleContent;
+import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.MediaNegotiator;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.nat.TransportNegotiator;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.JingleContent;
 
 /**
  *  @author Jeff Williams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 /**
  * The "action" in the jingle packet, as an enum.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleException.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.jingle.packet.JingleError;
+import org.jivesoftware.smackx.jingleold.packet.JingleError;
 
    /**
      * A Jingle exception.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -34,17 +34,17 @@ import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.provider.ProviderManager;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
-import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleSessionRequestListener;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.BasicTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
-import org.jivesoftware.smackx.jingle.nat.TransportResolver;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.provider.JingleProvider;
+import org.jivesoftware.smackx.jingleold.listeners.CreatedJingleSessionListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleSessionRequestListener;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.BasicTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.nat.TransportResolver;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.provider.JingleProvider;
 import org.jxmpp.util.XmppStringUtils;
 
 /**

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.listeners.JingleListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
 
 /**
  * Basic Jingle negotiator.
@@ -166,7 +166,7 @@ public abstract class JingleNegotiator {
      * Add a Jingle session listener to listen to incoming session requests.
      *
      * @param li The listener
-     * @see org.jivesoftware.smackx.jingle.listeners.JingleListener
+     * @see org.jivesoftware.smackx.jingleold.listeners.JingleListener
      */
     public void addListener(JingleListener li) {
         synchronized (listeners) {
@@ -178,7 +178,7 @@ public abstract class JingleNegotiator {
      * Removes a Jingle session listener.
      *
      * @param li The jingle session listener to be removed
-     * @see org.jivesoftware.smackx.jingle.listeners.JingleListener
+     * @see org.jivesoftware.smackx.jingleold.listeners.JingleListener
      */
     public void removeListener(JingleListener li) {
         synchronized (listeners) {

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiatorState.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 /**
  *  @author Jeff Williams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,21 +35,21 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.packet.PacketExtension;
 import org.jivesoftware.smack.packet.XMPPError;
-import org.jivesoftware.smackx.jingle.listeners.JingleListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleMediaListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleTransportListener;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.MediaNegotiator;
-import org.jivesoftware.smackx.jingle.media.MediaReceivedListener;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
-import org.jivesoftware.smackx.jingle.nat.TransportNegotiator;
-import org.jivesoftware.smackx.jingle.nat.TransportResolver;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.packet.JingleError;
+import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleMediaListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleTransportListener;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.MediaNegotiator;
+import org.jivesoftware.smackx.jingleold.media.MediaReceivedListener;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.nat.TransportNegotiator;
+import org.jivesoftware.smackx.jingleold.nat.TransportResolver;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.JingleError;
 
 /**
  * An abstract Jingle session. <p/> This class contains some basic properties of

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
 
 /**
  * A Jingle session request.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionState.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
 
 /**
  *  Implement the Jingle Session state using the State Behavioral pattern.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateActive.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.packet.JingleError;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.JingleError;
 
 /**
  *  @author Jeff Williams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import java.util.logging.Logger;
 
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.packet.JingleError;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.JingleError;
 
 /**
  *  @author Jeff Williams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
 
 /**
  *  @author Jeff Williams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java

@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingleold;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.MediaNegotiator;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportNegotiator;
-import org.jivesoftware.smackx.jingle.nat.TransportResolver;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.packet.JingleContent;
-import org.jivesoftware.smackx.jingle.packet.JingleDescription;
-import org.jivesoftware.smackx.jingle.packet.JingleError;
-import org.jivesoftware.smackx.jingle.packet.JingleTransport;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.MediaNegotiator;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportNegotiator;
+import org.jivesoftware.smackx.jingleold.nat.TransportResolver;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.JingleContent;
+import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
+import org.jivesoftware.smackx.jingleold.packet.JingleError;
+import org.jivesoftware.smackx.jingleold.packet.JingleTransport;
 
 /**
  *  @author Jeff Williams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
+import org.jivesoftware.smackx.jingleold.JingleSession;
 
 /**
  * Inteface used to dispatch a event when a Jingle session is created.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleListener.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
 /**
  * Jingle listeners interface.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
 /**
  * Interface for listening to jmf info events.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java

@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
 
 /**
  * Interface for listening to jmf events.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java

@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Interface for listening for session events.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
-import org.jivesoftware.smackx.jingle.JingleSessionRequest;
+import org.jivesoftware.smackx.jingleold.JingleSessionRequest;
 
 /**
  * Interface to listener Jingle session requests.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.listeners;
+package org.jivesoftware.smackx.jingleold.listeners;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Interface for listening to transport events.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/ContentInfo.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.media;
+package org.jivesoftware.smackx.jingleold.media;
 
 import java.util.Locale;
 

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java

@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.jivesoftware.smackx.jingle.media;
+package org.jivesoftware.smackx.jingleold.media;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 import java.util.List;
 

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java

@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.media;
+package org.jivesoftware.smackx.jingleold.media;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 import java.util.ArrayList;
 import java.util.List;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.media;
+package org.jivesoftware.smackx.jingleold.media;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,18 +23,18 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smackx.jingle.ContentNegotiator;
-import org.jivesoftware.smackx.jingle.JingleActionEnum;
-import org.jivesoftware.smackx.jingle.JingleException;
-import org.jivesoftware.smackx.jingle.JingleNegotiator;
-import org.jivesoftware.smackx.jingle.JingleNegotiatorState;
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.listeners.JingleListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleMediaListener;
-import org.jivesoftware.smackx.jingle.packet.Jingle;
-import org.jivesoftware.smackx.jingle.packet.JingleContent;
-import org.jivesoftware.smackx.jingle.packet.JingleDescription;
-import org.jivesoftware.smackx.jingle.packet.JingleError;
+import org.jivesoftware.smackx.jingleold.ContentNegotiator;
+import org.jivesoftware.smackx.jingleold.JingleActionEnum;
+import org.jivesoftware.smackx.jingleold.JingleException;
+import org.jivesoftware.smackx.jingleold.JingleNegotiator;
+import org.jivesoftware.smackx.jingleold.JingleNegotiatorState;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleMediaListener;
+import org.jivesoftware.smackx.jingleold.packet.Jingle;
+import org.jivesoftware.smackx.jingleold.packet.JingleContent;
+import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
+import org.jivesoftware.smackx.jingleold.packet.JingleError;
 
 /**
  * Manager for jmf descriptor negotiation. <p/> <p/> This class is responsible

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.media;
+package org.jivesoftware.smackx.jingleold.media;
 
 /**
  * Listener for new Incoming Media Streams

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.media;
+package org.jivesoftware.smackx.jingleold.media;
 
 /**
  * Represents a payload type.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl;
+package org.jivesoftware.smackx.jingleold.mediaimpl;
 
 import java.awt.Frame;
 import java.awt.TextArea;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jmf;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -46,7 +46,7 @@ import javax.media.rtp.RTPManager;
 import javax.media.rtp.SendStream;
 import javax.media.rtp.SessionAddress;
 
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
 
 /**
  * An Easy to use Audio Channel implemented using JMF.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioFormatUtils.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jmf;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
 
-import org.jivesoftware.smackx.jingle.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
 
 import javax.media.format.AudioFormat;
 

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jmf;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -22,10 +22,10 @@ import java.util.logging.Logger;
 
 import javax.media.MediaLocator;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * This Class implements a complete JingleMediaSession.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jmf;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
 
 import java.util.logging.Logger;
 
@@ -37,7 +37,7 @@ import javax.media.rtp.event.RemotePayloadChangeEvent;
 import javax.media.rtp.event.SessionEvent;
 import javax.media.rtp.event.StreamMappedEvent;
 
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
 
 /**
  * This class implements receive methods and listeners to be used in AudioChannel

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jmf;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,13 +22,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.mediaimpl.JMFInit;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.mediaimpl.JMFInit;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Implements a jingleMediaManager using JMF based API.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jspeex;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jspeex;
 
 import java.io.IOException;
 import java.net.DatagramSocket;
@@ -33,10 +33,10 @@ import mil.jfcom.cie.media.session.MediaSessionListener;
 import mil.jfcom.cie.media.session.StreamPlayer;
 import mil.jfcom.cie.media.srtp.packetizer.SpeexFormat;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * This Class implements a complete JingleMediaSession.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.jspeex;
+package org.jivesoftware.smackx.jingleold.mediaimpl.jspeex;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,13 +22,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.mediaimpl.JMFInit;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.mediaimpl.JMFInit;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Implements a jingleMediaManager using JMF based API and JSpeex.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.multi;
+package org.jivesoftware.smackx.jingleold.mediaimpl.multi;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 import java.util.ArrayList;
 import java.util.List;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java

@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare;
-
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageDecoder;
-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageEncoder;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare;
+
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageDecoder;
+import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageEncoder;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 import java.util.ArrayList;
 import java.util.List;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare;
 
 import java.awt.Rectangle;
 import java.awt.event.WindowAdapter;
@@ -29,14 +29,14 @@ import java.util.logging.Logger;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageDecoder;
-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageEncoder;
-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageReceiver;
-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageTransmitter;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageDecoder;
+import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageEncoder;
+import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageReceiver;
+import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageTransmitter;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * This Class implements a complete JingleMediaSession.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.Rectangle;
 import java.awt.RenderingHints;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultDecoder.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultEncoder.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.Canvas;
 import java.awt.Graphics;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.AWTException;
 import java.awt.Rectangle;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.io.PrintStream;
 import java.util.Vector;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/PixelUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.Color;
 import java.util.Random;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/QuantizeFilter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.Rectangle;
 

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 /**
  * The interface for an image quantizer. The addColor method is called (repeatedly

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.sshare.api;
+package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
 
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java

@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.test;
+package org.jivesoftware.smackx.jingleold.mediaimpl.test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * Implements a MediaManager for test purposes.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java

@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.mediaimpl.test;
+package org.jivesoftware.smackx.jingleold.mediaimpl.test;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
 
 /**
  * This Class implements a complete JingleMediaSession for unit testing.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicResolver.java

@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.nat;
+package org.jivesoftware.smackx.jingleold.nat;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.jingle.JingleSession;
+import org.jivesoftware.smackx.jingleold.JingleSession;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicTransportManager.java

@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.nat;
+package org.jivesoftware.smackx.jingleold.nat;
 
-import org.jivesoftware.smackx.jingle.JingleSession;
+import org.jivesoftware.smackx.jingleold.JingleSession;
 
 /**
  * A Basic Jingle Transport Manager implementation.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java

@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.nat;
+package org.jivesoftware.smackx.jingleold.nat;
 
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
-import org.jivesoftware.smackx.jingle.JingleSession;
+import org.jivesoftware.smackx.jingleold.JingleSession;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java

@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jivesoftware.smackx.jingle.nat;
+package org.jivesoftware.smackx.jingleold.nat;
 
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
-import org.jivesoftware.smackx.jingle.JingleSession;
-import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener;
-import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener;
-import org.jivesoftware.smackx.jingle.media.PayloadType;
+import org.jivesoftware.smackx.jingleold.JingleSession;
+import org.jivesoftware.smackx.jingleold.listeners.CreatedJingleSessionListener;
+import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
+import org.jivesoftware.smackx.jingleold.media.PayloadType;
 
 /**
  * A Jingle Transport Manager implementation to be used for NAT Networks.

smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java

@@ -14,7 +14,7 @@