Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 16:22:06 +01:00
Code Issues Releases Wiki Activity

Move Jingle packet and provider under smackx.jingle

Browse source 
The Jingle integration-tests where also accidentally not within the
smackx package.
This commit is contained in:
Florian Schmaus 2014-03-03 11:31:06 +01:00
parent 84a3fd7bd9
commit 14b43581dc
39 changed files with 64 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jingle/src/integration-test/java/org/jivesoftware/jingle/JingleManagerTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java
View file

@ -34,8 +34,8 @@ import org.jivesoftware.smackx.jingle.nat.FixedResolver;
import org.jivesoftware.smackx.jingle.nat.FixedTransportManager; import org.jivesoftware.smackx.jingle.nat.FixedTransportManager;
import org.jivesoftware.smackx.jingle.nat.RTPBridge; import org.jivesoftware.smackx.jingle.nat.RTPBridge;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.provider.JingleProvider; import org.jivesoftware.smackx.jingle.provider.JingleProvider;
import java.net.DatagramPacket; import java.net.DatagramPacket;
import java.net.DatagramSocket; import java.net.DatagramSocket;

2
jingle/src/integration-test/java/org/jivesoftware/jingle/JingleMediaTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java
View file

@ -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.BridgedTransportManager;
import org.jivesoftware.smackx.jingle.nat.ICETransportManager; import org.jivesoftware.smackx.jingle.nat.ICETransportManager;
import org.jivesoftware.smackx.jingle.nat.STUNTransportManager; 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.MediaLocator;
import javax.media.format.AudioFormat; import javax.media.format.AudioFormat;

0
jingle/src/integration-test/java/org/jivesoftware/jingle/JingleSessionTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/JingleSupportTests.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/PayloadTypeTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/nat/LocalhostTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java
View file

0
jingle/src/integration-test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java
View file

