diff --git a/pom.xml b/pom.xml index 04f1e3fc..3e5b6f4a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.amqp spring-amqp - Spring AMQP + Spring AMQP Project 1.0.0.BUILD-SNAPSHOT pom diff --git a/spring-amqp-core/pom.xml b/spring-amqp-core/pom.xml index 022d6488..5c58b985 100644 --- a/spring-amqp-core/pom.xml +++ b/spring-amqp-core/pom.xml @@ -9,7 +9,7 @@ spring-amqp-core jar - Spring AMQP Core + Spring AMQP Abstraction Layer diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java b/spring-erlang/src/main/java/org/springframework/erlang/ErlangBadRpcException.java similarity index 96% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java rename to spring-erlang/src/main/java/org/springframework/erlang/ErlangBadRpcException.java index 1d084348..8c8ecf63 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/ErlangBadRpcException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.otp.erlang; +package org.springframework.erlang; import com.ericsson.otp.erlang.OtpErlangTuple; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java b/spring-erlang/src/main/java/org/springframework/erlang/ErlangErrorRpcException.java similarity index 96% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java rename to spring-erlang/src/main/java/org/springframework/erlang/ErlangErrorRpcException.java index cf28835a..4c0ff139 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/ErlangErrorRpcException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.otp.erlang; +package org.springframework.erlang; import com.ericsson.otp.erlang.OtpErlangTuple; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpAuthException.java b/spring-erlang/src/main/java/org/springframework/erlang/OtpAuthException.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/OtpAuthException.java rename to spring-erlang/src/main/java/org/springframework/erlang/OtpAuthException.java index 765f6ab2..5531406c 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpAuthException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/OtpAuthException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang; +package org.springframework.erlang; /** * Runtime exception mirroring the OTP OtpAuthException. diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpException.java b/spring-erlang/src/main/java/org/springframework/erlang/OtpException.java similarity index 96% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/OtpException.java rename to spring-erlang/src/main/java/org/springframework/erlang/OtpException.java index 6646632e..e9de7955 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/OtpException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang; +package org.springframework.erlang; /** * Base RuntimeException for errors that occur when executing OTP operations. diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpIOException.java b/spring-erlang/src/main/java/org/springframework/erlang/OtpIOException.java similarity index 96% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/OtpIOException.java rename to spring-erlang/src/main/java/org/springframework/erlang/OtpIOException.java index 56ecdeff..7443045f 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/OtpIOException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/OtpIOException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang; +package org.springframework.erlang; import java.io.IOException; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java b/spring-erlang/src/main/java/org/springframework/erlang/UncategorizedOtpException.java similarity index 96% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java rename to spring-erlang/src/main/java/org/springframework/erlang/UncategorizedOtpException.java index c6292027..b6a3310f 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/UncategorizedOtpException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang; +package org.springframework.erlang; /** * A "catch-all" exception type within the OtpException hierarchy diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java b/spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactory.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java rename to spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactory.java index 41db9a92..c4e98d96 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.connection; +package org.springframework.erlang.connection; import java.io.IOException; import java.net.UnknownHostException; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java b/spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactoryUtils.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java rename to spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactoryUtils.java index 57ea26bf..44e3c314 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactoryUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.connection; +package org.springframework.erlang.connection; import org.apache.commons.logging.Log; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java b/spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionParameters.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java rename to spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionParameters.java index 07d9b24e..6a98ede4 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionParameters.java @@ -15,7 +15,7 @@ */ -package org.springframework.otp.erlang.connection; +package org.springframework.erlang.connection; import com.ericsson.otp.erlang.OtpPeer; import com.ericsson.otp.erlang.OtpSelf; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java b/spring-erlang/src/main/java/org/springframework/erlang/connection/SimpleConnectionFactory.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java rename to spring-erlang/src/main/java/org/springframework/erlang/connection/SimpleConnectionFactory.java index ae6c15dc..205071a0 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/connection/SimpleConnectionFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.otp.erlang.connection; +package org.springframework.erlang.connection; import java.io.IOException; import java.net.UnknownHostException; import org.springframework.beans.factory.InitializingBean; -import org.springframework.otp.erlang.OtpIOException; +import org.springframework.erlang.OtpIOException; import org.springframework.util.Assert; import com.ericsson.otp.erlang.OtpAuthException; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/Application.java b/spring-erlang/src/main/java/org/springframework/erlang/core/Application.java similarity index 97% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/core/Application.java rename to spring-erlang/src/main/java/org/springframework/erlang/core/Application.java index 550c6343..21480961 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/Application.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/core/Application.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.core; +package org.springframework.erlang.core; /** * Describes an Erlang application. Only three fields are supported as that is the level diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java b/spring-erlang/src/main/java/org/springframework/erlang/core/ConnectionCallback.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java rename to spring-erlang/src/main/java/org/springframework/erlang/core/ConnectionCallback.java index 6d94521d..1e433bef 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/core/ConnectionCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.core; +package org.springframework.erlang.core; import com.ericsson.otp.erlang.OtpConnection; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java b/spring-erlang/src/main/java/org/springframework/erlang/core/ErlangOperations.java similarity index 89% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java rename to spring-erlang/src/main/java/org/springframework/erlang/core/ErlangOperations.java index 1d62de6e..8742c812 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/core/ErlangOperations.java @@ -15,10 +15,10 @@ */ -package org.springframework.otp.erlang.core; +package org.springframework.erlang.core; -import org.springframework.otp.erlang.OtpException; -import org.springframework.otp.erlang.support.converter.ErlangConverter; +import org.springframework.erlang.OtpException; +import org.springframework.erlang.support.converter.ErlangConverter; import com.ericsson.otp.erlang.OtpErlangList; import com.ericsson.otp.erlang.OtpErlangObject; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java b/spring-erlang/src/main/java/org/springframework/erlang/core/ErlangTemplate.java similarity index 84% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java rename to spring-erlang/src/main/java/org/springframework/erlang/core/ErlangTemplate.java index 5df381f0..f2bfeb96 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/core/ErlangTemplate.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.otp.erlang.core; +package org.springframework.erlang.core; -import org.springframework.otp.erlang.ErlangErrorRpcException; -import org.springframework.otp.erlang.ErlangBadRpcException; -import org.springframework.otp.erlang.OtpException; -import org.springframework.otp.erlang.connection.ConnectionFactory; -import org.springframework.otp.erlang.support.ErlangAccessor; -import org.springframework.otp.erlang.support.ErlangUtils; -import org.springframework.otp.erlang.support.converter.ErlangConverter; -import org.springframework.otp.erlang.support.converter.SimpleErlangConverter; +import org.springframework.erlang.ErlangBadRpcException; +import org.springframework.erlang.ErlangErrorRpcException; +import org.springframework.erlang.OtpException; +import org.springframework.erlang.connection.ConnectionFactory; +import org.springframework.erlang.support.ErlangAccessor; +import org.springframework.erlang.support.ErlangUtils; +import org.springframework.erlang.support.converter.ErlangConverter; +import org.springframework.erlang.support.converter.SimpleErlangConverter; import org.springframework.util.Assert; import com.ericsson.otp.erlang.*; @@ -122,7 +122,7 @@ public class ErlangTemplate extends ErlangAccessor implements ErlangOperations { throw convertOtpAccessException(ex); } finally { - org.springframework.otp.erlang.connection.ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory()); + org.springframework.erlang.connection.ConnectionFactoryUtils.releaseConnection(con, getConnectionFactory()); } @@ -134,10 +134,10 @@ public class ErlangTemplate extends ErlangAccessor implements ErlangOperations { * Convert the specified checked exception to * a Spring runtime exception equivalent. *

The default implementation delegates to the - * {@link org.springframework.otp.erlang.support.ErlangUtils#convertOtpAccessException} method. + * {@link org.springframework.erlang.support.ErlangUtils#convertOtpAccessException} method. * @param ex the original checked {@link Exception} to convert * @return the Spring runtime wrapping ex - * @see org.springframework.otp.erlang.support.ErlangUtils#convertOtpAccessException + * @see org.springframework.erlang.support.ErlangUtils#convertOtpAccessException */ protected OtpException convertOtpAccessException(Exception ex) { return ErlangUtils.convertOtpAccessException(ex); diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/Node.java b/spring-erlang/src/main/java/org/springframework/erlang/core/Node.java similarity index 95% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/core/Node.java rename to spring-erlang/src/main/java/org/springframework/erlang/core/Node.java index e4c5ea17..21ef3203 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/core/Node.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/core/Node.java @@ -17,7 +17,7 @@ /** * Describes an Erlang node. */ -package org.springframework.otp.erlang.core; +package org.springframework.erlang.core; /** * Simple description class for an Erlang node. diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java b/spring-erlang/src/main/java/org/springframework/erlang/support/ErlangAccessor.java similarity index 91% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java rename to spring-erlang/src/main/java/org/springframework/erlang/support/ErlangAccessor.java index 9a7acd4b..1edd2ea9 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/support/ErlangAccessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.support; +package org.springframework.erlang.support; import java.io.IOException; import java.net.UnknownHostException; @@ -23,8 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.otp.erlang.OtpException; -import org.springframework.otp.erlang.connection.ConnectionFactory; +import org.springframework.erlang.OtpException; +import org.springframework.erlang.connection.ConnectionFactory; import com.ericsson.otp.erlang.OtpAuthException; import com.ericsson.otp.erlang.OtpConnection; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java b/spring-erlang/src/main/java/org/springframework/erlang/support/ErlangUtils.java similarity index 85% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java rename to spring-erlang/src/main/java/org/springframework/erlang/support/ErlangUtils.java index daa63835..553277eb 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/support/ErlangUtils.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.otp.erlang.support; +package org.springframework.erlang.support; import java.io.IOException; -import org.springframework.otp.erlang.OtpException; -import org.springframework.otp.erlang.OtpIOException; -import org.springframework.otp.erlang.UncategorizedOtpException; +import org.springframework.erlang.OtpException; +import org.springframework.erlang.OtpIOException; +import org.springframework.erlang.UncategorizedOtpException; import org.springframework.util.Assert; import com.ericsson.otp.erlang.OtpConnection; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java b/spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConversionException.java similarity index 89% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java rename to spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConversionException.java index aa5a6eb4..83ee4382 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConversionException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.otp.erlang.support.converter; +package org.springframework.erlang.support.converter; -import org.springframework.otp.erlang.OtpException; +import org.springframework.erlang.OtpException; /** * @author Mark Pollack diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java b/spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConverter.java similarity index 96% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java rename to spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConverter.java index 9da35f36..d808f33c 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.support.converter; +package org.springframework.erlang.support.converter; import com.ericsson.otp.erlang.OtpErlangObject; diff --git a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java b/spring-erlang/src/main/java/org/springframework/erlang/support/converter/SimpleErlangConverter.java similarity index 99% rename from spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java rename to spring-erlang/src/main/java/org/springframework/erlang/support/converter/SimpleErlangConverter.java index f3263252..29a9e34a 100644 --- a/spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java +++ b/spring-erlang/src/main/java/org/springframework/erlang/support/converter/SimpleErlangConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.otp.erlang.support.converter; +package org.springframework.erlang.support.converter; import java.util.ArrayList; diff --git a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdmin.java b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdmin.java index 5c870053..c5aa2c25 100644 --- a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdmin.java +++ b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdmin.java @@ -31,11 +31,11 @@ import org.springframework.amqp.rabbit.core.ChannelCallback; import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.core.task.SimpleAsyncTaskExecutor; +import org.springframework.erlang.connection.SimpleConnectionFactory; +import org.springframework.erlang.core.ErlangTemplate; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedOperationParameter; import org.springframework.jmx.export.annotation.ManagedOperationParameters; -import org.springframework.otp.erlang.connection.SimpleConnectionFactory; -import org.springframework.otp.erlang.core.ErlangTemplate; import org.springframework.util.Assert; import org.springframework.util.exec.Execute; import org.springframework.util.exec.Os; @@ -308,7 +308,7 @@ public class RabbitBrokerAdmin implements RabbitBrokerOperations { createErlangTemplate(otpCf); } - protected void createErlangTemplate(org.springframework.otp.erlang.connection.ConnectionFactory otpCf) { + protected void createErlangTemplate(org.springframework.erlang.connection.ConnectionFactory otpCf) { erlangTemplate = new ErlangTemplate(otpCf); erlangTemplate.setErlangConverter(new RabbitControlErlangConverter()); erlangTemplate.afterPropertiesSet(); diff --git a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitControlErlangConverter.java b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitControlErlangConverter.java index cc4178e2..34bf34e9 100644 --- a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitControlErlangConverter.java +++ b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitControlErlangConverter.java @@ -25,11 +25,11 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.otp.erlang.core.Application; -import org.springframework.otp.erlang.core.Node; -import org.springframework.otp.erlang.support.converter.ErlangConversionException; -import org.springframework.otp.erlang.support.converter.ErlangConverter; -import org.springframework.otp.erlang.support.converter.SimpleErlangConverter; +import org.springframework.erlang.core.Application; +import org.springframework.erlang.core.Node; +import org.springframework.erlang.support.converter.ErlangConversionException; +import org.springframework.erlang.support.converter.ErlangConverter; +import org.springframework.erlang.support.converter.SimpleErlangConverter; import com.ericsson.otp.erlang.OtpErlangAtom; import com.ericsson.otp.erlang.OtpErlangBinary; diff --git a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitStatus.java b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitStatus.java index 4f934690..4177644c 100644 --- a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitStatus.java +++ b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitStatus.java @@ -18,8 +18,8 @@ package org.springframework.amqp.rabbit.admin; import java.util.List; -import org.springframework.otp.erlang.core.Application; -import org.springframework.otp.erlang.core.Node; +import org.springframework.erlang.core.Application; +import org.springframework.erlang.core.Node; /** * The status object returned from querying the broker diff --git a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/test/RabbitTestExecutionListener.java b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/test/RabbitTestExecutionListener.java index 9a6003b3..786f3e04 100644 --- a/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/test/RabbitTestExecutionListener.java +++ b/spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/test/RabbitTestExecutionListener.java @@ -23,7 +23,7 @@ import org.springframework.amqp.rabbit.admin.RabbitBrokerAdmin; import org.springframework.amqp.rabbit.admin.RabbitStatus; import org.springframework.amqp.rabbit.connection.SingleConnectionFactory; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.otp.erlang.OtpIOException; +import org.springframework.erlang.OtpIOException; import org.springframework.test.context.TestContext; import org.springframework.test.context.support.AbstractTestExecutionListener; import org.springframework.test.context.transaction.TransactionConfiguration; diff --git a/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/JInterfaceIntegrationTests.java b/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/JInterfaceIntegrationTests.java index e917c1fb..9c74bc89 100644 --- a/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/JInterfaceIntegrationTests.java +++ b/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/JInterfaceIntegrationTests.java @@ -7,8 +7,8 @@ import java.net.UnknownHostException; import org.junit.Ignore; import org.junit.Test; -import org.springframework.otp.erlang.connection.SimpleConnectionFactory; -import org.springframework.otp.erlang.core.ErlangTemplate; +import org.springframework.erlang.connection.SimpleConnectionFactory; +import org.springframework.erlang.core.ErlangTemplate; import com.ericsson.otp.erlang.OtpAuthException; import com.ericsson.otp.erlang.OtpConnection; diff --git a/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdminIntegrationTests.java b/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdminIntegrationTests.java index f354a81b..8a304717 100644 --- a/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdminIntegrationTests.java +++ b/spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdminIntegrationTests.java @@ -26,7 +26,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.amqp.rabbit.connection.SingleConnectionFactory; -import org.springframework.otp.erlang.OtpIOException; +import org.springframework.erlang.OtpIOException; /** * @author Mark Pollack