diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java
index 6ec35463b..fbd860124 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/JetSecurity.java
@@ -1,10 +1,26 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jet.internal;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smackx.jet.element.JetSecurityElement;
+import org.jivesoftware.smackx.jingle.components.JingleSecurity;
import org.jivesoftware.smackx.jingle.element.JingleContentSecurityInfoElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
-import org.jivesoftware.smackx.jingle.components.JingleSecurity;
/**
* Created by vanitas on 22.07.17.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/package-info.java
new file mode 100644
index 000000000..7e86b0175
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/internal/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-XXXX: Jingle Encrypted Transfers.
+ * Internal classes.
+ */
+package org.jivesoftware.smackx.jet.internal;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/callback/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/callback/package-info.java
new file mode 100644
index 000000000..6b24dd11a
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/callback/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0234: Jingle File Transfer.
+ * Callbacks.
+ */
+package org.jivesoftware.smackx.jft.callback;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/package-info.java
new file mode 100644
index 000000000..aa7743a78
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0234: Jingle File Transfer.
+ * Controller.
+ */
+package org.jivesoftware.smackx.jft.controller;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java
index f09106310..c4601a318 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java
@@ -20,8 +20,8 @@ import java.util.Collections;
import java.util.List;
import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
-import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
+import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
/**
* File element.
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java
index ec8dccbee..82d987dab 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/JingleOutgoingFileOffer.java
@@ -33,7 +33,7 @@ public class JingleOutgoingFileOffer extends AbstractJingleFileOffer
@Override
public void onTransportReady(BytestreamSession bytestreamSession) {
-
+
}
@Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java
index 95ae0a6ec..d639f0c29 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/LocalFile.java
@@ -59,7 +59,7 @@ public class LocalFile extends AbstractJingleFileTransferFile {
@Override
public String getName() {
String path = file.getAbsolutePath();
- return path.substring(path.lastIndexOf(File.pathSeparatorChar)+1);
+ return path.substring(path.lastIndexOf(File.pathSeparatorChar) + 1);
}
@Override
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/package-info.java
new file mode 100644
index 000000000..1ecf1ccf5
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/file/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0234: Jingle File Transfer.
+ * Classes that may represent files.
+ */
+package org.jivesoftware.smackx.jft.internal.file;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/package-info.java
new file mode 100644
index 000000000..769833a43
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/internal/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0234: Jingle File Transfer.
+ * Internal classes.
+ */
+package org.jivesoftware.smackx.jft.internal;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/package-info.java
new file mode 100644
index 000000000..2fb4dffb8
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0234: Jingle File Transfer.
+ * Listeners.
+ */
+package org.jivesoftware.smackx.jft.listener;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/package-info.java
new file mode 100644
index 000000000..50b2857d2
--- /dev/null
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0234: Jingle File Transfer.
+ */
+package org.jivesoftware.smackx.jft;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java
index 2681f0af4..7f1542563 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java
@@ -23,13 +23,14 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
-import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jft.element.ChecksumElement;
import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jft.element.Range;
+import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.xmlpull.v1.XmlPullParser;
+
/**
* Provider for the Checksum element.
*/
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java
index 180e12c72..045fa475f 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java
@@ -24,12 +24,12 @@ import java.util.ArrayList;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smackx.hashes.element.HashElement;
import org.jivesoftware.smackx.hashes.provider.HashElementProvider;
+import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
+import org.jivesoftware.smackx.jft.element.JingleFileTransferElement;
+import org.jivesoftware.smackx.jft.element.Range;
import org.jivesoftware.smackx.jft.internal.JingleFileTransfer;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement;
import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider;
-import org.jivesoftware.smackx.jft.element.JingleFileTransferElement;
-import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
-import org.jivesoftware.smackx.jft.element.Range;
import org.jxmpp.util.XmppDateTime;
import org.xmlpull.v1.XmlPullParser;
diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java
index 3a6dee704..3f3e84fc1 100644
--- a/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java
+++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java
@@ -22,11 +22,11 @@ import org.jivesoftware.smack.test.util.SmackTestSuite;
import org.jivesoftware.smack.test.util.TestUtils;
import org.jivesoftware.smackx.hashes.HashManager;
import org.jivesoftware.smackx.hashes.element.HashElement;
-import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jft.element.ChecksumElement;
import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement;
import org.jivesoftware.smackx.jft.element.Range;
import org.jivesoftware.smackx.jft.provider.ChecksumProvider;
+import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.junit.Test;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
index 5a5e8db2c..9d25b5c4d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.jivesoftware.smack.Manager;
import org.jivesoftware.smack.XMPPConnection;
@@ -33,13 +35,13 @@ import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter;
import org.jivesoftware.smackx.jingle.adapter.JingleSecurityAdapter;
import org.jivesoftware.smackx.jingle.adapter.JingleTransportAdapter;
+import org.jivesoftware.smackx.jingle.components.JingleSession;
import org.jivesoftware.smackx.jingle.element.JingleAction;
import org.jivesoftware.smackx.jingle.element.JingleElement;
import org.jivesoftware.smackx.jingle.element.JingleReasonElement;
import org.jivesoftware.smackx.jingle.exception.UnsupportedDescriptionException;
import org.jivesoftware.smackx.jingle.exception.UnsupportedSecurityException;
import org.jivesoftware.smackx.jingle.exception.UnsupportedTransportException;
-import org.jivesoftware.smackx.jingle.components.JingleSession;
import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider;
import org.jivesoftware.smackx.jingle.provider.JingleContentSecurityProvider;
import org.jivesoftware.smackx.jingle.provider.JingleContentTransportProvider;
@@ -51,7 +53,8 @@ import org.jxmpp.jid.FullJid;
/**
* Manager for Jingle (XEP-0166).
*/
-public class JingleManager extends Manager {
+public final class JingleManager extends Manager {
+ private static final Logger LOGGER = Logger.getLogger(JingleManager.class.getName());
private static final WeakHashMap INSTANCES = new WeakHashMap<>();
private static final WeakHashMap> descriptionProviders = new WeakHashMap<>();
@@ -101,7 +104,7 @@ public class JingleManager extends Manager {
return JingleElement.createSessionTerminate(jingle.getFrom().asFullJidOrThrow(),
jingle.getSid(), JingleReasonElement.Reason.unsupported_transports);
} catch (UnsupportedSecurityException e) {
- e.printStackTrace();
+ LOGGER.log(Level.SEVERE, "Unsupported Security: " + e, e);
return null;
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java
index a4e40dea3..fe197afda 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleDescriptionAdapter.java
@@ -16,8 +16,8 @@
*/
package org.jivesoftware.smackx.jingle.adapter;
-import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
import org.jivesoftware.smackx.jingle.components.JingleDescription;
+import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
/**
* Adapter that creates a Description object from an element.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java
index 5c8c0d354..a7fe5bb6a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleSecurityAdapter.java
@@ -16,8 +16,8 @@
*/
package org.jivesoftware.smackx.jingle.adapter;
-import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement;
import org.jivesoftware.smackx.jingle.components.JingleSecurity;
+import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement;
/**
* Adapter that creates a Security object from an element.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java
index c27901e3b..f5f8c6f2d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/JingleTransportAdapter.java
@@ -16,8 +16,8 @@
*/
package org.jivesoftware.smackx.jingle.adapter;
-import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.components.JingleTransport;
+import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
/**
* Adapter that creates a Transport element from an element.
@@ -27,4 +27,4 @@ public interface JingleTransportAdapter> {
T transportFromElement(JingleContentTransportElement element);
String getNamespace();
-}
\ No newline at end of file
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/package-info.java
new file mode 100644
index 000000000..672be8d4c
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/adapter/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus, Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0166: Jingle.
+ * Adapters.
+ */
+package org.jivesoftware.smackx.jingle.adapter;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/JingleTransportCallback.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/JingleTransportCallback.java
index 697b24d66..2cb3405e9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/JingleTransportCallback.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/JingleTransportCallback.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jingle.callbacks;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/package-info.java
new file mode 100644
index 000000000..d51d7d3d2
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/callbacks/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus, Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0166: Jingle.
+ * Callbacks.
+ */
+package org.jivesoftware.smackx.jingle.callbacks;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java
index eebe26b34..91dd4c21b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleContent.java
@@ -29,19 +29,19 @@ import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.bytestreams.BytestreamSession;
+import org.jivesoftware.smackx.jingle.Callback;
import org.jivesoftware.smackx.jingle.JingleManager;
+import org.jivesoftware.smackx.jingle.JingleTransportManager;
import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter;
+import org.jivesoftware.smackx.jingle.adapter.JingleSecurityAdapter;
import org.jivesoftware.smackx.jingle.adapter.JingleTransportAdapter;
import org.jivesoftware.smackx.jingle.callbacks.JingleTransportCallback;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
+import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.element.JingleContentSecurityElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
-import org.jivesoftware.smackx.jingle.Callback;
-import org.jivesoftware.smackx.jingle.adapter.JingleSecurityAdapter;
-import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
import org.jivesoftware.smackx.jingle.element.JingleReasonElement;
-import org.jivesoftware.smackx.jingle.JingleTransportManager;
/**
* Internal class that holds the state of a content in a modifiable form.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java
index 035ffaf74..9877ba4f6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/JingleSession.java
@@ -423,4 +423,4 @@ public class JingleSession {
}
return map;
}
-}
\ No newline at end of file
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/package-info.java
new file mode 100644
index 000000000..eb37064f7
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/components/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus, Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0166: Jingle.
+ * Internal components.
+ */
+package org.jivesoftware.smackx.jingle.components;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentSecurityInfoElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentSecurityInfoElement.java
index ae7a8cd99..758ab6333 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentSecurityInfoElement.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentSecurityInfoElement.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jingle.element;
import org.jivesoftware.smack.packet.NamedElement;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/FailedTransportException.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/FailedTransportException.java
index 86eb907ff..fab4e1790 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/FailedTransportException.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/FailedTransportException.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jingle.exception;
/**
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/package-info.java
new file mode 100644
index 000000000..de9d53b55
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/exception/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus, Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0166: Jingle.
+ * Exceptions.
+ */
+package org.jivesoftware.smackx.jingle.exception;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
index 54efceee6..488a17ef5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java
@@ -17,7 +17,6 @@
package org.jivesoftware.smackx.jingle.provider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
-
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
import org.xmlpull.v1.XmlPullParser;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentSecurityProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentSecurityProvider.java
index 09613dc73..83403332e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentSecurityProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentSecurityProvider.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jingle.provider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
index a89c453bb..3e6daae1d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java
@@ -20,14 +20,12 @@ import java.util.logging.Logger;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils;
-
+import org.jivesoftware.smackx.jingle.element.JingleAction;
import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement;
+import org.jivesoftware.smackx.jingle.element.JingleContentElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.element.JingleElement;
-import org.jivesoftware.smackx.jingle.element.JingleContentElement;
-import org.jivesoftware.smackx.jingle.element.JingleAction;
import org.jivesoftware.smackx.jingle.element.JingleReasonElement;
-import org.jivesoftware.smackx.jingle.element.JingleReasonElement.Reason;
import org.jxmpp.jid.FullJid;
import org.xmlpull.v1.XmlPullParser;
@@ -75,7 +73,7 @@ public class JingleProvider extends IQProvider {
String sid = parser.nextText();
reason = new JingleReasonElement.AlternativeSession(sid);
} else {
- reason = new JingleReasonElement(Reason.fromString(reasonString));
+ reason = new JingleReasonElement(JingleReasonElement.Reason.fromString(reasonString));
}
builder.setReason(reason);
break;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java
index 40e6084ec..44b8441bf 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_ibb/JingleIBBTransportManager.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jingle.transport.jingle_ibb;
import java.util.WeakHashMap;
@@ -15,7 +31,7 @@ import org.jivesoftware.smackx.jingle.transport.jingle_ibb.provider.JingleIBBTra
/**
* Created by vanitas on 21.07.17.
*/
-public class JingleIBBTransportManager extends Manager implements JingleTransportManager {
+public final class JingleIBBTransportManager extends Manager implements JingleTransportManager {
public static final short MAX_BLOCKSIZE = 8192;
@@ -62,7 +78,7 @@ public class JingleIBBTransportManager extends Manager implements JingleTranspor
}
@Override
- public int compareTo(JingleTransportManager manager) {
- return Integer.compare(getPriority(), manager.getPriority());
+ public int compareTo(JingleTransportManager other) {
+ return getPriority() > other.getPriority() ? 1 : -1;
}
}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
index 4ef80640d..7835c5ecd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransport.java
@@ -35,13 +35,13 @@ import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.jingle.JingleManager;
import org.jivesoftware.smackx.jingle.callbacks.JingleTransportCallback;
-import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfoElement;
-import org.jivesoftware.smackx.jingle.element.JingleElement;
-import org.jivesoftware.smackx.jingle.exception.FailedTransportException;
import org.jivesoftware.smackx.jingle.components.JingleContent;
import org.jivesoftware.smackx.jingle.components.JingleSession;
import org.jivesoftware.smackx.jingle.components.JingleTransport;
import org.jivesoftware.smackx.jingle.components.JingleTransportCandidate;
+import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfoElement;
+import org.jivesoftware.smackx.jingle.element.JingleElement;
+import org.jivesoftware.smackx.jingle.exception.FailedTransportException;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportInfoElement;
@@ -166,7 +166,7 @@ public class JingleS5BTransport extends JingleTransport other.getPriority() ? 1 : -1;
}
private ConnectionListener connectionListener = new ConnectionListener() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java
index 3a0498668..cd26ba2cb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/S5BTransportException.java
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jivesoftware.smackx.jingle.transport.jingle_s5b;
import org.jivesoftware.smackx.jingle.exception.FailedTransportException;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportElement.java
index 38d0390a9..f53853756 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportElement.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/element/JingleS5BTransportElement.java
@@ -22,8 +22,8 @@ import java.util.List;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
-import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportCandidateElement;
+import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportInfoElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.JingleS5BTransport;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/provider/JingleS5BTransportProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/provider/JingleS5BTransportProvider.java
index f9e04d419..af959b256 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/provider/JingleS5BTransportProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/provider/JingleS5BTransportProvider.java
@@ -30,12 +30,13 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG;
import org.jivesoftware.smackx.jingle.element.JingleContentTransportElement;
import org.jivesoftware.smackx.jingle.provider.JingleContentTransportProvider;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.JingleS5BTransport;
-import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement;
+import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportInfoElement;
import org.xmlpull.v1.XmlPullParser;
+
/**
* Provider for JingleSocks5BytestreamTransport elements.
*/
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/package-info.java
new file mode 100644
index 000000000..068e827fe
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transport/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus, Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0166: Jingle.
+ * Jingle Transport methods.
+ */
+package org.jivesoftware.smackx.jingle.transport;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/util/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/util/package-info.java
new file mode 100644
index 000000000..4be0f057f
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/util/package-info.java
@@ -0,0 +1,22 @@
+/**
+ *
+ * Copyright 2017 Florian Schmaus, Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Smack's API for XEP-0166: Jingle.
+ * Small classes with no real place.
+ */
+package org.jivesoftware.smackx.jingle.util;
diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers
index 9aecd9f68..fc23362a1 100644
--- a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers
+++ b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers
@@ -548,31 +548,31 @@
jingle
urn:xmpp:jingle:1
- org.jivesoftware.smackx.jingle3.provider.JingleProvider
+ org.jivesoftware.smackx.jingle.provider.JingleProvider
out-of-order
urn:xmpp:jingle:errors:1
- org.jivesoftware.smackx.jingle3.provider.JingleErrorProvider
+ org.jivesoftware.smackx.jingle.provider.JingleErrorProvider
unknown-session
urn:xmpp:jingle:errors:1
- org.jivesoftware.smackx.jingle3.provider.JingleErrorProvider
+ org.jivesoftware.smackx.jingle.provider.JingleErrorProvider
unsupported-content
urn:xmpp:jingle:errors:1
- org.jivesoftware.smackx.jingle3.provider.JingleErrorProvider
+ org.jivesoftware.smackx.jingle.provider.JingleErrorProvider
unsupported-transports
urn:xmpp:jingle:errors:1
- org.jivesoftware.smackx.jingle3.provider.JingleErrorProvider
+ org.jivesoftware.smackx.jingle.provider.JingleErrorProvider
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleElementTest.java
index 68306a735..eadb1f911 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleElementTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleElementTest.java
@@ -294,7 +294,7 @@ public class JingleElementTest extends SmackTestSuite {
String jingleXML =
"" +
"" +
"" +
"" +
"";
- String xml = getIQXML(romeo, juliet, transportAccept.getStanzaId(), jingleXML);
+ String xml = getIQXML(juliet, romeo, transportAccept.getStanzaId(), jingleXML);
assertXMLEqual(xml, transportAccept.toXML().toString());
assertEquals(JingleAction.transport_accept, transportAccept.getAction());
assertEquals("transAcc", transportAccept.getSid());
@@ -319,7 +319,7 @@ public class JingleElementTest extends SmackTestSuite {
String jingleXML =
"" +
"" +
"" +
"" +
"";
- String xml = getIQXML(romeo, juliet, transportReplace.getStanzaId(), jingleXML);
+ String xml = getIQXML(juliet, romeo, transportReplace.getStanzaId(), jingleXML);
assertXMLEqual(xml, transportReplace.toXML().toString());
assertEquals(JingleAction.transport_replace, transportReplace.getAction());
assertEquals("transAcc", transportReplace.getSid());
@@ -339,7 +339,6 @@ public class JingleElementTest extends SmackTestSuite {
IQ error = JingleElement.createJingleErrorMalformedRequest(j);
String xml =
"" +
@@ -356,7 +355,6 @@ public class JingleElementTest extends SmackTestSuite {
IQ error = JingleElement.createJingleErrorTieBreak(j);
String xml =
"" +
@@ -374,7 +372,6 @@ public class JingleElementTest extends SmackTestSuite {
IQ error = JingleElement.createJingleErrorUnknownSession(j);
String xml =
"" +
@@ -392,7 +389,6 @@ public class JingleElementTest extends SmackTestSuite {
IQ error = JingleElement.createJingleErrorUnknownInitiator(j);
String xml =
"" +
@@ -409,7 +405,6 @@ public class JingleElementTest extends SmackTestSuite {
IQ error = JingleElement.createJingleErrorOutOfOrder(j);
String xml =
"" +
@@ -428,7 +423,6 @@ public class JingleElementTest extends SmackTestSuite {
IQ error = JingleElement.createJingleErrorUnsupportedInfo(j);
String xml =
"" +
@@ -441,7 +435,7 @@ public class JingleElementTest extends SmackTestSuite {
}
public static String getIQXML(FullJid from, FullJid to, String stanzaId, String jingleXML) {
- return "" +
+ return "" +
jingleXML +
"";
}
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java
index 3170f554e..674aa63fb 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transport/jingle_s5b/JingleS5BTransportTest.java
@@ -23,11 +23,10 @@ import static junit.framework.TestCase.assertNull;
import static junit.framework.TestCase.assertTrue;
import org.jivesoftware.smack.test.util.SmackTestSuite;
-
import org.jivesoftware.smack.test.util.TestUtils;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
-import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportCandidateElement;
+import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.element.JingleS5BTransportInfoElement;
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.provider.JingleS5BTransportProvider;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/package-info.java
index 3e5cc80f9..1a8ef4b05 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/package-info.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/package-info.java
@@ -16,6 +16,6 @@
*/
/**
- * TODO describe me.
+ * Tests for XEP-0234 - Jingle File Transfer.
*/
package org.jivesoftware.smackx.jft;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/package-info.java
new file mode 100644
index 000000000..a990a47b9
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Tests for Jingle.
+ */
+package org.jivesoftware.smackx.jingle;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/JingleIBBTransportTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleIBBTransportTest.java
similarity index 99%
rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/JingleIBBTransportTest.java
rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleIBBTransportTest.java
index e96c650ff..e723eac38 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/JingleIBBTransportTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/JingleIBBTransportTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jivesoftware.smackx.jingle;
+package org.jivesoftware.smackx.jingle.transport;
import static junit.framework.TestCase.fail;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/package-info.java
new file mode 100644
index 000000000..9e855d8d4
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle/transport/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Tests for Tests for different Jingle transport methods.
+ */
+package org.jivesoftware.smackx.jingle.transport;