svn commit: r1087005 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java

[da...@apache.org]

Author: davsclaus
Date: Wed Mar 30 16:14:37 2011
New Revision: 1087005

URL: http://svn.apache.org/viewvc?rev=1087005&view=rev
Log:
CAMEL-3795: Fixed issue with intercept send to endpoint with ftp endpoints causing the interceptor to be stopped.

Added:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java?rev=1087005&r1=1087004&r2=1087005&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java Wed Mar 30 16:14:37 2011
@@ -154,7 +154,7 @@ public class InterceptSendToEndpoint imp
             }
 
             public void stop() throws Exception {
-                ServiceHelper.stopService(detour);
+                // do not stop detour as it should only be stopped when the interceptor stops
             }
         };
     }
@@ -188,11 +188,11 @@ public class InterceptSendToEndpoint imp
     }
 
     public void start() throws Exception {
-        delegate.start();
+        ServiceHelper.startServices(detour, delegate);
     }
 
     public void stop() throws Exception {
-        delegate.stop();
+        ServiceHelper.stopServices(delegate, detour);
     }
 
     @Override

Added: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java?rev=1087005&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java Wed Mar 30 16:14:37 2011
@@ -0,0 +1,103 @@
+/**
+ * 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.itest.ftp;
+
+import java.io.File;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.FtpServerFactory;
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
+import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.listener.ListenerFactory;
+import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor;
+import org.apache.ftpserver.usermanager.impl.PropertiesUserManager;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class FtpAndHttpRecipientListInterceptSendToEndpointIssueTest extends CamelTestSupport {
+    protected FtpServer ftpServer;
+
+    @Test
+    public void testFtpAndHttpIssue() throws Exception {
+        String ftp = "ftp:localhost:20126/myapp?password=admin&username=admin";
+        String http = "http://localhost:9193/myapp";
+
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+        getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:intercept").expectedMessageCount(3);
+
+        template.sendBodyAndHeader("direct:start", "Hello World", "foo", "seda:foo," + ftp + "," + http);
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                interceptSendToEndpoint("(ftp|http|seda):.*")
+                    .to("mock:intercept");
+
+                from("direct:start")
+                    .recipientList(header("foo"))
+                    .to("mock:result");
+
+                from("jetty:http://0.0.0.0:9193/myapp")
+                    .transform().constant("Bye World");
+
+                from("seda:foo").to("mock:foo");
+            }
+        };
+    }
+
+    public void setUp() throws Exception {
+        super.setUp();
+        initFtpServer();
+        ftpServer.start();
+    }
+
+    public void tearDown() throws Exception {
+        super.tearDown();
+        ftpServer.stop();
+        ftpServer = null;
+    }
+
+    protected void initFtpServer() throws Exception {
+        FtpServerFactory serverFactory = new FtpServerFactory();
+
+        // setup user management to read our users.properties and use clear text passwords
+        File file = new File("./src/test/resources/users.properties").getAbsoluteFile();
+        UserManager uman = new PropertiesUserManager(new ClearTextPasswordEncryptor(), file, "admin");
+        serverFactory.setUserManager(uman);
+
+        NativeFileSystemFactory fsf = new NativeFileSystemFactory();
+        fsf.setCreateHome(true);
+        serverFactory.setFileSystem(fsf);
+
+        ListenerFactory factory = new ListenerFactory();
+        factory.setPort(20126);
+        serverFactory.addListener("default", factory.createListener());
+
+        ftpServer = serverFactory.createServer();
+    }
+
+}