AMQP-26 removed the 'otp' package

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;
 

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;
 

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.

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.

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;
 

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

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;

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;

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;

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;

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

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;
 

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;

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.
 	 * <p>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 <code>ex</code>
-	 * @see org.springframework.otp.erlang.support.ErlangUtils#convertOtpAccessException
+	 * @see org.springframework.erlang.support.ErlangUtils#convertOtpAccessException
 	 */
 	protected OtpException convertOtpAccessException(Exception ex) {
 		return ErlangUtils.convertOtpAccessException(ex);

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.

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;

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;

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

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;
 

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;