You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/09/23 08:13:16 UTC
svn commit: r817970 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/component/file/
components/camel-osgi/src/test/java/org/apache/camel/osgi/
components/camel-osgi/src/test/java/org/apache/camel/osgi/test/
components/camel-spring/src/main...
Author: davsclaus
Date: Wed Sep 23 06:13:15 2009
New Revision: 817970
URL: http://svn.apache.org/viewvc?rev=817970&view=rev
Log:
MR-188: Removed unused classes.
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java
- copied, changed from r817503, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
Removed:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/LazyLoadingBeanDefinitionParser.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ScriptDefinitionParser.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/remoting/SendBeforeInterceptor.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/SpringConverters.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
camel/trunk/components/camel-spring/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelContextFactoryTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundleContext.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyRouteBuilder.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyService.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyTypeConverter.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactedRuntimeCamelException.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilter.java Wed Sep 23 06:13:15 2009
@@ -63,7 +63,7 @@
@SuppressWarnings("unchecked")
private void init() throws NoSuchMethodException {
// we must use reflection to invoke the AntPathMatcherFileFilter that reside in camel-spring.jar
- // and we don't want camel-ftp to have runtime dependency on camel-spring.jar
+ // and we don't want camel-cone to have runtime dependency on camel-spring.jar
Class clazz = ObjectHelper.loadClass(ANTPATHMATCHER_CLASSNAME);
ObjectHelper.notNull(clazz, ANTPATHMATCHER_CLASSNAME + " not found in classpath. camel-spring.jar is required in the classpath.");
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/ActivatorTest.java Wed Sep 23 06:13:15 2009
@@ -14,13 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.osgi;
-import junit.framework.TestCase;
-import org.junit.Test;
-import org.springframework.osgi.mock.MockBundle;
-import org.springframework.osgi.mock.MockBundleContext;
+import org.junit.Test;
public class ActivatorTest extends CamelOsgiTestSupport {
@@ -29,10 +25,8 @@
Class clazz = Activator.getComponent("timer");
assertNull("Here should not find the timer component", clazz);
- clazz = null;
clazz = Activator.getComponent("timer_test");
assertNotNull("The timer_test component should not be null", clazz);
-
}
@Test
@@ -57,8 +51,7 @@
Activator.TypeConverterEntry[] entries = Activator.getTypeConverterEntries();
assertTrue("We should find some converter packages here", entries.length > 0);
assertTrue("Here should contains org.apache.camel.osgi.test", containsPackageName("org.apache.camel.osgi.test", entries));
- assertTrue("Here should contains org.apache.camel.spring.converter", containsPackageName("org.apache.camel.spring.converter", entries));
- assertTrue("Here should contains org.apache.camel.osgi.test", containsPackageName("org.apache.camel.osgi.test", entries));
+ assertTrue("Here should contains org.apache.camel.osgi.test", containsPackageName("org.apache.camel.osgi.test", entries));
}
}
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelContextFactoryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelContextFactoryTest.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelContextFactoryTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelContextFactoryTest.java Wed Sep 23 06:13:15 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.osgi;
import org.apache.camel.impl.DefaultCamelContext;
@@ -22,7 +21,8 @@
import org.junit.Test;
public class CamelContextFactoryTest extends CamelOsgiTestSupport {
- @Test
+
+ @Test
public void osigServiceRegistryTest() throws Exception {
CamelContextFactory factory = new CamelContextFactory();
factory.setBundleContext(getBundleContext());
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java Wed Sep 23 06:13:15 2009
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.osgi;
-import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -25,7 +23,6 @@
import org.springframework.osgi.mock.MockBundle;
-
/**
* The mock bundle will make up a normal camel-components bundle
*/
@@ -40,7 +37,7 @@
}
public boolean hasMoreElements() {
- return list == null ? false : index < list.size();
+ return list != null && index < list.size();
}
public Object nextElement() {
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundleContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundleContext.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundleContext.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundleContext.java Wed Sep 23 06:13:15 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.osgi;
import org.apache.camel.osgi.test.MyService;
@@ -22,9 +21,6 @@
import org.osgi.framework.ServiceReference;
import org.springframework.osgi.mock.MockBundleContext;
-/**
- *
- */
public class CamelMockBundleContext extends MockBundleContext {
public Object getService(ServiceReference reference) {
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java Wed Sep 23 06:13:15 2009
@@ -27,7 +27,7 @@
MockTypeConverterRegistry registry = new MockTypeConverterRegistry();
loader.load(registry);
assertTrue("There should have at lest one fallback converter", registry.getFallbackTypeConverters().size() >= 1);
- assertTrue("There should have at lest one coverter", registry.getTypeConverters().size() >= 1);
+ assertTrue("There should have at lest one converter", registry.getTypeConverters().size() >= 1);
}
}
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiFactoryFinderTest.java Wed Sep 23 06:13:15 2009
@@ -23,6 +23,7 @@
import org.junit.Test;
public class OsgiFactoryFinderTest extends CamelOsgiTestSupport {
+
@Test
public void testFindClass() throws Exception {
OsgiFactoryFinder finder = new OsgiFactoryFinder(new DefaultClassResolver(), "META-INF/services/org/apache/camel/component/");
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiPackageScanClassResolverTest.java Wed Sep 23 06:13:15 2009
@@ -27,6 +27,7 @@
import org.osgi.framework.BundleContext;
public class OsgiPackageScanClassResolverTest extends CamelOsgiTestSupport {
+
@Test
public void testOsgiResolverFindAnnotatedTest() throws IOException {
BundleContext context = getActivator().getBundle().getBundleContext();
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyRouteBuilder.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyRouteBuilder.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyRouteBuilder.java Wed Sep 23 06:13:15 2009
@@ -23,7 +23,6 @@
@Override
public void configure() throws Exception {
// Do nothing here
-
}
}
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyService.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyService.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyService.java Wed Sep 23 06:13:15 2009
@@ -17,6 +17,7 @@
package org.apache.camel.osgi.test;
public class MyService {
+
public String sayHi() {
return "Hello";
}
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyTypeConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyTypeConverter.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyTypeConverter.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/test/MyTypeConverter.java Wed Sep 23 06:13:15 2009
@@ -16,15 +16,12 @@
*/
package org.apache.camel.osgi.test;
-import java.util.Collection;
-
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.FallbackConverter;
import org.apache.camel.TypeConverter;
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.util.ObjectHelper;
@Converter
public final class MyTypeConverter {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/test/TestEndpoint.java Wed Sep 23 06:13:15 2009
@@ -46,11 +46,6 @@
this.expectedMessageEndpoint = expectedMessageEndpoint;
}
- public TestEndpoint(String endpointUri, Endpoint expectedMessageEndpoint) {
- super(endpointUri);
- this.expectedMessageEndpoint = expectedMessageEndpoint;
- }
-
@SuppressWarnings("unchecked")
public void start() throws Exception {
if (LOG.isDebugEnabled()) {
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java Wed Sep 23 06:13:15 2009
@@ -145,9 +145,7 @@
@XmlTransient
private SpringCamelContext context;
@XmlTransient
- private RouteBuilder routeBuilder;
- @XmlTransient
- private List<RoutesBuilder> additionalBuilders = new ArrayList<RoutesBuilder>();
+ private List<RoutesBuilder> builders = new ArrayList<RoutesBuilder>();
@XmlTransient
private ApplicationContext applicationContext;
@XmlTransient
@@ -176,10 +174,6 @@
return contextClassLoaderOnStart;
}
- public List<RoutesBuilder> getAdditionalBuilders() {
- return additionalBuilders;
- }
-
public void afterPropertiesSet() throws Exception {
if (properties != null) {
getContext().setProperties(properties.asMap());
@@ -577,26 +571,6 @@
this.interceptSendToEndpoints = interceptSendToEndpoints;
}
- public RouteBuilder getRouteBuilder() {
- return routeBuilder;
- }
-
- /**
- * Set a single {@link RouteBuilder} to be used to create the default routes
- * on startup
- */
- public void setRouteBuilder(RouteBuilder routeBuilder) {
- this.routeBuilder = routeBuilder;
- }
-
- /**
- * Set a collection of {@link RouteBuilder} instances to be used to create
- * the default routes on startup
- */
- public void setRouteBuilders(RouteBuilder[] builders) {
- additionalBuilders.addAll(Arrays.asList(builders));
- }
-
public ApplicationContext getApplicationContext() {
if (applicationContext == null) {
throw new IllegalArgumentException("No applicationContext has been injected!");
@@ -793,10 +767,6 @@
protected void installRoutes() throws Exception {
List<RouteBuilder> builders = new ArrayList<RouteBuilder>();
- if (routeBuilder != null) {
- builders.add(routeBuilder);
- }
-
// lets add route builders added from references
if (builderRefs != null) {
for (RouteBuilderDefinition builderRef : builderRefs) {
@@ -807,7 +777,7 @@
// support to get the route here
RoutesBuilder routes = builderRef.createRoutes(getContext());
if (routes != null) {
- additionalBuilders.add(routes);
+ this.builders.add(routes);
} else {
// Throw the exception that we can't find any build here
throw new CamelException("Cannot find any routes with this RouteBuilder reference: " + builderRef);
@@ -818,7 +788,7 @@
}
// install already configured routes
- for (RoutesBuilder routeBuilder : additionalBuilders) {
+ for (RoutesBuilder routeBuilder : this.builders) {
getContext().addRoutes(routeBuilder);
}
@@ -850,7 +820,7 @@
String[] normalized = normalizePackages(packageScanDef.getPackages());
RouteBuilderFinder finder = new RouteBuilderFinder(getContext(), normalized, getContextClassLoaderOnStart(),
getBeanPostProcessor(), getContext().getPackageScanClassResolver());
- finder.appendBuilders(getAdditionalBuilders());
+ finder.appendBuilders(builders);
}
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelEndpointFactoryBean.java Wed Sep 23 06:13:15 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.spring;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -46,8 +45,6 @@
private CamelContext context;
@XmlTransient
private Endpoint endpoint;
- @XmlTransient
- private boolean singleton;
public Object getObject() throws Exception {
if (endpoint == null) {
@@ -61,7 +58,10 @@
}
public boolean isSingleton() {
- return singleton;
+ if (endpoint == null) {
+ this.endpoint = createEndpoint();
+ }
+ return endpoint.isSingleton();
}
public CamelContext getCamelContext() {
@@ -77,18 +77,6 @@
this.context = context;
}
- public Endpoint getEndpoint() {
- return endpoint;
- }
-
- public void setEndpoint(Endpoint endpoint) {
- this.endpoint = endpoint;
- }
-
- public void setSingleton(boolean singleton) {
- this.singleton = singleton;
- }
-
public String getUri() {
return uri;
}
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/CamelProducerTemplateFactoryBean.java Wed Sep 23 06:13:15 2009
@@ -81,13 +81,8 @@
this.camelContext = camelContext;
}
- public String getDefaultEndpoint() {
- return defaultEndpoint;
- }
-
/**
- * Sets the default endpoint URI used by default for sending message
- * exchanges
+ * Sets the default endpoint URI used by default for sending message exchanges
*/
public void setDefaultEndpoint(String defaultEndpoint) {
this.defaultEndpoint = defaultEndpoint;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/RouteBuilderFinder.java Wed Sep 23 06:13:15 2009
@@ -23,8 +23,6 @@
import org.apache.camel.RoutesBuilder;
import org.apache.camel.spi.PackageScanClassResolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
@@ -34,7 +32,6 @@
* @version $Revision$
*/
public class RouteBuilderFinder {
- private static final transient Log LOG = LogFactory.getLog(RouteBuilderFinder.class);
private final SpringCamelContext camelContext;
private final String[] packages;
private PackageScanClassResolver resolver;
@@ -53,14 +50,6 @@
resolver.addClassLoader(classLoader);
}
- public String[] getPackages() {
- return packages;
- }
-
- public ApplicationContext getApplicationContext() {
- return applicationContext;
- }
-
/**
* Appends all the {@link org.apache.camel.builder.RouteBuilder} instances that can be found on the classpath
*/
@@ -81,9 +70,6 @@
}
}
- public void destroy() throws Exception {
- }
-
/**
* Lets ignore beans that are not explicitly configured in the spring.xml
*/
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/BeanDefinitionParser.java Wed Sep 23 06:13:15 2009
@@ -26,7 +26,6 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
-
/**
* A base class for a parser for a bean.
*
@@ -38,24 +37,14 @@
public class BeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
private Class type;
- protected BeanDefinitionParser() {
- }
-
public BeanDefinitionParser(Class type) {
this.type = type;
}
protected Class getBeanClass(Element element) {
- if (type == null) {
- type = loadType();
- }
return type;
}
- protected Class loadType() {
- throw new IllegalArgumentException("No type specified!");
- }
-
protected boolean isEligibleAttribute(String attributeName) {
return attributeName != null && !ID_ATTRIBUTE.equals(attributeName)
&& !attributeName.equals("xmlns") && !attributeName.startsWith("xmlns:");
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Wed Sep 23 06:13:15 2009
@@ -125,19 +125,11 @@
parentBuilder.addPropertyReference("beanPostProcessor", beanPostProcessorId);
}
- protected void registerScriptParser(String elementName, String engineName) {
- registerParser(elementName, new ScriptDefinitionParser(engineName));
- }
-
protected void registerParser(String name, org.springframework.beans.factory.xml.BeanDefinitionParser parser) {
parserElementNames.add(name);
registerBeanDefinitionParser(name, parser);
}
- public Set<String> getParserElementNames() {
- return parserElementNames;
- }
-
protected Object parseUsingJaxb(Element element, ParserContext parserContext, Binder<Node> binder) {
try {
return binder.unmarshal(element);
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactedRuntimeCamelException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactedRuntimeCamelException.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactedRuntimeCamelException.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactedRuntimeCamelException.java Wed Sep 23 06:13:15 2009
@@ -25,26 +25,6 @@
private final boolean handled;
- public TransactedRuntimeCamelException() {
- super();
- this.handled = false;
- }
-
- public TransactedRuntimeCamelException(String message) {
- super(message);
- this.handled = false;
- }
-
- public TransactedRuntimeCamelException(String message, Throwable cause) {
- super(message, cause);
- this.handled = false;
- }
-
- public TransactedRuntimeCamelException(Throwable cause) {
- super(cause);
- this.handled = false;
- }
-
public TransactedRuntimeCamelException(Throwable cause, boolean handled) {
super(cause);
this.handled = handled;
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/util/ReflectionUtils.java Wed Sep 23 06:13:15 2009
@@ -16,10 +16,7 @@
*/
package org.apache.camel.spring.util;
-import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
/**
@@ -27,24 +24,6 @@
*/
public class ReflectionUtils extends org.springframework.util.ReflectionUtils {
- public static <T extends Annotation> void callLifecycleMethod(final Object bean, final Class<T> annotation) {
- ReflectionUtils.doWithMethods(bean.getClass(), new ReflectionUtils.MethodCallback() {
- public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException {
- if (method.getAnnotation(annotation) != null) {
- try {
- method.invoke(bean, (Object[])null);
- } catch (IllegalArgumentException ex) {
- throw new IllegalStateException("Failure to invoke " + method + " on " + bean.getClass() + ": args=[]", ex);
- } catch (IllegalAccessException ex) {
- throw new UnsupportedOperationException(ex.toString());
- } catch (InvocationTargetException ex) {
- throw new UnsupportedOperationException("PostConstruct method on bean threw exception", ex.getTargetException());
- }
- }
- }
- });
- }
-
public static void setField(Field f, Object instance, Object value) {
try {
boolean oldAccessible = f.isAccessible();
@@ -62,5 +41,5 @@
ReflectionUtils.handleReflectionException(ex);
}
}
-
+
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java?rev=817970&r1=817969&r2=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java Wed Sep 23 06:13:15 2009
@@ -16,10 +16,7 @@
*/
package org.apache.camel.spring;
-import java.util.List;
-
import org.apache.camel.Endpoint;
-import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.example.DummyBean;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -31,6 +28,10 @@
public class EndpointReferenceTest extends SpringTestSupport {
protected static Object body = "<hello>world!</hello>";
+ public void testContextToString() throws Exception {
+ assertNotNull(context.toString());
+ }
+
public void testEndpointConfiguration() throws Exception {
Endpoint endpoint = getMandatoryBean(Endpoint.class, "endpoint1");
@@ -64,13 +65,6 @@
testEndpointConfiguration();
}
- protected void assertValidContext(SpringCamelContext context) {
- super.assertValidContext(context);
-
- List<Route> routes = context.getRoutes();
- assertEquals("Number of routes defined", 1, routes.size());
- }
-
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/endpointReference.xml");
}
Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java (from r817503, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java&r1=817503&r2=817970&rev=817970&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceLookupTypeTest.java Wed Sep 23 06:13:15 2009
@@ -16,80 +16,14 @@
*/
package org.apache.camel.spring.interceptor;
-import javax.sql.DataSource;
-
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spring.SpringRouteBuilder;
-import org.apache.camel.spring.SpringTestSupport;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
-import org.apache.camel.spring.spi.TransactedRuntimeCamelException;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.jdbc.core.JdbcTemplate;
/**
* Unit test to demonstrate the transactional client pattern.
*/
-public class TransactionalClientDataSourceTest extends SpringTestSupport {
-
- protected JdbcTemplate jdbc;
- protected boolean useTransactionErrorHandler = true;
-
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext(
- "/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml");
- }
-
- protected int getExpectedRouteCount() {
- return 0;
- }
-
- @Override
- protected void setUp() throws Exception {
- this.disableJMX();
- super.setUp();
-
- // START SNIPPET: e5
- // create database and insert dummy data
- final DataSource ds = getMandatoryBean(DataSource.class, "dataSource");
- jdbc = new JdbcTemplate(ds);
- jdbc.execute("create table books (title varchar(50))");
- jdbc.update("insert into books (title) values (?)", new Object[] {"Camel in Action"});
- // END SNIPPET: e5
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- jdbc.execute("drop table books");
- this.enableJMX();
- }
-
- // START SNIPPET: e3
- public void testTransactionSuccess() throws Exception {
- template.sendBody("direct:okay", "Hello World");
-
- int count = jdbc.queryForInt("select count(*) from books");
- assertEquals("Number of books", 3, count);
- }
- // END SNIPPET: e3
-
- // START SNIPPET: e4
- public void testTransactionRollback() throws Exception {
- try {
- template.sendBody("direct:fail", "Hello World");
- } catch (RuntimeCamelException e) {
- // expeced as we fail
- assertIsInstanceOf(TransactedRuntimeCamelException.class, e.getCause());
- assertTrue(e.getCause().getCause() instanceof IllegalArgumentException);
- assertEquals("We don't have Donkeys, only Camels", e.getCause().getCause().getMessage());
- }
-
- int count = jdbc.queryForInt("select count(*) from books");
- assertEquals("Number of books", 1, count);
- }
- // END SNIPPET: e4
+public class TransactionalClientDataSourceLookupTypeTest extends TransactionalClientDataSourceTest {
protected RouteBuilder createRouteBuilder() throws Exception {
// START SNIPPET: e1
@@ -99,7 +33,7 @@
public void configure() throws Exception {
// START SNIPPET: e1
// lookup the transaction policy
- SpringTransactionPolicy required = lookup("PROPAGATION_REQUIRED", SpringTransactionPolicy.class);
+ SpringTransactionPolicy required = lookup(SpringTransactionPolicy.class);
// use this error handler instead of DeadLetterChannel that is the default
// Notice: transactionErrorHandler is in SpringRouteBuilder
@@ -127,4 +61,4 @@
};
}
-}
+}
\ No newline at end of file