Re: svn commit: r578812 - /geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml

2007-10-08 Thread Kevan Miller 


On Oct 3, 2007, at 4:34 AM, Vamsavardhana Reddy wrote:

I am surprised that the ServerInfo reference is not there in the  
file because http://svn.apache.org/viewvc/geronimo/server/trunk/ 
configs/jetty6/src/plan/plan.xml?r1=577801r2=577800pathrev=577801  
shows that it is there in the commit!!


That's because it's a different file.

Looks like we have duplicate plans in all of our configs... src/plan/ 
plan.xml and src/main/plan/plan.xml.


Looks like http://svn.apache.org/viewvc?view=revrevision=572395  
created the src/main/plan/plan.xml files, but left around the src/ 
plan/plan.xml files.


We need to diff all plans and make sure that we aren't missing  
updates (note that a merge from branches/2.0 would apply cleanly) and  
delete all src/plan/plan.xml files from svn... Otherwise, this is  
going to happen again... ;-)


Any volunteers?

--kevan



Vamsi

On 9/24/07, [EMAIL PROTECTED]  [EMAIL PROTECTED] wrote:
Author: djencks
Date: Mon Sep 24 06:42:43 2007
New Revision: 578812

URL: http://svn.apache.org/viewvc?rev=578812view=rev
Log:
GERONIMO-2964 apparently missed new reference

Modified:
geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml

Modified: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ 
jetty6/src/main/plan/plan.xml?rev=578812r1=578811r2=578812view=diff
== 

--- geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml  
(original)
+++ geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml Mon  
Sep 24 06:42:43 2007

@@ -41,9 +41,12 @@

 !-- default WAR container using Jetty --
 gbean name=JettyWebContainer  
class=org.apache.geronimo.jetty6.JettyContainerImpl

-  reference name=WebManager
-nameJettyWebManager/name
-  /reference
+reference name=WebManager
+nameJettyWebManager/name
+/reference
+reference name=ServerInfo
+nameServerInfo/name
+/reference
 /gbean

 gbean name=JettyRequestLog  
class=org.apache.geronimo.jetty6.requestlog.NCSARequestLog 

@@ -88,29 +91,29 @@
 /gbean

 !-- DONT USE THIS ONE --
-!--
-gbean name=JettySSLConnector  
class=org.apache.geronimo.jetty6.connector.HTTPSSocketConnector 

-attribute name=host${PlanServerHostname}/attribute
-attribute name=port${PlanHTTPSPort}/attribute
-attribute name=keyStoregeronimo-default/attribute
-attribute name=keyAliasgeronimo/attribute
-attribute name=trustStoregeronimo-default/attribute
-attribute name=clientAuthRequiredfalse/attribute
-attribute name=algorithmDefault/attribute
-attribute name=secureProtocolTLS/attribute
-attribute name=maxThreads50/attribute
-reference name=JettyContainer
-nameJettyWebContainer/name
-/reference
-reference name=ThreadPool
-nameDefaultThreadPool/name
-/reference
-reference name=KeystoreManager
-nameKeystoreManager/name
-/reference
-/gbean
---
-!-- USE THIS ONE --
+!--
+gbean name=JettySSLConnector  
class=org.apache.geronimo.jetty6.connector.HTTPSSocketConnector

+attribute name=host${PlanServerHostname}/attribute
+attribute name=port${PlanHTTPSPort}/attribute
+attribute name=keyStoregeronimo-default/attribute
+attribute name=keyAliasgeronimo/attribute
+attribute name=trustStoregeronimo-default/attribute
+attribute name=clientAuthRequiredfalse/attribute
+attribute name=algorithmDefault/attribute
+attribute name=secureProtocolTLS/attribute
+attribute name=maxThreads50/attribute
+reference name=JettyContainer
+nameJettyWebContainer/name
+/reference
+reference name=ThreadPool
+nameDefaultThreadPool/name
+/reference
+reference name=KeystoreManager
+nameKeystoreManager/name
+/reference
+/gbean
+--
+!-- USE THIS ONE --
 gbean name=JettySSLConnector  
class=org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnecto 
r

 attribute name=host${PlanServerHostname}/attribute
 attribute name=port${PlanHTTPSPort}/attribute

Re: svn commit: r578812 - /geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml

2007-10-08 Thread Vamsavardhana Reddy 
Thanks Kevan.  I guess it is time to revisit my ophthalmologist :o(.  I
could not figure the difference even after repeated examination of the
URLs.  I have never paid attention to these plan.xml files under main.

Vamsi

On 10/8/07, Kevan Miller [EMAIL PROTECTED] wrote:


 On Oct 3, 2007, at 4:34 AM, Vamsavardhana Reddy wrote:

 I am surprised that the ServerInfo reference is not there in the file
 because 
 http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/plan/plan.xml?r1=577801r2=577800pathrev=577801
 shows that it is there in the commit!!


 That's because it's a different file.

 Looks like we have duplicate plans in all of our configs...
 src/plan/plan.xml and src/main/plan/plan.xml.

 Looks like http://svn.apache.org/viewvc?view=revrevision=572395 created
 the src/main/plan/plan.xml files, but left around the src/plan/plan.xml
 files.

 We need to diff all plans and make sure that we aren't missing updates
 (note that a merge from branches/2.0 would apply cleanly) and delete all
 src/plan/plan.xml files from svn... Otherwise, this is going to happen
 again... ;-)

 Any volunteers?

 --kevan


 Vamsi

 On 9/24/07, [EMAIL PROTECTED]  [EMAIL PROTECTED] wrote:
 
  Author: djencks
  Date: Mon Sep 24 06:42:43 2007
  New Revision: 578812
 
  URL: http://svn.apache.org/viewvc?rev=578812view=rev
  Log:
  GERONIMO-2964 apparently missed new reference
 
  Modified:
  geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
 
  Modified: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
  URL:
  http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml?rev=578812r1=578811r2=578812view=diff
  ==
 
  --- geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
  (original)
  +++ geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml Mon Sep
  24 06:42:43 2007
  @@ -41,9 +41,12 @@
 
   !-- default WAR container using Jetty --
   gbean name=JettyWebContainer class=
  org.apache.geronimo.jetty6.JettyContainerImpl
  -  reference name=WebManager
  -nameJettyWebManager/name
  -  /reference
  +reference name=WebManager
  +nameJettyWebManager/name
  +/reference
  +reference name=ServerInfo
  +nameServerInfo/name
  +/reference
   /gbean
 
   gbean name=JettyRequestLog class=
  org.apache.geronimo.jetty6.requestlog.NCSARequestLog 
  @@ -88,29 +91,29 @@
   /gbean
 
   !-- DONT USE THIS ONE --
  -!--
  -gbean name=JettySSLConnector class=
  org.apache.geronimo.jetty6.connector.HTTPSSocketConnector 
  -attribute name=host${PlanServerHostname}/attribute
  -attribute name=port${PlanHTTPSPort}/attribute
  -attribute name=keyStoregeronimo-default/attribute
  -attribute name=keyAliasgeronimo/attribute
  -attribute name=trustStoregeronimo-default/attribute
  -attribute name=clientAuthRequiredfalse/attribute
  -attribute name=algorithmDefault/attribute
  -attribute name=secureProtocolTLS/attribute
  -attribute name=maxThreads50/attribute
  -reference name=JettyContainer
  -nameJettyWebContainer/name
  -/reference
  -reference name=ThreadPool
  -nameDefaultThreadPool/name
  -/reference
  -reference name=KeystoreManager
  -nameKeystoreManager/name
  -/reference
  -/gbean
  ---
  -!-- USE THIS ONE --
  +!--
  +gbean name=JettySSLConnector class=
  org.apache.geronimo.jetty6.connector.HTTPSSocketConnector
  +attribute name=host${PlanServerHostname}/attribute
  +attribute name=port${PlanHTTPSPort}/attribute
  +attribute name=keyStoregeronimo-default/attribute
  +attribute name=keyAliasgeronimo/attribute
  +attribute name=trustStoregeronimo-default/attribute
  +attribute name=clientAuthRequiredfalse/attribute
  +attribute name=algorithmDefault/attribute
  +attribute name=secureProtocolTLS/attribute
  +attribute name=maxThreads50/attribute
  +reference name=JettyContainer
  +nameJettyWebContainer/name
  +/reference
  +reference name=ThreadPool
  +nameDefaultThreadPool/name
  +/reference
  +reference name=KeystoreManager
  +nameKeystoreManager/name
  +/reference
  +/gbean
  +--
  +!-- USE THIS ONE --
   gbean name=JettySSLConnector class=
  org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector
   attribute name=host${PlanServerHostname}/attribute
   attribute name=port${PlanHTTPSPort}/attribute
 
 
 




