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 2009/03/10 15:19:40 UTC
svn commit: r752117 - in /camel/trunk/components/camel-osgi: ./
src/main/java/org/apache/camel/osgi/ src/test/java/org/apache/camel/osgi/
src/test/resources/
src/test/resources/META-INF/services/org/apache/camel/language/resolver/
Author: ningjiang
Date: Tue Mar 10 14:19:37 2009
New Revision: 752117
URL: http://svn.apache.org/viewvc?rev=752117&view=rev
Log:
CAMEL-1443 fixed the script languages resolver issue in OSGi environment
Added:
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java (with props)
camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/resolver/
camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
Modified:
camel/trunk/components/camel-osgi/pom.xml
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java
camel/trunk/components/camel-osgi/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/pom.xml?rev=752117&r1=752116&r2=752117&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/pom.xml (original)
+++ camel/trunk/components/camel-osgi/pom.xml Tue Mar 10 14:19:37 2009
@@ -92,6 +92,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-script</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-mock</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java?rev=752117&r1=752116&r2=752117&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java Tue Mar 10 14:19:37 2009
@@ -43,10 +43,13 @@
public static final String META_INF_TYPE_CONVERTER = "META-INF/services/org/apache/camel/TypeConverter";
public static final String META_INF_COMPONENT = "META-INF/services/org/apache/camel/component/";
public static final String META_INF_LANGUAGE = "META-INF/services/org/apache/camel/language/";
+ public static final String META_INF_LANGUAGE_RESOLVER = "META-INF/services/org/apache/camel/language/resolver/";
+
private static final transient Log LOG = LogFactory.getLog(Activator.class);
private static final Map<String, ComponentEntry> COMPONENTS = new HashMap<String, ComponentEntry>();
private static final Map<URL, TypeConverterEntry> TYPE_CONVERTERS = new HashMap<URL, TypeConverterEntry>();
private static final Map<String, ComponentEntry> LANGUAGES = new HashMap<String, ComponentEntry>();
+ private static final Map<String, ComponentEntry> LANGUAGE_RESOLVERS = new HashMap<String, ComponentEntry>();
private static Bundle bundle;
private class ComponentEntry {
@@ -105,6 +108,7 @@
protected void mayBeAddComponentAndLanguageFor(Bundle bundle) {
addComponentEntry(META_INF_COMPONENT, bundle, COMPONENTS);
addComponentEntry(META_INF_LANGUAGE, bundle, LANGUAGES);
+ addComponentEntry(META_INF_LANGUAGE_RESOLVER, bundle, LANGUAGE_RESOLVERS);
}
protected synchronized void mayBeAddTypeConverterFor(Bundle bundle) {
@@ -130,7 +134,8 @@
protected void mayBeRemoveComponentAndLanguageFor(Bundle bundle) {
removeComponentEntry(bundle, COMPONENTS);
- removeComponentEntry(bundle, LANGUAGES);
+ removeComponentEntry(bundle, LANGUAGES);
+ removeComponentEntry(bundle, LANGUAGE_RESOLVERS);
}
protected void removeComponentEntry(Bundle bundle, Map<String, ComponentEntry> entries) {
@@ -252,13 +257,17 @@
return getClassFromEntries(name, LANGUAGES);
}
+ public static synchronized Class getLanguageResolver(String name) throws Exception {
+ return getClassFromEntries(name, LANGUAGE_RESOLVERS);
+ }
+
protected static synchronized Class getClassFromEntries(String name, Map<String, ComponentEntry> entries) throws Exception {
ComponentEntry entry = entries.get(name);
if (entry == null) {
return null;
}
if (entry.type == null) {
- URL url = entry.bundle.getEntry(entry.path);
+ URL url = entry.bundle.getEntry(entry.path);
if (LOG.isDebugEnabled()) {
LOG.debug("The entry " + name + "'s url is" + url);
}
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java?rev=752117&r1=752116&r2=752117&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiLanguageResolver.java Tue Mar 10 14:19:37 2009
@@ -18,6 +18,8 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
+import org.apache.camel.NoFactoryAvailableException;
+import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.LanguageResolver;
import org.apache.commons.logging.Log;
@@ -49,19 +51,46 @@
} catch (Throwable e) {
throw new IllegalArgumentException("Invalid URI, no Language registered for scheme : " + name, e);
}
- if (type == null) {
- return null;
- }
- if (Language.class.isAssignableFrom(type)) {
- return (Language)context.getInjector().newInstance(type);
+ if (type != null) {
+ if (Language.class.isAssignableFrom(type)) {
+ return (Language)context.getInjector().newInstance(type);
+ } else {
+ throw new IllegalArgumentException("Type is not a Lanaguage implementation. Found: "
+ + type.getName());
+ }
} else {
- throw new IllegalArgumentException("Type is not a Lanaguage implementation. Found: "
- + type.getName());
+ return noSpecificLanguageFound(name, context);
}
}
+
+ protected Language noSpecificLanguageFound(String name, CamelContext context) {
+ Class type = null;
+ try {
+ type = getLanaguageResolver("default");
+ } catch (NoFactoryAvailableException e) {
+ // ignore
+ } catch (Throwable e) {
+ throw new IllegalArgumentException("Invalid URI, no Language registered for scheme: " + name, e);
+ }
+ if (type != null) {
+ if (LanguageResolver.class.isAssignableFrom(type)) {
+ LanguageResolver resolver = (LanguageResolver)context.getInjector().newInstance(type);
+ return resolver.resolveLanguage(name, context);
+ } else {
+ throw new IllegalArgumentException("Type is not a LanguageResolver implementation. Found: " + type.getName());
+ }
+ }
+ throw new NoSuchLanguageException(name);
+ }
+
+
protected Class getLanaguage(String name) throws Exception {
return Activator.getLanguage(name);
}
+
+ protected Class getLanaguageResolver(String name) throws Exception {
+ return Activator.getLanguageResolver(name);
+ }
}
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java?rev=752117&r1=752116&r2=752117&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/CamelMockBundle.java Tue Mar 10 14:19:37 2009
@@ -72,6 +72,10 @@
String[] entries = new String[] {"bean_test", "file_test"};
result = getListEnumeration(Activator.META_INF_LANGUAGE, entries);
}
+ if (Activator.META_INF_LANGUAGE_RESOLVER.equals(path)) {
+ String[] entries = new String[] {"default"};
+ result = getListEnumeration(Activator.META_INF_LANGUAGE_RESOLVER, entries);
+ }
return result;
}
Added: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java?rev=752117&view=auto
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java (added)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java Tue Mar 10 14:19:37 2009
@@ -0,0 +1,34 @@
+/**
+ * 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.osgi;
+
+import java.io.IOException;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spi.Language;
+import org.osgi.framework.BundleContext;
+
+public class OsgiLanguageResolverTest extends CamelOsgiTestSupport {
+ public void testOsgiResolverFindLanguageTest() throws IOException {
+ BundleContext context = getActivator().getBundle().getBundleContext();
+ CamelContext camelContext = new DefaultCamelContext();
+ OsgiLanguageResolver resolver = new OsgiLanguageResolver();
+ Language language = resolver.noSpecificLanguageFound("js", camelContext);
+ assertNotNull("We should find js language", language);
+ }
+}
Propchange: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiLanguageResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default?rev=752117&view=auto
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default (added)
+++ camel/trunk/components/camel-osgi/src/test/resources/META-INF/services/org/apache/camel/language/resolver/default Tue Mar 10 14:19:37 2009
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.builder.script.ScriptLanguageResolver
\ No newline at end of file
Modified: camel/trunk/components/camel-osgi/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/resources/log4j.properties?rev=752117&r1=752116&r2=752117&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-osgi/src/test/resources/log4j.properties Tue Mar 10 14:19:37 2009
@@ -21,7 +21,7 @@
log4j.rootLogger=INFO, file
# uncomment the following to enable camel debugging
-#log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.camel=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
@@ -33,4 +33,4 @@
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/camel-ognl-test.log
\ No newline at end of file
+log4j.appender.file.file=target/camel-osgi-test.log
\ No newline at end of file