You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2007/09/20 14:42:16 UTC
svn commit: r577721 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/spi/ components/
components/camel-osgi/ components/camel-osgi/src/
components/camel-osgi/src/main/ components/camel-osgi/src/main/java/
components/camel-osgi/src/...
Author: gnodet
Date: Thu Sep 20 05:42:14 2007
New Revision: 577721
URL: http://svn.apache.org/viewvc?rev=577721&view=rev
Log:
CAMEL-153: support for component discovery inside OSGi
Added:
activemq/camel/trunk/components/camel-osgi/
activemq/camel/trunk/components/camel-osgi/pom.xml
activemq/camel/trunk/components/camel-osgi/src/
activemq/camel/trunk/components/camel-osgi/src/main/
activemq/camel/trunk/components/camel-osgi/src/main/java/
activemq/camel/trunk/components/camel-osgi/src/main/java/org/
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java
activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/package-info.java
activemq/camel/trunk/components/camel-osgi/src/main/resources/
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.handlers
activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas
activemq/camel/trunk/components/camel-osgi/src/main/resources/camel-osgi.xsd
activemq/camel/trunk/components/camel-osgi/src/main/resources/org/
activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/
activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/
activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/
activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/jaxb.index
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
activemq/camel/trunk/components/pom.xml
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java?rev=577721&r1=577720&r2=577721&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ComponentResolver.java Thu Sep 20 05:42:14 2007
@@ -22,7 +22,7 @@
/**
* Represents a resolver of components from a URI to be able to auto-load them using some
- * discovery mechanism like {@link DefaultComponentResolver}
+ * discovery mechanism like {@link org.apache.camel.impl.DefaultComponentResolver}
*
* @version $Revision$
*/
Added: activemq/camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (added)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Thu Sep 20 05:42:14 2007
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-osgi</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: OSGi</name>
+ <description>Camel OSGi support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.osgi*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>1.0-m2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- for parsing the XML -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+
+ <!-- for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>spring.osgi</id>
+ <url>http://static.springframework.org/maven2</url>
+ </repository>
+ </repositories>
+
+</project>
Added: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java Thu Sep 20 05:42:14 2007
@@ -0,0 +1,41 @@
+package org.apache.camel.osgi;
+
+import org.apache.camel.spring.SpringCamelContext;
+import org.osgi.framework.BundleContext;
+import org.springframework.osgi.context.BundleContextAware;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 20, 2007
+ * Time: 10:31:52 AM
+ * To change this template use File | Settings | File Templates.
+ */
+@XmlRootElement(name = "camelContext")
+@XmlAccessorType(XmlAccessType.FIELD)
+public class CamelContextFactoryBean extends org.apache.camel.spring.CamelContextFactoryBean implements BundleContextAware {
+
+ @XmlTransient
+ private BundleContext bundleContext;
+
+ public BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+
+ protected SpringCamelContext createContext() {
+ SpringCamelContext context = super.createContext();
+ context.setComponentResolver(new OsgiComponentResolver(bundleContext));
+ return context;
+ }
+
+}
Added: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java Thu Sep 20 05:42:14 2007
@@ -0,0 +1,24 @@
+package org.apache.camel.osgi;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 20, 2007
+ * Time: 11:24:23 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class CamelNamespaceHandler extends org.apache.camel.spring.handler.CamelNamespaceHandler {
+
+ public void init() {
+ super.init();
+ registerParser("camelContext", new CamelContextBeanDefinitionParser(CamelContextFactoryBean.class));
+ }
+
+ protected JAXBContext createJaxbContext() throws JAXBException {
+ return JAXBContext.newInstance("org.apache.camel.osgi:" + JAXB_PACKAGES);
+ }
+
+}
Added: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java Thu Sep 20 05:42:14 2007
@@ -0,0 +1,179 @@
+package org.apache.camel.osgi;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Component;
+import org.apache.camel.spi.ComponentResolver;
+import org.apache.camel.util.NoFactoryAvailableException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.springframework.osgi.context.support.BundleDelegatingClassLoader;
+
+import java.io.BufferedInputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Sep 20, 2007
+ * Time: 10:37:31 AM
+ * To change this template use File | Settings | File Templates.
+ */
+public class OsgiComponentResolver implements ComponentResolver {
+
+ private static final transient Log LOG = LogFactory.getLog(OsgiComponentResolver.class);
+
+ private BundleContext bundleContext;
+ private Map<String, ComponentEntry> components;
+
+ private class BundleListener implements SynchronousBundleListener {
+ public void bundleChanged(BundleEvent event) {
+ try {
+ Bundle bundle = event.getBundle();
+ if (event.getType() == BundleEvent.RESOLVED) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Bundle resolved: " + bundle.getSymbolicName());
+ }
+ mayBeAddComponentFor(bundle);
+ } else if (event.getType() == BundleEvent.UNRESOLVED) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Bundle unresolved: " + bundle.getSymbolicName());
+ }
+ mayBeRemoveComponentFor(bundle);
+ }
+ } catch (Throwable e) {
+ LOG.fatal("Exception handing bundle changed event", e);
+ }
+ }
+ }
+
+ private class ComponentEntry {
+ Bundle bundle;
+ String path;
+ String name;
+ Class type;
+ }
+
+ public OsgiComponentResolver(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ protected void init() {
+ if (components != null) {
+ return;
+ }
+ LOG.debug("Initializing OsgiComponentResolver");
+ components = new HashMap<String, ComponentEntry>();
+ bundleContext.addBundleListener(new BundleListener());
+ Bundle[] previousBundles = bundleContext.getBundles();
+ for (int i = 0; i < previousBundles.length; i++) {
+ int state = previousBundles[i].getState();
+ if (state == Bundle.RESOLVED || state == Bundle.ACTIVE) {
+ mayBeAddComponentFor(previousBundles[i]);
+ }
+ }
+ }
+
+ protected synchronized void mayBeAddComponentFor(Bundle bundle) {
+ Enumeration e = bundle.getEntryPaths("/META-INF/services/org/apache/camel/component/");
+ if (e != null) {
+ while (e.hasMoreElements()) {
+ String path = (String) e.nextElement();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found entry: " + path + " in bundle " + bundle.getSymbolicName());
+ }
+ ComponentEntry entry = new ComponentEntry();
+ entry.bundle = bundle;
+ entry.path = path;
+ entry.name = path.substring(path.lastIndexOf("/") + 1);
+ components.put(entry.name, entry);
+ }
+ }
+ }
+
+ protected synchronized void mayBeRemoveComponentFor(Bundle bundle) {
+ for (ComponentEntry entry : components.values()) {
+ if (entry.bundle == bundle) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Removing entry: " + entry.path + " in bundle " + bundle.getSymbolicName());
+ }
+ components.remove(entry.name);
+ }
+ }
+ }
+
+ protected synchronized Class getComponent(String name) throws Exception {
+ ComponentEntry entry = components.get(name);
+ if (entry == null) {
+ return null;
+ }
+ if (entry.type == null) {
+ URL url = entry.bundle.getEntry(entry.path);
+ // lets load the file
+ Properties properties = new Properties();
+ BufferedInputStream reader = null;
+ try {
+ reader = new BufferedInputStream(url.openStream());
+ properties.load(reader);
+ } finally {
+ try {
+ reader.close();
+ } catch (Exception ignore) {
+ }
+ }
+ String classname = (String) properties.get("class");
+ ClassLoader loader = BundleDelegatingClassLoader.createBundleClassLoaderFor(entry.bundle);
+ entry.type = loader.loadClass(classname);
+ }
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Found component: " + name + " via type: " + entry.type.getName());
+ }
+ return entry.type;
+ }
+
+ public Component resolveComponent(String name, CamelContext context) throws Exception {
+ Object bean = null;
+ try {
+ bean = context.getRegistry().lookup(name);
+ if (bean != null && LOG.isDebugEnabled()) {
+ LOG.debug("Found component: " + name + " in registry: " + bean);
+ }
+ }
+ catch (Exception e) {
+ LOG.debug("Ignored error looking up bean: " + name + ". Error: " + e);
+ }
+ if (bean != null) {
+ if (bean instanceof Component) {
+ return (Component) bean;
+ }
+ else {
+ throw new IllegalArgumentException("Bean with name: " + name + " in registry is not a Component: " + bean);
+ }
+ }
+ // Check in OSGi bundles
+ init();
+ Class type = null;
+ try {
+ type = getComponent(name);
+ }
+ catch (Throwable e) {
+ throw new IllegalArgumentException("Invalid URI, no Component registered for scheme : " + name, e);
+ }
+ if (type == null) {
+ return null;
+ }
+ if (Component.class.isAssignableFrom(type)) {
+ return (Component) context.getInjector().newInstance(type);
+ } else {
+ throw new IllegalArgumentException("Type is not a Component implementation. Found: " + type.getName());
+ }
+ }
+
+}
Added: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/package-info.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/package-info.java?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/package-info.java (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/package-info.java Thu Sep 20 05:42:14 2007
@@ -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.
+ */
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://activemq.apache.org/camel/schema/osgi", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.camel.osgi;
Added: activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.handlers?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.handlers (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.handlers Thu Sep 20 05:42:14 2007
@@ -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.
+#
+
+http\://activemq.apache.org/camel/schema/osgi=org.apache.camel.osgi.CamelNamespaceHandler
Added: activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/resources/META-INF/spring.schemas Thu Sep 20 05:42:14 2007
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd=camel-osgi.xsd
+
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.1.xsd=camel-osgi.xsd
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.1-SNAPSHOT.xsd=camel-osgi.xsd
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.2.xsd=camel-osgi.xsd
+http\://activemq.apache.org/camel/schema/osgi/camel-osgi-1.2-SNAPSHOT.xsd=camel-osgi.xsd
Added: activemq/camel/trunk/components/camel-osgi/src/main/resources/camel-osgi.xsd
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/resources/camel-osgi.xsd?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/resources/camel-osgi.xsd (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/resources/camel-osgi.xsd Thu Sep 20 05:42:14 2007
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xs:schema elementFormDefault="qualified" version="1.0"
+ targetNamespace="http://activemq.apache.org/camel/schema/osgi"
+ xmlns:tns="http://activemq.apache.org/camel/schema/osgi"
+ xmlns:camel="http://activemq.apache.org/camel/schema/spring"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:import namespace="http://activemq.apache.org/camel/schema/spring"
+ schemaLocation="http://activemq.apache.org/camel/schema/spring/camel-spring.xsd" />
+
+ <xs:element name="camelContext" type="tns:camelContextFactoryBean"/>
+
+ <xs:complexType name="camelContextFactoryBean">
+ <xs:complexContent>
+ <xs:extension base="camel:camelContextFactoryBean">
+ <xs:sequence/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+</xs:schema>
+
Added: activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/jaxb.index?rev=577721&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/jaxb.index (added)
+++ activemq/camel/trunk/components/camel-osgi/src/main/resources/org/apache/camel/osgi/jaxb.index Thu Sep 20 05:42:14 2007
@@ -0,0 +1,17 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+CamelContextFactoryBean
Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=577721&r1=577720&r2=577721&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Thu Sep 20 05:42:14 2007
@@ -55,6 +55,7 @@
<module>camel-mina</module>
<module>camel-msv</module>
<module>camel-ognl</module>
+ <module>camel-osgi</module>
<module>camel-quartz</module>
<module>camel-rmi</module>
<!--<module>camel-ruby</module>-->