Author: davsclaus
Date: Thu Aug 7 21:18:28 2008
New Revision: 683841
URL: http://svn.apache.org/viewvc?rev=683841&view=rev
Log:
CAMEL-633: Applied patch with thanks to Jonathan.
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportAndNamespacesRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportRouteTest.java
Modified:
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/ModelFileGenerator.java
Thu Aug 7 21:18:28 2008
@@ -10,14 +10,12 @@
import java.util.Properties;
import javax.xml.bind.JAXBException;
-import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Result;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.apache.camel.builder.xml.Namespaces;
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/bean/BeanRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -18,6 +18,8 @@
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -58,7 +60,7 @@
return 0;
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/bean/camelContext.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/event/EventRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -20,6 +20,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -52,7 +53,7 @@
assertEquals("Received event body", expectedBody, actualBody);
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/event/camelContext.xml");
}
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/validator/ValidatorRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -18,6 +18,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -58,7 +59,7 @@
return 0;
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/validator/camelContext.xml");
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -21,6 +21,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -56,7 +57,7 @@
return 0;
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/xslt/camelContext.xml");
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/ApplicationContextTestSupport.java
Thu Aug 7 21:18:28 2008
@@ -19,7 +19,6 @@
import junit.framework.TestCase;
import org.apache.camel.util.ObjectHelper;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
@@ -27,7 +26,7 @@
public abstract class ApplicationContextTestSupport extends TestCase {
protected AbstractXmlApplicationContext applicationContext;
- protected abstract ClassPathXmlApplicationContext
createApplicationContext();
+ protected abstract AbstractXmlApplicationContext
createApplicationContext();
@Override
protected void setUp() throws Exception {
@@ -60,4 +59,4 @@
return null;
}
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CamelContextAwareTest.java
Thu Aug 7 21:18:28 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -35,11 +36,11 @@
bean = getMandatoryBean(CamelContextAwareBean.class, "bean");
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/camelContextAwareBean.xml");
}
protected int getExpectedRouteCount() {
return 0;
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
Thu Aug 7 21:18:28 2008
@@ -65,7 +65,7 @@
log.debug("Found route: " + route);
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/routingUsingProcessor.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
Thu Aug 7 21:18:28 2008
@@ -24,6 +24,7 @@
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -68,7 +69,7 @@
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/defaultJmxConfig.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTest.java
Thu Aug 7 21:18:28 2008
@@ -18,6 +18,7 @@
import javax.management.ObjectName;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -29,7 +30,7 @@
public class DisableJmxAgentTest extends DefaultJMXAgentTest {
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/disableJmxConfig.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/DisableJmxAgentTheOldWayTest.java
Thu Aug 7 21:18:28 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -27,7 +28,7 @@
public class DisableJmxAgentTheOldWayTest extends DisableJmxAgentTest {
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/disableJmxTheOldWayConfig.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
Thu Aug 7 21:18:28 2008
@@ -22,6 +22,7 @@
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;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -70,7 +71,7 @@
assertEquals("Number of routes defined", 1, routes.size());
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/endpointReference.xml");
}
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
Thu Aug 7 21:18:28 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -59,7 +60,7 @@
bean = getMandatoryBean(InjectedBean.class, "injectedBean");
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/injectedBean.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
Thu Aug 7 21:18:28 2008
@@ -21,6 +21,7 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -57,7 +58,7 @@
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/jmxConfig.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
Thu Aug 7 21:18:28 2008
@@ -17,6 +17,7 @@
package org.apache.camel.spring;
import org.apache.camel.CamelContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -29,7 +30,7 @@
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
setUseRouteBuilder(false);
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/lifecycleStrategyInjection.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RegistryInjectionTest.java
Thu Aug 7 21:18:28 2008
@@ -18,6 +18,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.impl.JndiRegistry;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -28,7 +29,7 @@
public class RegistryInjectionTest extends SpringTestSupport {
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
setUseRouteBuilder(false);
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/RegistryInjection.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
Thu Aug 7 21:18:28 2008
@@ -65,7 +65,7 @@
assertEquals("Number of routes defined", 1, routes.size());
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/routingUsingCamelContextFactory.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
Thu Aug 7 21:18:28 2008
@@ -23,7 +23,6 @@
import org.apache.camel.Route;
import org.apache.camel.util.ObjectHelper;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
@@ -31,7 +30,7 @@
public abstract class SpringTestSupport extends ContextTestSupport {
protected AbstractXmlApplicationContext applicationContext;
- protected abstract ClassPathXmlApplicationContext
createApplicationContext();
+ protected abstract AbstractXmlApplicationContext
createApplicationContext();
@Override
protected void setUp() throws Exception {
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/BeanAsEndpointTest.java
Thu Aug 7 21:18:28 2008
@@ -19,6 +19,7 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -41,8 +42,8 @@
return 0;
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/bind/beanAsEndpoint.xml");
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
Thu Aug 7 21:18:28 2008
@@ -23,6 +23,7 @@
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -54,7 +55,7 @@
}
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/bind/processorAsEndpoint.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ErrorHandlerTest.java
Thu Aug 7 21:18:28 2008
@@ -26,10 +26,11 @@
import org.apache.camel.processor.DeadLetterChannel;
import org.apache.camel.processor.RedeliveryPolicy;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class ErrorHandlerTest extends SpringTestSupport {
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/config/errorHandler.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -19,6 +19,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
@@ -58,7 +59,7 @@
notMatchedEndpoint = getMockEndpoint("mock:notMatched");
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/example/contentBasedRoute.xml");
}
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
Thu Aug 7 21:18:28 2008
@@ -18,6 +18,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -42,7 +43,7 @@
resultEndpoint = getMockEndpoint("mock:result");
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/example/pojoConsumer.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
Thu Aug 7 21:18:28 2008
@@ -19,6 +19,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
@@ -59,7 +60,7 @@
mySender = getMandatoryBean(MySender.class, "mySender");
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/example/pojoSender.xml");
}
@@ -68,3 +69,4 @@
}
}
+
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/SimpleRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -19,6 +19,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -35,8 +36,8 @@
resultEndpoint.assertIsSatisfied();
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/example/simpleRoute.xml");
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
Thu Aug 7 21:18:28 2008
@@ -22,6 +22,7 @@
import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.SpringTestSupport;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -33,7 +34,7 @@
protected JdbcTemplate jdbc;
protected boolean useTransactionErrorHandler = true;
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
"/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/managment/JmxInstrumentationWithConnectorTest.java
Thu Aug 7 21:18:28 2008
@@ -19,6 +19,7 @@
import org.apache.camel.management.DefaultInstrumentationAgent;
import org.apache.camel.spi.InstrumentationAgent;
import org.apache.camel.spring.EndpointReferenceTest;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class JmxInstrumentationWithConnectorTest extends EndpointReferenceTest
{
@@ -31,7 +32,7 @@
}
@Override
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml");
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/mock/BeanMockTest.java
Thu Aug 7 21:18:28 2008
@@ -17,6 +17,7 @@
package org.apache.camel.spring.mock;
import org.apache.camel.spring.ApplicationContextTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -28,7 +29,7 @@
bean.assertEndpointsValid();
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/mock/spring.xml");
}
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTestHelper.java
Thu Aug 7 21:18:28 2008
@@ -20,6 +20,7 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Service;
import org.apache.camel.spring.SpringCamelContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -33,7 +34,7 @@
public static CamelContext createSpringCamelContext(ContextTestSupport
test, String classpathUri) throws Exception {
test.setUseRouteBuilder(false);
- final ClassPathXmlApplicationContext applicationContext = new
ClassPathXmlApplicationContext(classpathUri);
+ final AbstractXmlApplicationContext applicationContext = new
ClassPathXmlApplicationContext(classpathUri);
test.setCamelContextService(new Service() {
public void start() throws Exception {
applicationContext.start();
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
Thu Aug 7 21:18:28 2008
@@ -18,6 +18,7 @@
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class TransformWithExpressionTest extends SpringTestSupport {
@@ -39,7 +40,7 @@
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/processor/transformWithExpressionContext.xml");
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -32,7 +33,7 @@
private static final Log LOG =
LogFactory.getLog(SpringRemotingRouteTest.class);
public void testPojoRoutes() throws Exception {
- ClassPathXmlApplicationContext applicationContext =
createApplicationContext();
+ AbstractXmlApplicationContext applicationContext =
createApplicationContext();
/*
Object service = applicationContext.getBean("say");
log.info("Found service!: " + service);
@@ -51,7 +52,7 @@
applicationContext.destroy();
}
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/spring.xml");
}
}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportAndNamespacesRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportAndNamespacesRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportAndNamespacesRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportAndNamespacesRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring.remoting;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -23,7 +24,7 @@
*/
public class SpringRemotingWithServiceExportAndNamespacesRouteTest extends
SpringRemotingRouteTest {
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/spring-with-exporter-namespace.xml");
}
-}
\ No newline at end of file
+}
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportRouteTest.java?rev=683841&r1=683840&r2=683841&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/SpringRemotingWithServiceExportRouteTest.java
Thu Aug 7 21:18:28 2008
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring.remoting;
+import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
@@ -23,7 +24,7 @@
*/
public class SpringRemotingWithServiceExportRouteTest extends
SpringRemotingRouteTest {
- protected ClassPathXmlApplicationContext createApplicationContext() {
+ protected AbstractXmlApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/spring-with-exporter.xml");
}
-}
\ No newline at end of file
+}
