Re: svn commit: r1125615 - in /karaf/branches/karaf-2.2.x: assemblies/features/standard/src/main/resources/features.xml pom.xml

2011-06-26 Thread Freeman Fang

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=portProperty 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=1125615view=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=1125615r1=1125614r2=1125615view=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
-	bundlemvn:org.eclipse.jetty/jetty-util/${jetty.version}/ 
bundle

-   bundlemvn:org.eclipse.jetty/jetty-io/${jetty.version}/bundle
-	bundlemvn: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
+bundlemvn:org.eclipse.jetty/jetty-util/${jetty.version}/ 
bundle
+bundlemvn:org.eclipse.jetty/jetty-io/${jetty.version}/ 
bundle
+bundlemvn:org.eclipse.jetty/jetty-http/${jetty.version}/ 
bundle
bundlemvn:org.eclipse.jetty/jetty-client/${jetty.version}/ 
bundle
-	bundlemvn:org.eclipse.jetty/jetty-continuation/$ 
{jetty.version}/bundle
+bundlemvn:org.eclipse.jetty/jetty-continuation/$ 
{jetty.version}/bundle
bundlemvn:org.eclipse.jetty/jetty-jmx/${jetty.version}/ 
bundle
-	bundlemvn:org.eclipse.jetty/jetty-server/${jetty.version}/ 
bundle
-	bundlemvn:org.eclipse.jetty/jetty-security/${jetty.version}/ 
bundle
-	bundlemvn:org.eclipse.jetty/jetty-servlet/${jetty.version}/ 
bundle
+bundlemvn:org.eclipse.jetty/jetty-server/$ 
{jetty.version}/bundle
+bundlemvn:org.eclipse.jetty/jetty-security/$ 
{jetty.version}/bundle
+bundlemvn:org.eclipse.jetty/jetty-servlet/$ 
{jetty.version}/bundle
bundlemvn:org.eclipse.jetty/jetty-servlets/$ 
{jetty.version}/bundle
-	bundlemvn: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
-		bundlemvn:org.eclipse.jetty/jetty-webapp/${jetty.version}/ 
bundle

-   
bundlemvn:org.eclipse.jetty/jetty-jndi/${jetty.version}/bundle
-   
bundlemvn:org.eclipse.jetty/jetty-plus/${jetty.version}/bundle
-   /feature
+bundlemvn:org.eclipse.jetty/jetty-xml/${jetty.version}/ 
bundle
+bundlemvn:org.eclipse.jetty/jetty-webapp/$ 
{jetty.version}/bundle
+bundlemvn:org.eclipse.jetty/jetty-jndi/${jetty.version}/ 
bundle
+bundlemvn:org.eclipse.jetty/jetty-plus/${jetty.version}/ 
bundle

+/feature
feature name=http version=${project.version}  
resolver=(obr)
	configfile 

Re: svn commit: r1125615 - in /karaf/branches/karaf-2.2.x: assemblies/features/standard/src/main/resources/features.xml pom.xml

2011-06-26 Thread Andreas Pieber
You're right. I also experience the problem (although not introduced
by my patch ;))

@Achim: You've added the initial jetty.xml. I'm with Freeman that we
should simply drop this line since it is a) not really required (IMHO)
and b) it's quite annoying :). Was there any reason you've introduced
it in the first place (maybe some problem with pax-web in some special
cases) or can we simply drop it?

Kind regards,
Andreas

On Mon, Jun 27, 2011 at 5:28 AM, Freeman Fang freeman.f...@gmail.com wrote:
 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=portProperty 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=1125615view=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=1125615r1=1125614r2=1125615view=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
 -
 bundlemvn:org.eclipse.jetty/jetty-util/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-io/${jetty.version}/bundle
 -
 bundlemvn: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
 +
  bundlemvn:org.eclipse.jetty/jetty-util/${jetty.version}/bundle
 +        bundlemvn:org.eclipse.jetty/jetty-io/${jetty.version}/bundle
 +
  bundlemvn:org.eclipse.jetty/jetty-http/${jetty.version}/bundle

  bundlemvn:org.eclipse.jetty/jetty-client/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-continuation/${jetty.version}/bundle
 +
  bundlemvn:org.eclipse.jetty/jetty-continuation/${jetty.version}/bundle
        bundlemvn:org.eclipse.jetty/jetty-jmx/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-server/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-security/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-servlet/${jetty.version}/bundle
 +
  bundlemvn:org.eclipse.jetty/jetty-server/${jetty.version}/bundle
 +
  bundlemvn:org.eclipse.jetty/jetty-security/${jetty.version}/bundle
 +
  bundlemvn:org.eclipse.jetty/jetty-servlet/${jetty.version}/bundle

  bundlemvn:org.eclipse.jetty/jetty-servlets/${jetty.version}/bundle
 -       bundlemvn: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
 -
 bundlemvn:org.eclipse.jetty/jetty-webapp/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-jndi/${jetty.version}/bundle
 -
 bundlemvn:org.eclipse.jetty/jetty-plus/${jetty.version}/bundle
 -