Author: jstrachan
Date: Tue May 1 02:33:05 2007
New Revision: 533982
URL: http://svn.apache.org/viewvc?view=rev&rev=533982
Log:
moved the CamelClient into the core Camel API package
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
(contents, props changed)
- copied, changed from r533971,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelClient.java
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelClient.java
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
Copied:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
(from r533971,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelClient.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java?view=diff&rev=533982&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelClient.java&r1=533971&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelClient.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
Tue May 1 02:33:05 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.util;
+package org.apache.camel;
import org.apache.camel.Exchange;
import org.apache.camel.CamelContext;
@@ -23,10 +23,11 @@
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.util.ProducerCache;
import org.apache.camel.impl.ServiceSupport;
/**
- * A helper client for working with Camel
+ * A Client object for working with Camel and invoking [EMAIL PROTECTED]
Endpoint} instances with [EMAIL PROTECTED] Exchange} instances
*
* @version $Revision$
*/
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelClient.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
Tue May 1 02:33:05 2007
@@ -18,9 +18,7 @@
package org.apache.camel;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.ProducerCache;
-import org.apache.camel.util.CamelClient;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.CamelClient;
import org.apache.camel.builder.RouteBuilder;
/**
Modified:
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportBase.java
Tue May 1 02:33:05 2007
@@ -19,7 +19,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.util.CamelClient;
+import org.apache.camel.CamelClient;
import org.apache.cxf.Bus;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
Modified:
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfInvokeTest.java
Tue May 1 02:33:05 2007
@@ -22,7 +22,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
-import org.apache.camel.util.CamelClient;
+import org.apache.camel.CamelClient;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.frontend.ServerFactoryBean;
Modified:
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
(original)
+++
activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTest.java
Tue May 1 02:33:05 2007
@@ -23,7 +23,7 @@
import org.apache.camel.Processor;
import org.apache.camel.TypeConverter;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.CamelClient;
+import org.apache.camel.CamelClient;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.Bus;
Modified:
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
(original)
+++
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
Tue May 1 02:33:05 2007
@@ -23,9 +23,9 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.CamelClient;
import org.apache.camel.examples.SendEmail;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.CamelClient;
import static org.apache.camel.util.ServiceHelper.startServices;
import static org.apache.camel.util.ServiceHelper.stopServices;
import org.apache.commons.logging.Log;
Modified:
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
(original)
+++
activemq/camel/trunk/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
Tue May 1 02:33:05 2007
@@ -23,9 +23,9 @@
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.CamelClient;
import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.CamelClient;
import org.apache.camel.util.ServiceHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
Tue May 1 02:33:05 2007
@@ -23,8 +23,7 @@
import org.apache.camel.Message;
import org.apache.camel.Route;
import org.apache.camel.spring.example.MyProcessor;
-import org.apache.camel.util.CamelClient;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.CamelClient;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified:
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java?view=diff&rev=533982&r1=533981&r2=533982
==============================================================================
---
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
(original)
+++
activemq/camel/trunk/camel-spring/src/test/java/org/apache/camel/spring/RoutingUsingCamelContextFactoryTest.java
Tue May 1 02:33:05 2007
@@ -17,14 +17,13 @@
*/
package org.apache.camel.spring;
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.TestSupport;
import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.util.CamelClient;
+import org.apache.camel.CamelClient;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
