You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/06/03 04:28:35 UTC
svn commit: r950857 - in /camel/trunk/components/camel-spring: ./
src/test/java/org/apache/camel/core/osgi/
src/test/resources/META-INF/services/org/apache/camel/language/resolver/
Author: ningjiang
Date: Thu Jun 3 02:28:35 2010
New Revision: 950857
URL: http://svn.apache.org/viewvc?rev=950857&view=rev
Log:
Broke the cycle dependency of camel-spring and camel-script
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java (with props)
Modified:
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java
camel/trunk/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=950857&r1=950856&r2=950857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Thu Jun 3 02:28:35 2010
@@ -145,11 +145,6 @@
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-script</artifactId>
- <scope>test</scope>
- </dependency>
<!-- for testing Spring AOP at class level -->
<dependency>
Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java?rev=950857&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java (added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java Thu Jun 3 02:28:35 2010
@@ -0,0 +1,32 @@
+/**
+ * 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.core.osgi;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultLanguageResolver;
+import org.apache.camel.spi.Language;
+import org.apache.camel.spi.LanguageResolver;
+
+public class CamelMockLanguageResolver implements LanguageResolver {
+ // Delegate to the DefaultLanguageResolver
+ private LanguageResolver delegate = new DefaultLanguageResolver();
+
+ public Language resolveLanguage(String name, CamelContext context) {
+ return delegate.resolveLanguage(name, context);
+ }
+
+}
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/CamelMockLanguageResolver.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java?rev=950857&r1=950856&r2=950857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/core/osgi/OsgiLanguageResolverTest.java Thu Jun 3 02:28:35 2010
@@ -28,7 +28,7 @@ public class OsgiLanguageResolverTest ex
public void testOsgiResolverFindLanguageTest() throws IOException {
CamelContext camelContext = new DefaultCamelContext();
OsgiLanguageResolver resolver = new OsgiLanguageResolver();
- Language language = resolver.resolveLanguage("js", camelContext);
- assertNotNull("We should find js language", language);
+ Language language = resolver.resolveLanguage("simple", camelContext);
+ assertNotNull("We should find simple language", language);
}
}
Modified: camel/trunk/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default?rev=950857&r1=950856&r2=950857&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default (original)
+++ camel/trunk/components/camel-spring/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default Thu Jun 3 02:28:35 2010
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.builder.script.ScriptLanguageResolver
\ No newline at end of file
+class=org.apache.camel.core.osgi.CamelMockLanguageResolver
\ No newline at end of file