svn commit: r1031027 - in /camel/trunk: apache-camel/ apache-camel/src/main/descriptors/ camel-core/src/test/java/org/apache/camel/processor/ components/ components/camel-spring-ws/ parent/ platforms/karaf/features/

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1031027 - in /camel/trunk: apache-camel/ apache-camel/src/main/descriptors/ camel-core/src/test/java/org/apache/camel/processor/ components/ components/camel-spring-ws/ parent/ platforms/karaf/features/

davsclaus-2
Author: davsclaus
Date: Thu Nov  4 15:19:31 2010
New Revision: 1031027

URL: http://svn.apache.org/viewvc?rev=1031027&view=rev
Log:
CAMEL-3105: Removed camel-spring-ws to be added later from the ZIP file from the Apache JIRA.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FromToInOutTest.java
Removed:
    camel/trunk/components/camel-spring-ws/
Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/components/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1031027&r1=1031026&r2=1031027&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Thu Nov  4 15:19:31 2010
@@ -342,10 +342,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring-ws</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
       <artifactId>camel-sql</artifactId>
     </dependency>
     <dependency>

Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=1031027&r1=1031026&r2=1031027&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Thu Nov  4 15:19:31 2010
@@ -106,7 +106,6 @@
         <include>org.apache.camel:camel-spring-integration</include>
         <include>org.apache.camel:camel-spring-javaconfig</include>
         <include>org.apache.camel:camel-spring-security</include>
-        <include>org.apache.camel:camel-spring-ws</include>
         <include>org.apache.camel:camel-sql</include>
         <include>org.apache.camel:camel-stream</include>
         <include>org.apache.camel:camel-stringtemplate</include>

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FromToInOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FromToInOutTest.java?rev=1031027&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FromToInOutTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FromToInOutTest.java Thu Nov  4 15:19:31 2010
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class FromToInOutTest extends ContextTestSupport {
+
+    public void testInOut() throws Exception {
+        getMockEndpoint("mock:foo").expectedMessageCount(1);
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+
+        // start with InOnly
+        template.sendBody("direct:start", ExchangePattern.InOnly, "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .inOut("direct:foo")
+                    .to("mock:result");
+
+                from("direct:foo")
+                    .process(new Processor() {
+                        public void process(Exchange exchange) throws Exception {
+                            // but it should have been changed to InOut
+                            assertEquals(ExchangePattern.InOut, exchange.getPattern());
+                        }
+                    }).to("mock:foo");
+            }
+        };
+    }
+}

Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1031027&r1=1031026&r2=1031027&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Thu Nov  4 15:19:31 2010
@@ -105,7 +105,6 @@
     <module>camel-spring-integration</module>
     <module>camel-spring-javaconfig</module>
     <module>camel-spring-security</module>
-    <module>camel-spring-ws</module>
     <module>camel-sql</module>
     <module>camel-stringtemplate</module>
     <module>camel-stream</module>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1031027&r1=1031026&r2=1031027&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Nov  4 15:19:31 2010
@@ -129,7 +129,6 @@
     <spring-version>3.0.5.RELEASE</spring-version>
     <spring-osgi-version>1.2.0</spring-osgi-version>
     <spring-security-version>3.0.3.RELEASE</spring-security-version>
-    <spring-ws-version>1.5.9</spring-ws-version>
     <stax-api-version>1.0.1</stax-api-version>
     <stringtemplate-version>3.0</stringtemplate-version>
     <tagsoup-version>1.2</tagsoup-version>
@@ -595,11 +594,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-spring-ws</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-sql</artifactId>
         <version>${project.version}</version>
       </dependency>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1031027&r1=1031026&r2=1031027&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Thu Nov  4 15:19:31 2010
@@ -30,7 +30,6 @@
     <groupId>org.apache.camel.karaf</groupId>
     <artifactId>apache-camel</artifactId>
     <packaging>pom</packaging>
-    <version>2.6-SNAPSHOT</version>
     <name>Camel :: Platforms :: Apache Karaf :: Features</name>
 
     <!-- some of the bundles is located at: http://repo1.maven.org/maven2/org/apache/servicemix/bundles/ -->
@@ -87,7 +86,7 @@
       <jing-bundle-version>20030619_1</jing-bundle-version>
       <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
       <josql-bundle-version>1.5_3</josql-bundle-version>
-      <jsch-bundle-version>0.1.44_1-SNAPSHOT</jsch-bundle-version>
+      <jsch-bundle-version>0.1.43_1</jsch-bundle-version>
       <jsendnsca-bundle-version>1.3.1_1</jsendnsca-bundle-version>
       <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
       <juel-bundle-version>2.1.2_1</juel-bundle-version>