You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/11/11 20:28:47 UTC
svn commit: r713123 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/model/
components/camel-spring/src/main/java/org/apache/camel/spring/spi/
Author: janstey
Date: Tue Nov 11 11:28:46 2008
New Revision: 713123
URL: http://svn.apache.org/viewvc?rev=713123&view=rev
Log:
CAMEL-1061 - Remove a few more deprecated things
Removed:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/BeanInjector.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=713123&r1=713122&r2=713123&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Tue Nov 11 11:28:46 2008
@@ -161,29 +161,6 @@
*/
Collection<Endpoint> removeEndpoints(String uri) throws Exception;
- /**
- * Adds the endpoint to the context using the given URI. The endpoint will be registered as a singleton.
- *
- * @param uri the URI to be used to resolve this endpoint
- * @param endpoint the endpoint to be added to the context
- * @return the old endpoint that was previously registered to the context if there was
- * already an endpoint for that URI
- * @throws Exception if the new endpoint could not be started or the old endpoint could not be stopped
- */
- @Deprecated
- Endpoint addSingletonEndpoint(String uri, Endpoint endpoint) throws Exception;
-
- /**
- * Removes the singleton endpoint with the given URI
- *
- * @param uri the URI to be used to remove
- * @return the endpoint that was removed or null if there is no endpoint for this URI
- * @throws Exception if endpoint could not be stopped
- */
- @Deprecated
- Endpoint removeSingletonEndpoint(String uri) throws Exception;
-
-
// Route Management Methods
//-----------------------------------------------------------------------
@@ -202,15 +179,6 @@
List<Route> getRoutes();
/**
- * Sets the routes for this context, replacing any current routes
- *
- * @param routes the new routes to use
- * @deprecated is considered for deprecation, use addRoutes instead, could be removed in Camel 2.0
- */
- @Deprecated
- void setRoutes(List<Route> routes);
-
- /**
* Adds a collection of routes to this context
*
* @param routes the routes to add
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=713123&r1=713122&r2=713123&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java Tue Nov 11 11:28:46 2008
@@ -367,14 +367,6 @@
public void setOutputs(List<ProcessorType<?>> outputs) {
this.outputs = outputs;
}
-
- /**
- * @deprecated not used. Will be removed in Camel 2.0.
- */
- protected FilterProcessor createFilterProcessor(RouteContext routeContext) throws Exception {
- Processor childProcessor = routeContext.createProcessor(this);
- return new FilterProcessor(getExpression().createPredicate(routeContext), childProcessor);
- }
@Override
protected void configureChild(ProcessorType output) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java?rev=713123&r1=713122&r2=713123&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java Tue Nov 11 11:28:46 2008
@@ -83,16 +83,6 @@
return this;
}
- /**
- * @deprecated Use {@link #finallyBlock()} instead, as the name
- * is better. Current name sugests that it handles exception,
- * while it mimics java finally keyword. Will be removed in Camel 2.0.
- */
- @Deprecated
- public TryType handleAll() {
- return finallyBlock();
- }
-
public TryType finallyBlock() {
popBlock();
FinallyType answer = new FinallyType();
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=713123&r1=713122&r2=713123&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java Tue Nov 11 11:28:46 2008
@@ -37,7 +37,6 @@
public class TransactionErrorHandlerBuilder extends ErrorHandlerBuilderSupport implements Cloneable, InitializingBean {
private TransactionTemplate transactionTemplate;
- private RedeliveryPolicy redeliveryPolicy = new RedeliveryPolicy();
private DelayPolicy delayPolicy = new DelayPolicy();
public TransactionErrorHandlerBuilder() {
@@ -51,20 +50,6 @@
this.transactionTemplate = transactionTemplate;
}
- /**
- * @deprecated use setDelayPolicy. Will be removed in Camel 2.0
- */
- public RedeliveryPolicy getRedeliveryPolicy() {
- return redeliveryPolicy;
- }
-
- /**
- * @deprecated use setDelayPolicy. Will be removed in Camel 2.0
- */
- public void setRedeliveryPolicy(RedeliveryPolicy redeliveryPolicy) {
- this.redeliveryPolicy = redeliveryPolicy;
- }
-
public DelayPolicy getDelayPolicy() {
return delayPolicy;
}
@@ -91,53 +76,6 @@
// Builder methods
// -------------------------------------------------------------------------
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder backOffMultiplier(double backOffMultiplier) {
- getRedeliveryPolicy().backOffMultiplier(backOffMultiplier);
- return this;
- }
-
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder collisionAvoidancePercent(short collisionAvoidancePercent) {
- getRedeliveryPolicy().collisionAvoidancePercent(collisionAvoidancePercent);
- return this;
- }
-
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder maximumRedeliveries(int maximumRedeliveries) {
- getRedeliveryPolicy().maximumRedeliveries(maximumRedeliveries);
- return this;
- }
-
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder maximumRedeliveryDelay(long maximumRedeliveryDelay) {
- getRedeliveryPolicy().maximumRedeliveryDelay(maximumRedeliveryDelay);
- return this;
- }
-
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder useCollisionAvoidance() {
- getRedeliveryPolicy().useCollisionAvoidance();
- return this;
- }
-
- /**
- * @deprecated will be removed in Camel 2.0
- */
- public TransactionErrorHandlerBuilder useExponentialBackOff() {
- getRedeliveryPolicy().useExponentialBackOff();
- return this;
- }
public TransactionErrorHandlerBuilder delay(long delay) {
getDelayPolicy().delay(delay);
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java?rev=713123&r1=713122&r2=713123&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionInterceptor.java Tue Nov 11 11:28:46 2008
@@ -57,15 +57,6 @@
this.transactionTemplate = transactionTemplate;
}
- /**
- * @deprecated use DelayPolicy. Will be removed in Camel 2.0
- */
- public TransactionInterceptor(Processor processor, TransactionTemplate transactionTemplate, RedeliveryPolicy redeliveryPolicy) {
- this(processor, transactionTemplate);
- this.redeliveryPolicy = redeliveryPolicy;
- this.delayPolicy = redeliveryPolicy;
- }
-
public TransactionInterceptor(Processor processor, TransactionTemplate transactionTemplate, DelayPolicy delayPolicy) {
this(processor, transactionTemplate);
this.delayPolicy = delayPolicy;
@@ -161,20 +152,6 @@
}
}
- /**
- * @deprecated use DelayPolicy. Will be removed in Camel 2.0
- */
- public RedeliveryPolicy getRedeliveryPolicy() {
- return redeliveryPolicy;
- }
-
- /**
- * @deprecated use DelayPolicy. Will be removed in Camel 2.0
- */
- public void setRedeliveryPolicy(RedeliveryPolicy redeliveryPolicy) {
- this.redeliveryPolicy = redeliveryPolicy;
- }
-
public DelayPolicy getDelayPolicy() {
return delayPolicy;
}