From 4d2036b283a1620568b8b9c175cb7ec4edb31e9c Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Mon, 14 Aug 2017 13:58:48 +0200 Subject: [PATCH] Refactoring --- .../jivesoftware/smackx/jet/JetManager.java | 6 ++--- .../JingleFileTransferManager.java | 26 +++++++++---------- .../adapter/JingleFileTransferAdapter.java | 12 ++++----- .../adapter/package-info.java | 2 +- .../component/AbstractJingleFileOffer.java | 2 +- .../component/AbstractJingleFileRequest.java | 2 +- .../component/JingleFileTransfer.java | 8 +++--- .../component/JingleFileTransferFile.java | 4 +-- .../component/JingleIncomingFileOffer.java | 6 ++--- .../component/JingleIncomingFileRequest.java | 8 +++--- .../component/JingleOutgoingFileOffer.java | 4 +-- .../component/JingleOutgoingFileRequest.java | 4 +-- .../component/package-info.java | 2 +- .../IncomingFileOfferController.java | 2 +- .../IncomingFileRequestController.java | 2 +- .../JingleFileTransferController.java | 6 ++--- .../OutgoingFileOfferController.java | 2 +- .../OutgoingFileRequestController.java | 2 +- .../controller/package-info.java | 2 +- .../element/ChecksumElement.java | 4 +-- .../JingleFileTransferChildElement.java | 2 +- .../element/JingleFileTransferElement.java | 4 +-- .../element/Range.java | 2 +- .../element/package-info.java | 2 +- .../listener/IncomingFileOfferListener.java | 4 +-- .../listener/IncomingFileRequestListener.java | 4 +-- .../listener/ProgressListener.java | 2 +- .../listener/package-info.java | 2 +- .../package-info.java | 2 +- .../provider/ChecksumProvider.java | 8 +++--- .../provider/JingleFileTransferProvider.java | 10 +++---- .../provider/package-info.java | 2 +- .../ChecksumTest.java | 10 +++---- .../IncomingFileTransferTest.java | 6 ++--- .../smackx/jet/JetIntegrationTest.java | 10 +++---- .../JingleFileTransferIntegrationTest.java | 10 +++---- ...nsferTransportFallbackIntegrationTest.java | 10 +++---- .../package-info.java | 2 +- 38 files changed, 99 insertions(+), 99 deletions(-) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/JingleFileTransferManager.java (86%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/adapter/JingleFileTransferAdapter.java (83%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/adapter/package-info.java (92%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/AbstractJingleFileOffer.java (93%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/AbstractJingleFileRequest.java (93%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/JingleFileTransfer.java (88%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/JingleFileTransferFile.java (96%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/JingleIncomingFileOffer.java (95%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/JingleIncomingFileRequest.java (84%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/JingleOutgoingFileOffer.java (94%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/JingleOutgoingFileRequest.java (91%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/component/package-info.java (92%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/controller/IncomingFileOfferController.java (94%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/controller/IncomingFileRequestController.java (91%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/controller/JingleFileTransferController.java (80%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/controller/OutgoingFileOfferController.java (91%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/controller/OutgoingFileRequestController.java (91%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/controller/package-info.java (91%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/element/ChecksumElement.java (93%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/element/JingleFileTransferChildElement.java (98%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/element/JingleFileTransferElement.java (90%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/element/Range.java (98%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/element/package-info.java (92%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/listener/IncomingFileOfferListener.java (83%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/listener/IncomingFileRequestListener.java (83%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/listener/ProgressListener.java (92%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/listener/package-info.java (92%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/package-info.java (93%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/provider/ChecksumProvider.java (91%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/provider/JingleFileTransferProvider.java (92%) rename smack-experimental/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/provider/package-info.java (92%) rename smack-experimental/src/test/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/ChecksumTest.java (88%) rename smack-experimental/src/test/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/IncomingFileTransferTest.java (84%) rename smack-integration-test/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/JingleFileTransferIntegrationTest.java (93%) rename smack-integration-test/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/JingleFileTransferTransportFallbackIntegrationTest.java (94%) rename smack-integration-test/src/main/java/org/jivesoftware/smackx/{jft => jingle_filetransfer}/package-info.java (92%) diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java index e3f549bc0..1cf0cddb1 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jet/JetManager.java @@ -29,9 +29,9 @@ import org.jivesoftware.smackx.ciphers.Aes256GcmNoPadding; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.jivesoftware.smackx.jet.component.JetSecurity; import org.jivesoftware.smackx.jet.provider.JetSecurityProvider; -import org.jivesoftware.smackx.jft.JingleFileTransferManager; -import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.JingleFileTransferManager; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleOutgoingFileOffer; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jingle.JingleDescriptionManager; import org.jivesoftware.smackx.jingle.JingleManager; import org.jivesoftware.smackx.jingle.JingleTransportManager; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java similarity index 86% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java index 425f21414..b66539ac9 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer; import java.io.File; import java.io.InputStream; @@ -30,18 +30,18 @@ import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; -import org.jivesoftware.smackx.jft.adapter.JingleFileTransferAdapter; -import org.jivesoftware.smackx.jft.component.JingleFileTransfer; -import org.jivesoftware.smackx.jft.component.JingleFileTransferFile; -import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer; -import org.jivesoftware.smackx.jft.component.JingleIncomingFileRequest; -import org.jivesoftware.smackx.jft.component.JingleOutgoingFileOffer; -import org.jivesoftware.smackx.jft.component.JingleOutgoingFileRequest; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; -import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController; -import org.jivesoftware.smackx.jft.listener.IncomingFileOfferListener; -import org.jivesoftware.smackx.jft.listener.IncomingFileRequestListener; -import org.jivesoftware.smackx.jft.provider.JingleFileTransferProvider; +import org.jivesoftware.smackx.jingle_filetransfer.adapter.JingleFileTransferAdapter; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleFileTransfer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleFileTransferFile; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleIncomingFileOffer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleIncomingFileRequest; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleOutgoingFileOffer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleOutgoingFileRequest; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileRequestController; +import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingFileOfferListener; +import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingFileRequestListener; +import org.jivesoftware.smackx.jingle_filetransfer.provider.JingleFileTransferProvider; import org.jivesoftware.smackx.jingle.JingleDescriptionManager; import org.jivesoftware.smackx.jingle.JingleManager; import org.jivesoftware.smackx.jingle.JingleTransportManager; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/adapter/JingleFileTransferAdapter.java similarity index 83% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/adapter/JingleFileTransferAdapter.java index b18581f28..e1b97b9e5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/JingleFileTransferAdapter.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/adapter/JingleFileTransferAdapter.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.adapter; +package org.jivesoftware.smackx.jingle_filetransfer.adapter; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.packet.NamedElement; -import org.jivesoftware.smackx.jft.component.JingleFileTransfer; -import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer; -import org.jivesoftware.smackx.jft.component.JingleIncomingFileRequest; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleFileTransfer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleIncomingFileOffer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleIncomingFileRequest; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferElement; import org.jivesoftware.smackx.jingle.adapter.JingleDescriptionAdapter; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement; import org.jivesoftware.smackx.jingle.element.JingleContentElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/adapter/package-info.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/adapter/package-info.java index bb55e4942..3cf5e866f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/adapter/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/adapter/package-info.java @@ -19,4 +19,4 @@ * Smack's API for XEP-0234: Jingle File Transfer. * Adapters. */ -package org.jivesoftware.smackx.jft.adapter; +package org.jivesoftware.smackx.jingle_filetransfer.adapter; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java similarity index 93% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java index e851b16ce..4146ca85a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileOffer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; /** * Created by vanitas on 22.07.17. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java similarity index 93% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java index a9c5bd394..f5142d4f5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/AbstractJingleFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/AbstractJingleFileRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; /** * Created by vanitas on 22.07.17. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java similarity index 88% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java index 3ffbe37af..59ad43555 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransfer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransfer.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.jivesoftware.smackx.jft.controller.JingleFileTransferController; -import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; -import org.jivesoftware.smackx.jft.listener.ProgressListener; +import org.jivesoftware.smackx.jingle_filetransfer.controller.JingleFileTransferController; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferElement; +import org.jivesoftware.smackx.jingle_filetransfer.listener.ProgressListener; import org.jivesoftware.smackx.jingle.component.JingleDescription; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransferFile.java similarity index 96% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransferFile.java index 7730b4d44..2a5778dc1 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleFileTransferFile.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleFileTransferFile.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; import java.io.File; import java.util.Date; import org.jivesoftware.smackx.hashes.element.HashElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; /** * Represent a file sent in a file transfer. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleIncomingFileOffer.java similarity index 95% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleIncomingFileOffer.java index 7a4eac609..76b9bd250 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleIncomingFileOffer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; import java.io.File; import java.io.FileOutputStream; @@ -29,8 +29,8 @@ import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; import org.jivesoftware.smackx.jingle.component.JingleSession; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleIncomingFileRequest.java similarity index 84% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleIncomingFileRequest.java index 20c9ad04b..a44fcd788 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleIncomingFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleIncomingFileRequest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.controller.IncomingFileRequestController; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferElement; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileRequestController; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferElement; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleOutgoingFileOffer.java similarity index 94% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleOutgoingFileOffer.java index 53cab1cfd..c1d4b012d 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileOffer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleOutgoingFileOffer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; import java.io.File; import java.io.FileInputStream; @@ -25,7 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileOfferController; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleOutgoingFileRequest.java similarity index 91% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleOutgoingFileRequest.java index 2b3c1211d..74fdb6233 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/JingleOutgoingFileRequest.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/JingleOutgoingFileRequest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.jft.controller.OutgoingFileRequestController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileRequestController; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionInfoElement; import org.jivesoftware.smackx.jingle.element.JingleElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/package-info.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/package-info.java index f06a2d1e8..beda2d84e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/component/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/component/package-info.java @@ -19,4 +19,4 @@ * Smack's API for XEP-0234: Jingle File Transfer. * Internal classes. */ -package org.jivesoftware.smackx.jft.component; +package org.jivesoftware.smackx.jingle_filetransfer.component; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/IncomingFileOfferController.java similarity index 94% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/IncomingFileOfferController.java index 0e090dfab..069c1d771 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileOfferController.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/IncomingFileOfferController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.controller; +package org.jivesoftware.smackx.jingle_filetransfer.controller; import java.io.File; import java.util.concurrent.Future; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileRequestController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/IncomingFileRequestController.java similarity index 91% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileRequestController.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/IncomingFileRequestController.java index 8c5c65264..4d12ffe33 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/IncomingFileRequestController.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/IncomingFileRequestController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.controller; +package org.jivesoftware.smackx.jingle_filetransfer.controller; /** * Created by vanitas on 27.07.17. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/JingleFileTransferController.java similarity index 80% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/JingleFileTransferController.java index 77adaea94..5f0f74602 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/JingleFileTransferController.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/JingleFileTransferController.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.controller; +package org.jivesoftware.smackx.jingle_filetransfer.controller; -import org.jivesoftware.smackx.jft.component.JingleFileTransferFile; -import org.jivesoftware.smackx.jft.listener.ProgressListener; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleFileTransferFile; +import org.jivesoftware.smackx.jingle_filetransfer.listener.ProgressListener; import org.jivesoftware.smackx.jingle.JingleDescriptionController; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/OutgoingFileOfferController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/OutgoingFileOfferController.java similarity index 91% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/OutgoingFileOfferController.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/OutgoingFileOfferController.java index ad49cd33c..b2f86a998 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/OutgoingFileOfferController.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/OutgoingFileOfferController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.controller; +package org.jivesoftware.smackx.jingle_filetransfer.controller; /** * Created by vanitas on 27.07.17. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/OutgoingFileRequestController.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/OutgoingFileRequestController.java similarity index 91% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/OutgoingFileRequestController.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/OutgoingFileRequestController.java index 66da52222..e8aabc7dd 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/OutgoingFileRequestController.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/OutgoingFileRequestController.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.controller; +package org.jivesoftware.smackx.jingle_filetransfer.controller; /** * Created by vanitas on 27.07.17. 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/jingle_filetransfer/controller/package-info.java similarity index 91% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/package-info.java index aa7743a78..b2711989f 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/controller/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/controller/package-info.java @@ -19,4 +19,4 @@ * Smack's API for XEP-0234: Jingle File Transfer. * Controller. */ -package org.jivesoftware.smackx.jft.controller; +package org.jivesoftware.smackx.jingle_filetransfer.controller; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/ChecksumElement.java similarity index 93% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/ChecksumElement.java index 78bbaa5ef..b63aa2da7 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/ChecksumElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/ChecksumElement.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.element; +package org.jivesoftware.smackx.jingle_filetransfer.element; import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jivesoftware.smackx.jft.component.JingleFileTransfer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleFileTransfer; import org.jivesoftware.smackx.jingle.element.JingleContentElement; /** diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferChildElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChildElement.java similarity index 98% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferChildElement.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChildElement.java index 2cbf107e4..8392dd73a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferChildElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChildElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.element; +package org.jivesoftware.smackx.jingle_filetransfer.element; import java.io.File; import java.util.Date; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferElement.java similarity index 90% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferElement.java index 7e2d1de93..d4cbf9ddc 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/JingleFileTransferElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferElement.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.element; +package org.jivesoftware.smackx.jingle_filetransfer.element; import java.util.Collections; import java.util.List; -import org.jivesoftware.smackx.jft.component.JingleFileTransfer; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleFileTransfer; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionElement; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/Range.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java similarity index 98% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/Range.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java index 39138dd5e..811685f9a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/Range.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.element; +package org.jivesoftware.smackx.jingle_filetransfer.element; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.util.XmlStringBuilder; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/package-info.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/package-info.java index 2736a1e31..da2e22582 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/element/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/package-info.java @@ -19,4 +19,4 @@ * Smack's API for XEP-0234: Jingle File Transfer. * Elements. */ -package org.jivesoftware.smackx.jft.element; +package org.jivesoftware.smackx.jingle_filetransfer.element; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/IncomingFileOfferListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/IncomingFileOfferListener.java similarity index 83% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/IncomingFileOfferListener.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/IncomingFileOfferListener.java index e8616a43c..450f753c8 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/IncomingFileOfferListener.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/IncomingFileOfferListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.listener; +package org.jivesoftware.smackx.jingle_filetransfer.listener; -import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileOfferController; /** * Created by vanitas on 26.07.17. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/IncomingFileRequestListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/IncomingFileRequestListener.java similarity index 83% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/IncomingFileRequestListener.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/IncomingFileRequestListener.java index 6928cd29a..19698089b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/IncomingFileRequestListener.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/IncomingFileRequestListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.listener; +package org.jivesoftware.smackx.jingle_filetransfer.listener; -import org.jivesoftware.smackx.jft.controller.IncomingFileRequestController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileRequestController; /** * Created by vanitas on 27.07.17. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/ProgressListener.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/ProgressListener.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/ProgressListener.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/ProgressListener.java index 9fe8d8388..9ef8e2478 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/ProgressListener.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/ProgressListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.listener; +package org.jivesoftware.smackx.jingle_filetransfer.listener; /** * Created by vanitas on 27.07.17. 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/jingle_filetransfer/listener/package-info.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/package-info.java index 2fb4dffb8..438b31b61 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/listener/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/listener/package-info.java @@ -19,4 +19,4 @@ * Smack's API for XEP-0234: Jingle File Transfer. * Listeners. */ -package org.jivesoftware.smackx.jft.listener; +package org.jivesoftware.smackx.jingle_filetransfer.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/jingle_filetransfer/package-info.java similarity index 93% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/package-info.java index 50b2857d2..86fb45ecc 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/package-info.java @@ -18,4 +18,4 @@ /** * Smack's API for XEP-0234: Jingle File Transfer. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java similarity index 91% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java index 7f1542563..ce6464aea 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/ChecksumProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/ChecksumProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.provider; +package org.jivesoftware.smackx.jingle_filetransfer.provider; import static org.xmlpull.v1.XmlPullParser.END_TAG; import static org.xmlpull.v1.XmlPullParser.START_TAG; @@ -23,9 +23,9 @@ 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.jft.element.ChecksumElement; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; -import org.jivesoftware.smackx.jft.element.Range; +import org.jivesoftware.smackx.jingle_filetransfer.element.ChecksumElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.Range; import org.jivesoftware.smackx.jingle.element.JingleContentElement; import org.xmlpull.v1.XmlPullParser; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java index ee46befba..d6b82d626 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/JingleFileTransferProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/JingleFileTransferProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft.provider; +package org.jivesoftware.smackx.jingle_filetransfer.provider; import static org.xmlpull.v1.XmlPullParser.END_TAG; import static org.xmlpull.v1.XmlPullParser.START_TAG; @@ -24,10 +24,10 @@ 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.component.JingleFileTransfer; -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.jingle_filetransfer.component.JingleFileTransfer; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.Range; import org.jivesoftware.smackx.jingle.element.JingleContentDescriptionChildElement; import org.jivesoftware.smackx.jingle.provider.JingleContentDescriptionProvider; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/package-info.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/package-info.java similarity index 92% rename from smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/package-info.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/package-info.java index c0dd9d116..85163fdeb 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jft/provider/package-info.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/provider/package-info.java @@ -19,4 +19,4 @@ * Smack's API for XEP-0234: Jingle File Transfer. * Providers. */ -package org.jivesoftware.smackx.jft.provider; +package org.jivesoftware.smackx.jingle_filetransfer.provider; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/ChecksumTest.java similarity index 88% rename from smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/ChecksumTest.java index 3f3e84fc1..9385c32e1 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/ChecksumTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/ChecksumTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer; import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; @@ -22,10 +22,10 @@ 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.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_filetransfer.element.ChecksumElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.element.Range; +import org.jivesoftware.smackx.jingle_filetransfer.provider.ChecksumProvider; import org.jivesoftware.smackx.jingle.element.JingleContentElement; import org.junit.Test; diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/IncomingFileTransferTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingFileTransferTest.java similarity index 84% rename from smack-experimental/src/test/java/org/jivesoftware/smackx/jft/IncomingFileTransferTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingFileTransferTest.java index 8093e447b..17e14966b 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/jft/IncomingFileTransferTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/jingle_filetransfer/IncomingFileTransferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; @@ -22,8 +22,8 @@ import static junit.framework.TestCase.assertTrue; import java.util.Date; import org.jivesoftware.smack.test.util.SmackTestSuite; -import org.jivesoftware.smackx.jft.component.JingleIncomingFileOffer; -import org.jivesoftware.smackx.jft.element.JingleFileTransferChildElement; +import org.jivesoftware.smackx.jingle_filetransfer.component.JingleIncomingFileOffer; +import org.jivesoftware.smackx.jingle_filetransfer.element.JingleFileTransferChildElement; import org.junit.Test; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jet/JetIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jet/JetIntegrationTest.java index 36c6f48c9..a8a437191 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jet/JetIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jet/JetIntegrationTest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.jet; -import static org.jivesoftware.smackx.jft.JingleFileTransferIntegrationTest.prepareNewTestFile; +import static org.jivesoftware.smackx.jingle_filetransfer.JingleFileTransferIntegrationTest.prepareNewTestFile; import static org.jivesoftware.smackx.omemo.OmemoIntegrationTestHelper.cleanServerSideTraces; import static org.jivesoftware.smackx.omemo.OmemoIntegrationTestHelper.setUpOmemoManager; import static org.jivesoftware.smackx.omemo.OmemoIntegrationTestHelper.subscribe; @@ -29,11 +29,11 @@ import java.util.concurrent.Future; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.jft.JingleFileTransferManager; -import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController; -import org.jivesoftware.smackx.jft.listener.IncomingFileOfferListener; -import org.jivesoftware.smackx.jft.listener.ProgressListener; import org.jivesoftware.smackx.jingle.transport.jingle_ibb.JingleIBBTransportManager; +import org.jivesoftware.smackx.jingle_filetransfer.JingleFileTransferManager; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingFileOfferListener; +import org.jivesoftware.smackx.jingle_filetransfer.listener.ProgressListener; import org.jivesoftware.smackx.omemo.AbstractOmemoIntegrationTest; import org.jivesoftware.smackx.omemo.OmemoManager; import org.jivesoftware.smackx.omemo.OmemoService; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java similarity index 93% rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferIntegrationTest.java rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java index f52ea3179..44e5e92ba 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferIntegrationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer; import static junit.framework.TestCase.fail; import static org.junit.Assert.assertArrayEquals; @@ -30,11 +30,11 @@ import java.util.logging.Level; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy; -import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; -import org.jivesoftware.smackx.jft.listener.IncomingFileOfferListener; -import org.jivesoftware.smackx.jft.listener.ProgressListener; import org.jivesoftware.smackx.jingle.transport.jingle_ibb.JingleIBBTransportManager; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingFileOfferListener; +import org.jivesoftware.smackx.jingle_filetransfer.listener.ProgressListener; import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest; import org.igniterealtime.smack.inttest.SmackIntegrationTest; diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferTransportFallbackIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferTransportFallbackIntegrationTest.java similarity index 94% rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferTransportFallbackIntegrationTest.java rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferTransportFallbackIntegrationTest.java index 159ec07c5..0df4f93a6 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/JingleFileTransferTransportFallbackIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/JingleFileTransferTransportFallbackIntegrationTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer; import static junit.framework.TestCase.fail; import static org.junit.Assert.assertArrayEquals; @@ -30,12 +30,12 @@ import java.util.logging.Level; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy; -import org.jivesoftware.smackx.jft.controller.IncomingFileOfferController; -import org.jivesoftware.smackx.jft.controller.OutgoingFileOfferController; -import org.jivesoftware.smackx.jft.listener.IncomingFileOfferListener; -import org.jivesoftware.smackx.jft.listener.ProgressListener; import org.jivesoftware.smackx.jingle.transport.jingle_ibb.JingleIBBTransportManager; import org.jivesoftware.smackx.jingle.transport.jingle_s5b.JingleS5BTransportManager; +import org.jivesoftware.smackx.jingle_filetransfer.controller.IncomingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.controller.OutgoingFileOfferController; +import org.jivesoftware.smackx.jingle_filetransfer.listener.IncomingFileOfferListener; +import org.jivesoftware.smackx.jingle_filetransfer.listener.ProgressListener; import org.igniterealtime.smack.inttest.AbstractSmackIntegrationTest; import org.igniterealtime.smack.inttest.SmackIntegrationTest; 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/jingle_filetransfer/package-info.java similarity index 92% rename from smack-integration-test/src/main/java/org/jivesoftware/smackx/jft/package-info.java rename to smack-integration-test/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/package-info.java index 1a8ef4b05..1c0d4d68c 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/jingle_filetransfer/package-info.java @@ -18,4 +18,4 @@ /** * Tests for XEP-0234 - Jingle File Transfer. */ -package org.jivesoftware.smackx.jft; +package org.jivesoftware.smackx.jingle_filetransfer;