camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r998915 - in /camel/trunk/tests/camel-itest-osgi/src/test: java/org/apache/camel/itest/osgi/core/direct/ java/org/apache/camel/itest/osgi/core/file/ java/org/apache/camel/itest/osgi/core/language/ java/org/apache/camel/itest/osgi/core/manag...
Date Mon, 20 Sep 2010 13:07:38 GMT
Author: davsclaus
Date: Mon Sep 20 13:07:37 2010
New Revision: 998915

URL: http://svn.apache.org/viewvc?rev=998915&view=rev
Log:
CAMEL-3126: reorganized pacakges a bit because we will have many components to test.

Added:
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/direct/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
  (with props)
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/file/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
  (contents, props changed)
      - copied, changed from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/management/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/seda/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/validator/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/validator/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/xslt/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xslt/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/management/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/management/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/packages/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/packages/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/spring/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/spring/validator/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/validator/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/spring/xslt/
      - copied from r998895, camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/xslt/
Removed:
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/OSGiIntegrationSpringTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/direct/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/file/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/management/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/seda/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/validator/
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xslt/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/management/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/packages/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/validator/
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/xslt/
Modified:
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/MyRouteBuilder.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/validator/ValidatorRouteTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/xslt/XsltRouteTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/packages/CamelContext.xml

