You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/06/19 15:22:54 UTC
svn commit: r956222 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: ./ component/file/
converter/jaxp/ impl/ language/simple/ processor/ processor/aggregate/ util/
Author: davsclaus
Date: Sat Jun 19 13:22:54 2010
New Revision: 956222
URL: http://svn.apache.org/viewvc?rev=956222&view=rev
Log:
Removed @deprecated stuff.
Removed:
camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/Time.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Sat Jun 19 13:22:54 2010
@@ -150,7 +150,9 @@ public interface CamelContext extends Se
*
* @param componentName the component name to remove
* @return the previously added component or null if it had not been previously added.
+ * @deprecated will be removed in Camel 2.5
*/
+ @Deprecated
Component removeComponent(String componentName);
// Endpoint Management Methods
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Sat Jun 19 13:22:54 2010
@@ -31,15 +31,13 @@ import org.apache.camel.spi.UnitOfWork;
*/
public interface Exchange {
- String AUTHENTICATION = "CamelAuthentication";
+ String AUTHENTICATION = "CamelAuthentication";
String AUTHENTICATION_FAILURE_POLICY_ID = "CamelAuthenticationFailurePolicyId";
- String ACCEPT_CONTENT_TYPE = "CamelAcceptContentType";
- @Deprecated
- String AGGREGATED_INDEX = "CamelAggregatedIndex";
- String AGGREGATED_SIZE = "CamelAggregatedSize";
- String AGGREGATED_COMPLETED_BY = "CamelAggregatedCompletedBy";
- String AGGREGATED_CORRELATION_KEY = "CamelAggregatedCorrelationKey";
- String ASYNC_WAIT = "CamelAsyncWait";
+ String ACCEPT_CONTENT_TYPE = "CamelAcceptContentType";
+ String AGGREGATED_SIZE = "CamelAggregatedSize";
+ String AGGREGATED_COMPLETED_BY = "CamelAggregatedCompletedBy";
+ String AGGREGATED_CORRELATION_KEY = "CamelAggregatedCorrelationKey";
+ String ASYNC_WAIT = "CamelAsyncWait";
String BATCH_INDEX = "CamelBatchIndex";
String BATCH_SIZE = "CamelBatchSize";
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Route.java Sat Jun 19 13:22:54 2010
@@ -64,19 +64,6 @@ public interface Route {
RouteContext getRouteContext();
/**
- * This property map is used to associate information about
- * the route. Gets all the services for this routes
- * </p>
- * This implementation is used for initialization
- *
- * @return the services
- * @throws Exception is thrown in case of error
- * @deprecated will be removed in Camel 2.2
- */
- @Deprecated
- List<Service> getServicesForRoute() throws Exception;
-
- /**
* A strategy callback allowing special initialization when services is starting.
*
* @param services the service
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java Sat Jun 19 13:22:54 2010
@@ -212,7 +212,7 @@ public abstract class GenericFileEndpoin
/**
* Sets the move failure expression based on
- * {@link org.apache.camel.language.simple.FileLanguage}
+ * {@link org.apache.camel.language.simple.SimpleLanguage}
*/
public void setMoveFailed(String fileLanguageExpression) {
String expression = configureMoveOrPreMoveExpression(fileLanguageExpression);
@@ -229,7 +229,7 @@ public abstract class GenericFileEndpoin
/**
* Sets the move expression based on
- * {@link org.apache.camel.language.simple.FileLanguage}
+ * {@link org.apache.camel.language.simple.SimpleLanguage}
*/
public void setMove(String fileLanguageExpression) {
String expression = configureMoveOrPreMoveExpression(fileLanguageExpression);
@@ -246,7 +246,7 @@ public abstract class GenericFileEndpoin
/**
* Sets the pre move expression based on
- * {@link org.apache.camel.language.simple.FileLanguage}
+ * {@link org.apache.camel.language.simple.SimpleLanguage}
*/
public void setPreMove(String fileLanguageExpression) {
String expression = configureMoveOrPreMoveExpression(fileLanguageExpression);
@@ -263,7 +263,7 @@ public abstract class GenericFileEndpoin
/**
* Sets the file expression based on
- * {@link org.apache.camel.language.simple.FileLanguage}
+ * {@link org.apache.camel.language.simple.SimpleLanguage}
*/
public void setFileName(String fileLanguageExpression) {
this.fileName = createFileLanguageExpression(fileLanguageExpression);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileProducer.java Sat Jun 19 13:22:54 2010
@@ -232,7 +232,7 @@ public class GenericFileProducer<T> exte
// whatever configured on the endpoint
if (name.indexOf("${") > -1) {
if (log.isDebugEnabled()) {
- log.debug(Exchange.FILE_NAME + " contains a FileLanguage expression: " + name);
+ log.debug(Exchange.FILE_NAME + " contains a Simple expression: " + name);
}
Language language = getEndpoint().getCamelContext().resolveLanguage("file");
expression = language.createExpression(name);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/StaxConverter.java Sat Jun 19 13:22:54 2010
@@ -50,11 +50,6 @@ public class StaxConverter {
return getOutputFactory().createXMLEventWriter(out, IOConverter.getCharsetName(exchange));
}
- @Deprecated
- public XMLEventWriter createXMLEventWriter(OutputStream out) throws XMLStreamException {
- return getOutputFactory().createXMLEventWriter(out);
- }
-
@Converter
public XMLEventWriter createXMLEventWriter(Writer writer) throws XMLStreamException {
return getOutputFactory().createXMLEventWriter(writer);
@@ -65,11 +60,6 @@ public class StaxConverter {
return getOutputFactory().createXMLEventWriter(result);
}
- @Deprecated
- public XMLStreamWriter createXMLStreamWriter(OutputStream outputStream) throws XMLStreamException {
- return getOutputFactory().createXMLStreamWriter(outputStream);
- }
-
@Converter
public XMLStreamWriter createXMLStreamWriter(OutputStream outputStream, Exchange exchange) throws XMLStreamException {
return getOutputFactory().createXMLStreamWriter(outputStream, IOConverter.getCharsetName(exchange));
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Sat Jun 19 13:22:54 2010
@@ -264,7 +264,6 @@ public class DefaultCamelContext extends
}
}
- @Deprecated
public Component removeComponent(String componentName) {
synchronized (components) {
Component answer = components.remove(componentName);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultRoute.java Sat Jun 19 13:22:54 2010
@@ -71,12 +71,6 @@ public abstract class DefaultRoute exten
return properties;
}
- public List<Service> getServicesForRoute() throws Exception {
- List<Service> servicesForRoute = new ArrayList<Service>(getServices());
- addServices(servicesForRoute);
- return servicesForRoute;
- }
-
public void onStartingServices(List<Service> services) throws Exception {
addServices(services);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java Sat Jun 19 13:22:54 2010
@@ -24,6 +24,7 @@ import org.apache.camel.impl.DefaultExch
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ServiceHelper;
import static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
@@ -146,11 +147,11 @@ public class Enricher extends ServiceSup
}
protected void doStart() throws Exception {
- producer.start();
+ ServiceHelper.startService(producer);
}
protected void doStop() throws Exception {
- producer.stop();
+ ServiceHelper.stopService(producer);
}
private static class CopyAggregationStrategy implements AggregationStrategy {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/PollEnricher.java Sat Jun 19 13:22:54 2010
@@ -23,6 +23,7 @@ import org.apache.camel.impl.EventDriven
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.ServiceHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.apache.camel.util.ExchangeHelper.copyResultsPreservePattern;
@@ -111,7 +112,7 @@ public class PollEnricher extends Servic
* @param exchange input data.
*/
public void process(Exchange exchange) throws Exception {
- preChceckPoll(exchange);
+ preCheckPoll(exchange);
Exchange resourceExchange;
if (timeout < 0) {
@@ -167,7 +168,7 @@ public class PollEnricher extends Servic
*
* @param exchange the current exchange
*/
- protected void preChceckPoll(Exchange exchange) throws Exception {
+ protected void preCheckPoll(Exchange exchange) throws Exception {
// cannot poll a file endpoint if already consuming from a file endpoint (CAMEL-1895)
if (consumer instanceof EventDrivenPollingConsumer) {
EventDrivenPollingConsumer edpc = (EventDrivenPollingConsumer) consumer;
@@ -198,11 +199,11 @@ public class PollEnricher extends Servic
}
protected void doStart() throws Exception {
- consumer.start();
+ ServiceHelper.startService(consumer);
}
protected void doStop() throws Exception {
- consumer.stop();
+ ServiceHelper.stopService(consumer);
}
private static class CopyAggregationStrategy implements AggregationStrategy {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RoutingSlip.java Sat Jun 19 13:22:54 2010
@@ -59,13 +59,17 @@ public class RoutingSlip extends Service
this.camelContext = camelContext;
}
- // This method will be replaced by the construction method with the expression
+ /**
+ * Will be removed in Camel 2.5
+ */
@Deprecated
public RoutingSlip(CamelContext camelContext, String header) {
this(camelContext, header, RoutingSlipDefinition.DEFAULT_DELIMITER);
}
- // This method will be replaced by the construction method with the expression
+ /**
+ * Will be removed in Camel 2.5
+ */
@Deprecated
public RoutingSlip(CamelContext camelContext, String header, String uriDelimiter) {
notNull(camelContext, "camelContext");
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/Time.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/Time.java?rev=956222&r1=956221&r2=956222&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/Time.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/Time.java Sat Jun 19 13:22:54 2010
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
* A helper class for working with times in various units
*
* @version $Revision$
- * @deprecated
+ * @deprecated will be removed in Camel 2.5
*/
@Deprecated
public class Time {