Author: davsclaus
Date: Thu Oct 28 07:02:12 2010
New Revision: 1028202
URL: http://svn.apache.org/viewvc?rev=1028202&view=rev
Log:
CAMEL-3287: Removed http from features as it clashes with same feature in Karaf.
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-karaf/pom.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1028202&r1=1028201&r2=1028202&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Thu Oct 28 07:02:12 2010
@@ -33,17 +33,6 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle>
</feature>
- <feature name='http' version='${pom.version}'>
- <config name='org.ops4j.pax.web'>
- org.osgi.service.http.port=8181
- </config>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
- </feature>
<feature name='camel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<feature version='${pom.version}'>camel-spring</feature>
@@ -116,7 +105,6 @@
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
</feature>
<feature name='camel-cache' version='${pom.version}'>
@@ -137,7 +125,6 @@
</feature>
<feature name='camel-dozer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -221,7 +208,6 @@
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -394,7 +380,6 @@
</feature>
<feature name='camel-juel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-juel/${pom.version}</bundle>
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=1028202&r1=1028201&r2=1028202&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Oct 28 07:02:12 2010
@@ -36,17 +36,6 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle>
</feature>
- <feature name='http' version='${pom.version}'>
- <config name='org.ops4j.pax.web'>
- org.osgi.service.http.port=8181
- </config>
-
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty6-bundle-version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
- <bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
- </feature>
<feature name='camel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
<feature version='${pom.version}'>camel-spring</feature>
@@ -119,7 +108,6 @@
<bundle>mvn:org.apache.cxf/cxf-bundle/${cxf-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}</bundle>
<feature version='${pom.version}'>camel-spring</feature>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.apache.camel/camel-cxf/${pom.version}</bundle>
</feature>
<feature name='camel-cache' version='${pom.version}'>
@@ -206,7 +194,6 @@
<bundle>mvn:org.apache.camel/camel-atom/${pom.version}</bundle>
</feature>
<feature name='camel-bam' version='${pom.version}'>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.springframework/spring-tx/${spring3-version}</bundle>
<bundle>mvn:org.springframework/spring-web/${spring3-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
@@ -255,7 +242,6 @@
</feature>
<feature name='camel-dozer' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:net.sf.dozer/dozer-osgi/${dozer-bundle-version}</bundle>
<bundle>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
@@ -408,7 +394,6 @@
</feature>
<feature name='camel-juel' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
- <feature version='${pom.version}'>http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-juel/${pom.version}</bundle>
Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=1028202&r1=1028201&r2=1028202&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Thu Oct 28 07:02:12 2010
@@ -130,14 +130,6 @@
<excludes>
<!-- CXF test will hang with the Spring3, need to check Cxf
feature with karaf later -->
<exclude>**/*Cxf*.*</exclude>
- <!--
- <exclude>**/*Amqp*.*</exclude>
- <exclude>**/*Bindy*.*</exclude>
- <exclude>**/*Freemarker*.*</exclude>
- <exclude>**/*Http*.*</exclude>
- <exclude>**/*Tagsoup*.*</exclude>
- <exclude>**/*Jaxb*.*</exclude>
- -->
</excludes>
<systemPropertyVariables>
<springVersion>${spring-version}</springVersion>
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1028202&r1=1028201&r2=1028202&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Thu Oct 28 07:02:12 2010
@@ -26,11 +26,11 @@ import org.junit.After;
import org.junit.Before;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.options.FrameworkOption;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.BundleContext;
import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -142,15 +142,17 @@ public abstract class AbstractFeatureTes
artifactId("apache-camel").versionAsInProject().type(type);
}
- public static FrameworkOption getFramework() {
- return felix();
+ public static UrlReference getKarafFeatureUrl() {
+ String type = "xml/features";
+ return mavenBundle().groupId("org.apache.karaf").
+ artifactId("apache-karaf").version("2.1.0").type(type);
}
-
+
public static Option[] configure(String feature) {
- return configure(feature, getFramework());
+ return configure(feature, true, true);
}
- public static Option[] configure(String feature, FrameworkOption
framework) {
+ public static Option[] configure(String feature, boolean useFelix, boolean
useEquinox) {
Option[] options = options(
profile("log").version("1.4"),
// this is how you set the default log level when using pax
logging (logProfile)
@@ -158,15 +160,16 @@ public abstract class AbstractFeatureTes
//need to install some karaf features
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin").versionAsInProject(),
-
mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jaxp-ri").version("1.4.2_4"),
-
+ scanFeatures(getKarafFeatureUrl(), "http"),
+
+ // and the camel feature to be tested
scanFeatures(getCamelKarafFeatureUrl(),
"camel-spring", "camel-" + feature),
workingDirectory("target/paxrunner/"),
- framework);
-
+ useFelix ? felix() : null,
+ useEquinox ? equinox() : null);
return options;
}
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java?rev=1028202&r1=1028201&r2=1028202&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
Thu Oct 28 07:02:12 2010
@@ -42,11 +42,7 @@ public class CamelMailTest extends Abstr
@Configuration
public static Option[] configure() {
- return configure(COMPONENT, getFramework());
- }
-
- public static FrameworkOption getFramework() {
- return equinox();
+ return configure(COMPONENT, false, true);
}
}
\ No newline at end of file
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=1028202&r1=1028201&r2=1028202&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 Oct 28 07:02:12 2010
@@ -81,6 +81,12 @@ public class OSGiIntegrationTestSupport
artifactId("apache-camel").versionAsInProject().type(type);
}
+ public static UrlReference getKarafFeatureUrl() {
+ String type = "xml/features";
+ return mavenBundle().groupId("org.apache.karaf").
+ artifactId("apache-karaf").version("2.1.0").type(type);
+ }
+
@Configuration
public static Option[] configure() throws Exception {
Option[] options = options(
@@ -88,7 +94,10 @@ public class OSGiIntegrationTestSupport
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"),
-
+
+ // need to install some karaf features
+ scanFeatures(getKarafFeatureUrl(), "http"),
+
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
"camel-core", "camel-spring", "camel-test"),
