Author: gnodet
Date: Mon Nov 1 09:02:05 2010
New Revision: 1029578
URL: http://svn.apache.org/viewvc?rev=1029578&view=rev
Log:
[KARAF-256] Upgrade to pax-web 0.8.0
Modified:
karaf/trunk/assembly/pom.xml
karaf/trunk/assembly/src/main/filtered-resources/features.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/pom.xml?rev=1029578&r1=1029577&r2=1029578&view=diff
==============================================================================
--- karaf/trunk/assembly/pom.xml (original)
+++ karaf/trunk/assembly/pom.xml Mon Nov 1 09:02:05 2010
@@ -285,9 +285,48 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <optional>true</optional>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+<artifactId>com.springsource.org.objectweb.asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+<artifactId>com.springsource.org.objectweb.asm.tree</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
@@ -324,6 +363,11 @@
<artifactId>pax-web-extender-whiteboard</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-deployer</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<resources>
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=1029578&r1=1029577&r2=1029578&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Mon Nov 1
09:02:05 2010
@@ -55,33 +55,47 @@
<feature name="config" version="${project.version}">
<bundle
start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
- <feature name="http" version="${project.version}">
+ <feature name="jetty" version="${jetty.version}" resolver="(obr)">
+ <bundle
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <bundle
dependency='true'>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/${asm.version}</bundle>
+ <bundle
dependency='true'>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm.tree/${asm.version}</bundle>
+ <bundle
dependency='true'>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm.commons/${asm.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
+
<bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
+
<bundle>mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
+
<bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
+ </feature>
+ <feature name="http" version="${project.version}" resolver="(obr)">
<config name="org.ops4j.pax.web">
org.osgi.service.http.port=8181
+ org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
</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-api/${pax.web.version}</bundle>
+ <feature version="[7.0,8.0)">jetty</feature>
+ <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="war" version="${project.version}">
- <feature version="${project.version}">http</feature>
+ <feature name="war" version="${project.version}" resolver="(obr)">
+ <feature>http</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
+
<bundle>mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}</bundle>
<bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
-
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.war/${project.version}</bundle>
</feature>
<feature name="kar" version="${project.version}">
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
</feature>
<feature name="webconsole-base" version="${project.version}">
- <feature version="${project.version}">http</feature>
<config name="org.apache.karaf.webconsole">
realm=karaf
</config>
+ <feature>http</feature>
<bundle>mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle>mvn:org.apache.felix/org.apache.felix.webconsole/${felix.webconsole.version}</bundle>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1029578&r1=1029577&r2=1029578&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Mon Nov 1 09:02:05 2010
@@ -107,9 +107,10 @@
<commons-codec.bundle.version>1.3_3</commons-codec.bundle.version>
<commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
<jasypt.bundle.version>1.6_1</jasypt.bundle.version>
- <jetty.bundle.version>6.1.22_2</jetty.bundle.version>
+ <jetty.version>7.1.6.v20100715</jetty.version>
<junit.bundle.version>4.7_1</junit.bundle.version>
+ <asm.version>3.1.0</asm.version>
<commons.logging.version>1.1.1</commons.logging.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
@@ -137,7 +138,7 @@
<pax.logging.version>1.5.3</pax.logging.version>
<pax.runner.version>1.5.0</pax.runner.version>
<pax.url.version>1.2.0</pax.url.version>
- <pax.web.version>0.7.3</pax.web.version>
+ <pax.web.version>0.8.0</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<servlet.api.version>2.5</servlet.api.version>
<spring.osgi.version>1.2.0</spring.osgi.version>
@@ -596,9 +597,59 @@
<version>${junit.bundle.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.jetty-bundle</artifactId>
- <version>${jetty.bundle.version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+
<artifactId>com.springsource.org.objectweb.asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+
<artifactId>com.springsource.org.objectweb.asm.tree</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+
<artifactId>com.springsource.org.objectweb.asm.commons</artifactId>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -804,6 +855,11 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-deployer</artifactId>
+ <version>${pax.web.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-extender-war</artifactId>
<version>${pax.web.version}</version>
</dependency>
