You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/03/26 00:29:04 UTC
svn commit: r1460932 - in /karaf/branches/karaf-2.x: ./
assemblies/apache-karaf/ assemblies/apache-karaf/src/main/resources/extra/
assemblies/features/standard/src/main/resources/ demos/web/
webconsole/console/
Author: jbonofre
Date: Mon Mar 25 23:29:04 2013
New Revision: 1460932
URL: http://svn.apache.org/r1460932
Log:
[KARAF-2235] Upgrade to Pax Web 2.1.2 and Jetty 8.1.10
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.x/demos/web/pom.xml
karaf/branches/karaf-2.x/pom.xml
karaf/branches/karaf-2.x/webconsole/console/pom.xml
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml?rev=1460932&r1=1460931&r2=1460932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml Mon Mar 25 23:29:04 2013
@@ -328,7 +328,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml?rev=1460932&r1=1460931&r2=1460932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/resources/extra/jetty.xml Mon Mar 25 23:29:04 2013
@@ -43,7 +43,7 @@ DTD Configure//EN" "http://jetty.mortbay
<Property name="jetty.port" default="8181"/>
</Set>
<Set name="maxIdleTime">300000</Set>
- <Set name="Acceptors">1</Set>
+ <Set name="Acceptors">2</Set>
<Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
</New>
Modified: karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1460932&r1=1460931&r2=1460932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml Mon Mar 25 23:29:04 2013
@@ -335,24 +335,12 @@
<feature name="jetty" description="Provide Jetty engine support" version="${jetty.version}" resolver="(obr)">
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo.servlet.version}</bundle>
<bundle dependency="true" start-level="30">mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-io/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-http/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-client/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jmx/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-server/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-security/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlet/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty/jetty-websocket/${jetty.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation-spec.version}</bundle>
+ <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
+ <bundle start-level="30">mvn:org.eclipse.jetty.aggregate/jetty-all-server/${jetty.version}</bundle>
</feature>
<feature name="http" description="Implementation of the OSGi HTTP service" version="${project.version}" resolver="(obr)">
@@ -362,7 +350,7 @@
javax.servlet.context.tempdir=${karaf.data}/pax-web-jsp
org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
</config>
- <feature version="[7.0,8.0)">jetty</feature>
+ <feature version="[7.0,9.0)">jetty</feature>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
@@ -371,6 +359,7 @@
<feature name="http-whiteboard" description="Provide HTTP Whiteboard pattern support" version="${project.version}" resolver="(obr)">
<feature version="${http.feature.version}">http</feature>
+ <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
</feature>
@@ -383,6 +372,7 @@
<bundle start-level='30'>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.web/${project.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
+ <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}</bundle>
<bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
</feature>
Modified: karaf/branches/karaf-2.x/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/demos/web/pom.xml?rev=1460932&r1=1460931&r2=1460932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/demos/web/pom.xml (original)
+++ karaf/branches/karaf-2.x/demos/web/pom.xml Mon Mar 25 23:29:04 2013
@@ -35,7 +35,7 @@
<properties>
<jetty.port>8080</jetty.port>
<maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
- <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
+ <geronimo.servlet.version>1.0</geronimo.servlet.version>
<appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: karaf/branches/karaf-2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1460932&r1=1460931&r2=1460932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Mon Mar 25 23:29:04 2013
@@ -115,13 +115,15 @@
<commons-lang.version>2.6</commons-lang.version>
<injection.bundle.version>1.0</injection.bundle.version>
<jasypt.bundle.version>1.9.0_1</jasypt.bundle.version>
- <jetty.version>7.6.8.v20121106</jetty.version>
+ <jetty.version>8.1.10.v20130312</jetty.version>
<junit.version>4.10</junit.version>
<junit.bundle.version>4.10_1</junit.bundle.version>
+ <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version>
+ <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
- <geronimo.servlet.version>1.2</geronimo.servlet.version>
+ <geronimo.servlet.version>1.0</geronimo.servlet.version>
<easymock.version>3.1</easymock.version>
<equinox.version>3.8.0.v20120529-1548</equinox.version>
<felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
@@ -174,7 +176,7 @@
<pax.logging.version>1.7.0</pax.logging.version>
<pax.runner.version>1.7.6</pax.runner.version>
<pax.url.version>1.3.6</pax.url.version>
- <pax.web.version>1.1.12</pax.web.version>
+ <pax.web.version>2.1.2</pax.web.version>
<pax.swissbox.version>1.5.1</pax.swissbox.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<plexus.utils.version>2.1</plexus.utils.version>
@@ -872,7 +874,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${geronimo.servlet.version}</version>
</dependency>
<dependency>
Modified: karaf/branches/karaf-2.x/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/webconsole/console/pom.xml?rev=1460932&r1=1460931&r2=1460932&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.x/webconsole/console/pom.xml Mon Mar 25 23:29:04 2013
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>