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

Merge pull request #90 from ghillert/AMQP-302

Browse Source
This commit is contained in:
Gary Russell
2013-03-26 09:56:35 -04:00
parent aac640fff7 0ac827e73a
commit aef99f6f26
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@@ -22,7 +22,12 @@ allprojects {
}
ext {
expandPlaceholders='**/quick-tour.xml'
expandPlaceholders = '**/quick-tour.xml'
javadocLinks = [
"http://docs.oracle.com/javase/6/docs/api",
"http://docs.oracle.com/javaee/6/api",
"http://static.springsource.org/spring/docs/3.1.x/javadoc-api"
] as String[]
}
subprojects { subproject ->
@@ -218,6 +223,8 @@ task api(type: Javadoc) {
options.author = true
options.header = rootProject.description
options.overview = 'src/api/overview.html'
options.links(rootProject.ext.javadocLinks)
source subprojects.collect { project ->
project.sourceSets.main.allJava
}

5
spring-amqp/src/main/java/org/springframework/amqp/core/FederatedExchange.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@ import java.util.Map;
/**
*
* @see AmqpAdmin
* @deprecated RabbitMQ no longer supports 'x-federation' exchanges.
* @deprecated Starting with version 3.0 RabbitMQ no longer supports
* 'x-federation' exchanges.
*
* @author Gary Russell
*/

3
spring-amqp/src/main/java/org/springframework/amqp/support/converter/SimpleMessageConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import org.springframework.amqp.core.MessageProperties;
import org.springframework.amqp.utils.SerializationUtils;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.remoting.rmi.CodebaseAwareObjectInputStream;
import java.rmi.server.RMIClassLoader;
import org.springframework.util.ClassUtils;
/**

2
spring-erlang/src/main/java/org/springframework/erlang/connection/SingleConnectionFactory.java
View File

@@ -229,7 +229,7 @@ public class SingleConnectionFactory implements ConnectionFactory,
classes.add(Connection.class);
return (Connection) Proxy.newProxyInstance(
Connection.class.getClassLoader(),
classes.toArray(new Class[classes.size()]),
classes.toArray(new Class<?>[classes.size()]),
new SharedConnectionInvocationHandler(target));
}

5
spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/FederatedExchangeParser.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
@@ -14,7 +14,6 @@
package org.springframework.amqp.rabbit.config;
import org.springframework.amqp.core.ExchangeTypes;
import org.springframework.amqp.core.FederatedExchange;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -43,7 +42,7 @@ public class FederatedExchangeParser extends AbstractExchangeParser {
@Override
protected Class<?> getBeanClass(Element element) {
return FederatedExchange.class;
return org.springframework.amqp.core.FederatedExchange.class;
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
@@ -190,10 +190,10 @@ public class CachingConnectionFactory extends AbstractConnectionFactory {
getChannelListener().onCreate(targetChannel, transactional);
Class<?>[] interfaces;
if (this.publisherConfirms || this.publisherReturns) {
interfaces = new Class[] { ChannelProxy.class, PublisherCallbackChannel.class };
interfaces = new Class<?>[] { ChannelProxy.class, PublisherCallbackChannel.class };
}
else {
interfaces = new Class[] { ChannelProxy.class };
interfaces = new Class<?>[] { ChannelProxy.class };
}
return (ChannelProxy) Proxy.newProxyInstance(ChannelProxy.class.getClassLoader(),
interfaces, new CachedChannelInvocationHandler(targetChannel, channelList,