Author: davsclaus
Date: Sat Mar 31 15:12:13 2012
New Revision: 1307824
URL: http://svn.apache.org/viewvc?rev=1307824&view=rev
Log:
Fixed so features.xml can be validated.
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
camel/trunk/tests/camel-itest-osgi/pom.xml
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=1307824&r1=1307823&r2=1307824&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties
Sat Mar 31 15:12:13 2012
@@ -177,6 +177,7 @@ jre-1.6=, \
com.sun.org.apache.xerces.internal.jaxp, \
com.sun.org.apache.xerces.internal.xni, \
com.sun.jndi.ldap, \
+ sun.net.spi.nameservice, \
javax.accessibility, \
# javax.activation, \
javax.activity, \
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1307824&r1=1307823&r2=1307824&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat
Mar 31 15:12:13 2012
@@ -56,6 +56,7 @@
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
</feature>
+<!-- requires Spring 3.1
<feature name='camel-test-spring' version='${project.version}'
resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-spring</feature>
<bundle
dependency='true'>mvn:org.springframework/spring-test/${spring-version}</bundle>
@@ -63,6 +64,7 @@
<bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>
</feature>
+-->
<feature name='camel-context' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-context/${project.version}</bundle>
@@ -300,8 +302,7 @@
<bundle>mvn:org.apache.camel/camel-ftp/${project.version}</bundle>
</feature>
<feature name='camel-jsch' version='${project.version}' resolver='(obr)'
start-level='50'>
- <feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}</bundle>
+ <feature version='${project.version}'>camel-ftp</feature>
<bundle>mvn:org.apache.camel/camel-jsch/${project.version}</bundle>
</feature>
<feature name='camel-guice' version='${project.version}' resolver='(obr)'
start-level='50'>
@@ -498,6 +499,12 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-ldap/${project.version}</bundle>
</feature>
+ <feature name='camel-leveldb' version='${project.version}' resolver='(obr)'
start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle
dependency='true'>wrap:mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni-version}</bundle>
+ <bundle
dependency='true'>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-leveldb/${project.version}</bundle>
+ </feature>
<feature name='camel-lucene' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java?rev=1307824&r1=1307823&r2=1307824&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelTestSpringTest.java
Sat Mar 31 15:12:13 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -23,6 +24,7 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
+@Ignore("Requires Spring 3.1")
public class CamelTestSpringTest extends AbstractFeatureTest {
public static final String COMPONENT = "test-spring";
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1307824&r1=1307823&r2=1307824&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Sat Mar 31 15:12:13 2012
@@ -193,6 +193,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-leveldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-zookeeper</artifactId>
<scope>test</scope>
</dependency>
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java?rev=1307824&view=auto
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
(added)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java
Sat Mar 31 15:12:13 2012
@@ -0,0 +1,103 @@
+/**
+ * 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.leveldb;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.leveldb.LevelDBAggregationRepository;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
+import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.junit.Ignore;
+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 static org.ops4j.pax.exam.OptionUtils.combine;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
+
+@RunWith(JUnit4TestRunner.class)
+@Ignore("leveldb artifact needs to be osgi bundle.")
+public class LevelDBAggregateRouteTest extends OSGiIntegrationTestSupport {
+
+ @Test
+ public void testLevelDBAggregateRoute() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:aggregated");
+ mock.expectedBodiesReceived("ABCDE");
+
+ template.sendBodyAndHeader("direct:start", "A", "id", 123);
+ template.sendBodyAndHeader("direct:start", "B", "id", 123);
+ template.sendBodyAndHeader("direct:start", "C", "id", 123);
+ template.sendBodyAndHeader("direct:start", "D", "id", 123);
+ template.sendBodyAndHeader("direct:start", "E", "id", 123);
+
+ assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
+
+ // from endpoint should be preserved
+ assertEquals("direct://start",
mock.getReceivedExchanges().get(0).getFromEndpoint().getEndpointUri());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // delete the data directory
+ deleteDirectory("target/data");
+
+ // create the leveldb repo
+ LevelDBAggregationRepository repo = new
LevelDBAggregationRepository("repo1", "target/data/leveldb.dat");
+
+ // here is the Camel route where we aggregate
+ from("direct:start")
+ .aggregate(header("id"), new MyAggregationStrategy())
+ // use our created leveldb repo as aggregation
repository
+ .completionSize(5).aggregationRepository(repo)
+ .to("mock:aggregated");
+ }
+ };
+ }
+
+ public static class MyAggregationStrategy implements AggregationStrategy {
+
+ public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+ if (oldExchange == null) {
+ return newExchange;
+ }
+ String body1 = oldExchange.getIn().getBody(String.class);
+ String body2 = newExchange.getIn().getBody(String.class);
+
+ oldExchange.getIn().setBody(body1 + body2);
+ return oldExchange;
+ }
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ Option[] options = combine(
+ getDefaultCamelKarafOptions(),
+ // using the features to install the other camel components
+ scanFeatures(getCamelKarafFeatureUrl(), "camel-leveldb"));
+
+ return options;
+ }
+
+}