vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed smack-jingle to smack-jingle-old 

Also renamed package name from

org.jivesoftware.smackx.jingle

to

org.jivesoftware.smackx.jingleold
This commit is contained in:
Florian Schmaus 2014-08-20 00:25:57 +02:00
parent 6ab2bf9fe0
commit f65c0d5528
128 changed files with 300 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings.gradle
View File

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

0
smack-jingle/build.gradle → smack-jingle-old/build.gradle
View File

0
smack-jingle/libs/Speex.jar → smack-jingle-old/libs/Speex.jar
View File

0
smack-jingle/libs/jspeex-0.9.7-jfcom.jar → smack-jingle-old/libs/jspeex-0.9.7-jfcom.jar
View File

0
smack-jingle/libs/jstun.jar → smack-jingle-old/libs/jstun.jar
View File

0
smack-jingle/libs/mac/0JavaSoundStream.fix.mac.jar → smack-jingle-old/libs/mac/0JavaSoundStream.fix.mac.jar
View File

0
smack-jingle/libs/mac/0jmf.mac.jar → smack-jingle-old/libs/mac/0jmf.mac.jar
View File

0
smack-jingle/libs/windows/jmacm.dll → smack-jingle-old/libs/windows/jmacm.dll
View File

0
smack-jingle/libs/windows/jmam.dll → smack-jingle-old/libs/windows/jmam.dll
View File

0
smack-jingle/libs/windows/jmcvid.dll → smack-jingle-old/libs/windows/jmcvid.dll
View File

0
smack-jingle/libs/windows/jmdaud.dll → smack-jingle-old/libs/windows/jmdaud.dll
View File

0
smack-jingle/libs/windows/jmdaudc.dll → smack-jingle-old/libs/windows/jmdaudc.dll
View File

0
smack-jingle/libs/windows/jmddraw.dll → smack-jingle-old/libs/windows/jmddraw.dll
View File

0
smack-jingle/libs/windows/jmfjawt.dll → smack-jingle-old/libs/windows/jmfjawt.dll
View File

0
smack-jingle/libs/windows/jmg723.dll → smack-jingle-old/libs/windows/jmg723.dll
View File

0
smack-jingle/libs/windows/jmgdi.dll → smack-jingle-old/libs/windows/jmgdi.dll
View File

0
smack-jingle/libs/windows/jmgsm.dll → smack-jingle-old/libs/windows/jmgsm.dll
View File

0
smack-jingle/libs/windows/jmh263enc.dll → smack-jingle-old/libs/windows/jmh263enc.dll
View File

0
smack-jingle/libs/windows/jmjpeg.dll → smack-jingle-old/libs/windows/jmjpeg.dll
View File

0
smack-jingle/libs/windows/jmmci.dll → smack-jingle-old/libs/windows/jmmci.dll
View File

0
smack-jingle/libs/windows/jmmpa.dll → smack-jingle-old/libs/windows/jmmpa.dll
View File

0
smack-jingle/libs/windows/jmmpegv.dll → smack-jingle-old/libs/windows/jmmpegv.dll
View File

0
smack-jingle/libs/windows/jmutil.dll → smack-jingle-old/libs/windows/jmutil.dll
View File

0
smack-jingle/libs/windows/jmvcm.dll → smack-jingle-old/libs/windows/jmvcm.dll
View File

0
smack-jingle/libs/windows/jmvfw.dll → smack-jingle-old/libs/windows/jmvfw.dll
View File

0
smack-jingle/libs/windows/jmvh263.dll → smack-jingle-old/libs/windows/jmvh263.dll
View File

0
smack-jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java → smack-jingle-old/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
View File

0
smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java → smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java
View File

0
smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java → smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java
View File

0
smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java → smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java
View File

0
smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java → smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java
View File

0
smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java → smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java
View File

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

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

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

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

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

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

0
smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java → smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java
View File

0
smack-jingle/src/integration-test/resources/test-case.xml → smack-jingle-old/src/integration-test/resources/test-case.xml
View File

