Fix spring / spring-dm features, use pax-web instead of felix http service for web console
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@786288 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index cf73a2f..9ade34d 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -183,8 +183,8 @@
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jline</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index 05c843f..606b739 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -180,8 +180,8 @@
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
<!--
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-->
</includes>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index ab9b10e..250d2eb 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -172,8 +172,8 @@
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>org/apache/geronimo/specs/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
<!--
+ <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
-->
</includes>
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
index 5615941..491ec5c 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
@@ -70,4 +70,10 @@
#
# The following property value will add the system folder as a repo.
#
-org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2,http://people.apache.org/repo/m2-snapshot-repository@snapshots@noreleases,http://repository.ops4j.org/maven2,http://svn.apache.org/repos/asf/servicemix/m2-repo
+org.ops4j.pax.url.mvn.repositories= \
+ http://repo1.maven.org/maven2, \
+ http://people.apache.org/repo/m2-snapshot-repository@snapshots@noreleases, \
+ http://repository.ops4j.org/maven2, \
+ http://svn.apache.org/repos/asf/servicemix/m2-repo, \
+ http://repository.springsource.com/maven/bundles/release, \
+ http://repository.springsource.com/maven/bundles/external
diff --git a/karaf/assembly/src/main/filtered-resources/etc/startup.properties b/karaf/assembly/src/main/filtered-resources/etc/startup.properties
index 59be088..123b01a 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/startup.properties
+++ b/karaf/assembly/src/main/filtered-resources/etc/startup.properties
@@ -27,7 +27,7 @@
org/ops4j/pax/url/pax-url-wrap/${pax.url.version}/pax-url-wrap-${pax.url.version}.jar=5
org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar=8
org/ops4j/pax/logging/pax-logging-service/${pax.logging.version}/pax-logging-service-${pax.logging.version}.jar=8
-org/apache/geronimo/specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}/geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
+#org/apache/geronimo/specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}/geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
org/apache/servicemix/specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version}/org.apache.servicemix.specs.jaxp-api-1.4-${servicemix.specs.version}.jar=10
org/apache/servicemix/bundles/org.apache.servicemix.bundles.jaxp-ri/${jaxp.ri.version}/org.apache.servicemix.bundles.jaxp-ri-${jaxp.ri.version}.jar=10
#org/apache/felix/org.osgi.compendium/${felix.compendium.version}/org.osgi.compendium-${felix.compendium.version}.jar=10
diff --git a/karaf/assembly/src/main/filtered-resources/features.xml b/karaf/assembly/src/main/filtered-resources/features.xml
index fbaccfe..f01e8b4 100644
--- a/karaf/assembly/src/main/filtered-resources/features.xml
+++ b/karaf/assembly/src/main/filtered-resources/features.xml
@@ -19,19 +19,19 @@
<features>
<feature name="spring" version="${spring.version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
+ <bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
- <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
</feature>
<feature name="spring-dm" version="${spring.osgi.version}">
<feature version="${spring.version}">spring</feature>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
+ <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+ <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
<bundle>mvn:org.apache.felix.karaf.deployer/org.apache.felix.karaf.deployer.spring/${version}</bundle>
</feature>
<feature name="wrapper" version="${version}">
@@ -41,23 +41,22 @@
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
<bundle>mvn:org.apache.felix.karaf.gshell/org.apache.felix.karaf.gshell.obr/${version}</bundle>
</feature>
- <feature name="felix-http" version="${version}">
- <bundle>mvn:org.mortbay.jetty/jetty-util/${jetty.version}/jar</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty-sslengine/${jetty.version}/jar</bundle>
- <bundle>mvn:org.mortbay.jetty/jetty/${jetty.version}/jar</bundle>
- <bundle>mvn:org.apache.felix/org.apache.felix.http.jetty/${felix.http.version}/jar</bundle>
- <config name="org.apache.felix.http">
+ <feature name="http" version="${version}">
+ <config name="org.ops4j.pax.web">
org.osgi.service.http.port=8080
</config>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+ <bundle>mvn:org.ops4j.pax.web/pax-web-bundle/${pax.web.version}</bundle>
</feature>
<feature name="webconsole" version="${version}">
- <feature version="${version}">felix-http</feature>
- <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}/jar</bundle>
- <bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}/jar</bundle>
+ <feature version="${version}">http</feature>
<config name="org.apache.felix.webconsole.internal.servlet.OsgiManager">
username=karaf
password=karaf
</config>
- <bundle>mvn:org.apache.felix.karaf/org.apache.felix.karaf.webconsole/${version}/jar</bundle>
+ <bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
+ <bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
+ <bundle>mvn:org.apache.felix.karaf/org.apache.felix.karaf.webconsole/${version}</bundle>
</feature>
</features>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 76c60f3..aba3279 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -95,7 +95,7 @@
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<gshell.version>1.0-alpha-2</gshell.version>
<jaxp.ri.version>1.4.2_2</jaxp.ri.version>
- <jetty.version>6.1.14</jetty.version>
+ <jetty.bundle.version>6.1.14_1</jetty.bundle.version>
<junit.version>3.8.2_1</junit.version>
<jline.version>0.9.94_1</jline.version>
<log4j.version>1.2.14</log4j.version>
@@ -105,11 +105,12 @@
<pax.exam.version>0.5.0</pax.exam.version>
<pax.logging.version>1.3.1-SNAPSHOT</pax.logging.version>
<pax.url.version>0.3.3</pax.url.version>
+ <pax.web.version>0.6.0</pax.web.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.4-SNAPSHOT</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
- <spring.osgi.version>1.2.0-rc1</spring.osgi.version>
- <spring.version>2.5.6</spring.version>
+ <spring.osgi.version>1.2.0</spring.osgi.version>
+ <spring.version>2.5.6.SEC01</spring.version>
<sshd.version>1.0-SNAPSHOT</sshd.version>
<woodstox.version>3.2.7_1</woodstox.version>
<osgi.jmx.version>1.0-r6125-patched</osgi.jmx.version>