-- 
Vamsi ([EMAIL PROTECTED])
(Committer and Member of Apache Geronimo PMC)
Blog: http://vamsic007.livejournal.com/
One-stop-shop for configuring JEE

Re: svn commit: r578812 - /geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml

2007-10-03 Thread Vamsavardhana Reddy 
I am surprised that the ServerInfo reference is not there in the file
because
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/plan/plan.xml?r1=577801r2=577800pathrev=577801shows
that it is there in the commit!!

Vamsi

On 9/24/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:

 Author: djencks
 Date: Mon Sep 24 06:42:43 2007
 New Revision: 578812

 URL: http://svn.apache.org/viewvc?rev=578812view=rev
 Log:
 GERONIMO-2964 apparently missed new reference

 Modified:
 geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml

 Modified: geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml
 URL:
 http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml?rev=578812r1=578811r2=578812view=diff

 ==
 --- geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml (original)
 +++ geronimo/server/trunk/configs/jetty6/src/main/plan/plan.xml Mon Sep 24
 06:42:43 2007
 @@ -41,9 +41,12 @@

  !-- default WAR container using Jetty --
  gbean name=JettyWebContainer class=
 org.apache.geronimo.jetty6.JettyContainerImpl
 -  reference name=WebManager
 -nameJettyWebManager/name
 -  /reference
 +reference name=WebManager
 +nameJettyWebManager/name
 +/reference
 +reference name=ServerInfo
 +nameServerInfo/name
 +/reference
  /gbean

  gbean name=JettyRequestLog class=
 org.apache.geronimo.jetty6.requestlog.NCSARequestLog
 @@ -88,29 +91,29 @@
  /gbean

  !-- DONT USE THIS ONE --
 -!--
 -gbean name=JettySSLConnector class=
 org.apache.geronimo.jetty6.connector.HTTPSSocketConnector
 -attribute name=host${PlanServerHostname}/attribute
 -attribute name=port${PlanHTTPSPort}/attribute
 -attribute name=keyStoregeronimo-default/attribute
 -attribute name=keyAliasgeronimo/attribute
 -attribute name=trustStoregeronimo-default/attribute
 -attribute name=clientAuthRequiredfalse/attribute
 -attribute name=algorithmDefault/attribute
 -attribute name=secureProtocolTLS/attribute
 -attribute name=maxThreads50/attribute
 -reference name=JettyContainer
 -nameJettyWebContainer/name
 -/reference
 -reference name=ThreadPool
 -nameDefaultThreadPool/name
 -/reference
 -reference name=KeystoreManager
 -nameKeystoreManager/name
 -/reference
 -/gbean
 ---
 -!-- USE THIS ONE --
 +!--
 +gbean name=JettySSLConnector class=
 org.apache.geronimo.jetty6.connector.HTTPSSocketConnector
 +attribute name=host${PlanServerHostname}/attribute
 +attribute name=port${PlanHTTPSPort}/attribute
 +attribute name=keyStoregeronimo-default/attribute
 +attribute name=keyAliasgeronimo/attribute
 +attribute name=trustStoregeronimo-default/attribute
 +attribute name=clientAuthRequiredfalse/attribute
 +attribute name=algorithmDefault/attribute
 +attribute name=secureProtocolTLS/attribute
 +attribute name=maxThreads50/attribute
 +reference name=JettyContainer
 +nameJettyWebContainer/name
 +/reference
 +reference name=ThreadPool
 +nameDefaultThreadPool/name
 +/reference
 +reference name=KeystoreManager
 +nameKeystoreManager/name
 +/reference
 +/gbean
 +--
 +!-- USE THIS ONE --
  gbean name=JettySSLConnector class=
 org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector
  attribute name=host${PlanServerHostname}/attribute
  attribute name=port${PlanHTTPSPort}/attribute