Hi Andreas,
Somehow this change cause a problem that when we install http feature,
jetty will start both 8080 and 8181 port, you can download kit from
here[1] to verify it.
Seems the configuration from pax-web can't override the one from
jetty.xml.
Simply remove those from our jetty.xml
<!-- default port will be overwritten by pax-web configuration -->
<Set name="port"><Property name="jetty.port"
default="8080"/></Set>
works and only let the configuration from pax-web take effect.
WDYT?
Best Regards
Freeman
[1]https://repository.apache.org/content/repositories/snapshots/org/apache/karaf/apache-karaf/2.2.2-SNAPSHOT/
On 2011-5-21, at 上午10:20, pie...@apache.org wrote:
Author: pieber
Date: Sat May 21 02:20:32 2011
New Revision: 1125615
URL: http://svn.apache.org/viewvc?rev=1125615&view=rev
Log:
[KARAF-654] Merged jetty and jetty-jaas feature
Signed-off-by: Andreas Pieber <anpie...@gmail.com>
Modified:
karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/
resources/features.xml
karaf/branches/karaf-2.2.x/pom.xml
Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/
src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1125615&r1=1125614&r2=1125615&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/
resources/features.xml (original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/
resources/features.xml Sat May 21 02:20:32 2011
@@ -100,28 +100,27 @@
<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="jetty" version="${jetty.version}" resolver="(obr)">
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-
servlet_2.5_spec/${geronimo.servlet.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>
+ <feature name="jetty" version="${jetty.version}"
resolver="(obr)">
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/
geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/
geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
+ <bundle dependency='true'>mvn:javax.mail/mail/$
{javax.mail.version}</bundle>
+ <bundle dependency='true'>mvn:javax.mail/mail/$
{javax.mail.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/
geronimo-jta_1.1_spec/${geronimo.jta-spec.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-client/${jetty.version}</
bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-continuation/$
{jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-continuation/$
{jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-jmx/${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-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-servlets/$
{jetty.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</
bundle>
- </feature>
- <feature name="jetty-jaas" version="${jetty.version}"
resolver="(obr)">
- <feature version="[7.0,8.0)">jetty</feature>
- <bundle dependency='true'>mvn:javax.mail/mail/$
{javax.mail.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-
jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle>mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}</
bundle>
-
<bundle>mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
-
<bundle>mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
- </feature>
+ <bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</
bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-webapp/$
{jetty.version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</
bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</
bundle>
+ </feature>
<feature name="http" version="${project.version}"
resolver="(obr)">
<configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf/
apache-karaf/${project.version}/xml/jettyconfig</configfile>
<config name="org.ops4j.pax.web">
@@ -140,7 +139,6 @@
org.ops4j.pax.url.war.importPaxLoggingPackages=true
</config>
<feature>http</feature>
- <feature>jetty-jaas</feature>
<bundle start-level='30'>mvn:org.apache.karaf.shell/
org.apache.karaf.shell.web/${project.version}</bundle>
<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>
@@ -156,7 +154,6 @@
realm=karaf
</config>
<feature>http</feature>
- <feature version="[7.0,8.0)">jetty-jaas</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.karaf.webconsole/
org.apache.karaf.webconsole.console/${project.version}</bundle>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1125615&r1=1125614&r2=1125615&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Sat May 21 02:20:32 2011
@@ -115,6 +115,7 @@
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
+ <geronimo.activation.version>1.1</
geronimo.activation.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
<depends-maven-plugin.version>1.0</depends-maven-
plugin.version>
<easymock.version>2.4</easymock.version>
@@ -813,6 +814,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo.activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>${geronimo.servlet.version}</version>
</dependency>
---------------------------------------------
Freeman Fang
FuseSource
Email:ff...@fusesource.com
Web: fusesource.com
Twitter: freemanfang
Blog: http://freemanfang.blogspot.com