Added: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java?rev=998915&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
(added)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
Mon Sep 20 13:07:37 2010
@@ -0,0 +1,48 @@
+/**
+ * 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.osgi.core.direct;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+
+@RunWith(JUnit4TestRunner.class)
+public class DirectTest extends OSGiIntegrationTestSupport {
+    
+    @Test
+    public void testSendMessage() throws Exception {
+        MockEndpoint mock =  getMandatoryEndpoint("mock:result", MockEndpoint.class);
+        assertNotNull("The mock endpoint should not be null", mock);
+        
+        mock.expectedBodiesReceived("Hello World");
+        template.sendBody("direct:start", "Hello World");
+        assertMockEndpointsSatisfied();        
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("mock:result");
+            }
+        };
+    }
+}

Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.file;
+package org.apache.camel.itest.osgi.core.file;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.file;
+package org.apache.camel.itest.osgi.core.file;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.file;
+package org.apache.camel.itest.osgi.core.file;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;

Copied: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
(from r998895, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java&r1=998895&r2=998915&rev=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.groovy;
+package org.apache.camel.itest.osgi.core.language;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -33,7 +33,7 @@ import static org.ops4j.pax.exam.contain
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
-public class GroovyTest extends OSGiIntegrationTestSupport {
+public class SimpleTest extends OSGiIntegrationTestSupport {
     
     @Test
     public void testSimpleLanguage() throws Exception {        
@@ -43,21 +43,11 @@ public class GroovyTest extends OSGiInte
         result.assertIsSatisfied();
     }
     
-    @Test
-    public void testGroovyLanguage() throws Exception {
-        MockEndpoint result = getMockEndpoint("mock:result");
-        result.expectedBodiesReceived("Hello is processed!");
-        template.sendBody("direct:groovy", "Hello");
-        result.assertIsSatisfied();
-    }
-        
+
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                // Test the simple expression
-                from("direct:simple").setBody().simple("${body} IS processed!").to("mock:result");
                       
-                // Test other language from other bundle
-                from("direct:groovy").setBody().groovy("request.body + ' is processed!'").to("mock:result");
+                from("direct:simple").setBody().simple("${body} IS processed!").to("mock:result");
             }
         };
     }
@@ -72,7 +62,7 @@ public class GroovyTest extends OSGiInte
             
             // using the features to install the camel components             
             scanFeatures(getCamelKarafFeatureUrl(),                         
-                          "camel-core", "camel-spring", "camel-test", "camel-groovy"),
+                          "camel-core", "camel-test"),
             
             workingDirectory("target/paxrunner/"),
 

Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.management;
+package org.apache.camel.itest.osgi.core.management;
 
 import java.net.URL;
 import java.util.Set;
@@ -22,10 +22,7 @@ import java.util.Set;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.camel.management.DefaultManagementNamingStrategy;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -67,11 +64,11 @@ public class OSGiIntegrationManagedCamel
         String name = (String) mbeanServer.getAttribute(on, "CamelId");
         assertEquals(camelContextName, name);
     }
-    
+
     private static URL getCamelContextInputStream() {
         return OSGiIntegrationManagedCamelContextTest.class.getResource("CamelContext.xml");
     }
-    
+
     @Configuration
     public static Option[] configure() throws Exception {
         

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/MyRouteBuilder.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/MyRouteBuilder.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/MyRouteBuilder.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.packages;
+package org.apache.camel.itest.osgi.core.packages;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.stereotype.Component;

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.packages;
+package org.apache.camel.itest.osgi.core.packages;
 
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
@@ -38,7 +38,7 @@ public class OSGiPackageScanTest extends
     
     @Override
     protected OsgiBundleXmlApplicationContext createApplicationContext() {
-        return new OsgiBundleXmlApplicationContext(new String[]{"org/apache/camel/itest/osgi/packages/CamelContext.xml"});
+        return new OsgiBundleXmlApplicationContext(new String[]{"org/apache/camel/itest/osgi/core/packages/CamelContext.xml"});
     }
 
 }

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.seda;
+package org.apache.camel.itest.osgi.core.seda;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java?rev=998915&r1=998914&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
Mon Sep 20 13:07:37 2010
@@ -36,14 +36,6 @@ import static org.ops4j.pax.exam.contain
 public class GroovyTest extends OSGiIntegrationTestSupport {
     
     @Test
-    public void testSimpleLanguage() throws Exception {        
-        MockEndpoint result = getMockEndpoint("mock:result");
-        result.expectedBodiesReceived("Hello IS processed!");
-        template.sendBody("direct:simple", "Hello");
-        result.assertIsSatisfied();
-    }
-    
-    @Test
     public void testGroovyLanguage() throws Exception {
         MockEndpoint result = getMockEndpoint("mock:result");
         result.expectedBodiesReceived("Hello is processed!");
@@ -54,9 +46,6 @@ public class GroovyTest extends OSGiInte
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                // Test the simple expression
-                from("direct:simple").setBody().simple("${body} IS processed!").to("mock:result");
                       
-                // Test other language from other bundle
                 from("direct:groovy").setBody().groovy("request.body + ' is processed!'").to("mock:result");
             }
         };
@@ -72,7 +61,7 @@ public class GroovyTest extends OSGiInte
             
             // using the features to install the camel components             
             scanFeatures(getCamelKarafFeatureUrl(),                         
-                          "camel-core", "camel-spring", "camel-test", "camel-groovy"),
+                          "camel-core", "camel-test", "camel-groovy"),
             
             workingDirectory("target/paxrunner/"),
 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java?rev=998915&r1=998914&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
Mon Sep 20 13:07:37 2010
@@ -53,7 +53,7 @@ public class OSGiMulitJettyCamelContexts
         
         endpointURI = "http://localhost:9010/context1/";
         try {
-            response = template.requestBody(endpointURI, "Hello World", String.class);
+            template.requestBody(endpointURI, "Hello World", String.class);
             fail("We are expect the exception here");
         } catch (Exception ex) {
             assertTrue("Get the wrong exception.", ex instanceof CamelExecutionException);
@@ -63,8 +63,7 @@ public class OSGiMulitJettyCamelContexts
         response = template.requestBody(endpointURI, "Hello World", String.class);
         assertEquals("response is " , "camelContext2", response);
     }
-    
-    
+
     @Configuration
     public static Option[] configure() throws Exception {
         

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java?rev=998915&r1=998914&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java
Mon Sep 20 13:07:37 2010
@@ -37,10 +37,7 @@ import org.ops4j.pax.exam.junit.JUnit4Te
 
 import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
@@ -111,7 +108,6 @@ public class ShiroAuthenticationTest ext
 
 
     protected RouteBuilder createRouteBuilder() throws Exception {
-         
         return new RouteBuilder() {
             public void configure() {
                 

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/validator/ValidatorRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/validator/ValidatorRouteTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/validator/ValidatorRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/validator/ValidatorRouteTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.validator;
+package org.apache.camel.itest.osgi.spring.validator;
 
 import org.apache.camel.ValidationException;
 import org.apache.camel.builder.RouteBuilder;
@@ -57,7 +57,7 @@ public class ValidatorRouteTest extends 
             public void configure() throws Exception {
                 from("direct:start")
                     .doTry()
-                        .to("validator:org/apache/camel/itest/osgi/validator/schema.xsd")
+                        .to("validator:org/apache/camel/itest/osgi/spring/validator/schema.xsd")
                         .to("mock:valid")
                     .doCatch(ValidationException.class)
                         .to("mock:invalid")

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/xslt/XsltRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/xslt/XsltRouteTest.java?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/xslt/XsltRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/xslt/XsltRouteTest.java
Mon Sep 20 13:07:37 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.itest.osgi.xslt;
+package org.apache.camel.itest.osgi.spring.xslt;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -43,7 +43,7 @@ public class XsltRouteTest extends OSGiI
             @Override
             public void configure() throws Exception {
                 from("direct:start")
-                    .to("xslt:org/apache/camel/itest/osgi/xslt/example.xsl")
+                    .to("xslt:org/apache/camel/itest/osgi/spring/xslt/example.xsl")
                     .to("log:result")
                     .to("mock:result");
             }

Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/packages/CamelContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/packages/CamelContext.xml?rev=998915&r1=998895&r2=998915&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/packages/CamelContext.xml
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/core/packages/CamelContext.xml
Mon Sep 20 13:07:37 2010
@@ -28,7 +28,7 @@
   <!-- context:component-scan base-package="org.apache.camel.itest.osgi.packages" /-->
 
   <camelContext xmlns="http://camel.apache.org/schema/spring">
-    <package>org.apache.camel.itest.osgi.packages</package>
+    <package>org.apache.camel.itest.osgi.core.packages</package>
   </camelContext>
 
 </beans>



Mime
View raw message