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

AMQP-105: Added bundlor config to fail on warnings and fixed problems with existing templates

Browse Source
This commit is contained in:
Dave Syer
2011-03-22 17:49:23 +00:00
parent 04f9a88240
commit 92079b5e7f
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-amqp-core/template.mf
View File

@@ -4,6 +4,7 @@ Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
org.springframework.*;version="[3.0.5, 4.0.0)",
org.springframework.amqp.*;version="[1.0.0, 1.1.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
org.codehaus.jackson.*;version="[1.4.3, 2.0.0)";resolution:=optional,
org.w3c.dom.*;version="0",

7
spring-amqp-parent/pom.xml
View File

@@ -62,10 +62,6 @@
<junitArtifactName>junit:junit</junitArtifactName>
</configuration>
</plugin>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</profile>
@@ -403,6 +399,9 @@
</goals>
</execution>
</executions>
<configuration>
<failOnWarnings>true</failOnWarnings>
</configuration>
</plugin>
</plugins>
</pluginManagement>

8
spring-rabbit/pom.xml
View File

@@ -115,4 +115,12 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.springsource.bundlor</groupId>
<artifactId>com.springsource.bundlor.maven</artifactId>
</plugin>
</plugins>
</build>
</project>

4
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
View File

@@ -19,8 +19,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.LinkedList;
import javax.naming.OperationNotSupportedException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.DisposableBean;
@@ -185,7 +183,7 @@ public class CachingConnectionFactory extends SingleConnectionFactory implements
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
String methodName = method.getName();
if (methodName.equals("txSelect") && !this.transactional) {
throw new OperationNotSupportedException("Cannot start transaction on non-transactional channel");
throw new UnsupportedOperationException("Cannot start transaction on non-transactional channel");
}
if (methodName.equals("equals")) {
// Only consider equal when proxies are identical.

5
spring-rabbit/template.mf
View File

@@ -4,8 +4,11 @@ Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
org.springframework.*;version="[3.0.5, 4.0.0)",
org.springframework.amqp.*;version="[1.0.0, 1.1.0)",
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
com.rabbitmq.*;version="[1.8.1, 2.0.0)",
com.rabbitmq.*;version="[2.0.0, 2.2.0)",
org.aopalliance.*;version="0";resolution:=optional,
com.ericsson.otp.erlang;version="0";resolution:=optional,
org.junit.*;version="0",
org.w3c.dom.*;version="0",
javax.xml.*;version="0"