Author: hadrian
Date: Sun Nov 9 23:37:54 2008
New Revision: 712622
URL: http://svn.apache.org/viewvc?rev=712622&view=rev
Log:
CAMEL-872. Removed generics from Component. Part 6 of 8.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
activemq/camel/trunk/components/camel-jcr/src/main/java/org/apache/camel/component/jcr/JcrComponent.java
activemq/camel/trunk/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcComponent.java
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
activemq/camel/trunk/components/camel-jhc/src/main/java/org/apache/camel/component/jhc/JhcComponent.java
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsComponent.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaComponent.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
activemq/camel/trunk/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400Component.java
activemq/camel/trunk/components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapComponent.java
activemq/camel/trunk/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
activemq/camel/trunk/components/camel-rmi/src/main/java/org/apache/camel/component/rmi/RmiComponent.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestComponent.java
activemq/camel/trunk/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamComponent.java
activemq/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppComponent.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Component.java
Sun Nov 9 23:37:54 2008
@@ -22,7 +22,7 @@
*
* @version $Revision$
*/
-public interface Component<E extends Exchange> {
+public interface Component {
/**
* Returns the context
@@ -45,6 +45,6 @@
* @return a newly created endpoint or null if this component cannot create
* instances of the given uri
*/
- Endpoint<E> createEndpoint(String uri) throws Exception;
+ Endpoint createEndpoint(String uri) throws Exception;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetComponent.java
Sun Nov 9 23:37:54 2008
@@ -28,7 +28,7 @@
*
* @version $Revision$
*/
-public class DataSetComponent extends DefaultComponent<Exchange> {
+public class DataSetComponent extends DefaultComponent {
@Override
protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/direct/DirectComponent.java
Sun Nov 9 23:37:54 2008
@@ -28,7 +28,7 @@
*
* @version $Revision$
*/
-public class DirectComponent<E extends Exchange> extends DefaultComponent<E> {
+public class DirectComponent<E extends Exchange> extends DefaultComponent {
protected Endpoint<E> createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
Endpoint<E> endpoint = new DirectEndpoint<E>(uri, this);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
Sun Nov 9 23:37:54 2008
@@ -29,7 +29,7 @@
*
* @version $Revision$
*/
-public class FileComponent extends DefaultComponent<FileExchange> {
+public class FileComponent extends DefaultComponent {
/**
* Header key holding the value: the fixed filename to use for producing
files.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/jmx/JMXComponent.java
Sun Nov 9 23:37:54 2008
@@ -30,7 +30,7 @@
*
* @version $Revision$
*/
-public class JMXComponent extends DefaultComponent<JMXExchange> {
+public class JMXComponent extends DefaultComponent {
private MBeanServer mbeanServer;
public JMXComponent() {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java
Sun Nov 9 23:37:54 2008
@@ -34,7 +34,7 @@
*
* @version $Revision$
*/
-public class LogComponent extends DefaultComponent<Exchange> {
+public class LogComponent extends DefaultComponent {
protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
LoggingLevel level = getLoggingLevel(parameters);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockComponent.java
Sun Nov 9 23:37:54 2008
@@ -29,7 +29,7 @@
*
* @version $Revision$
*/
-public class MockComponent extends DefaultComponent<Exchange> {
+public class MockComponent extends DefaultComponent {
@Override
protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/ref/RefComponent.java
Sun Nov 9 23:37:54 2008
@@ -19,7 +19,6 @@
import java.util.Map;
import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultComponent;
/**
@@ -27,11 +26,10 @@
* <p/>
* This component uses the <tt>ref:</tt> notation instead of the mostly common
<tt>uri:</tt> notation.
*/
-public class RefComponent extends DefaultComponent<Exchange> {
+public class RefComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map
parameters) throws Exception {
String name = uri.substring("ref:".length());
return getCamelContext().getRegistry().lookup(name, Endpoint.class);
}
-
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
Sun Nov 9 23:37:54 2008
@@ -30,7 +30,7 @@
*
* @version $Revision$
*/
-public class SedaComponent extends DefaultComponent<Exchange> {
+public class SedaComponent extends DefaultComponent {
public BlockingQueue<Exchange> createQueue(String uri, Map parameters) {
int size = getAndRemoveParameter(parameters, "size", Integer.class,
1000);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/timer/TimerComponent.java
Sun Nov 9 23:37:54 2008
@@ -31,7 +31,7 @@
*
* @version $Revision$
*/
-public class TimerComponent extends DefaultComponent<Exchange> {
+public class TimerComponent extends DefaultComponent {
private Map<String, Timer> timers = new HashMap<String, Timer>();
public Timer getTimer(TimerEndpoint endpoint) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Sun Nov 9 23:37:54 2008
@@ -322,7 +322,7 @@
String splitURI[] = ObjectHelper.splitOnCharacter(uri,
":", 2);
if (splitURI[1] != null) {
String scheme = splitURI[0];
- Component<?> component = getComponent(scheme);
+ Component component = getComponent(scheme);
// Ask the component to resolve the endpoint.
if (component != null) {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponent.java
Sun Nov 9 23:37:54 2008
@@ -43,7 +43,7 @@
*
* @version $Revision$
*/
-public abstract class DefaultComponent<E extends Exchange> extends
ServiceSupport implements Component<E> {
+public abstract class DefaultComponent extends ServiceSupport implements
Component {
private static final transient Log LOG =
LogFactory.getLog(DefaultComponent.class);
private int defaultThreadPoolSize = 5;
@@ -57,7 +57,7 @@
this.camelContext = context;
}
- public Endpoint<E> createEndpoint(String uri) throws Exception {
+ public Endpoint createEndpoint(String uri) throws Exception {
ObjectHelper.notNull(getCamelContext(), "camelContext");
//encode URI string to the unsafe URI characters
URI u = new URI(UnsafeUriCharactersEncoder.encode(uri));
@@ -78,7 +78,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Creating endpoint uri=[" + uri + "], path=[" + path +
"], parameters=[" + parameters + "]");
}
- Endpoint<E> endpoint = createEndpoint(uri, path, parameters);
+ Endpoint endpoint = createEndpoint(uri, path, parameters);
if (endpoint == null) {
return null;
}
@@ -179,7 +179,7 @@
* @return a newly created endpoint or null if the endpoint cannot be
* created based on the inputs
*/
- protected abstract Endpoint<E> createEndpoint(String uri, String
remaining, Map parameters)
+ protected abstract Endpoint createEndpoint(String uri, String remaining,
Map parameters)
throws Exception;
/**
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultComponentResolver.java
Sun Nov 9 23:37:54 2008
@@ -18,7 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.Exchange;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.util.FactoryFinder;
import org.apache.camel.util.NoFactoryAvailableException;
@@ -33,12 +32,12 @@
*
* @version $Revision$
*/
-public class DefaultComponentResolver<E extends Exchange> implements
ComponentResolver<E> {
+public class DefaultComponentResolver implements ComponentResolver {
protected static final FactoryFinder COMPONENT_FACTORY =
new FactoryFinder("META-INF/services/org/apache/camel/component/");
private static final transient Log LOG =
LogFactory.getLog(DefaultComponentResolver.class);
- public Component<E> resolveComponent(String name, CamelContext context) {
+ public Component resolveComponent(String name, CamelContext context) {
Object bean = null;
try {
bean = context.getRegistry().lookup(name);
@@ -70,7 +69,7 @@
return null;
}
if (Component.class.isAssignableFrom(type)) {
- return (Component<E>) context.getInjector().newInstance(type);
+ return (Component) context.getInjector().newInstance(type);
} else {
throw new IllegalArgumentException("Type is not a Component
implementation. Found: "
+ type.getName());
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
Sun Nov 9 23:37:54 2008
@@ -18,7 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.Exchange;
/**
* Represents a resolver of components from a URI to be able to auto-load them
using some
@@ -26,7 +25,7 @@
*
* @version $Revision$
*/
-public interface ComponentResolver<E extends Exchange> {
+public interface ComponentResolver {
/**
* Attempts to resolve the component for the given URI
@@ -36,5 +35,5 @@
* @return the component which is added to the context or null if it can
not be resolved
* @throws Exception is thrown if the the component could not be loaded
*/
- Component<E> resolveComponent(String name, CamelContext context) throws
Exception;
+ Component resolveComponent(String name, CamelContext context) throws
Exception;
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
Sun Nov 9 23:37:54 2008
@@ -84,5 +84,4 @@
assertMockEndpointsSatisfied();
}
-
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
Sun Nov 9 23:37:54 2008
@@ -28,7 +28,7 @@
*/
public class DefaultComponentTest extends ContextTestSupport {
- private final class MyComponent extends DefaultComponent<DefaultExchange> {
+ private final class MyComponent extends DefaultComponent {
private MyComponent(CamelContext context) {
super(context);
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
Sun Nov 9 23:37:54 2008
@@ -24,14 +24,12 @@
import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.spi.HeaderFilterStrategy;
-
/**
* Defines the <a href="http://activemq.apache.org/camel/cxf.html";>CXF
Component</a>
* @version $Revision$
*/
-public class CxfComponent extends DefaultComponent<CxfExchange> implements
HeaderFilterStrategyAware {
-
+public class CxfComponent extends DefaultComponent implements
HeaderFilterStrategyAware {
private HeaderFilterStrategy headerFilterStrategy = new
CxfHeaderFilterStrategy();
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Sun Nov 9 23:37:54 2008
@@ -51,8 +51,6 @@
private ConfigurerImpl configurer;
private CxfEndpointBean cxfEndpointBean;
-
-
public CxfEndpoint(String uri, String address, CxfComponent component) {
super(uri, component);
this.component = component;
Modified:
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileComponent.java
Sun Nov 9 23:37:54 2008
@@ -24,7 +24,7 @@
import org.apache.camel.impl.DefaultComponent;
import org.apache.commons.net.ftp.FTPClientConfig;
-public class RemoteFileComponent extends DefaultComponent<RemoteFileExchange> {
+public class RemoteFileComponent extends DefaultComponent {
private RemoteFileConfiguration configuration;
public RemoteFileComponent() {
Modified:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
(original)
+++
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
Sun Nov 9 23:37:54 2008
@@ -35,7 +35,7 @@
*
* @version $Revision$
*/
-public class HttpComponent extends DefaultComponent<HttpExchange> implements
HeaderFilterStrategyAware {
+public class HttpComponent extends DefaultComponent implements
HeaderFilterStrategyAware {
private HttpClientConfigurer httpClientConfigurer;
private HttpConnectionManager httpConnectionManager = new
MultiThreadedHttpConnectionManager();
Modified:
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
(original)
+++
activemq/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
Sun Nov 9 23:37:54 2008
@@ -32,7 +32,7 @@
*
* @version $Revision$
*/
-public class IrcComponent extends DefaultComponent<IrcExchange> {
+public class IrcComponent extends DefaultComponent {
private static final transient Log LOG =
LogFactory.getLog(IrcComponent.class);
private IrcConfiguration configuration;
private final Map<String, IRCConnection> connectionCache = new
HashMap<String, IRCConnection>();
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -25,7 +25,7 @@
/**
* A component for integrating with JSR-170 (JCR) compliant content
repositories
*/
-public class JcrComponent extends DefaultComponent<DefaultExchange> {
+public class JcrComponent extends DefaultComponent {
/**
* Property key for specifying the name of a node in the 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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -26,7 +26,7 @@
/**
* @version $Revision:520964 $
*/
-public class JdbcComponent extends DefaultComponent<DefaultExchange> {
+public class JdbcComponent extends DefaultComponent {
public JdbcComponent() {
}
@@ -39,5 +39,4 @@
protected Endpoint<DefaultExchange> createEndpoint(String uri, String
remaining, Map parameters) throws Exception {
return new JdbcEndpoint(uri, remaining, this);
}
-
}
Modified:
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
Sun Nov 9 23:37:54 2008
@@ -19,6 +19,7 @@
import java.net.URI;
import java.net.URISyntaxException;
+import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
@@ -56,7 +57,7 @@
}
@Override
- public JettyHttpComponent getComponent() {
+ public Component getComponent() {
return component;
}
@@ -67,5 +68,4 @@
public boolean isSessionSupport() {
return sessionSupport;
}
-
}
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -22,7 +22,6 @@
import org.apache.camel.Endpoint;
import org.apache.camel.HeaderFilterStrategyAware;
import org.apache.camel.impl.DefaultComponent;
-import org.apache.camel.impl.DefaultHeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,7 +30,7 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
-public class JhcComponent extends DefaultComponent<JhcExchange> implements
HeaderFilterStrategyAware {
+public class JhcComponent extends DefaultComponent implements
HeaderFilterStrategyAware {
private static final Log LOG = LogFactory.getLog(JhcComponent.class);
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -48,7 +48,7 @@
*
* @version $Revision:520964 $
*/
-public class JmsComponent extends DefaultComponent<JmsExchange> implements
ApplicationContextAware,
+public class JmsComponent extends DefaultComponent implements
ApplicationContextAware,
HeaderFilterStrategyAware {
private static final transient Log LOG =
LogFactory.getLog(JmsComponent.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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -32,7 +32,7 @@
*
* @version $Revision$
*/
-public class JpaComponent extends DefaultComponent<Exchange> {
+public class JpaComponent extends DefaultComponent {
private EntityManagerFactory entityManagerFactory;
public Component resolveComponent(CamelContext container, String uri)
throws Exception {
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=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
Sun Nov 9 23:37:54 2008
@@ -29,7 +29,6 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.ScheduledPollEndpoint;
import org.apache.camel.util.IntrospectionSupport;
import org.apache.camel.util.ObjectHelper;
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -29,14 +29,13 @@
*
* Current implementation only supports working with data queues (*DTAQ)
*/
-public class Jt400Component extends DefaultComponent<Exchange> {
+public class Jt400Component extends DefaultComponent {
private static final String DATA_QUEUE = "DTAQ";
@Override
@SuppressWarnings("unchecked")
- protected Endpoint<Exchange> createEndpoint(String uri, String remaining,
Map properties)
- throws Exception {
+ protected Endpoint<Exchange> 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-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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -28,7 +28,7 @@
*
* @version
*/
-public class LdapComponent<E extends Exchange> extends DefaultComponent<E> {
+public class LdapComponent<E extends Exchange> extends DefaultComponent {
public LdapComponent() {
}
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -31,7 +31,7 @@
*
* @version $Revision:520964 $
*/
-public class MailComponent extends DefaultComponent<MailExchange> implements
HeaderFilterStrategyAware {
+public class MailComponent extends DefaultComponent implements
HeaderFilterStrategyAware {
private MailConfiguration configuration;
private HeaderFilterStrategy headerFilterStrategy = new
DefaultHeaderFilterStrategy();
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -62,7 +62,7 @@
*
* @version $Revision$
*/
-public class MinaComponent extends DefaultComponent<MinaExchange> {
+public class MinaComponent extends DefaultComponent {
private static final transient Log LOG =
LogFactory.getLog(MinaComponent.class);
private static final long DEFAULT_CONNECT_TIMEOUT = 30000;
Modified:
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
(original)
+++
activemq/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
Sun Nov 9 23:37:54 2008
@@ -37,7 +37,7 @@
*
* @version $Revision:520964 $
*/
-public class QuartzComponent extends DefaultComponent<QuartzExchange> {
+public class QuartzComponent extends DefaultComponent {
private static final transient Log LOG =
LogFactory.getLog(QuartzComponent.class);
private SchedulerFactory factory;
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -26,7 +26,7 @@
/**
* @version $Revision:520964 $
*/
-public class RmiComponent extends DefaultComponent<BeanExchange> {
+public class RmiComponent extends DefaultComponent {
public RmiComponent() {
}
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationComponent.java
Sun Nov 9 23:37:54 2008
@@ -26,7 +26,7 @@
*
* @version $Revision$
*/
-public class SpringIntegrationComponent extends
DefaultComponent<SpringIntegrationExchange> {
+public class SpringIntegrationComponent extends DefaultComponent {
protected SpringIntegrationEndpoint createEndpoint(String uri, String
remaining, Map parameters) throws Exception {
SpringIntegrationEndpoint endpoint = new
SpringIntegrationEndpoint(uri, remaining, this);
Modified:
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
(original)
+++
activemq/camel/trunk/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpoint.java
Sun Nov 9 23:37:54 2008
@@ -22,7 +22,6 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.ScheduledPollEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/ResourceBasedComponent.java
Sun Nov 9 23:37:54 2008
@@ -31,7 +31,7 @@
*
* @version $Revision$
*/
-public abstract class ResourceBasedComponent extends
DefaultComponent<Exchange> {
+public abstract class ResourceBasedComponent extends DefaultComponent {
protected final transient Log log = LogFactory.getLog(getClass());
private ResourceLoader resourceLoader = new DefaultResourceLoader();
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java?rev=712622&r1=712621&r2=712622&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
Sun Nov 9 23:37:54 2008
@@ -32,7 +32,7 @@
*
* @version $Revision$
*/
-public class EventComponent extends DefaultComponent<Exchange> implements
ApplicationContextAware {
+public class EventComponent extends DefaultComponent implements
ApplicationContextAware {
private ApplicationContext applicationContext;
public EventComponent() {
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -34,7 +34,7 @@
*
* @version $Revision$
*/
-public class TestComponent extends DefaultComponent<Exchange> {
+public class TestComponent extends DefaultComponent {
public Endpoint<Exchange> createEndpoint(String uri) throws Exception {
// lets not use the normal parameter handling so that all parameters
are sent to the nested endpoint
@@ -51,5 +51,4 @@
Endpoint endpoint =
CamelContextHelper.getMandatoryEndpoint(getCamelContext(), remaining);
return new TestEndpoint(uri, this, endpoint);
}
-
}
\ No newline at end of file
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -24,7 +24,7 @@
/**
* Component providing streams connectivity
*/
-public class StreamComponent extends DefaultComponent<Exchange> {
+public class StreamComponent extends DefaultComponent {
// TODO: remove file and url support in this component. Will be removed in
Camel 2.0
// (Should use other components for such needs.)
@@ -34,5 +34,4 @@
throws Exception {
return new StreamEndpoint(uri, this);
}
-
}
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=712622&r1=712621&r2=712622&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
Sun Nov 9 23:37:54 2008
@@ -29,7 +29,7 @@
/**
* @version $Revision:520964 $
*/
-public class XmppComponent extends DefaultComponent<XmppExchange> implements
HeaderFilterStrategyAware {
+public class XmppComponent extends DefaultComponent implements
HeaderFilterStrategyAware {
private HeaderFilterStrategy headerFilterStrategy = new
DefaultHeaderFilterStrategy();
