Author: ningjiang
Date: Thu Aug 19 09:23:06 2010
New Revision: 987100
URL: http://svn.apache.org/viewvc?rev=987100&view=rev
Log:
CAMEL-3047 Fixed the issue of JettyHttpComponent.doStop() shuts down all
servers in the VM, not just those associated with the component
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java
(with props)
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
(with props)
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
(with props)
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
(with props)
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=987100&r1=987099&r2=987100&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Thu Aug 19 09:23:06 2010
@@ -111,6 +111,10 @@ public class JettyHttpComponent extends
public int decrement() {
return --refCount;
}
+
+ public int getRefCount() {
+ return refCount;
+ }
}
@Override
@@ -673,18 +677,21 @@ public class JettyHttpComponent extends
protected void doStop() throws Exception {
super.doStop();
if (CONNECTORS.size() > 0) {
- for (ConnectorRef connectorRef : CONNECTORS.values()) {
- connectorRef.server.removeConnector(connectorRef.connector);
- connectorRef.connector.stop();
- connectorRef.server.stop();
- // Camel controls the lifecycle of these entities so remove the
- // registered MBeans when Camel is done with the managed
objects.
- if (mbContainer != null) {
- mbContainer.removeBean(connectorRef.server);
- mbContainer.removeBean(connectorRef.connector);
+ for (String connectorKey : CONNECTORS.keySet()) {
+ ConnectorRef connectorRef = CONNECTORS.get(connectorKey);
+ if (connectorRef != null && connectorRef.getRefCount() == 0) {
+
connectorRef.server.removeConnector(connectorRef.connector);
+ connectorRef.connector.stop();
+ connectorRef.server.stop();
+ // Camel controls the lifecycle of these entities so
remove the
+ // registered MBeans when Camel is done with the managed
objects.
+ if (mbContainer != null) {
+ mbContainer.removeBean(connectorRef.server);
+ mbContainer.removeBean(connectorRef.connector);
+ }
+ CONNECTORS.remove(connectorKey);
}
}
- CONNECTORS.clear();
}
if (httpClient != null) {
httpClient.stop();
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java?rev=987100&r1=987099&r2=987100&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionRedeliveryTest.java
Thu Aug 19 09:23:06 2010
@@ -20,6 +20,7 @@ import java.net.ConnectException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.Route;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -43,9 +44,8 @@ public class SpringJettyNoConnectionRede
@Test
public void testConnectionNotOk() throws Exception {
- // stop Jetty so there should not be a connection
- JettyHttpComponent jetty = context.getComponent("jetty",
JettyHttpComponent.class);
- jetty.stop();
+ // stop Jetty route so there should not be a connection
+ context.stopRoute("jetty");
Exchange exchange = template.request("direct:start", new Processor() {
public void process(Exchange exchange) throws Exception {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java?rev=987100&r1=987099&r2=987100&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringJettyNoConnectionTest.java
Thu Aug 19 09:23:06 2010
@@ -42,9 +42,8 @@ public class SpringJettyNoConnectionTest
@Test
public void testConnectionNotOk() throws Exception {
- // stop Jetty so there should not be a connection
- JettyHttpComponent jetty = context.getComponent("jetty",
JettyHttpComponent.class);
- jetty.stop();
+ // stop Jetty route so there should not be a connection
+ context.stopRoute("jetty");
try {
template.requestBody("direct:start", "Moon", String.class);
Modified:
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml?rev=987100&r1=987099&r2=987100&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
(original)
+++
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection-redelivery.xml
Thu Aug 19 09:23:06 2010
@@ -34,7 +34,7 @@
<to uri="http://localhost:9221/hi"/>
</route>
- <route>
+ <route id="jetty">
<from uri="jetty:http://localhost:9221/hi"/>
<transform><simple>Bye ${body}</simple></transform>
</route>
Modified:
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml?rev=987100&r1=987099&r2=987100&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
(original)
+++
camel/trunk/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-noconnection.xml
Thu Aug 19 09:23:06 2010
@@ -28,7 +28,7 @@
<to uri="http://localhost:9222/hi"/>
</route>
- <route>
+ <route id="jetty">
<from uri="jetty:http://localhost:9222/hi"/>
<transform><simple>Bye ${body}</simple></transform>
</route>
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=987100&r1=987099&r2=987100&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Thu Aug 19 09:23:06 2010
@@ -25,6 +25,7 @@ import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.options.UrlReference;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import static org.ops4j.pax.exam.CoreOptions.equinox;
@@ -39,6 +40,19 @@ public class OSGiIntegrationTestSupport
protected static final transient Log LOG =
LogFactory.getLog(OSGiIntegrationTestSupport.class);
@Inject
protected BundleContext bundleContext;
+
+ protected Bundle getInstalledBundle(String symbolicName) {
+ for (Bundle b : bundleContext.getBundles()) {
+ if (b.getSymbolicName().equals(symbolicName)) {
+ return b;
+ }
+ }
+ for (Bundle b : bundleContext.getBundles()) {
+ System.err.println("Bundle: " + b.getSymbolicName());
+ }
+ throw new RuntimeException("Bundle " + symbolicName + " does not
exist");
+ }
+
protected CamelContext createCamelContext() throws Exception {
setThreadContextClassLoader();
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java?rev=987100&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java
(added)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java
Thu Aug 19 09:23:06 2010
@@ -0,0 +1,33 @@
+/**
+ * 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.jetty;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+
+public class JettyProcessor implements Processor {
+ private String prefix;
+
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ public void process(Exchange exchange) throws Exception {
+ exchange.getOut().setBody(prefix);
+ }
+
+}
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/JettyProcessor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
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=987100&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
(added)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
Thu Aug 19 09:23:06 2010
@@ -0,0 +1,114 @@
+/**
+ * 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.jetty;
+
+import java.net.URL;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelExecutionException;
+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;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.swissbox.tinybundles.dp.Constants;
+
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.felix;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+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;
+import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
+
+...@runwith(JUnit4TestRunner.class)
+public class OSGiMulitJettyCamelContextsTest extends
OSGiIntegrationTestSupport {
+
+ @Test
+ public void testStoppingJettyContext() throws Exception {
+ // Wait a while to let all the service started
+ Thread.sleep(3000);
+ String endpointURI = "http://localhost:9010/context1/";
+ String response = template.requestBody(endpointURI, "Hello World",
String.class);
+ assertEquals("response is " , "camelContext1", response);
+
+ endpointURI = "http://localhost:9010/context2/";
+ response = template.requestBody(endpointURI, "Hello World",
String.class);
+ assertEquals("response is " , "camelContext2", response);
+
+
getInstalledBundle("org.apache.camel.itest.osgi.CamelContextBundle1").uninstall();
+
+ endpointURI = "http://localhost:9010/context1/";
+ try {
+ response = 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);
+ }
+
+ endpointURI = "http://localhost:9010/context2/";
+ response = template.requestBody(endpointURI, "Hello World",
String.class);
+ assertEquals("response is " , "camelContext2", response);
+ }
+
+
+ @Configuration
+ public static Option[] configure() throws Exception {
+
+ Option[] options = options(
+ // install the spring dm profile
+ profile("spring.dm").version("1.2.0"),
+ // this is how you set the default log level when using pax
logging (logProfile)
+
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+
+ // using the features to install the camel components
+ scanFeatures(getCamelKarafFeatureUrl(),
+ "camel-core", "camel-spring", "camel-test",
"camel-jetty"),
+ //set up the camel context bundle1
+ provision(newBundle().add("META-INF/spring/CamelContext1.xml",
OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext1.xml"))
+ .add(JettyProcessor.class)
+ .set(Constants.BUNDLE_SYMBOLICNAME,
"org.apache.camel.itest.osgi.CamelContextBundle1")
+ .set(Constants.BUNDLE_NAME, "CamelContext1")
+ .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+ .build()),
+
+ //set up the camel context bundle1
+ provision(newBundle().add("META-INF/spring/CamelContext2.xml",
OSGiMulitJettyCamelContextsTest.class.getResource("CamelContext2.xml"))
+ .add(JettyProcessor.class)
+ .set(Constants.BUNDLE_SYMBOLICNAME,
"org.apache.camel.itest.osgi.CamelContextBundle2")
+ .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+ .set(Constants.BUNDLE_NAME, "CamelContext2").build()),
+
+
+ workingDirectory("target/paxrunner/"),
+
+ equinox(),
+ felix());
+
+ return options;
+ }
+
+}
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml?rev=987100&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
(added)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
Thu Aug 19 09:23:06 2010
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://camel.apache.org/schema/osgi"
+ xmlns:camel="http://camel.apache.org/schema/spring"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/osgi
http://camel.apache.org/schema/osgi/camel-osgi.xsd">
+
+ <bean id="jettyProcessor"
class="org.apache.camel.itest.osgi.jetty.JettyProcessor">
+ <property name="prefix" value="camelContext1"/>
+ </bean>
+
+ <camelContext id="camelContext1"
xmlns="http://camel.apache.org/schema/spring">
+ <camel:route>
+ <camel:from uri="jetty:http://localhost:9010/context1/"/>
+ <camel:process ref="jettyProcessor"/>
+ </camel:route>
+ </camelContext>
+
+</beans>
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml?rev=987100&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
(added)
+++
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
Thu Aug 19 09:23:06 2010
@@ -0,0 +1,39 @@
+<?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.
+-->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:osgi="http://camel.apache.org/schema/osgi"
+ xmlns:camel="http://camel.apache.org/schema/spring"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://camel.apache.org/schema/osgi
http://camel.apache.org/schema/osgi/camel-osgi.xsd">
+
+ <bean id="jettyProcessor"
class="org.apache.camel.itest.osgi.jetty.JettyProcessor">
+ <property name="prefix" value="camelContext2"/>
+ </bean>
+
+ <camelContext id="camelContext2"
xmlns="http://camel.apache.org/schema/spring">
+ <camel:route>
+ <camel:from uri="jetty:http://localhost:9010/context2/"/>
+ <camel:process ref="jettyProcessor"/>
+ </camel:route>
+ </camelContext>
+
+</beans>
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/jetty/CamelContext2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml