Spring/spring-amqp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQP-26 removed the 'otp' package

Browse Source
This commit is contained in:
Mark Fisher
2010-07-16 10:39:09 -04:00
parent bade5f60f9
commit f02c0d72a0
28 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-amqp</artifactId>
<name>Spring AMQP</name>
<name>Spring AMQP Project</name>
<version>1.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>

2
spring-amqp-core/pom.xml
View File

@@ -9,7 +9,7 @@
</parent>
<artifactId>spring-amqp-core</artifactId>
<packaging>jar</packaging>
<name>Spring AMQP Core</name>
<name>Spring AMQP Abstraction Layer</name>
<dependencies>
<!-- Spring -->
<dependency>

2
spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangBadRpcException.java → spring-erlang/src/main/java/org/springframework/erlang/ErlangBadRpcException.java
View File

@@ -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;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/ErlangErrorRpcException.java → spring-erlang/src/main/java/org/springframework/erlang/ErlangErrorRpcException.java
View File

@@ -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;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/OtpAuthException.java → spring-erlang/src/main/java/org/springframework/erlang/OtpAuthException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.otp.erlang;
package org.springframework.erlang;
/**
* Runtime exception mirroring the OTP OtpAuthException.

2
spring-erlang/src/main/java/org/springframework/otp/erlang/OtpException.java → spring-erlang/src/main/java/org/springframework/erlang/OtpException.java
View File

@@ -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.

2
spring-erlang/src/main/java/org/springframework/otp/erlang/OtpIOException.java → spring-erlang/src/main/java/org/springframework/erlang/OtpIOException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.otp.erlang;
package org.springframework.erlang;
import java.io.IOException;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/UncategorizedOtpException.java → spring-erlang/src/main/java/org/springframework/erlang/UncategorizedOtpException.java
View File

@@ -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

2
spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactory.java → spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactory.java
View File

@@ -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;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionFactoryUtils.java → spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionFactoryUtils.java
View File

@@ -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;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/connection/ConnectionParameters.java → spring-erlang/src/main/java/org/springframework/erlang/connection/ConnectionParameters.java
View File

@@ -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;

4
spring-erlang/src/main/java/org/springframework/otp/erlang/connection/SimpleConnectionFactory.java → spring-erlang/src/main/java/org/springframework/erlang/connection/SimpleConnectionFactory.java
View File

@@ -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;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/core/Application.java → spring-erlang/src/main/java/org/springframework/erlang/core/Application.java
View File

@@ -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

2
spring-erlang/src/main/java/org/springframework/otp/erlang/core/ConnectionCallback.java → spring-erlang/src/main/java/org/springframework/erlang/core/ConnectionCallback.java
View File

@@ -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;

6
spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangOperations.java → spring-erlang/src/main/java/org/springframework/erlang/core/ErlangOperations.java
View File

@@ -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;

24
spring-erlang/src/main/java/org/springframework/otp/erlang/core/ErlangTemplate.java → spring-erlang/src/main/java/org/springframework/erlang/core/ErlangTemplate.java
View File

@@ -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);

2
spring-erlang/src/main/java/org/springframework/otp/erlang/core/Node.java → spring-erlang/src/main/java/org/springframework/erlang/core/Node.java
View File

@@ -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.

6
spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangAccessor.java → spring-erlang/src/main/java/org/springframework/erlang/support/ErlangAccessor.java
View File

@@ -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;

8
spring-erlang/src/main/java/org/springframework/otp/erlang/support/ErlangUtils.java → spring-erlang/src/main/java/org/springframework/erlang/support/ErlangUtils.java
View File

@@ -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;

4
spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConversionException.java → spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConversionException.java
View File

@@ -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

2
spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/ErlangConverter.java → spring-erlang/src/main/java/org/springframework/erlang/support/converter/ErlangConverter.java
View File

@@ -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;

2
spring-erlang/src/main/java/org/springframework/otp/erlang/support/converter/SimpleErlangConverter.java → spring-erlang/src/main/java/org/springframework/erlang/support/converter/SimpleErlangConverter.java
View File

@@ -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;

6
spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdmin.java
View File

@@ -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();

10
spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitControlErlangConverter.java
View File

@@ -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;

4
spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/admin/RabbitStatus.java
View File

@@ -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

2
spring-rabbit-admin/src/main/java/org/springframework/amqp/rabbit/test/RabbitTestExecutionListener.java
View File

@@ -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;

4
spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/JInterfaceIntegrationTests.java
View File

@@ -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;

2
spring-rabbit-admin/src/test/java/org/springframework/amqp/rabbit/admin/RabbitBrokerAdminIntegrationTests.java
View File

@@ -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