From f65c0d5528c6e5968293b2669f22208b808a325f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 20 Aug 2014 00:25:57 +0200 Subject: [PATCH] Renamed smack-jingle to smack-jingle-old Also renamed package name from org.jivesoftware.smackx.jingle to org.jivesoftware.smackx.jingleold --- settings.gradle | 2 +- .../build.gradle | 0 .../libs/Speex.jar | Bin .../libs/jspeex-0.9.7-jfcom.jar | Bin .../libs/jstun.jar | Bin .../libs/mac/0JavaSoundStream.fix.mac.jar | Bin .../libs/mac/0jmf.mac.jar | Bin .../libs/windows/jmacm.dll | Bin .../libs/windows/jmam.dll | Bin .../libs/windows/jmcvid.dll | Bin .../libs/windows/jmdaud.dll | Bin .../libs/windows/jmdaudc.dll | Bin .../libs/windows/jmddraw.dll | Bin .../libs/windows/jmfjawt.dll | Bin .../libs/windows/jmg723.dll | Bin .../libs/windows/jmgdi.dll | Bin .../libs/windows/jmgsm.dll | Bin .../libs/windows/jmh263enc.dll | Bin .../libs/windows/jmjpeg.dll | Bin .../libs/windows/jmmci.dll | Bin .../libs/windows/jmmpa.dll | Bin .../libs/windows/jmmpegv.dll | Bin .../libs/windows/jmutil.dll | Bin .../libs/windows/jmvcm.dll | Bin .../libs/windows/jmvfw.dll | Bin .../libs/windows/jmvh263.dll | Bin .../smackx/jingle/mediaimpl/demo/Demo.java | 0 .../smackx/jingle/JingleManagerTest.java | 0 .../smackx/jingle/JingleMediaTest.java | 0 .../smackx/jingle/JingleSessionTest.java | 0 .../smackx/jingle/JingleSupportTests.java | 0 .../smackx/jingle/PayloadTypeTest.java | 0 .../smackx/jingle/nat/BasicResolverTest.java | 0 .../jingle/nat/BridgedResolverTest.java | 0 .../smackx/jingle/nat/LocalhostTest.java | 0 .../smackx/jingle/nat/STUNResolverTest.java | 0 .../jingle/nat/TransportCandidateTest.java | 0 .../jingle/nat/TransportResolverTest.java | 0 .../jingle/provider/JingleProviderTest.java | 0 .../integration-test/resources/test-case.xml | 0 .../smackx/jingleold}/ContentNegotiator.java | 24 +++++------ .../smackx/jingleold}/JingleActionEnum.java | 2 +- .../smackx/jingleold}/JingleException.java | 4 +- .../smackx/jingleold}/JingleManager.java | 24 +++++------ .../smackx/jingleold}/JingleNegotiator.java | 8 ++-- .../jingleold}/JingleNegotiatorState.java | 2 +- .../smackx/jingleold}/JingleSession.java | 32 +++++++------- .../jingleold}/JingleSessionRequest.java | 4 +- .../smackx/jingleold}/JingleSessionState.java | 4 +- .../jingleold}/JingleSessionStateActive.java | 6 +-- .../jingleold}/JingleSessionStateEnded.java | 6 +-- .../jingleold}/JingleSessionStatePending.java | 4 +- .../jingleold}/JingleSessionStateUnknown.java | 24 +++++------ .../CreatedJingleSessionListener.java | 4 +- .../jingleold}/listeners/JingleListener.java | 2 +- .../listeners/JingleMediaInfoListener.java | 2 +- .../listeners/JingleMediaListener.java | 4 +- .../listeners/JingleSessionListener.java | 8 ++-- .../JingleSessionRequestListener.java | 4 +- .../listeners/JingleTransportListener.java | 4 +- .../smackx/jingleold}/media/ContentInfo.java | 2 +- .../jingleold}/media/JingleMediaManager.java | 8 ++-- .../jingleold}/media/JingleMediaSession.java | 6 +-- .../jingleold}/media/MediaNegotiator.java | 26 ++++++------ .../media/MediaReceivedListener.java | 2 +- .../smackx/jingleold}/media/PayloadType.java | 2 +- .../smackx/jingleold}/mediaimpl/JMFInit.java | 2 +- .../mediaimpl/jmf/AudioChannel.java | 4 +- .../mediaimpl/jmf/AudioFormatUtils.java | 4 +- .../mediaimpl/jmf/AudioMediaSession.java | 10 ++--- .../mediaimpl/jmf/AudioReceiver.java | 4 +- .../mediaimpl/jmf/JmfMediaManager.java | 16 +++---- .../mediaimpl/jspeex/AudioMediaSession.java | 10 ++--- .../mediaimpl/jspeex/SpeexMediaManager.java | 16 +++---- .../mediaimpl/multi/MultiMediaManager.java | 14 +++--- .../sshare/ScreenShareMediaManager.java | 18 ++++---- .../mediaimpl/sshare/ScreenShareSession.java | 18 ++++---- .../sshare/api/AbstractBufferedImageOp.java | 2 +- .../mediaimpl/sshare/api/DefaultDecoder.java | 2 +- .../mediaimpl/sshare/api/DefaultEncoder.java | 2 +- .../mediaimpl/sshare/api/ImageDecoder.java | 2 +- .../mediaimpl/sshare/api/ImageEncoder.java | 2 +- .../mediaimpl/sshare/api/ImageReceiver.java | 2 +- .../sshare/api/ImageTransmitter.java | 2 +- .../sshare/api/OctTreeQuantizer.java | 2 +- .../mediaimpl/sshare/api/PixelUtils.java | 2 +- .../mediaimpl/sshare/api/QuantizeFilter.java | 2 +- .../mediaimpl/sshare/api/Quantizer.java | 2 +- .../sshare/api/WholeImageFilter.java | 2 +- .../mediaimpl/test/TestMediaManager.java | 14 +++--- .../mediaimpl/test/TestMediaSession.java | 10 ++--- .../smackx/jingleold}/nat/BasicResolver.java | 4 +- .../jingleold}/nat/BasicTransportManager.java | 4 +- .../jingleold}/nat/BridgedResolver.java | 4 +- .../nat/BridgedTransportManager.java | 10 ++--- .../jingleold}/nat/DatagramListener.java | 2 +- .../smackx/jingleold}/nat/FixedResolver.java | 4 +- .../jingleold}/nat/FixedTransportManager.java | 10 ++--- .../smackx/jingleold}/nat/HttpServer.java | 2 +- .../smackx/jingleold}/nat/ICECandidate.java | 2 +- .../smackx/jingleold}/nat/ICEResolver.java | 4 +- .../jingleold}/nat/ICETransportManager.java | 10 ++--- .../nat/JingleTransportManager.java | 4 +- .../smackx/jingleold}/nat/RTPBridge.java | 2 +- .../smackx/jingleold}/nat/ResultListener.java | 2 +- .../smackx/jingleold}/nat/STUN.java | 2 +- .../smackx/jingleold}/nat/STUNResolver.java | 4 +- .../jingleold}/nat/STUNTransportManager.java | 4 +- .../jingleold}/nat/TcpUdpBridgeClient.java | 2 +- .../jingleold}/nat/TcpUdpBridgeServer.java | 2 +- .../smackx/jingleold}/nat/TestResult.java | 2 +- .../jingleold}/nat/TransportCandidate.java | 6 +-- .../jingleold}/nat/TransportNegotiator.java | 40 +++++++++--------- .../jingleold}/nat/TransportResolver.java | 4 +- .../nat/TransportResolverListener.java | 2 +- .../smackx/jingleold}/packet/Jingle.java | 4 +- .../jingleold}/packet/JingleContent.java | 2 +- .../packet/JingleContentDescription.java | 4 +- .../jingleold}/packet/JingleContentInfo.java | 4 +- .../jingleold}/packet/JingleDescription.java | 4 +- .../smackx/jingleold}/packet/JingleError.java | 4 +- .../jingleold}/packet/JingleTransport.java | 14 +++--- .../JingleContentDescriptionProvider.java | 8 ++-- .../provider/JingleContentInfoProvider.java | 6 +-- .../provider/JingleContentProvider.java | 4 +- .../provider/JingleDescriptionProvider.java | 6 +-- .../jingleold}/provider/JingleProvider.java | 14 +++--- .../provider/JingleTransportProvider.java | 10 ++--- 128 files changed, 300 insertions(+), 300 deletions(-) rename {smack-jingle => smack-jingle-old}/build.gradle (100%) rename {smack-jingle => smack-jingle-old}/libs/Speex.jar (100%) rename {smack-jingle => smack-jingle-old}/libs/jspeex-0.9.7-jfcom.jar (100%) rename {smack-jingle => smack-jingle-old}/libs/jstun.jar (100%) rename {smack-jingle => smack-jingle-old}/libs/mac/0JavaSoundStream.fix.mac.jar (100%) rename {smack-jingle => smack-jingle-old}/libs/mac/0jmf.mac.jar (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmacm.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmam.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmcvid.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmdaud.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmdaudc.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmddraw.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmfjawt.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmg723.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmgdi.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmgsm.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmh263enc.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmjpeg.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmmci.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmmpa.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmmpegv.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmutil.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmvcm.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmvfw.dll (100%) rename {smack-jingle => smack-jingle-old}/libs/windows/jmvh263.dll (100%) rename {smack-jingle => smack-jingle-old}/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java (100%) rename {smack-jingle => smack-jingle-old}/src/integration-test/resources/test-case.xml (100%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/ContentNegotiator.java (93%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleActionEnum.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleException.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleManager.java (96%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleNegotiator.java (96%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleNegotiatorState.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSession.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSessionRequest.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSessionState.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSessionStateActive.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSessionStateEnded.java (92%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSessionStatePending.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/JingleSessionStateUnknown.java (91%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/CreatedJingleSessionListener.java (88%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/JingleListener.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/JingleMediaInfoListener.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/JingleMediaListener.java (91%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/JingleSessionListener.java (92%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/JingleSessionRequestListener.java (89%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/listeners/JingleTransportListener.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/media/ContentInfo.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/media/JingleMediaManager.java (91%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/media/JingleMediaSession.java (96%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/media/MediaNegotiator.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/media/MediaReceivedListener.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/media/PayloadType.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/JMFInit.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jmf/AudioChannel.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jmf/AudioFormatUtils.java (92%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jmf/AudioMediaSession.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jmf/AudioReceiver.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jmf/JmfMediaManager.java (90%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jspeex/AudioMediaSession.java (96%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/jspeex/SpeexMediaManager.java (88%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/multi/MultiMediaManager.java (87%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/ScreenShareMediaManager.java (82%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/ScreenShareSession.java (91%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/AbstractBufferedImageOp.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/DefaultDecoder.java (93%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/DefaultEncoder.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/ImageDecoder.java (93%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/ImageEncoder.java (93%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/ImageReceiver.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/ImageTransmitter.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/OctTreeQuantizer.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/PixelUtils.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/QuantizeFilter.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/Quantizer.java (96%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/sshare/api/WholeImageFilter.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/test/TestMediaManager.java (84%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/mediaimpl/test/TestMediaSession.java (88%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/BasicResolver.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/BasicTransportManager.java (89%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/BridgedResolver.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/BridgedTransportManager.java (89%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/DatagramListener.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/FixedResolver.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/FixedTransportManager.java (85%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/HttpServer.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/ICECandidate.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/ICEResolver.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/ICETransportManager.java (89%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/JingleTransportManager.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/RTPBridge.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/ResultListener.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/STUN.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/STUNResolver.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/STUNTransportManager.java (92%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TcpUdpBridgeClient.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TcpUdpBridgeServer.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TestResult.java (96%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TransportCandidate.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TransportNegotiator.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TransportResolver.java (99%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/nat/TransportResolverListener.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/Jingle.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/JingleContent.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/JingleContentDescription.java (98%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/JingleContentInfo.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/JingleDescription.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/JingleError.java (97%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/packet/JingleTransport.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/provider/JingleContentDescriptionProvider.java (93%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/provider/JingleContentInfoProvider.java (94%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/provider/JingleContentProvider.java (93%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/provider/JingleDescriptionProvider.java (95%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/provider/JingleProvider.java (91%) rename {smack-jingle/src/main/java/org/jivesoftware/smackx/jingle => smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold}/provider/JingleTransportProvider.java (95%) diff --git a/settings.gradle b/settings.gradle index 5888f2742..f606d75b1 100644 --- a/settings.gradle +++ b/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' diff --git a/smack-jingle/build.gradle b/smack-jingle-old/build.gradle similarity index 100% rename from smack-jingle/build.gradle rename to smack-jingle-old/build.gradle diff --git a/smack-jingle/libs/Speex.jar b/smack-jingle-old/libs/Speex.jar similarity index 100% rename from smack-jingle/libs/Speex.jar rename to smack-jingle-old/libs/Speex.jar diff --git a/smack-jingle/libs/jspeex-0.9.7-jfcom.jar b/smack-jingle-old/libs/jspeex-0.9.7-jfcom.jar similarity index 100% rename from smack-jingle/libs/jspeex-0.9.7-jfcom.jar rename to smack-jingle-old/libs/jspeex-0.9.7-jfcom.jar diff --git a/smack-jingle/libs/jstun.jar b/smack-jingle-old/libs/jstun.jar similarity index 100% rename from smack-jingle/libs/jstun.jar rename to smack-jingle-old/libs/jstun.jar diff --git a/smack-jingle/libs/mac/0JavaSoundStream.fix.mac.jar b/smack-jingle-old/libs/mac/0JavaSoundStream.fix.mac.jar similarity index 100% rename from smack-jingle/libs/mac/0JavaSoundStream.fix.mac.jar rename to smack-jingle-old/libs/mac/0JavaSoundStream.fix.mac.jar diff --git a/smack-jingle/libs/mac/0jmf.mac.jar b/smack-jingle-old/libs/mac/0jmf.mac.jar similarity index 100% rename from smack-jingle/libs/mac/0jmf.mac.jar rename to smack-jingle-old/libs/mac/0jmf.mac.jar diff --git a/smack-jingle/libs/windows/jmacm.dll b/smack-jingle-old/libs/windows/jmacm.dll similarity index 100% rename from smack-jingle/libs/windows/jmacm.dll rename to smack-jingle-old/libs/windows/jmacm.dll diff --git a/smack-jingle/libs/windows/jmam.dll b/smack-jingle-old/libs/windows/jmam.dll similarity index 100% rename from smack-jingle/libs/windows/jmam.dll rename to smack-jingle-old/libs/windows/jmam.dll diff --git a/smack-jingle/libs/windows/jmcvid.dll b/smack-jingle-old/libs/windows/jmcvid.dll similarity index 100% rename from smack-jingle/libs/windows/jmcvid.dll rename to smack-jingle-old/libs/windows/jmcvid.dll diff --git a/smack-jingle/libs/windows/jmdaud.dll b/smack-jingle-old/libs/windows/jmdaud.dll similarity index 100% rename from smack-jingle/libs/windows/jmdaud.dll rename to smack-jingle-old/libs/windows/jmdaud.dll diff --git a/smack-jingle/libs/windows/jmdaudc.dll b/smack-jingle-old/libs/windows/jmdaudc.dll similarity index 100% rename from smack-jingle/libs/windows/jmdaudc.dll rename to smack-jingle-old/libs/windows/jmdaudc.dll diff --git a/smack-jingle/libs/windows/jmddraw.dll b/smack-jingle-old/libs/windows/jmddraw.dll similarity index 100% rename from smack-jingle/libs/windows/jmddraw.dll rename to smack-jingle-old/libs/windows/jmddraw.dll diff --git a/smack-jingle/libs/windows/jmfjawt.dll b/smack-jingle-old/libs/windows/jmfjawt.dll similarity index 100% rename from smack-jingle/libs/windows/jmfjawt.dll rename to smack-jingle-old/libs/windows/jmfjawt.dll diff --git a/smack-jingle/libs/windows/jmg723.dll b/smack-jingle-old/libs/windows/jmg723.dll similarity index 100% rename from smack-jingle/libs/windows/jmg723.dll rename to smack-jingle-old/libs/windows/jmg723.dll diff --git a/smack-jingle/libs/windows/jmgdi.dll b/smack-jingle-old/libs/windows/jmgdi.dll similarity index 100% rename from smack-jingle/libs/windows/jmgdi.dll rename to smack-jingle-old/libs/windows/jmgdi.dll diff --git a/smack-jingle/libs/windows/jmgsm.dll b/smack-jingle-old/libs/windows/jmgsm.dll similarity index 100% rename from smack-jingle/libs/windows/jmgsm.dll rename to smack-jingle-old/libs/windows/jmgsm.dll diff --git a/smack-jingle/libs/windows/jmh263enc.dll b/smack-jingle-old/libs/windows/jmh263enc.dll similarity index 100% rename from smack-jingle/libs/windows/jmh263enc.dll rename to smack-jingle-old/libs/windows/jmh263enc.dll diff --git a/smack-jingle/libs/windows/jmjpeg.dll b/smack-jingle-old/libs/windows/jmjpeg.dll similarity index 100% rename from smack-jingle/libs/windows/jmjpeg.dll rename to smack-jingle-old/libs/windows/jmjpeg.dll diff --git a/smack-jingle/libs/windows/jmmci.dll b/smack-jingle-old/libs/windows/jmmci.dll similarity index 100% rename from smack-jingle/libs/windows/jmmci.dll rename to smack-jingle-old/libs/windows/jmmci.dll diff --git a/smack-jingle/libs/windows/jmmpa.dll b/smack-jingle-old/libs/windows/jmmpa.dll similarity index 100% rename from smack-jingle/libs/windows/jmmpa.dll rename to smack-jingle-old/libs/windows/jmmpa.dll diff --git a/smack-jingle/libs/windows/jmmpegv.dll b/smack-jingle-old/libs/windows/jmmpegv.dll similarity index 100% rename from smack-jingle/libs/windows/jmmpegv.dll rename to smack-jingle-old/libs/windows/jmmpegv.dll diff --git a/smack-jingle/libs/windows/jmutil.dll b/smack-jingle-old/libs/windows/jmutil.dll similarity index 100% rename from smack-jingle/libs/windows/jmutil.dll rename to smack-jingle-old/libs/windows/jmutil.dll diff --git a/smack-jingle/libs/windows/jmvcm.dll b/smack-jingle-old/libs/windows/jmvcm.dll similarity index 100% rename from smack-jingle/libs/windows/jmvcm.dll rename to smack-jingle-old/libs/windows/jmvcm.dll diff --git a/smack-jingle/libs/windows/jmvfw.dll b/smack-jingle-old/libs/windows/jmvfw.dll similarity index 100% rename from smack-jingle/libs/windows/jmvfw.dll rename to smack-jingle-old/libs/windows/jmvfw.dll diff --git a/smack-jingle/libs/windows/jmvh263.dll b/smack-jingle-old/libs/windows/jmvh263.dll similarity index 100% rename from smack-jingle/libs/windows/jmvh263.dll rename to smack-jingle-old/libs/windows/jmvh263.dll diff --git a/smack-jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java b/smack-jingle-old/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java similarity index 100% rename from smack-jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java rename to smack-jingle-old/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java diff --git a/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java similarity index 100% rename from smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java rename to smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java diff --git a/smack-jingle/src/integration-test/resources/test-case.xml b/smack-jingle-old/src/integration-test/resources/test-case.xml similarity index 100% rename from smack-jingle/src/integration-test/resources/test-case.xml rename to smack-jingle-old/src/integration-test/resources/test-case.xml diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java similarity index 93% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.java index 74a2b3705..807c342c5 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.java index 674e39763..591ea6006 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleException.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleException.java index 096e45074..e7492a2eb 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java similarity index 96% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java index cf2575149..d69a729bd 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java +++ b/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; /** diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java similarity index 96% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java index 732e167ed..f3c57fd8f 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java +++ b/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) { diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiatorState.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiatorState.java index 32c559cdd..c955838f7 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java index b2b3f871a..96cf47e2b 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java +++ b/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.

This class contains some basic properties of diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java index 633cff1c1..cb611f902 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionState.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionState.java index df205ce58..50232481d 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateActive.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateActive.java index 5d806a5b9..a77a8d8de 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java similarity index 92% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.java index 7e21633ba..1536ba852 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java index a9041ec6c..11958d3d6 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java similarity index 91% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java index e34120104..f7e09c160 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java similarity index 88% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java index 5295342cb..a0a0fc67f 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleListener.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleListener.java index 00458aed7..5a46a1d99 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.java index e2eb5da4d..fa118d7f5 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java similarity index 91% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java index 4c832c12a..49ec6d64e 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java similarity index 92% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.java index 0507a4830..52d87ee05 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java similarity index 89% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java index 8f5aa828a..7ae79b44b 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.java index 8ee755f49..cd60a296e 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/ContentInfo.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/ContentInfo.java index 1b6b4faa3..513de4ee6 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java similarity index 91% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java index f3885a217..90eb1a338 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java similarity index 96% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java index dc17c5504..ddd94ab31 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java index a86429691..f0d422baf 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java +++ b/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.

This class is responsible diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.java index 62f33d2de..69a17f529 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.java index 3c708466e..54407d480 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.java index 8f6783a9d..ae0e0da0d 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java index afb609964..329a17392 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioFormatUtils.java similarity index 92% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioFormatUtils.java index 410006dc9..adacf3b7b 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java index 699021876..ed2abfa69 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.java index 27568181a..d8421b503 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java similarity index 90% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.java index 75220421e..ccac9238a 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java similarity index 96% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java index f261a2719..14f343a66 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java similarity index 88% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.java index 936846415..65de8d19d 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java similarity index 87% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.java index 8a2136d53..b948ef8f2 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java similarity index 82% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareMediaManager.java index fc042e5df..4b4193f85 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java +++ b/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; +package org.jivesoftware.smackx.jingleold.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; +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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java similarity index 91% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java index 0fffee829..a7fd41c2e 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.java index 0832e7d6d..ec12e8c0b 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultDecoder.java similarity index 93% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultDecoder.java index 5c32ee48a..0495f54f4 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultEncoder.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultEncoder.java index 1e78aa646..aa78f7b5c 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java similarity index 93% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.java index 5695e8014..69b9b307d 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java similarity index 93% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.java index f0ffa5d18..1eac94ad9 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.java index bf344f623..3ef5d6f0b 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.java index e2c7e46d8..d625e6efb 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.java index 27ae64ded..b67d2a30a 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/PixelUtils.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/PixelUtils.java index 24419c601..e1e0e9edf 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/QuantizeFilter.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/QuantizeFilter.java index 98cc7b35d..5f400921a 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java similarity index 96% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.java index 548322a60..60ace6334 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java +++ b/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 diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.java index 5a38bc410..d3e8ddff1 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java similarity index 84% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaManager.java index 58d24a7e7..63ead7bd1 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java similarity index 88% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.java index 7c1286da6..4b36ac922 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicResolver.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicResolver.java index dfea792f8..01ae614c4 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicTransportManager.java similarity index 89% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicTransportManager.java index b11471536..cf4e7dcda 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.java index cc9bee88c..572cf25cb 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java +++ b/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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java similarity index 89% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java index 54d123600..c467542ea 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java +++ b/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. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java index f2dbdabf3..89a0c3344 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java @@ -14,7 +14,7 @@ * 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 java.net.DatagramPacket; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedResolver.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedResolver.java index 936a58e92..a7f01faa5 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedResolver.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; /** * The FixedResolver is a resolver where diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedTransportManager.java similarity index 85% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedTransportManager.java index 4f4226a29..798afe3a8 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedTransportManager.java @@ -14,13 +14,13 @@ * 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.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 Fixed Jingle Transport Manager implementation. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java index 1eae2ae5a..c4b1991e6 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.java @@ -14,7 +14,7 @@ * 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 java.io.BufferedReader; import java.io.IOException; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java index 24eac0c89..336a46202 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.java @@ -14,7 +14,7 @@ * 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 java.net.InetAddress; import java.net.UnknownHostException; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java index 5df366122..561d024c6 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICEResolver.java @@ -14,7 +14,7 @@ * 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 java.net.InetAddress; import java.net.NetworkInterface; @@ -29,7 +29,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.jingle.JingleSession; +import org.jivesoftware.smackx.jingleold.JingleSession; import de.javawi.jstun.test.demo.ice.Candidate; import de.javawi.jstun.test.demo.ice.ICENegociator; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java similarity index 89% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java index 948769d7f..63c81c74c 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICETransportManager.java @@ -14,16 +14,16 @@ * 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.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; public class ICETransportManager extends JingleTransportManager implements JingleSessionListener, CreatedJingleSessionListener { diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.java index 75a75bc2d..303ae5fc8 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/JingleTransportManager.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; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.jingle.JingleSession; +import org.jivesoftware.smackx.jingleold.JingleSession; /** * Transport manager for Jingle. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java index 1197f44e3..e82739564 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.nat; +package org.jivesoftware.smackx.jingleold.nat; import java.net.InetAddress; import java.net.NetworkInterface; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java index cae363eae..a879f5783 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ResultListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.nat; +package org.jivesoftware.smackx.jingleold.nat; /** * Listener for ECHO Test Results diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java index 1db835070..053906e06 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java @@ -14,7 +14,7 @@ * 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 java.util.ArrayList; import java.util.List; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java index 7d5feae77..d0d6e7f66 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNResolver.java @@ -14,7 +14,7 @@ * 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 java.io.IOException; import java.net.InetAddress; @@ -28,7 +28,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.jingle.JingleSession; +import org.jivesoftware.smackx.jingleold.JingleSession; import org.xmlpull.v1.XmlPullParserFactory; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNTransportManager.java similarity index 92% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNTransportManager.java index d5368caab..d26b55619 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUNTransportManager.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 Jingle Transport Manager implementation to be used on NAT networks with STUN Service NOT Blocked. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java index e0697cc5d..b29f203f7 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeClient.java @@ -14,7 +14,7 @@ * 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 java.io.IOException; import java.io.InputStream; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java index ea31b66d2..b81d6a4eb 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TcpUdpBridgeServer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.nat; +package org.jivesoftware.smackx.jingleold.nat; import java.io.IOException; import java.io.InputStream; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TestResult.java similarity index 96% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TestResult.java index 3e9b95304..905863b33 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TestResult.java @@ -14,7 +14,7 @@ * 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; /** * Result of an ECHO Test diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java index 1652032a1..43244ac7e 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java @@ -14,7 +14,7 @@ * 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 java.io.IOException; import java.io.UnsupportedEncodingException; @@ -30,8 +30,8 @@ import java.util.Locale; import java.util.logging.Logger; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smackx.jingle.JingleSession; -import org.jivesoftware.smackx.jingle.nat.TransportResolverListener.Checker; +import org.jivesoftware.smackx.jingleold.JingleSession; +import org.jivesoftware.smackx.jingleold.nat.TransportResolverListener.Checker; /** * Transport candidate. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java index f93fbb6ec..54ed04b5a 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.nat; +package org.jivesoftware.smackx.jingleold.nat; import java.util.ArrayList; import java.util.Collections; @@ -27,18 +27,18 @@ 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.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.JingleTransportListener; -import org.jivesoftware.smackx.jingle.packet.Jingle; -import org.jivesoftware.smackx.jingle.packet.JingleContent; -import org.jivesoftware.smackx.jingle.packet.JingleTransport; -import org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate; +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.JingleTransportListener; +import org.jivesoftware.smackx.jingleold.packet.Jingle; +import org.jivesoftware.smackx.jingleold.packet.JingleContent; +import org.jivesoftware.smackx.jingleold.packet.JingleTransport; +import org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportCandidate; /** * Transport negotiator. @@ -736,7 +736,7 @@ public abstract class TransportNegotiator extends JingleNegotiator { * @param jin The input packet * @return a Jingle packet * @throws XMPPException an exception - * @see org.jivesoftware.smackx.jingle.JingleNegotiator.State#eventAccept(org.jivesoftware.smackx.jingle.packet.Jingle) + * @see org.jivesoftware.smackx.jingleold.JingleNegotiator.State#eventAccept(org.jivesoftware.smackx.jingleold.packet.Jingle) */ private IQ receiveContentAcceptAction(Jingle jingle) throws XMPPException { IQ response = null; @@ -831,9 +831,9 @@ public abstract class TransportNegotiator extends JingleNegotiator { /** * Get a TransportNegotiator instance. */ - public org.jivesoftware.smackx.jingle.packet.JingleTransport getJingleTransport(TransportCandidate bestRemote) { - org.jivesoftware.smackx.jingle.packet.JingleTransport.RawUdp jt = new org.jivesoftware.smackx.jingle.packet.JingleTransport.RawUdp(); - jt.addCandidate(new org.jivesoftware.smackx.jingle.packet.JingleTransport.RawUdp.Candidate(bestRemote)); + public org.jivesoftware.smackx.jingleold.packet.JingleTransport getJingleTransport(TransportCandidate bestRemote) { + org.jivesoftware.smackx.jingleold.packet.JingleTransport.RawUdp jt = new org.jivesoftware.smackx.jingleold.packet.JingleTransport.RawUdp(); + jt.addCandidate(new org.jivesoftware.smackx.jingleold.packet.JingleTransport.RawUdp.Candidate(bestRemote)); return jt; } @@ -885,9 +885,9 @@ public abstract class TransportNegotiator extends JingleNegotiator { * * @param candidate */ - public org.jivesoftware.smackx.jingle.packet.JingleTransport getJingleTransport(TransportCandidate candidate) { - org.jivesoftware.smackx.jingle.packet.JingleTransport.Ice jt = new org.jivesoftware.smackx.jingle.packet.JingleTransport.Ice(); - jt.addCandidate(new org.jivesoftware.smackx.jingle.packet.JingleTransport.Ice.Candidate(candidate)); + public org.jivesoftware.smackx.jingleold.packet.JingleTransport getJingleTransport(TransportCandidate candidate) { + org.jivesoftware.smackx.jingleold.packet.JingleTransport.Ice jt = new org.jivesoftware.smackx.jingleold.packet.JingleTransport.Ice(); + jt.addCandidate(new org.jivesoftware.smackx.jingleold.packet.JingleTransport.Ice.Candidate(candidate)); return jt; } diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java similarity index 99% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java index 36527df48..15caf0e31 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolver.java @@ -14,7 +14,7 @@ * 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 java.io.IOException; import java.net.ServerSocket; @@ -27,7 +27,7 @@ import java.util.logging.Logger; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.jingle.JingleSession; +import org.jivesoftware.smackx.jingleold.JingleSession; /** * A TransportResolver is used for obtaining a list of valid transport diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java index 365eeb9f0..03257382a 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportResolverListener.java @@ -14,7 +14,7 @@ * 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; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java index 5d29892bd..6f3164109 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.jingle.JingleActionEnum; +import org.jivesoftware.smackx.jingleold.JingleActionEnum; import java.util.ArrayList; import java.util.Collections; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java index 270aeb28d..e689a9d23 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import java.util.ArrayList; import java.util.Collections; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java similarity index 98% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java index 462ff2c33..ccceef77e 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.jingle.media.PayloadType; +import org.jivesoftware.smackx.jingleold.media.PayloadType; import java.util.ArrayList; import java.util.Collections; diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java index 37219688a..d38c9e3e4 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.jingle.media.ContentInfo; +import org.jivesoftware.smackx.jingleold.media.ContentInfo; /** * Jingle content info diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java index 37b3e908a..b15004b3b 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import java.util.ArrayList; import java.util.Collections; @@ -23,7 +23,7 @@ import java.util.List; import java.util.logging.Logger; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.jingle.media.PayloadType; +import org.jivesoftware.smackx.jingleold.media.PayloadType; /** * Jingle content description. diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java similarity index 97% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java index 4ddff788d..c73229d66 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import java.util.Locale; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.jingle.media.ContentInfo; +import org.jivesoftware.smackx.jingleold.media.ContentInfo; import org.xmlpull.v1.XmlPullParser; public class JingleError implements PacketExtension { diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java index c1f1711d6..a5303f24c 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.packet; +package org.jivesoftware.smackx.jingleold.packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.jingle.nat.ICECandidate; -import org.jivesoftware.smackx.jingle.nat.TransportCandidate; +import org.jivesoftware.smackx.jingleold.nat.ICECandidate; +import org.jivesoftware.smackx.jingleold.nat.TransportCandidate; import java.util.ArrayList; import java.util.Collections; @@ -276,7 +276,7 @@ public class JingleTransport implements PacketExtension { /** * Add a transport candidate * - * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate) + * @see org.jivesoftware.smackx.jingleold.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportCandidate) */ public void addCandidate(final JingleTransportCandidate candidate) { super.addCandidate(candidate); @@ -286,7 +286,7 @@ public class JingleTransport implements PacketExtension { * Get the list of candidates. As a "raw-udp" transport can only contain * one candidate, we use the first in the list... * - * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#getCandidates() + * @see org.jivesoftware.smackx.jingleold.packet.JingleTransport#getCandidates() */ public List getCandidatesList() { List copy = new ArrayList(); @@ -358,7 +358,7 @@ public class JingleTransport implements PacketExtension { /** * Add a transport candidate * - * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate) + * @see org.jivesoftware.smackx.jingleold.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportCandidate) */ public void addCandidate(final JingleTransportCandidate candidate) { candidates.clear(); @@ -369,7 +369,7 @@ public class JingleTransport implements PacketExtension { * Get the list of candidates. As a "raw-udp" transport can only contain * one candidate, we use the first in the list... * - * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#getCandidates() + * @see org.jivesoftware.smackx.jingleold.packet.JingleTransport#getCandidates() */ public List getCandidatesList() { List copy = new ArrayList(); diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java similarity index 93% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java index 008f5e308..263a7f8ce 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentDescriptionProvider.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.provider; +package org.jivesoftware.smackx.jingleold.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.jingle.media.PayloadType; -import org.jivesoftware.smackx.jingle.packet.JingleContentDescription; -import org.jivesoftware.smackx.jingle.packet.JingleContentDescription.JinglePayloadType; +import org.jivesoftware.smackx.jingleold.media.PayloadType; +import org.jivesoftware.smackx.jingleold.packet.JingleContentDescription; +import org.jivesoftware.smackx.jingleold.packet.JingleContentDescription.JinglePayloadType; import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java similarity index 94% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java index 284cdd8e4..f0ab261f7 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentInfoProvider.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.provider; +package org.jivesoftware.smackx.jingleold.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.jingle.media.ContentInfo; -import org.jivesoftware.smackx.jingle.packet.JingleContentInfo; +import org.jivesoftware.smackx.jingleold.media.ContentInfo; +import org.jivesoftware.smackx.jingleold.packet.JingleContentInfo; import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java similarity index 93% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java index 439919a40..169abf187 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleContentProvider.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.provider; +package org.jivesoftware.smackx.jingleold.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.jingle.packet.JingleContent; +import org.jivesoftware.smackx.jingleold.packet.JingleContent; import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java index 8db42df4f..550b9ecd8 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleDescriptionProvider.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.provider; +package org.jivesoftware.smackx.jingleold.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.jingle.media.PayloadType; -import org.jivesoftware.smackx.jingle.packet.JingleDescription; +import org.jivesoftware.smackx.jingleold.media.PayloadType; +import org.jivesoftware.smackx.jingleold.packet.JingleDescription; import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java similarity index 91% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java index 09fda1537..0b64a1eb9 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleProvider.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.jivesoftware.smackx.jingle.provider; +package org.jivesoftware.smackx.jingleold.provider; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smackx.jingle.JingleActionEnum; -import org.jivesoftware.smackx.jingle.packet.Jingle; -import org.jivesoftware.smackx.jingle.packet.JingleContent; -import org.jivesoftware.smackx.jingle.packet.JingleContentInfo; -import org.jivesoftware.smackx.jingle.packet.JingleDescription; -import org.jivesoftware.smackx.jingle.packet.JingleTransport; +import org.jivesoftware.smackx.jingleold.JingleActionEnum; +import org.jivesoftware.smackx.jingleold.packet.Jingle; +import org.jivesoftware.smackx.jingleold.packet.JingleContent; +import org.jivesoftware.smackx.jingleold.packet.JingleContentInfo; +import org.jivesoftware.smackx.jingleold.packet.JingleDescription; +import org.jivesoftware.smackx.jingleold.packet.JingleTransport; import org.xmlpull.v1.XmlPullParser; /** diff --git a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java similarity index 95% rename from smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java rename to smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java index 5051bfce4..16400ebad 100644 --- a/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/provider/JingleTransportProvider.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jingle.provider; +package org.jivesoftware.smackx.jingleold.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.jingle.nat.ICECandidate; -import org.jivesoftware.smackx.jingle.nat.TransportCandidate; -import org.jivesoftware.smackx.jingle.packet.JingleTransport; -import org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate; +import org.jivesoftware.smackx.jingleold.nat.ICECandidate; +import org.jivesoftware.smackx.jingleold.nat.TransportCandidate; +import org.jivesoftware.smackx.jingleold.packet.JingleTransport; +import org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportCandidate; import org.xmlpull.v1.XmlPullParser; /**