You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/12/22 23:04:48 UTC
svn commit: r1222482 - in /camel/trunk/components:
camel-atom/src/main/java/org/apache/camel/component/atom/
camel-aws/src/main/java/org/apache/camel/component/aws/s3/
camel-aws/src/main/java/org/apache/camel/component/aws/sdb/
camel-aws/src/main/java/...
Author: dkulp
Date: Thu Dec 22 22:04:47 2011
New Revision: 1222482
URL: http://svn.apache.org/viewvc?rev=1222482&view=rev
Log:
Fix more warnings in eclipse
Modified:
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java
camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxEndpoint.java
camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectEndpoint.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Modified: camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java (original)
+++ camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java Thu Dec 22 22:04:47 2011
@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;
* @version
*/
public class AtomEntryPollingConsumer extends FeedEntryPollingConsumer {
- private static final transient Logger LOG = LoggerFactory.getLogger(AtomEntryPollingConsumer.class);
private Document<Feed> document;
public AtomEntryPollingConsumer(AtomEndpoint endpoint, Processor processor, boolean filter, Date lastUpdate, boolean throttleEntries) {
Modified: camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java (original)
+++ camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomPollingConsumer.java Thu Dec 22 22:04:47 2011
@@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory;
* @version
*/
public class AtomPollingConsumer extends FeedPollingConsumer {
- private static final transient Logger LOG = LoggerFactory.getLogger(AtomPollingConsumer.class);
public AtomPollingConsumer(AtomEndpoint endpoint, Processor processor) {
super(endpoint, processor);
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Component.java Thu Dec 22 22:04:47 2011
@@ -48,7 +48,7 @@ public class S3Component extends Default
throw new IllegalArgumentException("AmazonS3Client or accessKey and secretKey must be specified");
}
- S3Endpoint endpoint = new S3Endpoint(uri, getCamelContext(), configuration);
+ S3Endpoint endpoint = new S3Endpoint(uri, this, configuration);
return endpoint;
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Endpoint.java Thu Dec 22 22:04:47 2011
@@ -26,6 +26,7 @@ import com.amazonaws.services.s3.model.O
import com.amazonaws.services.s3.model.S3Object;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -49,10 +50,15 @@ public class S3Endpoint extends Schedule
private S3Configuration configuration;
private int maxMessagesPerPoll = 10;
+ @Deprecated
public S3Endpoint(String uri, CamelContext context, S3Configuration configuration) {
super(uri, context);
this.configuration = configuration;
}
+ public S3Endpoint(String uri, Component comp, S3Configuration configuration) {
+ super(uri, comp);
+ this.configuration = configuration;
+ }
public Consumer createConsumer(Processor processor) throws Exception {
S3Consumer s3Consumer = new S3Consumer(this, processor);
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbComponent.java Thu Dec 22 22:04:47 2011
@@ -48,7 +48,7 @@ public class SdbComponent extends Defaul
throw new IllegalArgumentException("amazonSDBClient or accessKey and secretKey must be specified");
}
- SdbEndpoint endpoint = new SdbEndpoint(uri, getCamelContext(), configuration);
+ SdbEndpoint endpoint = new SdbEndpoint(uri, this, configuration);
return endpoint;
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sdb/SdbEndpoint.java Thu Dec 22 22:04:47 2011
@@ -24,6 +24,7 @@ import com.amazonaws.services.simpledb.m
import com.amazonaws.services.simpledb.model.DomainMetadataRequest;
import com.amazonaws.services.simpledb.model.NoSuchDomainException;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -41,10 +42,15 @@ public class SdbEndpoint extends Schedul
private static final Logger LOG = LoggerFactory.getLogger(S3Endpoint.class);
private SdbConfiguration configuration;
+ @Deprecated
public SdbEndpoint(String uri, CamelContext context, SdbConfiguration configuration) {
super(uri, context);
this.configuration = configuration;
}
+ public SdbEndpoint(String uri, Component component, SdbConfiguration configuration) {
+ super(uri, component);
+ this.configuration = configuration;
+ }
public Consumer createConsumer(Processor processor) throws Exception {
throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesComponent.java Thu Dec 22 22:04:47 2011
@@ -48,6 +48,6 @@ public class SesComponent extends Defaul
throw new IllegalArgumentException("AmazonSESClient or accessKey and secretKey must be specified");
}
- return new SesEndpoint(uri, getCamelContext(), configuration);
+ return new SesEndpoint(uri, this, configuration);
}
}
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/ses/SesEndpoint.java Thu Dec 22 22:04:47 2011
@@ -21,6 +21,7 @@ import com.amazonaws.auth.BasicAWSCreden
import com.amazonaws.services.simpleemail.AmazonSimpleEmailService;
import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -34,10 +35,15 @@ public class SesEndpoint extends Default
private SesConfiguration configuration;
+ @Deprecated
public SesEndpoint(String uri, CamelContext context, SesConfiguration configuration) {
super(uri, context);
this.configuration = configuration;
}
+ public SesEndpoint(String uri, Component component, SesConfiguration configuration) {
+ super(uri, component);
+ this.configuration = configuration;
+ }
public Consumer createConsumer(Processor processor) throws Exception {
throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsComponent.java Thu Dec 22 22:04:47 2011
@@ -48,7 +48,7 @@ public class SnsComponent extends Defaul
throw new IllegalArgumentException("AmazonSNSClient or accessKey and secretKey must be specified");
}
- SnsEndpoint endpoint = new SnsEndpoint(uri, getCamelContext(), configuration);
+ SnsEndpoint endpoint = new SnsEndpoint(uri, this, configuration);
return endpoint;
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java (original)
+++ camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sns/SnsEndpoint.java Thu Dec 22 22:04:47 2011
@@ -24,6 +24,7 @@ import com.amazonaws.services.sns.model.
import com.amazonaws.services.sns.model.SetTopicAttributesRequest;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -41,11 +42,16 @@ public class SnsEndpoint extends Default
private SnsConfiguration configuration;
private AmazonSNSClient snsClient;
-
+
+ @Deprecated
public SnsEndpoint(String uri, CamelContext context, SnsConfiguration configuration) {
super(uri, context);
this.configuration = configuration;
}
+ public SnsEndpoint(String uri, Component component, SnsConfiguration configuration) {
+ super(uri, component);
+ this.configuration = configuration;
+ }
public Consumer createConsumer(Processor processor) throws Exception {
throw new UnsupportedOperationException("You cannot receive messages from this endpoint");
Modified: camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java (original)
+++ camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java Thu Dec 22 22:04:47 2011
@@ -48,6 +48,7 @@ public class MailEndpoint extends Schedu
this.configuration = configuration;
}
+ @Deprecated
public MailEndpoint(String endpointUri, MailConfiguration configuration) {
super(endpointUri);
this.configuration = configuration;
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailEndpointTest.java Thu Dec 22 22:04:47 2011
@@ -71,7 +71,8 @@ public class MailEndpointTest extends Ca
cfg.setUsername("james");
cfg.setPassword("secret");
- MailEndpoint endpoint = new MailEndpoint("smtp://myhost", cfg);
+ MailComponent comp = new MailComponent(cfg);
+ MailEndpoint endpoint = new MailEndpoint("smtp://myhost", comp, cfg);
assertSame(cfg, endpoint.getConfiguration());
assertNull(endpoint.getContentTypeResolver());
assertNotNull(endpoint.getBinding());
Modified: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java (original)
+++ camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjComponent.java Thu Dec 22 22:04:47 2011
@@ -68,7 +68,7 @@ public class QuickfixjComponent extends
}
}
- endpoint = new QuickfixjEndpoint(engine, uri, getCamelContext());
+ endpoint = new QuickfixjEndpoint(engine, uri, this);
engine.addEventListener(endpoint);
endpoints.put(uri, endpoint);
}
@@ -131,18 +131,4 @@ public class QuickfixjComponent extends
this.configurations = configurations;
}
- private static String getPath(String uri) throws URISyntaxException {
- // Adapted from DefaultComponent
- URI u = new URI(UnsafeUriCharactersEncoder.encode(uri));
- String path = u.getSchemeSpecificPart();
- // lets trim off any query arguments
- if (path.startsWith("//")) {
- path = path.substring(2);
- }
- int idx = path.indexOf('?');
- if (idx > 0) {
- path = path.substring(0, idx);
- }
- return path;
- }
}
Modified: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java (original)
+++ camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEndpoint.java Thu Dec 22 22:04:47 2011
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Exchange;
import org.apache.camel.MultipleConsumersSupport;
@@ -46,10 +47,15 @@ public class QuickfixjEndpoint extends D
private final List<QuickfixjConsumer> consumers = new CopyOnWriteArrayList<QuickfixjConsumer>();
private final QuickfixjEngine engine;
+ @Deprecated
public QuickfixjEndpoint(QuickfixjEngine engine, String uri, CamelContext context) {
super(uri, context);
this.engine = engine;
}
+ public QuickfixjEndpoint(QuickfixjEngine engine, String uri, Component component) {
+ super(uri, component);
+ this.engine = engine;
+ }
public SessionID getSessionID() {
return sessionID;
Modified: camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java (original)
+++ camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/examples/trading/TradeExecutorComponent.java Thu Dec 22 22:04:47 2011
@@ -94,7 +94,7 @@ public class TradeExecutorComponent exte
private List<Processor> processors = new CopyOnWriteArrayList<Processor>();
public TradeExecutorEndpoint(String uri, TradeExecutor tradeExecutor) {
- super(uri, TradeExecutorComponent.this.getCamelContext());
+ super(uri, TradeExecutorComponent.this);
this.tradeExecutor = tradeExecutor;
tradeExecutor.addListener(new QuickfixjMessageListener() {
public void onMessage(SessionID sessionID, Message message) throws Exception {
Modified: camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java (original)
+++ camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiEndpoint.java Thu Dec 22 22:04:47 2011
@@ -49,6 +49,7 @@ public class RmiEndpoint extends Default
this.uri = new URI(endpointUri);
}
+ @Deprecated
public RmiEndpoint(String endpointUri) throws URISyntaxException {
super(endpointUri);
this.uri = new URI(endpointUri);
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxEndpoint.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/RouteboxEndpoint.java Thu Dec 22 22:04:47 2011
@@ -27,10 +27,12 @@ public abstract class RouteboxEndpoint e
super();
}
+ @Deprecated
public RouteboxEndpoint(String endpointUri) {
super(endpointUri);
}
+ @Deprecated
public RouteboxEndpoint(String endpointUri, CamelContext camelContext) {
super(endpointUri, camelContext);
}
Modified: camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectEndpoint.java (original)
+++ camel/trunk/components/camel-routebox/src/main/java/org/apache/camel/component/routebox/direct/RouteboxDirectEndpoint.java Thu Dec 22 22:04:47 2011
@@ -29,6 +29,7 @@ import org.apache.camel.component.routeb
public class RouteboxDirectEndpoint extends RouteboxEndpoint {
private final Map<String, RouteboxDirectConsumer> consumers = new HashMap<String, RouteboxDirectConsumer>();
+ @Deprecated
public RouteboxDirectEndpoint(String endpointUri) {
super(endpointUri);
}
Modified: camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Thu Dec 22 22:04:47 2011
@@ -64,7 +64,6 @@ import org.apache.camel.RuntimeExpressio
import org.apache.camel.StringSource;
import org.apache.camel.component.bean.BeanInvocation;
import org.apache.camel.converter.IOConverter;
-import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.MessageHelper;
@@ -86,7 +85,6 @@ public abstract class XQueryBuilder impl
private StaticQueryContext staticQueryContext;
private Map<String, Object> parameters = new HashMap<String, Object>();
private Map<String, String> namespacePrefixes = new HashMap<String, String>();
- private XmlConverter converter = new XmlConverter();
private ResultFormat resultsFormat = ResultFormat.DOM;
private Properties properties = new Properties();
private Class resultType;
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java Thu Dec 22 22:04:47 2011
@@ -41,11 +41,13 @@ public class SpringIntegrationEndpoint e
this.defaultChannel = channel;
}
+ @Deprecated
public SpringIntegrationEndpoint(String uri, MessageChannel channel, CamelContext context) {
super(uri, context);
this.messageChannel = channel;
}
+ @Deprecated
public SpringIntegrationEndpoint(String endpointUri, MessageChannel messageChannel) {
super(endpointUri);
this.messageChannel = messageChannel;
Modified: camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java (original)
+++ camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/converter/SpringIntegrationConverter.java Thu Dec 22 22:04:47 2011
@@ -38,6 +38,7 @@ public final class SpringIntegrationConv
}
@Converter
+ @SuppressWarnings("deprecation")
public static Endpoint toEndpoint(final MessageChannel channel) throws Exception {
Endpoint answer = new SpringIntegrationEndpoint("spring-integration://" + channel.toString(), channel, null);
return answer;
Modified: camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java (original)
+++ camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamEndpoint.java Thu Dec 22 22:04:47 2011
@@ -46,6 +46,7 @@ public class StreamEndpoint extends Defa
super(endpointUri, component);
}
+ @Deprecated
public StreamEndpoint(String endpointUri) {
super(endpointUri);
}
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=1222482&r1=1222481&r2=1222482&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Thu Dec 22 22:04:47 2011
@@ -69,6 +69,7 @@ public class XmppEndpoint extends Defaul
super(uri, component);
}
+ @Deprecated
public XmppEndpoint(String endpointUri) {
super(endpointUri);
}