From 14b43581dc94068880f29ce2cfb58b2ec9f1c723 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 3 Mar 2014 11:31:06 +0100 Subject: [PATCH] Move Jingle packet and provider under smackx.jingle The Jingle integration-tests where also accidentally not within the smackx package. --- .../jingle/JingleManagerTest.java | 4 ++-- .../{ => smackx}/jingle/JingleMediaTest.java | 2 +- .../jingle/JingleSessionTest.java | 0 .../jingle/JingleSupportTests.java | 0 .../{ => smackx}/jingle/PayloadTypeTest.java | 0 .../jingle/nat/BasicResolverTest.java | 0 .../jingle/nat/BridgedResolverTest.java | 0 .../jingle/nat/LocalhostTest.java | 0 .../jingle/nat/STUNResolverTest.java | 0 .../jingle/nat/TransportCandidateTest.java | 0 .../jingle/nat/TransportResolverTest.java | 0 .../jingle}/provider/JingleProviderTest.java | 4 ++-- .../smackx/jingle/ContentNegotiator.java | 4 ++-- .../smackx/jingle/JingleException.java | 2 +- .../smackx/jingle/JingleManager.java | 4 ++-- .../smackx/jingle/JingleSession.java | 4 ++-- .../smackx/jingle/JingleSessionRequest.java | 2 +- .../smackx/jingle/JingleSessionState.java | 2 +- .../jingle/JingleSessionStateActive.java | 4 ++-- .../jingle/JingleSessionStateEnded.java | 4 ++-- .../jingle/JingleSessionStatePending.java | 2 +- .../jingle/JingleSessionStateUnknown.java | 10 ++++----- .../smackx/jingle/media/MediaNegotiator.java | 8 +++---- .../jingle/nat/TransportNegotiator.java | 22 +++++++++---------- .../smackx/{ => jingle}/packet/Jingle.java | 2 +- .../{ => jingle}/packet/JingleContent.java | 2 +- .../packet/JingleContentDescription.java | 2 +- .../packet/JingleContentInfo.java | 2 +- .../packet/JingleDescription.java | 2 +- .../{ => jingle}/packet/JingleError.java | 2 +- .../{ => jingle}/packet/JingleTransport.java | 10 ++++----- .../JingleContentDescriptionProvider.java | 6 ++--- .../provider/JingleContentInfoProvider.java | 4 ++-- .../provider/JingleContentProvider.java | 4 ++-- .../provider/JingleDescriptionProvider.java | 4 ++-- .../{ => jingle}/provider/JingleProvider.java | 4 ++-- .../provider/JingleTransportProvider.java | 6 ++--- .../jivesoftware/smackx/packet/package.html | 1 - .../jivesoftware/smackx/provider/package.html | 1 - 39 files changed, 64 insertions(+), 66 deletions(-) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/JingleManagerTest.java (99%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/JingleMediaTest.java (99%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/JingleSessionTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/JingleSupportTests.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/PayloadTypeTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/nat/BasicResolverTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/nat/BridgedResolverTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/nat/LocalhostTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/nat/STUNResolverTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/nat/TransportCandidateTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx}/jingle/nat/TransportResolverTest.java (100%) rename jingle/src/integration-test/java/org/jivesoftware/{ => smackx/jingle}/provider/JingleProviderTest.java (97%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/Jingle.java (99%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/JingleContent.java (99%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/JingleContentDescription.java (99%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/JingleContentInfo.java (98%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/JingleDescription.java (99%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/JingleError.java (99%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/packet/JingleTransport.java (95%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/provider/JingleContentDescriptionProvider.java (95%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/provider/JingleContentInfoProvider.java (96%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/provider/JingleContentProvider.java (93%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/provider/JingleDescriptionProvider.java (97%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/provider/JingleProvider.java (98%) rename jingle/src/main/java/org/jivesoftware/smackx/{ => jingle}/provider/JingleTransportProvider.java (97%) delete mode 100644 jingle/src/main/java/org/jivesoftware/smackx/packet/package.html delete mode 100644 jingle/src/main/java/org/jivesoftware/smackx/provider/package.html diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/JingleManagerTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java similarity index 99% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/JingleManagerTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java index 36aff9956..d00926f70 100644 --- a/jingle/src/integration-test/java/org/jivesoftware/jingle/JingleManagerTest.java +++ b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java @@ -34,8 +34,8 @@ import org.jivesoftware.smackx.jingle.nat.FixedResolver; import org.jivesoftware.smackx.jingle.nat.FixedTransportManager; import org.jivesoftware.smackx.jingle.nat.RTPBridge; import org.jivesoftware.smackx.jingle.nat.TransportCandidate; -import org.jivesoftware.smackx.packet.Jingle; -import org.jivesoftware.smackx.provider.JingleProvider; +import org.jivesoftware.smackx.jingle.packet.Jingle; +import org.jivesoftware.smackx.jingle.provider.JingleProvider; import java.net.DatagramPacket; import java.net.DatagramSocket; diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/JingleMediaTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java similarity index 99% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/JingleMediaTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java index 3b9ceed02..cdd4eacd8 100644 --- a/jingle/src/integration-test/java/org/jivesoftware/jingle/JingleMediaTest.java +++ b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java @@ -30,7 +30,7 @@ import org.jivesoftware.smackx.jingle.mediaimpl.sshare.ScreenShareMediaManager; import org.jivesoftware.smackx.jingle.nat.BridgedTransportManager; import org.jivesoftware.smackx.jingle.nat.ICETransportManager; import org.jivesoftware.smackx.jingle.nat.STUNTransportManager; -import org.jivesoftware.smackx.packet.JingleError; +import org.jivesoftware.smackx.jingle.packet.JingleError; import javax.media.MediaLocator; import javax.media.format.AudioFormat; diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/JingleSessionTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/JingleSessionTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/JingleSupportTests.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/JingleSupportTests.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/PayloadTypeTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/PayloadTypeTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/nat/LocalhostTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/nat/LocalhostTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/provider/JingleProviderTest.java b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java similarity index 97% rename from jingle/src/integration-test/java/org/jivesoftware/provider/JingleProviderTest.java rename to jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java index 555c6a150..55e4728f8 100644 --- a/jingle/src/integration-test/java/org/jivesoftware/provider/JingleProviderTest.java +++ b/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.SmackConfiguration; @@ -22,7 +22,7 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.test.SmackTestCase; -import org.jivesoftware.smackx.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.Jingle; public class JingleProviderTest extends SmackTestCase { diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java index 178cc292d..1939d2008 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java @@ -30,8 +30,8 @@ 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.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleContent; +import org.jivesoftware.smackx.jingle.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.JingleContent; /** * @author Jeff Williams diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java index 03b8694e9..096e45074 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java @@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jingle; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.packet.JingleError; +import org.jivesoftware.smackx.jingle.packet.JingleError; /** * A Jingle exception. diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java index 92c1a8a9d..91959d9eb 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java @@ -42,9 +42,9 @@ 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.disco.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.Jingle; -import org.jivesoftware.smackx.provider.JingleProvider; /** * Jingle is a session establishment protocol defined in (XEP-0166). diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java index 42d97034f..024463540 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java @@ -45,8 +45,8 @@ 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.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleError; +import org.jivesoftware.smackx.jingle.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.JingleError; /** * An abstract Jingle session.

This class contains some basic properties of diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java index bb0aa24fd..6b8e72580 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java @@ -20,7 +20,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.Jingle; /** * A Jingle session request. diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java index 58ebadf89..9adddad0e 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.jingle; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.Jingle; /** * Implement the Jingle Session state using the State Behavioral pattern. diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java index 1482dcb0e..4d8e7a649 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java @@ -18,8 +18,8 @@ package org.jivesoftware.smackx.jingle; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleError; +import org.jivesoftware.smackx.jingle.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.JingleError; /** * @author Jeff Williams diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java index 2485ef706..7e21633ba 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java @@ -19,8 +19,8 @@ package org.jivesoftware.smackx.jingle; import java.util.logging.Logger; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleError; +import org.jivesoftware.smackx.jingle.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.JingleError; /** * @author Jeff Williams diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java index e2cdf1acd..bcc5451bf 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java @@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jingle; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.packet.Jingle; +import org.jivesoftware.smackx.jingle.packet.Jingle; /** * @author Jeff Williams diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java index 27a49c0de..3f5246603 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java @@ -24,11 +24,11 @@ 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.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleContent; -import org.jivesoftware.smackx.packet.JingleDescription; -import org.jivesoftware.smackx.packet.JingleError; -import org.jivesoftware.smackx.packet.JingleTransport; +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; /** * @author Jeff Williams diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java index 28e45e1a4..e3bd28f59 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java @@ -30,10 +30,10 @@ 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.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleContent; -import org.jivesoftware.smackx.packet.JingleDescription; -import org.jivesoftware.smackx.packet.JingleError; +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; /** * Manager for jmf descriptor negotiation.

This class is responsible diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java index 23a210e95..1852a538e 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java @@ -33,10 +33,10 @@ 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.packet.Jingle; -import org.jivesoftware.smackx.packet.JingleContent; -import org.jivesoftware.smackx.packet.JingleTransport; -import org.jivesoftware.smackx.packet.JingleTransport.JingleTransportCandidate; +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; /** * Transport negotiator. @@ -718,7 +718,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.packet.Jingle) + * @see org.jivesoftware.smackx.jingle.JingleNegotiator.State#eventAccept(org.jivesoftware.smackx.jingle.packet.Jingle) */ private IQ receiveContentAcceptAction(Jingle jingle) throws XMPPException { IQ response = null; @@ -812,9 +812,9 @@ public abstract class TransportNegotiator extends JingleNegotiator { /** * Get a TransportNegotiator instance. */ - public org.jivesoftware.smackx.packet.JingleTransport getJingleTransport(TransportCandidate bestRemote) { - org.jivesoftware.smackx.packet.JingleTransport.RawUdp jt = new org.jivesoftware.smackx.packet.JingleTransport.RawUdp(); - jt.addCandidate(new org.jivesoftware.smackx.packet.JingleTransport.RawUdp.Candidate(bestRemote)); + 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)); return jt; } @@ -866,9 +866,9 @@ public abstract class TransportNegotiator extends JingleNegotiator { * * @param candidate */ - public org.jivesoftware.smackx.packet.JingleTransport getJingleTransport(TransportCandidate candidate) { - org.jivesoftware.smackx.packet.JingleTransport.Ice jt = new org.jivesoftware.smackx.packet.JingleTransport.Ice(); - jt.addCandidate(new org.jivesoftware.smackx.packet.JingleTransport.Ice.Candidate(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)); return jt; } diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java similarity index 99% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java index 731882d63..2869ed955 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.jingle.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smackx.jingle.JingleActionEnum; diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java similarity index 99% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java index 1ac4cbac1..270aeb28d 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.packet; +package org.jivesoftware.smackx.jingle.packet; import java.util.ArrayList; import java.util.Collections; diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java similarity index 99% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java index 062f14739..462ff2c33 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.jingle.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smackx.jingle.media.PayloadType; diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java similarity index 98% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java index e0fa376c0..37219688a 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.jingle.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smackx.jingle.media.ContentInfo; diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java similarity index 99% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java index 667cfd740..37b3e908a 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.packet; +package org.jivesoftware.smackx.jingle.packet; import java.util.ArrayList; import java.util.Collections; diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java similarity index 99% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java index 37c4cad30..e4ccca107 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.jingle.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java similarity index 95% rename from jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java index d4eb4fbe0..c1f1711d6 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.jingle.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smackx.jingle.nat.ICECandidate; @@ -276,7 +276,7 @@ public class JingleTransport implements PacketExtension { /** * Add a transport candidate * - * @see org.jivesoftware.smackx.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.packet.JingleTransport.JingleTransportCandidate) + * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.jingle.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.packet.JingleTransport#getCandidates() + * @see org.jivesoftware.smackx.jingle.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.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.packet.JingleTransport.JingleTransportCandidate) + * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#addCandidate(org.jivesoftware.smackx.jingle.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.packet.JingleTransport#getCandidates() + * @see org.jivesoftware.smackx.jingle.packet.JingleTransport#getCandidates() */ public List getCandidatesList() { List copy = new ArrayList(); diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java similarity index 95% rename from jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java index fc5d99b7b..008f5e308 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.provider; +package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smackx.jingle.media.PayloadType; -import org.jivesoftware.smackx.packet.JingleContentDescription; -import org.jivesoftware.smackx.packet.JingleContentDescription.JinglePayloadType; +import org.jivesoftware.smackx.jingle.packet.JingleContentDescription; +import org.jivesoftware.smackx.jingle.packet.JingleContentDescription.JinglePayloadType; import org.xmlpull.v1.XmlPullParser; /** diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java similarity index 96% rename from jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java index b4260e36f..284cdd8e4 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.provider; +package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smackx.jingle.media.ContentInfo; -import org.jivesoftware.smackx.packet.JingleContentInfo; +import org.jivesoftware.smackx.jingle.packet.JingleContentInfo; import org.xmlpull.v1.XmlPullParser; /** diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java similarity index 93% rename from jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java index a6f78e906..439919a40 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.provider; +package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.packet.JingleContent; +import org.jivesoftware.smackx.jingle.packet.JingleContent; import org.xmlpull.v1.XmlPullParser; /** diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java similarity index 97% rename from jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java index dc7f350a6..8db42df4f 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.provider; +package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smackx.jingle.media.PayloadType; -import org.jivesoftware.smackx.packet.JingleDescription; +import org.jivesoftware.smackx.jingle.packet.JingleDescription; import org.xmlpull.v1.XmlPullParser; /** diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java similarity index 98% rename from jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java index 7e6ae5353..aa48a5885 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.jingle.provider; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smackx.jingle.JingleActionEnum; -import org.jivesoftware.smackx.packet.*; +import org.jivesoftware.smackx.jingle.packet.*; import org.xmlpull.v1.XmlPullParser; /** diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java similarity index 97% rename from jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java index b4b7298c5..5051bfce4 100644 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java +++ b/jingle/src/main/java/org/jivesoftware/smackx/jingle/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.provider; +package org.jivesoftware.smackx.jingle.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.packet.JingleTransport; -import org.jivesoftware.smackx.packet.JingleTransport.JingleTransportCandidate; +import org.jivesoftware.smackx.jingle.packet.JingleTransport; +import org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate; import org.xmlpull.v1.XmlPullParser; /** diff --git a/jingle/src/main/java/org/jivesoftware/smackx/packet/package.html b/jingle/src/main/java/org/jivesoftware/smackx/packet/package.html deleted file mode 100644 index 490d1d72d..000000000 --- a/jingle/src/main/java/org/jivesoftware/smackx/packet/package.html +++ /dev/null @@ -1 +0,0 @@ -XML packets that are part of the XMPP extension protocols. \ No newline at end of file diff --git a/jingle/src/main/java/org/jivesoftware/smackx/provider/package.html b/jingle/src/main/java/org/jivesoftware/smackx/provider/package.html deleted file mode 100644 index 962ba6372..000000000 --- a/jingle/src/main/java/org/jivesoftware/smackx/provider/package.html +++ /dev/null @@ -1 +0,0 @@ -Provides pluggable parsing logic for Smack extensions. \ No newline at end of file