You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/11/10 07:01:14 UTC
svn commit: r712612 - in /activemq/camel/trunk: camel-core/
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/component/direct/
camel-core/src/main/java/org/apache/camel/component/file/
camel-core/src/main/java/org/ap...
Author: hadrian
Date: Sun Nov 9 22:01:12 2008
New Revision: 712612
URL: http://svn.apache.org/viewvc?rev=712612&view=rev
Log:
CAMEL-872. Remove generics on Producer. Part 5, a few more commits left for this issue.
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapProducer.java
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java
activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Sun Nov 9 22:01:12 2008
@@ -137,6 +137,7 @@
<excludes>
<!-- TODO FIXME ASAP -->
<exclude>**/XXXTest.*</exclude>
+ <exclude>**/DataSetSedaTest.*</exclude>
</excludes>
</configuration>
</plugin>
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Endpoint.java Sun Nov 9 22:01:12 2008
@@ -76,7 +76,7 @@
*
* @return a newly created producer
*/
- Producer<E> createProducer() throws Exception;
+ Producer createProducer() throws Exception;
/**
* Creates a new <a
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Producer.java Sun Nov 9 22:01:12 2008
@@ -22,9 +22,9 @@
*
* @version $Revision$
*/
-public interface Producer<E extends Exchange> extends Processor, Service {
+public interface Producer extends Processor, Service {
- Endpoint<E> getEndpoint();
+ Endpoint getEndpoint();
/**
* Creates a new exchange to send to this endpoint
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectEndpoint.java Sun Nov 9 22:01:12 2008
@@ -44,7 +44,7 @@
super(endpointUri);
}
- public Producer<E> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new DirectProducer<E>(this);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java Sun Nov 9 22:01:12 2008
@@ -84,9 +84,8 @@
public FileEndpoint() {
}
- public Producer<FileExchange> createProducer() throws Exception {
- Producer<FileExchange> result = new FileProducer(this);
- return result;
+ public Producer createProducer() throws Exception {
+ return new FileProducer(this);
}
public Consumer createConsumer(Processor processor) throws Exception {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java Sun Nov 9 22:01:12 2008
@@ -25,6 +25,7 @@
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
+import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Message;
@@ -52,7 +53,7 @@
/**
* @deprecated will be removed in Camel 2.0.
*/
- public FileEndpoint getEndpoint() {
+ public Endpoint getEndpoint() {
return endpoint;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXEndpoint.java Sun Nov 9 22:01:12 2008
@@ -56,7 +56,7 @@
super(endpointUri);
}
- public Producer<JMXExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
throw new UnsupportedOperationException("Producer not supported");
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/list/ListEndpoint.java Sun Nov 9 22:01:12 2008
@@ -78,7 +78,7 @@
propertyChangeSupport.removePropertyChangeListener(listener);
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new DefaultProducer<Exchange>(this) {
public void process(Exchange exchange) throws Exception {
onExchange(exchange);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Sun Nov 9 22:01:12 2008
@@ -166,7 +166,7 @@
throw new UnsupportedOperationException("You cannot consume from this endpoint");
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new DefaultProducer<Exchange>(this) {
public void process(Exchange exchange) {
onExchange(exchange);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerEndpoint.java Sun Nov 9 22:01:12 2008
@@ -55,7 +55,7 @@
super(endpointUri);
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
throw new RuntimeCamelException("Cannot produce to a TimerEndpoint: " + getEndpointUri());
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducer.java Sun Nov 9 22:01:12 2008
@@ -26,7 +26,7 @@
*
* @version $Revision$
*/
-public abstract class DefaultProducer<E extends Exchange> extends ServiceSupport implements Producer<E> {
+public abstract class DefaultProducer<E extends Exchange> extends ServiceSupport implements Producer {
private Endpoint<E> endpoint;
public DefaultProducer(Endpoint<E> endpoint) {
@@ -38,7 +38,7 @@
return "Producer[" + endpoint.getEndpointUri() + "]";
}
- public Endpoint<E> getEndpoint() {
+ public Endpoint getEndpoint() {
return endpoint;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultProducerTemplate.java Sun Nov 9 22:01:12 2008
@@ -212,7 +212,7 @@
// Properties
// -----------------------------------------------------------------------
- public Producer<E> getProducer(Endpoint<E> endpoint) {
+ public Producer getProducer(Endpoint<E> endpoint) {
return producerCache.getProducer(endpoint);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProcessorEndpoint.java Sun Nov 9 22:01:12 2008
@@ -60,7 +60,7 @@
super(endpointUri, component);
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new DefaultProducer<Exchange>(this) {
public void process(Exchange exchange) throws Exception {
onExchange(exchange);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ProducerCache.java Sun Nov 9 22:01:12 2008
@@ -42,11 +42,11 @@
public class ProducerCache<E extends Exchange> extends ServiceSupport {
private static final transient Log LOG = LogFactory.getLog(ProducerCache.class);
- private Map<String, Producer<E>> producers = new HashMap<String, Producer<E>>();
+ private Map<String, Producer> producers = new HashMap<String, Producer>();
- public synchronized Producer<E> getProducer(Endpoint<E> endpoint) {
+ public synchronized Producer getProducer(Endpoint<E> endpoint) {
String key = endpoint.getEndpointUri();
- Producer<E> answer = producers.get(key);
+ Producer answer = producers.get(key);
if (answer == null) {
try {
answer = endpoint.createProducer();
@@ -67,7 +67,7 @@
*/
public void send(Endpoint<E> endpoint, E exchange) {
try {
- Producer<E> producer = getProducer(endpoint);
+ Producer producer = getProducer(endpoint);
producer.process(exchange);
} catch (Exception e) {
throw wrapRuntimeCamelException(e);
@@ -83,7 +83,7 @@
*/
public E send(Endpoint<E> endpoint, Processor processor) {
try {
- Producer<E> producer = getProducer(endpoint);
+ Producer producer = getProducer(endpoint);
E exchange = (E) producer.createExchange();
return sendExchange(endpoint, producer, processor, exchange);
} catch (Exception e) {
@@ -101,7 +101,7 @@
*/
public E send(Endpoint<E> endpoint, Processor processor, AsyncCallback callback) {
try {
- Producer<E> producer = getProducer(endpoint);
+ Producer producer = getProducer(endpoint);
E exchange = (E) producer.createExchange();
boolean sync = sendExchange(endpoint, producer, processor, exchange, callback);
setProcessedSync(exchange, sync);
@@ -131,7 +131,7 @@
*/
public E send(Endpoint<E> endpoint, ExchangePattern pattern, Processor processor) {
try {
- Producer<E> producer = getProducer(endpoint);
+ Producer producer = getProducer(endpoint);
E exchange = (E) producer.createExchange(pattern);
return sendExchange(endpoint, producer, processor, exchange);
} catch (Exception e) {
@@ -140,7 +140,7 @@
}
- protected E sendExchange(Endpoint<E> endpoint, Producer<E> producer, Processor processor, E exchange) throws Exception {
+ protected E sendExchange(Endpoint<E> endpoint, Producer producer, Processor processor, E exchange) throws Exception {
// lets populate using the processor callback
processor.process(exchange);
@@ -152,7 +152,7 @@
return exchange;
}
- protected boolean sendExchange(Endpoint<E> endpoint, Producer<E> producer, Processor processor, E exchange, AsyncCallback callback) throws Exception {
+ protected boolean sendExchange(Endpoint<E> endpoint, Producer producer, Processor processor, E exchange, AsyncCallback callback) throws Exception {
// lets populate using the processor callback
processor.process(exchange);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Sun Nov 9 22:01:12 2008
@@ -68,7 +68,7 @@
while (iter.hasNext()) {
Object recipient = iter.next();
Endpoint<Exchange> endpoint = resolveEndpoint(exchange, recipient);
- Producer<Exchange> producer = producerCache.getProducer(endpoint);
+ Producer producer = producerCache.getProducer(endpoint);
processors.add(producer);
}
MulticastProcessor mp = new MulticastProcessor(processors, new UseLatestAggregationStrategy());
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Sun Nov 9 22:01:12 2008
@@ -69,7 +69,7 @@
for (String nextRecipient : recipients) {
Endpoint<Exchange> endpoint = resolveEndpoint(exchange, nextRecipient);
- Producer<Exchange> producer = producerCache.getProducer(endpoint);
+ Producer producer = producerCache.getProducer(endpoint);
Exchange ex = current.newInstance();
updateRoutingSlip(current);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java Sun Nov 9 22:01:12 2008
@@ -51,5 +51,4 @@
}
};
}
-
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/direct/DirectRouteTest.java Sun Nov 9 22:01:12 2008
@@ -57,7 +57,7 @@
Exchange exchange = endpoint.createExchange();
exchange.getIn().setHeader("cheese", 123);
- Producer<Exchange> producer = endpoint.createProducer();
+ Producer producer = endpoint.createProducer();
producer.process(exchange);
// now lets sleep for a while
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaRouteTest.java Sun Nov 9 22:01:12 2008
@@ -60,7 +60,7 @@
Exchange exchange = endpoint.createExchange();
exchange.getIn().setHeader("cheese", 123);
- Producer<Exchange> producer = endpoint.createProducer();
+ Producer producer = endpoint.createProducer();
producer.process(exchange);
// now lets sleep for a while
@@ -89,7 +89,6 @@
}
});
-
context.start();
// now lets fire in a message
@@ -97,7 +96,7 @@
Exchange exchange = endpoint.createExchange();
exchange.getIn().setHeader("cheese", 123);
- Producer<Exchange> producer = endpoint.createProducer();
+ Producer producer = endpoint.createProducer();
producer.process(exchange);
// now lets sleep for a while
@@ -106,5 +105,4 @@
context.stop();
}
-
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ProducerTest.java Sun Nov 9 22:01:12 2008
@@ -50,7 +50,7 @@
return new MyExchange(getCamelContext(), pattern);
}
- public Producer<MyExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return null;
}
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEndpoint.java Sun Nov 9 22:01:12 2008
@@ -66,7 +66,7 @@
return true;
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
throw new UnsupportedOperationException("AtomProducer is not implemented");
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Sun Nov 9 22:01:12 2008
@@ -71,7 +71,7 @@
}
}
- public Producer<CxfExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new CxfProducer(this);
}
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapProducer.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSoapProducer.java Sun Nov 9 22:01:12 2008
@@ -22,6 +22,7 @@
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
+import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
@@ -92,7 +93,7 @@
}
- public org.apache.camel.Endpoint getEndpoint() {
+ public Endpoint getEndpoint() {
return producer.getEndpoint();
}
Modified: activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java Sun Nov 9 22:01:12 2008
@@ -59,7 +59,7 @@
return true;
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new FlatpackProducer(this);
}
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Sun Nov 9 22:01:12 2008
@@ -61,7 +61,7 @@
this.httpConnectionManager = httpConnectionManager;
}
- public Producer<HttpExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new HttpProducer(this);
}
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java Sun Nov 9 22:01:12 2008
@@ -46,7 +46,7 @@
/**
* @version $Revision$
*/
-public class HttpProducer extends DefaultProducer<HttpExchange> implements Producer<HttpExchange> {
+public class HttpProducer extends DefaultProducer<HttpExchange> {
public static final String HTTP_URI = "http.uri";
public static final String HTTP_RESPONSE_CODE = "http.responseCode";
public static final String QUERY = "org.apache.camel.component.http.query";
Modified: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java (original)
+++ activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisProducer.java Sun Nov 9 22:01:12 2008
@@ -19,6 +19,7 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
@@ -40,7 +41,7 @@
}
@Override
- public IBatisEndpoint getEndpoint() {
+ public Endpoint getEndpoint() {
return (IBatisEndpoint) super.getEndpoint();
}
Modified: activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrEndpoint.java Sun Nov 9 22:01:12 2008
@@ -75,7 +75,7 @@
/**
* Creates a new {@link Producer}
*/
- public Producer<DefaultExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new JcrProducer(this);
}
Modified: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcEndpoint.java Sun Nov 9 22:01:12 2008
@@ -56,7 +56,7 @@
throw new RuntimeCamelException("A JDBC Consumer would be the server side of database! No such support here");
}
- public Producer<DefaultExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new JdbcProducer(this, remaining, readSize);
}
Modified: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java Sun Nov 9 22:01:12 2008
@@ -25,7 +25,6 @@
import org.apache.camel.Producer;
import org.apache.camel.component.http.HttpConsumer;
import org.apache.camel.component.http.HttpEndpoint;
-import org.apache.camel.component.http.HttpExchange;
import org.apache.camel.component.http.HttpPollingConsumer;
import org.apache.commons.httpclient.HttpConnectionManager;
@@ -42,7 +41,7 @@
}
@Override
- public Producer<HttpExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return super.createProducer();
}
Modified: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java (original)
+++ activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java Sun Nov 9 22:01:12 2008
@@ -42,7 +42,7 @@
/**
* @deprecated use org.apache.camel.component.http.HttpProducer instead. Will be removed in Camel 2.0.
*/
-public class JettyHttpProducer extends DefaultProducer<HttpExchange> implements Producer<HttpExchange>, AsyncProcessor {
+public class JettyHttpProducer extends DefaultProducer<HttpExchange> implements Producer, AsyncProcessor {
private final class CamelContentExchange extends ContentExchange {
Modified: activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcEndpoint.java Sun Nov 9 22:01:12 2008
@@ -94,7 +94,7 @@
return true;
}
- public Producer<JhcExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new JhcProducer(this);
}
Modified: activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java (original)
+++ activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcProducer.java Sun Nov 9 22:01:12 2008
@@ -28,6 +28,7 @@
import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
+import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.impl.DefaultProducer;
Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java Sun Nov 9 22:01:12 2008
@@ -64,7 +64,7 @@
super(endpointUri);
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
validate();
return new JpaProducer(this, getProducerExpression());
}
Modified: activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400DataQueueEndpoint.java Sun Nov 9 22:01:12 2008
@@ -87,7 +87,7 @@
return new Jt400DataQueueConsumer(this);
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new Jt400DataQueueProducer(this);
}
Modified: activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapEndpoint.java Sun Nov 9 22:01:12 2008
@@ -56,7 +56,7 @@
throw new RuntimeCamelException("An LDAP Consumer would be the LDAP server itself! No such support here");
}
- public Producer<E> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new LdapProducer(this, remaining, base, toSearchControlScope(scope));
}
Modified: activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java Sun Nov 9 22:01:12 2008
@@ -51,7 +51,7 @@
this(endpointUri, new MailConfiguration());
}
- public Producer<MailExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
JavaMailSender sender = configuration.createJavaMailSender();
return createProducer(sender);
}
@@ -59,7 +59,7 @@
/**
* Creates a producer using the given sender
*/
- public Producer<MailExchange> createProducer(JavaMailSender sender) throws Exception {
+ public Producer createProducer(JavaMailSender sender) throws Exception {
return new MailProducer(this, sender);
}
Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java Sun Nov 9 22:01:12 2008
@@ -70,9 +70,7 @@
this.sync = sync;
}
-
- @SuppressWarnings({"unchecked"})
- public Producer<MinaExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new MinaProducer(this);
}
Modified: activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java Sun Nov 9 22:01:12 2008
@@ -132,7 +132,7 @@
return new QuartzExchange(getCamelContext(), getExchangePattern(), jobExecutionContext);
}
- public Producer<QuartzExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
throw new UnsupportedOperationException("You cannot send messages to this endpoint");
}
Modified: activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java Sun Nov 9 22:01:12 2008
@@ -70,7 +70,7 @@
return new RmiConsumer(this, processor);
}
- public Producer<BeanExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new RmiProducer(this);
}
Modified: activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java Sun Nov 9 22:01:12 2008
@@ -56,7 +56,7 @@
this.messageChannel = messageChannel;
}
- public Producer<SpringIntegrationExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new SpringIntegrationProducer(this);
}
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventEndpoint.java Sun Nov 9 22:01:12 2008
@@ -64,7 +64,7 @@
return true;
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
ObjectHelper.notNull(getApplicationContext(), "applicationContext");
return new DefaultProducer<Exchange>(this) {
public void process(Exchange exchange) throws Exception {
Modified: activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java Sun Nov 9 22:01:12 2008
@@ -50,7 +50,7 @@
return new StreamConsumer(this, processor, uri);
}
- public Producer<Exchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
return new StreamProducer(this, uri);
}
Modified: activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=712612&r1=712611&r2=712612&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Sun Nov 9 22:01:12 2008
@@ -63,7 +63,7 @@
super(endpointUri);
}
- public Producer<XmppExchange> createProducer() throws Exception {
+ public Producer createProducer() throws Exception {
if (room != null) {
return createGroupChatProducer();
} else {
@@ -75,11 +75,11 @@
}
}
- public Producer<XmppExchange> createGroupChatProducer() throws Exception {
+ public Producer createGroupChatProducer() throws Exception {
return new XmppGroupChatProducer(this);
}
- public Producer<XmppExchange> createPrivateChatProducer(String participant) throws Exception {
+ public Producer createPrivateChatProducer(String participant) throws Exception {
return new XmppPrivateChatProducer(this, participant);
}