24
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/ContentNegotiator.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.jingle; package org.jivesoftware.smackx.jingleold;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -23,17 +23,17 @@ import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
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.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.MediaNegotiator; import org.jivesoftware.smackx.jingleold.media.MediaNegotiator;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import org.jivesoftware.smackx.jingle.nat.TransportNegotiator; import org.jivesoftware.smackx.jingleold.nat.TransportNegotiator;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.packet.JingleContent; import org.jivesoftware.smackx.jingleold.packet.JingleContent;
/** /**
* @author Jeff Williams * @author Jeff Williams

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleActionEnum.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.jingle; package org.jivesoftware.smackx.jingleold;
/** /**
* The "action" in the jingle packet, as an enum. * The "action" in the jingle packet, as an enum.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleException.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.jingle; package org.jivesoftware.smackx.jingleold;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.packet.JingleError; import org.jivesoftware.smackx.jingleold.packet.JingleError;
/** /**
* A Jingle exception. * A Jingle exception.

24
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.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.jingle; package org.jivesoftware.smackx.jingleold;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -34,17 +34,17 @@ import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.provider.ProviderManager;
import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.CreatedJingleSessionListener;
import org.jivesoftware.smackx.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
import org.jivesoftware.smackx.jingle.listeners.JingleSessionRequestListener; import org.jivesoftware.smackx.jingleold.listeners.JingleSessionRequestListener;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.BasicTransportManager; import org.jivesoftware.smackx.jingleold.nat.BasicTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import org.jivesoftware.smackx.jingle.nat.TransportResolver; import org.jivesoftware.smackx.jingleold.nat.TransportResolver;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.provider.JingleProvider; import org.jivesoftware.smackx.jingleold.provider.JingleProvider;
import org.jxmpp.util.XmppStringUtils; import org.jxmpp.util.XmppStringUtils;
/** /**

8
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.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.jingle; package org.jivesoftware.smackx.jingleold;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -24,7 +24,7 @@ import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
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.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
/** /**
* Basic Jingle negotiator. * Basic Jingle negotiator.
@ -166,7 +166,7 @@ public abstract class JingleNegotiator {
* Add a Jingle session listener to listen to incoming session requests. * Add a Jingle session listener to listen to incoming session requests.
* *
* @param li The listener * @param li The listener
* @see org.jivesoftware.smackx.jingle.listeners.JingleListener * @see org.jivesoftware.smackx.jingleold.listeners.JingleListener
*/ */
public void addListener(JingleListener li) { public void addListener(JingleListener li) {
synchronized (listeners) { synchronized (listeners) {
@ -178,7 +178,7 @@ public abstract class JingleNegotiator {
* Removes a Jingle session listener. * Removes a Jingle session listener.
* *
* @param li The jingle session listener to be removed * @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) { public void removeListener(JingleListener li) {
synchronized (listeners) { synchronized (listeners) {

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiatorState.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.jingle; package org.jivesoftware.smackx.jingleold;
/** /**
* @author Jeff Williams * @author Jeff Williams

32
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.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.jingle; package org.jivesoftware.smackx.jingleold;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; 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.Packet;
import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smackx.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
import org.jivesoftware.smackx.jingle.listeners.JingleMediaListener; import org.jivesoftware.smackx.jingleold.listeners.JingleMediaListener;
import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
import org.jivesoftware.smackx.jingle.listeners.JingleTransportListener; import org.jivesoftware.smackx.jingleold.listeners.JingleTransportListener;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.MediaNegotiator; import org.jivesoftware.smackx.jingleold.media.MediaNegotiator;
import org.jivesoftware.smackx.jingle.media.MediaReceivedListener; import org.jivesoftware.smackx.jingleold.media.MediaReceivedListener;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import org.jivesoftware.smackx.jingle.nat.TransportNegotiator; import org.jivesoftware.smackx.jingleold.nat.TransportNegotiator;
import org.jivesoftware.smackx.jingle.nat.TransportResolver; import org.jivesoftware.smackx.jingleold.nat.TransportResolver;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.packet.JingleError; import org.jivesoftware.smackx.jingleold.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

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.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.jingle; package org.jivesoftware.smackx.jingleold;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
/** /**
* A Jingle session request. * A Jingle session request.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionState.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.jingle; package org.jivesoftware.smackx.jingleold;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.packet.IQ; 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. * Implement the Jingle Session state using the State Behavioral pattern.

6
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateActive.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.jingle; package org.jivesoftware.smackx.jingleold;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.packet.JingleError; import org.jivesoftware.smackx.jingleold.packet.JingleError;
/** /**
* @author Jeff Williams * @author Jeff Williams

6
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateEnded.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.jingle; package org.jivesoftware.smackx.jingleold;
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.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.packet.JingleError; import org.jivesoftware.smackx.jingleold.packet.JingleError;
/** /**
* @author Jeff Williams * @author Jeff Williams

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStatePending.java
View File

@ -14,10 +14,10 @@
* 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.jingle; package org.jivesoftware.smackx.jingleold;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
/** /**
* @author Jeff Williams * @author Jeff Williams

24
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionStateUnknown.java
View File

@ -14,22 +14,22 @@
* 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.jingle; package org.jivesoftware.smackx.jingleold;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
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.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.MediaNegotiator; import org.jivesoftware.smackx.jingleold.media.MediaNegotiator;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportNegotiator; import org.jivesoftware.smackx.jingleold.nat.TransportNegotiator;
import org.jivesoftware.smackx.jingle.nat.TransportResolver; import org.jivesoftware.smackx.jingleold.nat.TransportResolver;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.packet.JingleContent; import org.jivesoftware.smackx.jingleold.packet.JingleContent;
import org.jivesoftware.smackx.jingle.packet.JingleDescription; import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
import org.jivesoftware.smackx.jingle.packet.JingleError; import org.jivesoftware.smackx.jingleold.packet.JingleError;
import org.jivesoftware.smackx.jingle.packet.JingleTransport; import org.jivesoftware.smackx.jingleold.packet.JingleTransport;
/** /**
* @author Jeff Williams * @author Jeff Williams

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/CreatedJingleSessionListener.java
View File

@ -14,9 +14,9 @@
* 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.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. * Inteface used to dispatch a event when a Jingle session is created.

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleListener.java
View File

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

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaInfoListener.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.jingle.listeners; package org.jivesoftware.smackx.jingleold.listeners;
/** /**
* Interface for listening to jmf info events. * Interface for listening to jmf info events.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleMediaListener.java
View File

@ -15,10 +15,10 @@
* limitations under the License. * 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.SmackException.NotConnectedException;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
/** /**
* Interface for listening to jmf events. * Interface for listening to jmf events.

8
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionListener.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.jingle.listeners; package org.jivesoftware.smackx.jingleold.listeners;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* Interface for listening for session events. * Interface for listening for session events.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleSessionRequestListener.java
View File

@ -14,9 +14,9 @@
* 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.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. * Interface to listener Jingle session requests.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/listeners/JingleTransportListener.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.jingle.listeners; package org.jivesoftware.smackx.jingleold.listeners;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPException; 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. * Interface for listening to transport events.

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/ContentInfo.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.jingle.media; package org.jivesoftware.smackx.jingleold.media;
import java.util.Locale; import java.util.Locale;

8
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaManager.java
View File

@ -15,11 +15,11 @@
* limitations under the License. * 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.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import java.util.List; import java.util.List;

6
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/JingleMediaSession.java
View File

@ -14,10 +14,10 @@
* 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.jingle.media; package org.jivesoftware.smackx.jingleold.media;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

26
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.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.jingle.media; package org.jivesoftware.smackx.jingleold.media;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -23,18 +23,18 @@ import java.util.logging.Logger;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
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.jingle.ContentNegotiator; import org.jivesoftware.smackx.jingleold.ContentNegotiator;
import org.jivesoftware.smackx.jingle.JingleActionEnum; import org.jivesoftware.smackx.jingleold.JingleActionEnum;
import org.jivesoftware.smackx.jingle.JingleException; import org.jivesoftware.smackx.jingleold.JingleException;
import org.jivesoftware.smackx.jingle.JingleNegotiator; import org.jivesoftware.smackx.jingleold.JingleNegotiator;
import org.jivesoftware.smackx.jingle.JingleNegotiatorState; import org.jivesoftware.smackx.jingleold.JingleNegotiatorState;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.listeners.JingleListener; import org.jivesoftware.smackx.jingleold.listeners.JingleListener;
import org.jivesoftware.smackx.jingle.listeners.JingleMediaListener; import org.jivesoftware.smackx.jingleold.listeners.JingleMediaListener;
import org.jivesoftware.smackx.jingle.packet.Jingle; import org.jivesoftware.smackx.jingleold.packet.Jingle;
import org.jivesoftware.smackx.jingle.packet.JingleContent; import org.jivesoftware.smackx.jingleold.packet.JingleContent;
import org.jivesoftware.smackx.jingle.packet.JingleDescription; import org.jivesoftware.smackx.jingleold.packet.JingleDescription;
import org.jivesoftware.smackx.jingle.packet.JingleError; import org.jivesoftware.smackx.jingleold.packet.JingleError;
/** /**
* Manager for jmf descriptor negotiation. <p/> <p/> This class is responsible * Manager for jmf descriptor negotiation. <p/> <p/> This class is responsible

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaReceivedListener.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.jingle.media; package org.jivesoftware.smackx.jingleold.media;
/** /**
* Listener for new Incoming Media Streams * Listener for new Incoming Media Streams

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/PayloadType.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.jingle.media; package org.jivesoftware.smackx.jingleold.media;
/** /**
* Represents a payload type. * Represents a payload type.

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/JMFInit.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.jingle.mediaimpl; package org.jivesoftware.smackx.jingleold.mediaimpl;
import java.awt.Frame; import java.awt.Frame;
import java.awt.TextArea; import java.awt.TextArea;

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.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.jingle.mediaimpl.jmf; package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
@ -46,7 +46,7 @@ import javax.media.rtp.RTPManager;
import javax.media.rtp.SendStream; import javax.media.rtp.SendStream;
import javax.media.rtp.SessionAddress; 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. * An Easy to use Audio Channel implemented using JMF.

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

@ -14,9 +14,9 @@
* 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.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; import javax.media.format.AudioFormat;

10
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.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.jingle.mediaimpl.jmf; package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
import java.io.IOException; import java.io.IOException;
import java.net.ServerSocket; import java.net.ServerSocket;
@ -22,10 +22,10 @@ import java.util.logging.Logger;
import javax.media.MediaLocator; import javax.media.MediaLocator;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* This Class implements a complete JingleMediaSession. * This Class implements a complete JingleMediaSession.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioReceiver.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.jingle.mediaimpl.jmf; package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
import java.util.logging.Logger; 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.SessionEvent;
import javax.media.rtp.event.StreamMappedEvent; 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 * This class implements receive methods and listeners to be used in AudioChannel

16
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/JmfMediaManager.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.jingle.mediaimpl.jmf; package org.jivesoftware.smackx.jingleold.mediaimpl.jmf;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -22,13 +22,13 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.mediaimpl.JMFInit; import org.jivesoftware.smackx.jingleold.mediaimpl.JMFInit;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* Implements a jingleMediaManager using JMF based API. * Implements a jingleMediaManager using JMF based API.

10
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.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.jingle.mediaimpl.jspeex; package org.jivesoftware.smackx.jingleold.mediaimpl.jspeex;
import java.io.IOException; import java.io.IOException;
import java.net.DatagramSocket; 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.session.StreamPlayer;
import mil.jfcom.cie.media.srtp.packetizer.SpeexFormat; import mil.jfcom.cie.media.srtp.packetizer.SpeexFormat;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* This Class implements a complete JingleMediaSession. * This Class implements a complete JingleMediaSession.

16
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/SpeexMediaManager.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.jingle.mediaimpl.jspeex; package org.jivesoftware.smackx.jingleold.mediaimpl.jspeex;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -22,13 +22,13 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.mediaimpl.JMFInit; import org.jivesoftware.smackx.jingleold.mediaimpl.JMFInit;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* Implements a jingleMediaManager using JMF based API and JSpeex. * Implements a jingleMediaManager using JMF based API and JSpeex.

14
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/multi/MultiMediaManager.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.jingle.mediaimpl.multi; package org.jivesoftware.smackx.jingleold.mediaimpl.multi;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

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

@ -14,16 +14,16 @@
* 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.jingle.mediaimpl.sshare; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageDecoder; import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageDecoder;
import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageEncoder; import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageEncoder;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

18
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.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.jingle.mediaimpl.sshare; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
@ -29,14 +29,14 @@ import java.util.logging.Logger;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JPanel; import javax.swing.JPanel;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageDecoder; import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageDecoder;
import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageEncoder; import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageEncoder;
import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageReceiver; import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageReceiver;
import org.jivesoftware.smackx.jingle.mediaimpl.sshare.api.ImageTransmitter; import org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api.ImageTransmitter;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* This Class implements a complete JingleMediaSession. * This Class implements a complete JingleMediaSession.

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/AbstractBufferedImageOp.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.RenderingHints; import java.awt.RenderingHints;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultDecoder.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/DefaultEncoder.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageDecoder.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageEncoder.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageReceiver.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.Canvas; import java.awt.Canvas;
import java.awt.Graphics; import java.awt.Graphics;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/ImageTransmitter.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.AWTException; import java.awt.AWTException;
import java.awt.Rectangle; import java.awt.Rectangle;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/OctTreeQuantizer.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.Vector; import java.util.Vector;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/PixelUtils.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.Color; import java.awt.Color;
import java.util.Random; import java.util.Random;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/QuantizeFilter.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.Rectangle; import java.awt.Rectangle;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/Quantizer.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
/** /**
* The interface for an image quantizer. The addColor method is called (repeatedly * The interface for an image quantizer. The addColor method is called (repeatedly

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/api/WholeImageFilter.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.jingle.mediaimpl.sshare.api; package org.jivesoftware.smackx.jingleold.mediaimpl.sshare.api;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;

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

@ -14,17 +14,17 @@
* 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.jingle.mediaimpl.test; package org.jivesoftware.smackx.jingleold.mediaimpl.test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaManager; import org.jivesoftware.smackx.jingleold.media.JingleMediaManager;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingleold.nat.JingleTransportManager;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* Implements a MediaManager for test purposes. * Implements a MediaManager for test purposes.

10
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/test/TestMediaSession.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.jingle.mediaimpl.test; package org.jivesoftware.smackx.jingleold.mediaimpl.test;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.media.JingleMediaSession; import org.jivesoftware.smackx.jingleold.media.JingleMediaSession;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
import org.jivesoftware.smackx.jingle.nat.TransportCandidate; import org.jivesoftware.smackx.jingleold.nat.TransportCandidate;
/** /**
* This Class implements a complete JingleMediaSession for unit testing. * This Class implements a complete JingleMediaSession for unit testing.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicResolver.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BasicTransportManager.java
View File

@ -14,9 +14,9 @@
* 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.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. * A Basic Jingle Transport Manager implementation.

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedResolver.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.XMPPException.XMPPErrorException; 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.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;

10
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/BridgedTransportManager.java
View File

@ -14,15 +14,15 @@
* 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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.CreatedJingleSessionListener;
import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
/** /**
* A Jingle Transport Manager implementation to be used for NAT Networks. * A Jingle Transport Manager implementation to be used for NAT Networks.

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import java.net.DatagramPacket; import java.net.DatagramPacket;

4
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedResolver.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotConnectedException;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
/** /**
* The FixedResolver is a resolver where * The FixedResolver is a resolver where

10
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/FixedTransportManager.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.jingle.JingleSession; import org.jivesoftware.smackx.jingleold.JingleSession;
import org.jivesoftware.smackx.jingle.listeners.CreatedJingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.CreatedJingleSessionListener;
import org.jivesoftware.smackx.jingle.listeners.JingleSessionListener; import org.jivesoftware.smackx.jingleold.listeners.JingleSessionListener;
import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingleold.media.PayloadType;
/** /**
* A Fixed Jingle Transport Manager implementation. * A Fixed Jingle Transport Manager implementation.

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/HttpServer.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

2
smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java → smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/ICECandidate.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.jingle.nat; package org.jivesoftware.smackx.jingleold.nat;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;

Some files were not shown because too many files have changed in this diff Show More