4
jingle/src/integration-test/java/org/jivesoftware/provider/JingleProviderTest.java → jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java
View file

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smackx.provider; package org.jivesoftware.smackx.jingle.provider;
import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.SmackConfiguration; 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.IQProvider;
import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.provider.ProviderManager;
import org.jivesoftware.smack.test.SmackTestCase; import org.jivesoftware.smack.test.SmackTestCase;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
public class JingleProviderTest extends SmackTestCase { public class JingleProviderTest extends SmackTestCase {

4
jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java
View file

@ -30,8 +30,8 @@ import org.jivesoftware.smackx.jingle.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
import org.jivesoftware.smackx.jingle.nat.TransportNegotiator; import org.jivesoftware.smackx.jingle.nat.TransportNegotiator;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleContent; import org.jivesoftware.smackx.jingle.packet.JingleContent;
/** /**
* @author Jeff Williams * @author Jeff Williams

2
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java
View file

@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jingle;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.packet.JingleError; import org.jivesoftware.smackx.jingle.packet.JingleError;
/** /**
* A Jingle exception. * A Jingle exception.

4
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
View file

@ -42,9 +42,9 @@ import org.jivesoftware.smackx.jingle.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.BasicTransportManager; import org.jivesoftware.smackx.jingle.nat.BasicTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
import org.jivesoftware.smackx.jingle.nat.TransportResolver; 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.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). * Jingle is a session establishment protocol defined in (XEP-0166).

4
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
View file

@ -45,8 +45,8 @@ import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
import org.jivesoftware.smackx.jingle.nat.TransportNegotiator; import org.jivesoftware.smackx.jingle.nat.TransportNegotiator;
import org.jivesoftware.smackx.jingle.nat.TransportResolver; import org.jivesoftware.smackx.jingle.nat.TransportResolver;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleError; import org.jivesoftware.smackx.jingle.packet.JingleError;
/** /**
* An abstract Jingle session. <p/> This class contains some basic properties of * An abstract Jingle session. <p/> This class contains some basic properties of

2
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
View file

@ -20,7 +20,7 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
/** /**
* A Jingle session request. * A Jingle session request.

2
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smackx.jingle; package org.jivesoftware.smackx.jingle;
import org.jivesoftware.smack.packet.IQ; 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. * Implement the Jingle Session state using the State Behavioral pattern.

4
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
View file

@ -18,8 +18,8 @@ package org.jivesoftware.smackx.jingle;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleError; import org.jivesoftware.smackx.jingle.packet.JingleError;
/** /**
* @author Jeff Williams * @author Jeff Williams

4
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
View file

@ -19,8 +19,8 @@ package org.jivesoftware.smackx.jingle;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleError; import org.jivesoftware.smackx.jingle.packet.JingleError;
/** /**
* @author Jeff Williams * @author Jeff Williams

2
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
View file

@ -18,7 +18,7 @@ package org.jivesoftware.smackx.jingle;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
/** /**
* @author Jeff Williams * @author Jeff Williams

10
jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
View file

@ -24,11 +24,11 @@ import org.jivesoftware.smackx.jingle.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportNegotiator; import org.jivesoftware.smackx.jingle.nat.TransportNegotiator;
import org.jivesoftware.smackx.jingle.nat.TransportResolver; import org.jivesoftware.smackx.jingle.nat.TransportResolver;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleContent; import org.jivesoftware.smackx.jingle.packet.JingleContent;
import org.jivesoftware.smackx.packet.JingleDescription; import org.jivesoftware.smackx.jingle.packet.JingleDescription;
import org.jivesoftware.smackx.packet.JingleError; import org.jivesoftware.smackx.jingle.packet.JingleError;
import org.jivesoftware.smackx.packet.JingleTransport; import org.jivesoftware.smackx.jingle.packet.JingleTransport;
/** /**
* @author Jeff Williams * @author Jeff Williams

8
jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
View file

@ -30,10 +30,10 @@ import org.jivesoftware.smackx.jingle.JingleNegotiatorState;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingle.JingleSession;
import org.jivesoftware.smackx.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingle.listeners.JingleListener;
import org.jivesoftware.smackx.jingle.listeners.JingleMediaListener; import org.jivesoftware.smackx.jingle.listeners.JingleMediaListener;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleContent; import org.jivesoftware.smackx.jingle.packet.JingleContent;
import org.jivesoftware.smackx.packet.JingleDescription; import org.jivesoftware.smackx.jingle.packet.JingleDescription;
import org.jivesoftware.smackx.packet.JingleError; import org.jivesoftware.smackx.jingle.packet.JingleError;
/** /**
* Manager for jmf descriptor negotiation. <p/> <p/> This class is responsible * Manager for jmf descriptor negotiation. <p/> <p/> This class is responsible

22
jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
View file

@ -33,10 +33,10 @@ import org.jivesoftware.smackx.jingle.JingleNegotiatorState;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingle.JingleSession;
import org.jivesoftware.smackx.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingle.listeners.JingleListener;
import org.jivesoftware.smackx.jingle.listeners.JingleTransportListener; import org.jivesoftware.smackx.jingle.listeners.JingleTransportListener;
import org.jivesoftware.smackx.packet.Jingle; import org.jivesoftware.smackx.jingle.packet.Jingle;
import org.jivesoftware.smackx.packet.JingleContent; import org.jivesoftware.smackx.jingle.packet.JingleContent;
import org.jivesoftware.smackx.packet.JingleTransport; import org.jivesoftware.smackx.jingle.packet.JingleTransport;
import org.jivesoftware.smackx.packet.JingleTransport.JingleTransportCandidate; import org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate;
/** /**
* Transport negotiator. * Transport negotiator.
@ -718,7 +718,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
* @param jin The input packet * @param jin The input packet
* @return a Jingle packet * @return a Jingle packet
* @throws XMPPException an exception * @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 { private IQ receiveContentAcceptAction(Jingle jingle) throws XMPPException {
IQ response = null; IQ response = null;
@ -812,9 +812,9 @@ public abstract class TransportNegotiator extends JingleNegotiator {
/** /**
* Get a TransportNegotiator instance. * Get a TransportNegotiator instance.
*/ */
public org.jivesoftware.smackx.packet.JingleTransport getJingleTransport(TransportCandidate bestRemote) { public org.jivesoftware.smackx.jingle.packet.JingleTransport getJingleTransport(TransportCandidate bestRemote) {
org.jivesoftware.smackx.packet.JingleTransport.RawUdp jt = new org.jivesoftware.smackx.packet.JingleTransport.RawUdp(); org.jivesoftware.smackx.jingle.packet.JingleTransport.RawUdp jt = new org.jivesoftware.smackx.jingle.packet.JingleTransport.RawUdp();
jt.addCandidate(new org.jivesoftware.smackx.packet.JingleTransport.RawUdp.Candidate(bestRemote)); jt.addCandidate(new org.jivesoftware.smackx.jingle.packet.JingleTransport.RawUdp.Candidate(bestRemote));
return jt; return jt;
} }
@ -866,9 +866,9 @@ public abstract class TransportNegotiator extends JingleNegotiator {
* *
* @param candidate * @param candidate
*/ */
public org.jivesoftware.smackx.packet.JingleTransport getJingleTransport(TransportCandidate candidate) { public org.jivesoftware.smackx.jingle.packet.JingleTransport getJingleTransport(TransportCandidate candidate) {
org.jivesoftware.smackx.packet.JingleTransport.Ice jt = new org.jivesoftware.smackx.packet.JingleTransport.Ice(); org.jivesoftware.smackx.jingle.packet.JingleTransport.Ice jt = new org.jivesoftware.smackx.jingle.packet.JingleTransport.Ice();
jt.addCandidate(new org.jivesoftware.smackx.packet.JingleTransport.Ice.Candidate(candidate)); jt.addCandidate(new org.jivesoftware.smackx.jingle.packet.JingleTransport.Ice.Candidate(candidate));
return jt; return jt;
} }

2
jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smackx.packet; package org.jivesoftware.smackx.jingle.packet;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.jingle.JingleActionEnum; import org.jivesoftware.smackx.jingle.JingleActionEnum;

2
jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java
View file

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

2
jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingle.media.PayloadType;

2
jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smackx.jingle.media.ContentInfo; import org.jivesoftware.smackx.jingle.media.ContentInfo;

2
jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java
View file

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

2
jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java
View file

@ -15,7 +15,7 @@
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;

10
jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smackx.jingle.nat.ICECandidate; import org.jivesoftware.smackx.jingle.nat.ICECandidate;
@ -276,7 +276,7 @@ public class JingleTransport implements PacketExtension {
/** /**
* Add a transport candidate * 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) { public void addCandidate(final JingleTransportCandidate candidate) {
super.addCandidate(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 * Get the list of candidates. As a "raw-udp" transport can only contain
* one candidate, we use the first in the list... * 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<JingleTransportCandidate> getCandidatesList() { public List<JingleTransportCandidate> getCandidatesList() {
List<JingleTransportCandidate> copy = new ArrayList<JingleTransportCandidate>(); List<JingleTransportCandidate> copy = new ArrayList<JingleTransportCandidate>();
@ -358,7 +358,7 @@ public class JingleTransport implements PacketExtension {
/** /**
* Add a transport candidate * 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) { public void addCandidate(final JingleTransportCandidate candidate) {
candidates.clear(); candidates.clear();
@ -369,7 +369,7 @@ public class JingleTransport implements PacketExtension {
* Get the list of candidates. As a "raw-udp" transport can only contain * Get the list of candidates. As a "raw-udp" transport can only contain
* one candidate, we use the first in the list... * 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<JingleTransportCandidate> getCandidatesList() { public List<JingleTransportCandidate> getCandidatesList() {
List<JingleTransportCandidate> copy = new ArrayList<JingleTransportCandidate>(); List<JingleTransportCandidate> copy = new ArrayList<JingleTransportCandidate>();

6
jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
View file

@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingle.media.PayloadType;
import org.jivesoftware.smackx.packet.JingleContentDescription; import org.jivesoftware.smackx.jingle.packet.JingleContentDescription;
import org.jivesoftware.smackx.packet.JingleContentDescription.JinglePayloadType; import org.jivesoftware.smackx.jingle.packet.JingleContentDescription.JinglePayloadType;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
/** /**

4
jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java
View file

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smackx.jingle.media.ContentInfo; 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; import org.xmlpull.v1.XmlPullParser;
/** /**

4
jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java
View file

@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smackx.packet.JingleContent; import org.jivesoftware.smackx.jingle.packet.JingleContent;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
/** /**

4
jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java
View file

@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smackx.jingle.media.PayloadType; 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; import org.xmlpull.v1.XmlPullParser;
/** /**

4
jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
View file

@ -15,13 +15,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smackx.provider; package org.jivesoftware.smackx.jingle.provider;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smackx.jingle.JingleActionEnum; import org.jivesoftware.smackx.jingle.JingleActionEnum;
import org.jivesoftware.smackx.packet.*; import org.jivesoftware.smackx.jingle.packet.*;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
/** /**

6
jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java → jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java
View file

@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * 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.packet.PacketExtension;
import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smackx.jingle.nat.ICECandidate; import org.jivesoftware.smackx.jingle.nat.ICECandidate;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingle.nat.TransportCandidate;
import org.jivesoftware.smackx.packet.JingleTransport; import org.jivesoftware.smackx.jingle.packet.JingleTransport;
import org.jivesoftware.smackx.packet.JingleTransport.JingleTransportCandidate; import org.jivesoftware.smackx.jingle.packet.JingleTransport.JingleTransportCandidate;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
/** /**

1
jingle/src/main/java/org/jivesoftware/smackx/packet/package.html
View file

@ -1 +0,0 @@
<body>XML packets that are part of the XMPP extension protocols.</body>

1
jingle/src/main/java/org/jivesoftware/smackx/provider/package.html
View file

@ -1 +0,0 @@
<body>Provides pluggable parsing logic for Smack extensions.</body>