Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java (original) +++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConsumer.java Mon Nov 10 20:34:17 2008 @@ -55,5 +55,4 @@ endpoint.disconnect(this); super.doStop(); } - }
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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -38,7 +38,7 @@ * * @version $Revision$ */ -public class HttpEndpoint extends DefaultPollingEndpoint<HttpExchange> { +public class HttpEndpoint extends DefaultPollingEndpoint { private HttpBinding binding; private HttpComponent component; @@ -65,7 +65,6 @@ return new HttpProducer(this); } - @Override public PollingConsumer createPollingConsumer() throws Exception { return new HttpPollingConsumer(this); } @@ -99,7 +98,6 @@ component.disconnect(consumer); } - @Override public boolean isLenientProperties() { // true to allow dynamic URI options to be configured and passed to external system for eg. the HttpProducer return true; 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -16,6 +16,8 @@ */ package org.apache.camel.component.http; +import static org.apache.camel.component.http.HttpMethods.HTTP_METHOD; + import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -26,7 +28,6 @@ import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.NoTypeConversionAvailableException; -import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.http.helper.LoadingByteArrayOutputStream; import org.apache.camel.impl.DefaultProducer; @@ -41,8 +42,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import static org.apache.camel.component.http.HttpMethods.HTTP_METHOD; /** * @version $Revision$ */ Modified: activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisEndpoint.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisEndpoint.java (original) +++ activemq/camel/trunk/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/IBatisEndpoint.java Mon Nov 10 20:34:17 2008 @@ -41,7 +41,7 @@ * * @version $Revision$ */ -public class IBatisEndpoint extends DefaultPollingEndpoint<Exchange> { +public class IBatisEndpoint extends DefaultPollingEndpoint { private static final transient Log logger = LogFactory.getLog(IBatisEndpoint.class); private IBatisProcessingStrategy strategy; Modified: activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java (original) +++ activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java Mon Nov 10 20:34:17 2008 @@ -28,7 +28,7 @@ * * @version $Revision$ */ -public class IrcEndpoint extends DefaultEndpoint<IrcExchange> { +public class IrcEndpoint extends DefaultEndpoint { private IrcBinding binding; private IrcConfiguration configuration; private IrcComponent component; Modified: activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrComponent.java (original) +++ activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrComponent.java Mon Nov 10 20:34:17 2008 @@ -20,7 +20,6 @@ import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; -import org.apache.camel.impl.DefaultExchange; /** * A component for integrating with JSR-170 (JCR) compliant content repositories @@ -33,7 +32,7 @@ public static final String NODE_NAME = "org.apache.camel.component.jcr.node_name"; @Override @SuppressWarnings("unchecked") - protected Endpoint<DefaultExchange> createEndpoint(String uri, String remaining, Map properties) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map properties) throws Exception { return new JcrEndpoint(uri, this); } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -28,12 +28,11 @@ import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.DefaultEndpoint; -import org.apache.camel.impl.DefaultExchange; /** * A JCR endpoint */ -public class JcrEndpoint extends DefaultEndpoint<DefaultExchange> { +public class JcrEndpoint extends DefaultEndpoint { private Credentials credentials; private Repository repository; Modified: activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java (original) +++ activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java Mon Nov 10 20:34:17 2008 @@ -21,7 +21,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; -import org.apache.camel.impl.DefaultExchange; /** * @version $Revision:520964 $ @@ -36,7 +35,7 @@ } @Override - protected Endpoint<DefaultExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { return new JdbcEndpoint(uri, remaining, 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -24,12 +24,11 @@ import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.DefaultEndpoint; -import org.apache.camel.impl.DefaultExchange; /** * @version $Revision:520964 $ */ -public class JdbcEndpoint extends DefaultEndpoint<DefaultExchange> { +public class JdbcEndpoint extends DefaultEndpoint { private URI uri; private String remaining; Modified: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original) +++ activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Mon Nov 10 20:34:17 2008 @@ -25,16 +25,12 @@ import org.apache.camel.component.http.HttpComponent; import org.apache.camel.component.http.HttpConsumer; import org.apache.camel.component.http.HttpEndpoint; -import org.apache.camel.component.http.HttpExchange; - import org.mortbay.jetty.Connector; import org.mortbay.jetty.Server; import org.mortbay.jetty.client.HttpClient; import org.mortbay.jetty.nio.SelectChannelConnector; import org.mortbay.jetty.security.SslSocketConnector; import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.HashSessionIdManager; -import org.mortbay.jetty.servlet.HashSessionManager; import org.mortbay.jetty.servlet.ServletHolder; import org.mortbay.jetty.servlet.SessionHandler; @@ -74,7 +70,7 @@ private SslSocketConnector sslSocketConnector; @Override - protected Endpoint<HttpExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { URI httpURL = uri.startsWith("jetty:") ? new URI(remaining) : new URI(uri); JettyHttpEndpoint result = new JettyHttpEndpoint(this, uri, httpURL, getHttpConnectionManager()); setProperties(result, parameters); Modified: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java (original) +++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRoundtripHeaderTest.java Mon Nov 10 20:34:17 2008 @@ -62,14 +62,13 @@ // override the default set of ignored headers which includes Content-Length ((DefaultHeaderFilterStrategy)endpoint.getHeaderFilterStrategy()).setOutFilter(null); + // read the response data InputStream answer = (InputStream) template.sendBody(uri, inputText); - verifyMockGotExpectedText(mockEndpoint, expectedText); - // read the response data String lastLine = readLastLine(answer); - assertNotNull("last response line", lastLine); + // Content-Length from request will truncate the output to just the inputText assertEquals("response matches: " + inputText, inputText, lastLine); } Modified: activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java (original) +++ activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java Mon Nov 10 20:34:17 2008 @@ -23,8 +23,6 @@ import org.apache.camel.HeaderFilterStrategyAware; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.spi.HeaderFilterStrategy; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpConnectionParams; import org.apache.http.params.HttpParams; @@ -32,14 +30,10 @@ public class JhcComponent extends DefaultComponent implements HeaderFilterStrategyAware { - private static final Log LOG = LogFactory.getLog(JhcComponent.class); - private HttpParams params; - private HeaderFilterStrategy headerFilterStrategy; public JhcComponent() { - setHeaderFilterStrategy(new JhcHeaderFilterStrategy()); params = new BasicHttpParams() @@ -59,7 +53,7 @@ this.params = params; } - protected Endpoint<JhcExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { return new JhcEndpoint(uri, this, new URI(uri.substring(uri.indexOf(':') + 1))); } @@ -70,5 +64,4 @@ public void setHeaderFilterStrategy(HeaderFilterStrategy strategy) { headerFilterStrategy = strategy; } - } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -34,7 +34,7 @@ * Time: 8:06:42 PM * To change this template use File | Settings | File Templates. */ -public class JhcEndpoint extends DefaultEndpoint<JhcExchange> { +public class JhcEndpoint extends DefaultEndpoint { private HttpParams params; private URI httpUri; Modified: activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java (original) +++ activemq/camel/trunk/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingComponent.java Mon Nov 10 20:34:17 2008 @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.component.ResourceBasedComponent; import org.apache.camel.impl.ProcessorEndpoint; import org.springframework.core.io.Resource; @@ -31,7 +30,7 @@ * @version $Revision$ */ public class JingComponent extends ResourceBasedComponent { - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { JingValidator validator = new JingValidator(); Resource resource = resolveMandatoryResource(remaining); validator.setSchemaResource(resource); Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java (original) +++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java Mon Nov 10 20:34:17 2008 @@ -358,7 +358,7 @@ } @Override - protected Endpoint<JmsExchange> createEndpoint(String uri, String remaining, Map parameters) + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { boolean pubSubDomain = false; Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java (original) +++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java Mon Nov 10 20:34:17 2008 @@ -37,7 +37,7 @@ * * @version $Revision:520964 $ */ -public class JmsEndpoint extends DefaultEndpoint<JmsExchange> { +public class JmsEndpoint extends DefaultEndpoint { private final boolean pubSubDomain; private JmsBinding binding; private String destination; Modified: activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java (original) +++ activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsQueueEndpoint.java Mon Nov 10 20:34:17 2008 @@ -30,7 +30,7 @@ * * @version $Revision$ */ -public class JmsQueueEndpoint extends JmsEndpoint implements BrowsableEndpoint<JmsExchange> { +public class JmsQueueEndpoint extends JmsEndpoint implements BrowsableEndpoint { private static final transient Log LOG = LogFactory.getLog(JmsQueueEndpoint.class); private int maximumBrowseSize = -1; Modified: activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java (original) +++ activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java Mon Nov 10 20:34:17 2008 @@ -53,7 +53,6 @@ resultEndpoint.assertIsSatisfied(); } - public void testJmsMulticastAndAggregration() throws Exception { MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:reply", MockEndpoint.class); Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java (original) +++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java Mon Nov 10 20:34:17 2008 @@ -23,7 +23,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.util.ObjectHelper; @@ -53,7 +52,7 @@ //------------------------------------------------------------------------- @Override - protected Endpoint<Exchange> createEndpoint(String uri, String path, Map options) throws Exception { + protected Endpoint createEndpoint(String uri, String path, Map options) throws Exception { JpaEndpoint endpoint = new JpaEndpoint(uri, this); // lets interpret the next string as a class 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -37,7 +37,7 @@ /** * @version $Revision$ */ -public class JpaEndpoint extends ScheduledPollEndpoint<Exchange> { +public class JpaEndpoint extends ScheduledPollEndpoint { private EntityManagerFactory entityManagerFactory; private String persistenceUnit = "camel"; private JpaTemplate template; Modified: activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java (original) +++ activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java Mon Nov 10 20:34:17 2008 @@ -21,7 +21,6 @@ import org.apache.camel.CamelException; import org.apache.camel.Component; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultComponent; /** @@ -35,7 +34,7 @@ @Override @SuppressWarnings("unchecked") - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map properties) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map properties) throws Exception { String type = remaining.substring(remaining.lastIndexOf(".") + 1).toUpperCase(); if (DATA_QUEUE.equals(type)) { 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -32,13 +32,12 @@ /** * AS/400 Data queue endpoint */ -public class Jt400DataQueueEndpoint extends DefaultPollingEndpoint<Exchange> { +public class Jt400DataQueueEndpoint extends DefaultPollingEndpoint { /** * Enumeration of supported data formats */ public enum Format { - /** * Using <code>String</code> for transferring data */ Modified: activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapComponent.java (original) +++ activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapComponent.java Mon Nov 10 20:34:17 2008 @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultComponent; /** @@ -28,7 +27,7 @@ * * @version */ -public class LdapComponent<E extends Exchange> extends DefaultComponent { +public class LdapComponent extends DefaultComponent { public LdapComponent() { } @@ -37,8 +36,8 @@ super(context); } - protected Endpoint<E> createEndpoint(String uri, String remaining, Map parameters) throws Exception { - Endpoint<E> endpoint = new LdapEndpoint<E>(uri, remaining, this); + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { + Endpoint endpoint = new LdapEndpoint(uri, remaining, this); setProperties(endpoint, parameters); return endpoint; } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -32,7 +32,7 @@ * * @version */ -public class LdapEndpoint<E extends Exchange> extends DefaultEndpoint<E> { +public class LdapEndpoint extends DefaultEndpoint { public static final String SYSTEM_DN = "ou=system"; public static final String OBJECT_SCOPE = "object"; public static final String ONELEVEL_SCOPE = "onelevel"; Modified: activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java (original) +++ activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java Mon Nov 10 20:34:17 2008 @@ -63,7 +63,7 @@ } @Override - protected Endpoint<MailExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { URI url = new URI(uri); if ("nntp".equalsIgnoreCase(url.getScheme())) { Modified: activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java (original) +++ activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java Mon Nov 10 20:34:17 2008 @@ -47,7 +47,7 @@ private Store store; public MailConsumer(MailEndpoint endpoint, Processor processor, JavaMailSenderImpl sender) { - super((DefaultEndpoint)endpoint, processor); + super(endpoint, processor); this.endpoint = endpoint; this.sender = sender; } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -32,7 +32,7 @@ * * @version $Revision:520964 $ */ -public class MailEndpoint extends ScheduledPollEndpoint<MailExchange> { +public class MailEndpoint extends ScheduledPollEndpoint { private MailBinding binding; private MailConfiguration configuration; Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java (original) +++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java Mon Nov 10 20:34:17 2008 @@ -85,7 +85,7 @@ } @Override - protected Endpoint<MinaExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("Creating MinaEndpoint from uri: " + uri); } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -36,7 +36,7 @@ * * @version $Revision$ */ -public class MinaEndpoint extends DefaultEndpoint<MinaExchange> { +public class MinaEndpoint extends DefaultEndpoint { private static final long DEFAULT_TIMEOUT = 30000; private long timeout = DEFAULT_TIMEOUT; 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -43,7 +43,7 @@ * * @version $Revision:520964 $ */ -public class QuartzEndpoint extends DefaultEndpoint<QuartzExchange> { +public class QuartzEndpoint extends DefaultEndpoint { public static final String ENDPOINT_KEY = "org.apache.camel.quartz"; private static final transient Log LOG = LogFactory.getLog(QuartzEndpoint.class); private Scheduler scheduler; Modified: activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java (original) +++ activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java Mon Nov 10 20:34:17 2008 @@ -20,7 +20,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.component.bean.BeanExchange; import org.apache.camel.impl.DefaultComponent; /** @@ -36,8 +35,7 @@ } @Override - protected Endpoint<BeanExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { return new RmiEndpoint(uri, this); } - } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -36,7 +36,7 @@ /** * @version $Revision:520964 $ */ -public class RmiEndpoint extends DefaultEndpoint<BeanExchange> { +public class RmiEndpoint extends DefaultEndpoint { private List<Class> remoteInterfaces; private ClassLoader classLoader; Modified: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java (original) +++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java Mon Nov 10 20:34:17 2008 @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.component.ResourceBasedComponent; import org.apache.camel.impl.ProcessorEndpoint; import org.springframework.core.io.Resource; @@ -33,7 +32,7 @@ */ public class XQueryComponent extends ResourceBasedComponent { - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { Resource resource = resolveMandatoryResource(remaining); if (log.isDebugEnabled()) { log.debug(this + " using schema resource: " + resource); Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java (original) +++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java Mon Nov 10 20:34:17 2008 @@ -18,9 +18,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.builder.xml.Namespaces; import org.apache.camel.component.mock.MockEndpoint; /** @@ -28,7 +26,7 @@ */ public class XQueryFilterTest extends ContextTestSupport { - protected Endpoint<Exchange> startEndpoint; + protected Endpoint startEndpoint; protected MockEndpoint resultEndpoint; public void testSendMatchingMessage() throws Exception { Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java (original) +++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java Mon Nov 10 20:34:17 2008 @@ -18,9 +18,7 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.builder.xml.Namespaces; import org.apache.camel.component.mock.MockEndpoint; /** @@ -28,7 +26,7 @@ */ public class XQueryTransformTest extends ContextTestSupport { - protected Endpoint<Exchange> startEndpoint; + protected Endpoint startEndpoint; protected MockEndpoint resultEndpoint; public void testSendMatchingMessage() throws Exception { Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java (original) +++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java Mon Nov 10 20:34:17 2008 @@ -18,18 +18,15 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.builder.xml.Namespaces; import org.apache.camel.component.mock.MockEndpoint; -import static org.apache.camel.component.xquery.XQueryBuilder.xquery; - /** * @version $Revision$ */ public class XQueryWithNamespacesFilterTest extends ContextTestSupport { - protected Endpoint<Exchange> startEndpoint; + protected Endpoint startEndpoint; protected MockEndpoint resultEndpoint; public void testSendMatchingMessage() throws Exception { 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -32,7 +32,7 @@ * * @version $Revision$ */ -public class SpringIntegrationEndpoint extends ScheduledPollEndpoint<SpringIntegrationExchange> { +public class SpringIntegrationEndpoint extends ScheduledPollEndpoint { private static final Log LOG = LogFactory.getLog(SpringIntegrationEndpoint.class); private String inputChannel; private String outputChannel; 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -39,7 +39,7 @@ * * @version $Revision$ */ -public class EventEndpoint extends DefaultEndpoint<Exchange> implements ApplicationContextAware { +public class EventEndpoint extends DefaultEndpoint implements ApplicationContextAware { private LoadBalancer loadBalancer; private ApplicationContext applicationContext; Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java (original) +++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java Mon Nov 10 20:34:17 2008 @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultComponent; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -36,7 +35,7 @@ */ public class TestComponent extends DefaultComponent { - public Endpoint<Exchange> createEndpoint(String uri) throws Exception { + public Endpoint createEndpoint(String uri) throws Exception { // lets not use the normal parameter handling so that all parameters are sent to the nested endpoint ObjectHelper.notNull(getCamelContext(), "camelContext"); @@ -47,7 +46,7 @@ } @Override - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { Endpoint endpoint = CamelContextHelper.getMandatoryEndpoint(getCamelContext(), remaining); return new TestEndpoint(uri, this, endpoint); } Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java (original) +++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/validator/ValidatorComponent.java Mon Nov 10 20:34:17 2008 @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.component.ResourceBasedComponent; import org.apache.camel.impl.ProcessorEndpoint; import org.springframework.core.io.Resource; @@ -32,7 +31,7 @@ */ public class ValidatorComponent extends ResourceBasedComponent { - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { SpringValidator validator = new SpringValidator(); Resource resource = resolveMandatoryResource(remaining); validator.setSchemaResource(resource); Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java (original) +++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/xslt/XsltComponent.java Mon Nov 10 20:34:17 2008 @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.builder.xml.XsltBuilder; import org.apache.camel.component.ResourceBasedComponent; import org.apache.camel.converter.jaxp.XmlConverter; @@ -43,7 +42,7 @@ this.xmlConverter = xmlConverter; } - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { Resource resource = resolveMandatoryResource(remaining); if (log.isDebugEnabled()) { log.debug(this + " using schema resource: " + resource); Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java (original) +++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DummyLifecycleStrategy.java Mon Nov 10 20:34:17 2008 @@ -35,33 +35,27 @@ public class DummyLifecycleStrategy implements LifecycleStrategy { public void onContextCreate(CamelContext context) { - // TODO Auto-generated method stub - + // Do nothing } - public void onEndpointAdd(Endpoint<? extends Exchange> endpoint) { - // TODO Auto-generated method stub - + public void onEndpointAdd(Endpoint endpoint) { + // Do nothing } public void onRouteContextCreate(RouteContext routeContext) { - // TODO Auto-generated method stub - + // Do nothing } public void onRoutesAdd(Collection<Route> routes) { - // TODO Auto-generated method stub - + // Do nothing } public void onServiceAdd(CamelContext context, Service service) { - // TODO Auto-generated method stub - + // Do nothing } public void onContextStart(CamelContext arg0) { - // TODO Auto-generated method stub - + // Do nothing } } Modified: activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java (original) +++ activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java Mon Nov 10 20:34:17 2008 @@ -17,8 +17,8 @@ package org.apache.camel.component.stream; import java.util.Map; + import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultComponent; /** @@ -30,7 +30,7 @@ // (Should use other components for such needs.) @Override - protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters) + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { return new StreamEndpoint(uri, this); } 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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -20,14 +20,13 @@ import org.apache.camel.Component; import org.apache.camel.Consumer; -import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -public class StreamEndpoint extends DefaultEndpoint<Exchange> { +public class StreamEndpoint extends DefaultEndpoint { private static final transient Log LOG = LogFactory.getLog(StreamEndpoint.class); private String uri; Modified: activemq/camel/trunk/components/camel-uface/src/main/java/org/apache/camel/component/uface/UFaceBrowser.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-uface/src/main/java/org/apache/camel/component/uface/UFaceBrowser.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-uface/src/main/java/org/apache/camel/component/uface/UFaceBrowser.java (original) +++ activemq/camel/trunk/components/camel-uface/src/main/java/org/apache/camel/component/uface/UFaceBrowser.java Mon Nov 10 20:34:17 2008 @@ -66,7 +66,7 @@ camelContext.setLifecycleStrategy(new DelegateLifecycleStrategy(camelContext.getLifecycleStrategy()) { @Override - public void onEndpointAdd(Endpoint<? extends Exchange> endpoint) { + public void onEndpointAdd(Endpoint endpoint) { super.onEndpointAdd(endpoint); if (endpoint instanceof BrowsableEndpoint) { Modified: activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java (original) +++ activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java Mon Nov 10 20:34:17 2008 @@ -48,7 +48,7 @@ } @Override - protected Endpoint<XmppExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception { + protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { XmppEndpoint endpoint = new XmppEndpoint(uri, this); URI u = new URI(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=712937&r1=712936&r2=712937&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 Mon Nov 10 20:34:17 2008 @@ -39,7 +39,7 @@ * * @version $Revision:520964 $ */ -public class XmppEndpoint extends DefaultEndpoint<XmppExchange> { +public class XmppEndpoint extends DefaultEndpoint { private static final transient Log LOG = LogFactory.getLog(XmppEndpoint.class); private XmppBinding binding; private XMPPConnection connection; Modified: activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java?rev=712937&r1=712936&r2=712937&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java (original) +++ activemq/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java Mon Nov 10 20:34:17 2008 @@ -50,7 +50,7 @@ protected XmppExchange receivedExchange; protected CamelContext container = new DefaultCamelContext(); protected CountDownLatch latch = new CountDownLatch(1); - protected Endpoint<XmppExchange> endpoint; + protected Endpoint endpoint; protected ProducerCache client = new ProducerCache(); public static void main(String[] args) {
