Deutsche werden kuenftig beim Arzt abgezockt

2005-05-14 Thread amyroh
Lese selbst:
http://globalfire.tv/nj/03de/politik/fruehtod_reform.htm

EU-Abgeordnete goennen sich luxurioese Vollversorgung:
http://www.rp-online.de/public/article/nachrichten/politik/ausland/85804

Deutsche Krankenversicherungen muessen fuer Harems-Frauen zahlen:
http://www.spiegel.de/spiegel/vorab/0,1518,323476,00.html

Kassenfunktionaere vervierfachten Gehalt:
http://www.spiegel.de/wirtschaft/0,1518,353600,00.html

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



hello

2005-04-04 Thread amyroh
The message cannot be represented in 7-bit ASCII encoding and has been sent as 
a binary attachment.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Secure SMTP Message

2005-01-21 Thread amyroh

You got a new message.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF struts-config.xml

2004-11-30 Thread amyroh
amyroh  2004/11/30 12:24:00

  Modified:webapps/admin/WEB-INF Tag: TOMCAT_5_0 struts-config.xml
  Log:
  Fix bugzilla 32445 for admin webapp to work with Struts 1.2.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.6.2.1   +5 -2  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- struts-config.xml 17 Apr 2004 02:50:41 -  1.6
  +++ struts-config.xml 30 Nov 2004 20:24:00 -  1.6.2.1
  @@ -1,8 +1,8 @@
   ?xml version=1.0 encoding=ISO-8859-1 ?
   
   !DOCTYPE struts-config PUBLIC
  -  -//Apache Software Foundation//DTD Struts Configuration 1.0//EN
  -  http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd; 
  +  -//Apache Software Foundation//DTD Struts Configuration 1.2//EN
  +  http://struts.apache.org/dtds/struts-config_1_2.dtd;
   
   
   struts-config
  @@ -1058,5 +1058,8 @@
   
   
 /action-mappings  
  +
  +  message-resources
  +parameter=org.apache.webapp.admin.ApplicationResources/
   
   /struts-config
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF struts-config.xml

2004-11-30 Thread amyroh
amyroh  2004/11/30 12:42:22

  Modified:webapps/admin/WEB-INF struts-config.xml
  Log:
  Modify to use Struts 1.2 config for consistency.
  
  Revision  ChangesPath
  1.10  +2 -2  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- struts-config.xml 18 Oct 2004 06:37:52 -  1.9
  +++ struts-config.xml 30 Nov 2004 20:42:22 -  1.10
  @@ -1,8 +1,8 @@
   ?xml version=1.0 encoding=ISO-8859-1 ?
   
   !DOCTYPE struts-config PUBLIC
  -  -//Apache Software Foundation//DTD Struts Configuration 1.1//EN
  -  http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd; 
  +  -//Apache Software Foundation//DTD Struts Configuration 1.2//EN
  +  http://struts.apache.org/dtds/struts-config_1_2.dtd;
   
   
   struts-config
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/tester/src/tester/org/apache/tester TestClient.java

2004-09-25 Thread amyroh
amyroh  2004/09/25 14:27:31

  Modified:tester/src/tester/org/apache/tester TestClient.java
  Log:
  Fix compilation error in tester - thanks Mladen.  :-)
  
  Revision  ChangesPath
  1.4   +5 -5  
jakarta-tomcat-catalina/tester/src/tester/org/apache/tester/TestClient.java
  
  Index: TestClient.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/tester/src/tester/org/apache/tester/TestClient.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestClient.java   17 Sep 2004 18:32:14 -  1.3
  +++ TestClient.java   25 Sep 2004 21:27:31 -  1.4
  @@ -485,9 +485,9 @@
   parseSession(value);
   }
   if (debug = 1) {
  -log.println(DATA:  + outData);
  +log(DATA:  + outData);
   if (outText.length()  2)
  -log.println(TEXT:  + outText);
  +log(TEXT:  + outText);
   }
   
   // Validate the response against our criteria
  @@ -546,9 +546,9 @@
   
   // Log the results of executing this request
   if (success)
  -log.println(OK  + summary);
  +log(OK  + summary);
   else {
  -log.println(FAIL  + summary +   + result);
  +log(FAIL  + summary +   + result);
   if (throwable != null)
   throwable.printStackTrace(System.out);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler SmapUtil.java

2004-09-20 Thread amyroh
amyroh  2004/09/20 10:51:28

  Modified:jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
  Log:
  Remove verbose.
  
  Revision  ChangesPath
  1.25  +20 -62
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java
  
  Index: SmapUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- SmapUtil.java 17 Sep 2004 21:02:34 -  1.24
  +++ SmapUtil.java 20 Sep 2004 17:51:28 -  1.25
  @@ -45,8 +45,6 @@
   
   private static org.apache.commons.logging.Log log=
   org.apache.commons.logging.LogFactory.getLog( SmapUtil.class );
  -
  -private static final boolean verbose = false;
   
   //*
   // Constants
  @@ -286,10 +284,7 @@
   copy(4 + 2 + 2); // magic min/maj version
   int constantPoolCountPos = genPos;
   int constantPoolCount = readU2();
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(constant pool count:  + constantPoolCount);
  -}
  +log(constant pool count:  + constantPoolCount);
   writeU2(constantPoolCount);
   
   // copy old constant pool return index of SDE symbol, if found
  @@ -303,45 +298,27 @@
   ++constantPoolCount;
   randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
   
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(
  -SourceDebugExtension not found, installed at: 
  -+ sdeIndex);
  -}
  +log(SourceDebugExtension not found, installed at:  + sdeIndex);
   } else {
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(
  -SourceDebugExtension found at:  + sdeIndex);
  -}
  +log(SourceDebugExtension found at:  + sdeIndex);
   }
   copy(2 + 2 + 2); // access, this, super
   int interfaceCount = readU2();
   writeU2(interfaceCount);
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(interfaceCount:  + interfaceCount);
  -}
  +log(interfaceCount:  + interfaceCount);
   copy(interfaceCount * 2);
   copyMembers(); // fields
   copyMembers(); // methods
   int attrCountPos = genPos;
   int attrCount = readU2();
   writeU2(attrCount);
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(class attrCount:  + attrCount);
  -}
  +log(class attrCount:  + attrCount);
   // copy the class attributes, return true if SDE attr found (not copied)
   if (!copyAttrs(attrCount)) {
   // we will be adding SDE and it isn't already counted
   ++attrCount;
   randomAccessWriteU2(attrCountPos, attrCount);
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(class attrCount incremented);
  -}
  +log(class attrCount incremented);
   }
   writeAttrForSDE(sdeIndex);
   }
  @@ -349,18 +326,12 @@
   void copyMembers() {
   int count = readU2();
   writeU2(count);
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(members count:  + count);
  -}
  +log(members count:  + count);
   for (int i = 0; i  count; ++i) {
   copy(6); // access, name, descriptor
   int attrCount = readU2();
   writeU2(attrCount);
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(member attr count:  + attrCount);
  -}
  +log(member attr count:  + attrCount);
   copyAttrs(attrCount);
   }
   }
  @@ -372,19 +343,13 @@
   // don't write old SDE
   if (nameIndex == sdeIndex) {
   sdeFound = true;
  -if (verbose) {
  -if (log.isDebugEnabled())
  -log.debug(SDE attr found);
  -}
  +log(SDE attr found);
   } else {
   writeU2(nameIndex

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf C2BConverter.java

2004-09-20 Thread amyroh
amyroh  2004/09/20 10:52:09

  Modified:jk/java/org/apache/jk/config WebXml2Jk.java
   jk/test/org/apache/ajp/test TestAjp13.java
   util/java/org/apache/tomcat/util/buf C2BConverter.java
  Log:
  A couple more logging changes.
  
  Revision  ChangesPath
  1.7   +2 -1  
jakarta-tomcat-connectors/jk/java/org/apache/jk/config/WebXml2Jk.java
  
  Index: WebXml2Jk.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/config/WebXml2Jk.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebXml2Jk.java24 Feb 2004 08:48:43 -  1.6
  +++ WebXml2Jk.java20 Sep 2004 17:52:09 -  1.7
  @@ -417,7 +417,8 @@
  String systemId)
   throws SAXException, IOException
   {
  -System.out.println(ResolveEntity:  + publicId +   + systemId);
  +if (log.isDebugEnabled())
  +log.debug(ResolveEntity:  + publicId +   + systemId);
   return new InputSource(new StringReader());
   }
   }
  
  
  
  1.4   +5 -1  
jakarta-tomcat-connectors/jk/test/org/apache/ajp/test/TestAjp13.java
  
  Index: TestAjp13.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/test/org/apache/ajp/test/TestAjp13.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestAjp13.java24 Feb 2004 08:48:44 -  1.3
  +++ TestAjp13.java20 Sep 2004 17:52:09 -  1.4
  @@ -34,6 +34,9 @@
   
   public class TestAjp13 extends TestCase {
   
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( TestAjp13.class );
  +
   Ajp13Server server = null;
   
   public TestAjp13(String name) {
  @@ -167,7 +170,8 @@
   }
   
   protected static void println(String msg) {
  -System.out.println([TestAjp13]  + msg);
  +if (log.isDebugEnabled())
  +log.debug([TestAjp13]  + msg);
   }
   
   public static void main(String[] args) throws Exception {
  
  
  
  1.5   +6 -1  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/C2BConverter.java
  
  Index: C2BConverter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/buf/C2BConverter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- C2BConverter.java 24 Feb 2004 08:50:06 -  1.4
  +++ C2BConverter.java 20 Sep 2004 17:52:09 -  1.5
  @@ -29,6 +29,10 @@
* 
*/
   public final class C2BConverter {
  +
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog(C2BConverter.class );
  +
   private IntermediateOutputStream ios;
   private WriteConvertor conv;
   private ByteChunk bb;
  @@ -108,7 +112,8 @@
   charC.getOffset(), charC.getLength());
   //System.out.println(XXX Converting  + mb.getCharChunk() );
   } else {
  -System.out.println(XXX unknowon type  + type );
  +if (log.isDebugEnabled())
  +log.debug(XXX unknowon type  + type );
   }
   flushBuffer();
   //System.out.println(C2B: XXX  + bb.getBuffer() + bb.getLength()); 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler SmapUtil.java

2004-09-20 Thread amyroh
amyroh  2004/09/20 11:27:09

  Modified:jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
  Log:
  Do not use log(String) helper method since unnecessary Sting parameters
  will be created without the log.isDebugEnabled() condition.
  
  Thanks Remy and Paul for catching this.
  
  Revision  ChangesPath
  1.26  +28 -19
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java
  
  Index: SmapUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- SmapUtil.java 20 Sep 2004 17:51:28 -  1.25
  +++ SmapUtil.java 20 Sep 2004 18:27:09 -  1.26
  @@ -284,7 +284,8 @@
   copy(4 + 2 + 2); // magic min/maj version
   int constantPoolCountPos = genPos;
   int constantPoolCount = readU2();
  -log(constant pool count:  + constantPoolCount);
  +if (log.isDebugEnabled())
  +log.debug(constant pool count:  + constantPoolCount);
   writeU2(constantPoolCount);
   
   // copy old constant pool return index of SDE symbol, if found
  @@ -298,27 +299,32 @@
   ++constantPoolCount;
   randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
   
  -log(SourceDebugExtension not found, installed at:  + sdeIndex);
  +if (log.isDebugEnabled())
  +log.debug(SourceDebugExtension not found, installed at:  + 
sdeIndex);
   } else {
  -log(SourceDebugExtension found at:  + sdeIndex);
  +if (log.isDebugEnabled())
  +log.debug(SourceDebugExtension found at:  + sdeIndex);
   }
   copy(2 + 2 + 2); // access, this, super
   int interfaceCount = readU2();
   writeU2(interfaceCount);
  -log(interfaceCount:  + interfaceCount);
  +if (log.isDebugEnabled())
  +log.debug(interfaceCount:  + interfaceCount);
   copy(interfaceCount * 2);
   copyMembers(); // fields
   copyMembers(); // methods
   int attrCountPos = genPos;
   int attrCount = readU2();
   writeU2(attrCount);
  -log(class attrCount:  + attrCount);
  +if (log.isDebugEnabled())
  +log.debug(class attrCount:  + attrCount);
   // copy the class attributes, return true if SDE attr found (not copied)
   if (!copyAttrs(attrCount)) {
   // we will be adding SDE and it isn't already counted
   ++attrCount;
   randomAccessWriteU2(attrCountPos, attrCount);
  -log(class attrCount incremented);
  +if (log.isDebugEnabled())
  +log.debug(class attrCount incremented);
   }
   writeAttrForSDE(sdeIndex);
   }
  @@ -326,12 +332,14 @@
   void copyMembers() {
   int count = readU2();
   writeU2(count);
  -log(members count:  + count);
  +if (log.isDebugEnabled())
  +log.debug(members count:  + count);
   for (int i = 0; i  count; ++i) {
   copy(6); // access, name, descriptor
   int attrCount = readU2();
   writeU2(attrCount);
  -log(member attr count:  + attrCount);
  +if (log.isDebugEnabled())
  +log.debug(member attr count:  + attrCount);
   copyAttrs(attrCount);
   }
   }
  @@ -343,13 +351,15 @@
   // don't write old SDE
   if (nameIndex == sdeIndex) {
   sdeFound = true;
  -log(SDE attr found);
  +if (log.isDebugEnabled())
  +log.debug(SDE attr found);
   } else {
   writeU2(nameIndex); // name
   int len = readU4();
   writeU4(len);
   copy(len);
  -log(attr len:  + len);
  +if (log.isDebugEnabled())
  +log.debug(attr len:  + len);
   }
   }
   return sdeFound;
  @@ -428,7 +438,8 @@
   switch (tag) {
   case 7 : // Class
   case 8 : // String
  -log(i +  copying 2 bytes);
  +if (log.isDebugEnabled())
  +log.debug(i +  copying 2 bytes);
   copy(2);
   break;
   case 9 : // Field
  @@ -437,12 +448,14

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin CommitChangesAction.java

2004-09-17 Thread amyroh
amyroh  2004/09/17 11:32:14

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/io
XByteBuffer.java
   modules/cluster/src/share/org/apache/catalina/cluster/tcp
SimpleTcpCluster.java
   tester/src/tester/org/apache/tester TestClient.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin
CommitChangesAction.java
  Log:
  More logging changes - let me know if you see any problems with'em.
  
  Revision  ChangesPath
  1.10  +2 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java
  
  Index: XByteBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XByteBuffer.java  1 Jul 2004 09:44:27 -   1.9
  +++ XByteBuffer.java  17 Sep 2004 18:32:14 -  1.10
  @@ -381,7 +381,7 @@
  log.info(Nr of packages=+s);
  while ( s  0 ) {
  d = b.extractPackage(true);
  -   System.out.print(Package d1=);
  +   log.info(Package d1=);
  printBuf(d);
  s--;
  }//while
  
  
  
  1.49  +3 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java
  
  Index: SimpleTcpCluster.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/SimpleTcpCluster.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- SimpleTcpCluster.java 5 Sep 2004 22:00:52 -   1.48
  +++ SimpleTcpCluster.java 17 Sep 2004 18:32:14 -  1.49
  @@ -270,8 +270,8 @@
   
   
   public synchronized Manager createManager(String name) {
  -log.debug(Creating ClusterManager for context +name +  using class 
+getManagerClassName());
  -System.out.println(\n\n\n\nCreating ClusterManager for context +name +  
using class +getManagerClassName()+\n\n\n\n);
  +if (log.isDebugEnabled())
  +log.debug(Creating ClusterManager for context +name +  using class 
+getManagerClassName());
   ClusterManager manager = null;
   try {
   manager = 
(ClusterManager)getClass().getClassLoader().loadClass(getManagerClassName()).newInstance();
  
  
  
  1.3   +19 -19
jakarta-tomcat-catalina/tester/src/tester/org/apache/tester/TestClient.java
  
  Index: TestClient.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/tester/src/tester/org/apache/tester/TestClient.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestClient.java   27 Feb 2004 14:58:57 -  1.2
  +++ TestClient.java   17 Sep 2004 18:32:14 -  1.3
  @@ -354,7 +354,7 @@
   try {
   readGolden();
   } catch (IOException e) {
  -System.out.println(FAIL:  readGolden( + golden + ));
  +log(FAIL:  readGolden( + golden + ));
   e.printStackTrace(System.out);
   }
   if ((protocol == null) || (protocol.length() == 0))
  @@ -378,7 +378,7 @@
   // Construct a summary of the request we will be sending
   String summary = [ + method +   + request + ];
   if (debug = 1)
  -System.out.println(RQST:  + summary);
  +log(RQST:  + summary);
   boolean success = true;
   String result = null;
   Throwable throwable = null;
  @@ -396,7 +396,7 @@
   conn.setRequestProperty(Content-Length,
+ inContent.length());
   if (debug = 1)
  -System.out.println(INPH: Content-Length:  +
  +log(INPH: Content-Length:  +
  inContent.length());
   } else {
   conn.setDoOutput(false);
  @@ -407,12 +407,12 @@
   conn.setRequestProperty(Cookie,
   JSESSIONID= + sessionId);
   if (debug = 1)
  -System.out.println(INPH: Cookie: JSESSIONID= +
  +log(INPH: Cookie: JSESSIONID= +
  sessionId);
   }
   
   if (this.redirect  (debug = 1))
  -System.out.println(FLAG: setInstanceFollowRedirects( +
  +log(FLAG: setInstanceFollowRedirects( +
  this.redirect + ));
   conn.setInstanceFollowRedirects(this.redirect);
   conn.setRequestMethod(method

cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads Expirer.java Reaper.java

2004-09-17 Thread amyroh
amyroh  2004/09/17 11:34:19

  Modified:coyote/src/java/org/apache/coyote/tomcat4 OutputBuffer.java
   http11/src/test/java/org/apache/coyote/http11
RandomAdapter.java
   jk/java/org/apache/ajp Ajp13Packet.java Logger.java
NegociationHandler.java
   jk/java/org/apache/ajp/tomcat4 JkServlet.java
   jk/java/org/apache/jk/common MsgAjp.java Shm.java
   jk/jkant/java/org/apache/jk/ant/compilers MsvcCompiler.java
MsvcLinker.java MwccCompiler.java MwldLinker.java
   naming/src/org/apache/naming/modules/fs FileDirContext.java
   util/java/org/apache/tomcat/util IntrospectionUtils.java
   util/java/org/apache/tomcat/util/buf B2CConverter.java
Base64.java UDecoder.java UEncoder.java
UTF8Decoder.java
   util/java/org/apache/tomcat/util/collections SimplePool.java
   util/java/org/apache/tomcat/util/http Cookies.java
Parameters.java ServerCookie.java
   util/java/org/apache/tomcat/util/threads Expirer.java
Reaper.java
  Log:
  More logging changes - let me know if you see any problems with'em.
  
  Revision  ChangesPath
  1.14  +5 -1  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/OutputBuffer.java
  
  Index: OutputBuffer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/OutputBuffer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- OutputBuffer.java 24 Feb 2004 08:54:29 -  1.13
  +++ OutputBuffer.java 17 Sep 2004 18:34:18 -  1.14
  @@ -40,6 +40,9 @@
   implements ByteChunk.ByteOutputChannel, CharChunk.CharOutputChannel {
   
   
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( OutputBuffer.class );
  +
   // -- Constants
   
   
  @@ -664,7 +667,8 @@
   
   
   protected void log( String s ) {
  - System.out.println(OutputBuffer:  + s);
  +if (log.isDebugEnabled()) 
  +log.debug(OutputBuffer:  + s);
   }
   
   
  
  
  
  1.3   +14 -6 
jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11/RandomAdapter.java
  
  Index: RandomAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/test/java/org/apache/coyote/http11/RandomAdapter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RandomAdapter.java27 Feb 2004 15:14:08 -  1.2
  +++ RandomAdapter.java17 Sep 2004 18:34:18 -  1.3
  @@ -33,6 +33,8 @@
   public class RandomAdapter
   implements Adapter {
   
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( RandomAdapter.class );
   
   public static final String CRLF = \r\n;
   public static final byte[] b = 0123456789\r\n.getBytes();
  @@ -60,13 +62,15 @@
   case 0:
   
   // 0) Do nothing
  -System.out.println(Response 0);
  +if (log.isDebugEnabled())
  +log.debug(Response 0);
   break;
   
   case 1:
   
   // 1) Set content length, and write the appropriate content
  -System.out.println(Response 1);
  +if (log.isDebugEnabled())
  +log.debug(Response 1);
   res.setContentLength(b.length);
   bc.setBytes(b, 0, b.length);
   res.doWrite(bc);
  @@ -76,7 +80,8 @@
   
   // 2) Read the request data, and print out the number of bytes
   // read
  -System.out.println(Response 2);
  +if (log.isDebugEnabled())
  +log.debug(Response 2);
   while (nRead = 0) {
   nRead = req.doRead(bc);
   buf = (Read  + nRead +  bytes\r\n).getBytes();
  @@ -88,7 +93,8 @@
   case 3:
   
   // 3) Return 204 (no content), while reading once on input
  -System.out.println(Response 3);
  +if (log.isDebugEnabled())
  +log.debug(Response 3);
   res.setStatus(204);
   nRead = req.doRead(bc);
   res.setHeader(Info, Read  + nRead +  bytes);
  @@ -97,7 +103,8 @@
   case 4:
   
   // 4) Do a request dump
  -System.out.println(Response 4);
  +if (log.isDebugEnabled())
  +log.debug(Response 4);
   sbuf.append(Request dump:);
   sbuf.append(CRLF);
   sbuf.append(req.method

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser ParserUtils.java UTF8Reader.java

2004-09-17 Thread amyroh
amyroh  2004/09/17 14:02:34

  Modified:jasper2/src/share/org/apache/jasper/compiler SmapUtil.java
   jasper2/src/share/org/apache/jasper/runtime HttpJspBase.java
   jasper2/src/share/org/apache/jasper/security
SecurityClassLoad.java
   jasper2/src/share/org/apache/jasper/xmlparser
ParserUtils.java UTF8Reader.java
  Log:
  More logging changes.
  
  Revision  ChangesPath
  1.24  +31 -14
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java
  
  Index: SmapUtil.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/SmapUtil.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- SmapUtil.java 17 Mar 2004 19:23:03 -  1.23
  +++ SmapUtil.java 17 Sep 2004 21:02:34 -  1.24
  @@ -43,6 +43,9 @@
*/
   public class SmapUtil {
   
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( SmapUtil.class );
  +
   private static final boolean verbose = false;
   
   //*
  @@ -284,7 +287,8 @@
   int constantPoolCountPos = genPos;
   int constantPoolCount = readU2();
   if (verbose) {
  -System.out.println(constant pool count:  + constantPoolCount);
  +if (log.isDebugEnabled())
  +log.debug(constant pool count:  + constantPoolCount);
   }
   writeU2(constantPoolCount);
   
  @@ -300,13 +304,15 @@
   randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
   
   if (verbose) {
  -System.out.println(
  +if (log.isDebugEnabled())
  +log.debug(
   SourceDebugExtension not found, installed at: 
   + sdeIndex);
   }
   } else {
   if (verbose) {
  -System.out.println(
  +if (log.isDebugEnabled())
  +log.debug(
   SourceDebugExtension found at:  + sdeIndex);
   }
   }
  @@ -314,7 +320,8 @@
   int interfaceCount = readU2();
   writeU2(interfaceCount);
   if (verbose) {
  -System.out.println(interfaceCount:  + interfaceCount);
  +if (log.isDebugEnabled())
  +log.debug(interfaceCount:  + interfaceCount);
   }
   copy(interfaceCount * 2);
   copyMembers(); // fields
  @@ -323,7 +330,8 @@
   int attrCount = readU2();
   writeU2(attrCount);
   if (verbose) {
  -System.out.println(class attrCount:  + attrCount);
  +if (log.isDebugEnabled())
  +log.debug(class attrCount:  + attrCount);
   }
   // copy the class attributes, return true if SDE attr found (not copied)
   if (!copyAttrs(attrCount)) {
  @@ -331,7 +339,8 @@
   ++attrCount;
   randomAccessWriteU2(attrCountPos, attrCount);
   if (verbose) {
  -System.out.println(class attrCount incremented);
  +if (log.isDebugEnabled())
  +log.debug(class attrCount incremented);
   }
   }
   writeAttrForSDE(sdeIndex);
  @@ -341,14 +350,16 @@
   int count = readU2();
   writeU2(count);
   if (verbose) {
  -System.out.println(members count:  + count);
  +if (log.isDebugEnabled())
  +log.debug(members count:  + count);
   }
   for (int i = 0; i  count; ++i) {
   copy(6); // access, name, descriptor
   int attrCount = readU2();
   writeU2(attrCount);
   if (verbose) {
  -System.out.println(member attr count:  + attrCount);
  +if (log.isDebugEnabled())
  +log.debug(member attr count:  + attrCount);
   }
   copyAttrs(attrCount);
   }
  @@ -362,7 +373,8 @@
   if (nameIndex == sdeIndex) {
   sdeFound = true;
   if (verbose) {
  -System.out.println(SDE attr found);
  +if (log.isDebugEnabled())
  +log.debug(SDE attr found);
   }
   } else {
   writeU2(nameIndex); // name
  @@ -370,7 +382,8

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser UCSReader.java

2004-09-17 Thread amyroh
amyroh  2004/09/17 14:57:44

  Modified:jasper2/src/share/org/apache/jasper/xmlparser UCSReader.java
  Log:
  More logging changes - remove System.err to use commons logging.
  
  Revision  ChangesPath
  1.3   +6 -2  
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/UCSReader.java
  
  Index: UCSReader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/xmlparser/UCSReader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UCSReader.java17 Mar 2004 19:23:05 -  1.2
  +++ UCSReader.java17 Sep 2004 21:57:44 -  1.3
  @@ -30,6 +30,9 @@
*/
   public class UCSReader extends Reader {
   
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( UCSReader.class );
  +
   //
   // Constants
   //
  @@ -120,7 +123,8 @@
   int b3 = fInputStream.read()  0xff;
   if (b3 == 0xff)
   return -1;
  -System.err.println(b0 is  + (b0  0xff) +  b1  + (b1  0xff) +  b2 
 + (b2  0xff) +  b3  + (b3  0xff));
  +if (log.isDebugEnabled())
  +log.debug(b0 is  + (b0  0xff) +  b1  + (b1  0xff) +  b2  + 
(b2  0xff) +  b3  + (b3  0xff));
   if (fEncoding == UCS4BE)
   return (b024)+(b116)+(b28)+b3;
   else
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/collections SimpleHashtable.java

2004-09-17 Thread amyroh
amyroh  2004/09/17 14:57:55

  Modified:jk/java/org/apache/ajp/tomcat4 JkServlet.java
   jk/java/org/apache/ajp/tomcat4/config BaseJkConfig.java
   jk/java/org/apache/jk/common Shm14.java WorkerDummy.java
   util/java/org/apache/tomcat/util IntrospectionUtils.java
   util/java/org/apache/tomcat/util/collections
SimpleHashtable.java
  Log:
  More logging changes - remove System.err to use commons logging.
  
  Revision  ChangesPath
  1.5   +1 -1  
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/JkServlet.java
  
  Index: JkServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/JkServlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JkServlet.java17 Sep 2004 18:34:18 -  1.4
  +++ JkServlet.java17 Sep 2004 21:57:54 -  1.5
  @@ -88,7 +88,7 @@
   
   private static final int dL=10;
   private static void d(String s ) {
  -System.err.println( JkServlet:  + s );
  +log( JkServlet:  + s );
   }
   
   
  
  
  
  1.7   +6 -5  
jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/BaseJkConfig.java
  
  Index: BaseJkConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/config/BaseJkConfig.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BaseJkConfig.java 31 Aug 2004 23:52:52 -  1.6
  +++ BaseJkConfig.java 17 Sep 2004 21:57:54 -  1.7
  @@ -91,6 +91,10 @@
@version $Revision$
*/
   public class BaseJkConfig  implements LifecycleListener {
  +
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( BaseJkConfig.class );
  +
   protected int debug=0;
   protected File configHome = null;
   protected File workersConfig = null;
  @@ -132,7 +136,7 @@
try {
mod_jk = getWriter();
} catch(IOException iex) {
  - log(Unable to open config file);
  + log.warn(Unable to open config file, iex);
return;
}
Lifecycle who = evt.getLifecycle();
  @@ -478,8 +482,5 @@
return true;
   
return false;
  -}
  -protected void log(String msg) {
  - System.err.println(msg);
   }
   }
  
  
  
  1.4   +8 -2  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm14.java
  
  Index: Shm14.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/Shm14.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Shm14.java24 Feb 2004 08:48:42 -  1.3
  +++ Shm14.java17 Sep 2004 21:57:55 -  1.4
  @@ -31,8 +31,13 @@
* @author Costin Manolache
*/
   public class Shm14 extends Shm {
  +
  +
   // Not ready yet.
  -
  +
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( Shm14.class );
  +
   MappedByteBuffer bb;
   
   public void init() {
  @@ -60,7 +65,8 @@
   public  int invoke(Msg msg, MsgContext ep )
   throws IOException
   {
  -System.err.println(ChannelShm14.invoke:   + ep );
  +if (log.isDebugEnabled())
  +log.debug(ChannelShm14.invoke:   + ep );
   
   // 
   
  
  
  
  1.9   +0 -3  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java
  
  Index: WorkerDummy.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/WorkerDummy.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WorkerDummy.java  24 Feb 2004 08:48:42 -  1.8
  +++ WorkerDummy.java  17 Sep 2004 21:57:55 -  1.9
  @@ -86,8 +86,5 @@
   }
   
   private static final int dL=0;
  -private static void d(String s ) {
  -System.err.println( WorkerDummy:  + s );
  -}
   }
   
  
  
  
  1.12  +2 -4  
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java
  
  Index: IntrospectionUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/IntrospectionUtils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- IntrospectionUtils.java   17 Sep 2004 18:34:18 -  1.11
  +++ IntrospectionUtils.java   17 Sep 2004 21:57:55 -  1.12
  @@ -346,8 +346,7 @@
   }
   
   } catch (IllegalArgumentException ex2

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardServer.java

2004-09-17 Thread amyroh
amyroh  2004/09/17 14:58:25

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  More logging changes - remove System.err to use commons logging.
  
  Revision  ChangesPath
  1.37  +8 -11 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- StandardServer.java   29 Aug 2004 16:46:09 -  1.36
  +++ StandardServer.java   17 Sep 2004 21:58:25 -  1.37
  @@ -463,9 +463,8 @@
   new ServerSocket(port, 1,
InetAddress.getByName(127.0.0.1));
   } catch (IOException e) {
  -System.err.println(StandardServer.await: create[ + port
  -   + ]:  + e);
  -e.printStackTrace();
  +log.error(StandardServer.await: create[ + port
  +   + ]: , e);
   System.exit(1);
   }
   
  @@ -480,12 +479,11 @@
   socket.setSoTimeout(10 * 1000);  // Ten seconds
   stream = socket.getInputStream();
   } catch (AccessControlException ace) {
  -System.err.println(StandardServer.accept security exception: 
  -   + ace.getMessage());
  +log.warn(StandardServer.accept security exception: 
  +   + ace.getMessage(), ace);
   continue;
   } catch (IOException e) {
  -System.err.println(StandardServer.await: accept:  + e);
  -e.printStackTrace();
  +log.error(StandardServer.await: accept: , e);
   System.exit(1);
   }
   
  @@ -502,8 +500,7 @@
   try {
   ch = stream.read();
   } catch (IOException e) {
  -System.err.println(StandardServer.await: read:  + e);
  -e.printStackTrace();
  +log.warn(StandardServer.await: read: , e);
   ch = -1;
   }
   if (ch  32)  // Control character or EOF terminates loop
  @@ -524,7 +521,7 @@
   if (match) {
   break;
   } else
  -System.err.println(StandardServer.await: Invalid command ' +
  +log.warn(StandardServer.await: Invalid command ' +
  command.toString() + ' received);
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources WARDirContext.java

2004-09-16 Thread amyroh
amyroh  2004/09/16 16:19:55

  Modified:catalina/src/share/org/apache/catalina/ant JMXQueryTask.java
JMXSetTask.java
   catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java
   catalina/src/share/org/apache/catalina/startup Catalina.java
CatalinaProperties.java
   catalina/src/share/org/apache/catalina/util
ProcessEnvironment.java ProcessHelper.java
StringManager.java
   catalina/src/share/org/apache/naming/resources
WARDirContext.java
  Log:
  Remove System.out and use commons.logging instead - part 1.
  
  Revision  ChangesPath
  1.5   +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXQueryTask.java
  
  Index: JMXQueryTask.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXQueryTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JMXQueryTask.java 29 Aug 2004 16:46:09 -  1.4
  +++ JMXQueryTask.java 16 Sep 2004 23:19:54 -  1.5
  @@ -72,7 +72,7 @@
   public void execute() throws BuildException {
   super.execute();
   String queryString = (query == null) ? :(?qry=+query);
  -System.out.println (INFO:Query string is  + queryString); 
  +log(Query string is  + queryString); 
   execute (/jmxproxy/ + queryString);
   }
   }
  
  
  
  1.5   +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXSetTask.java
  
  Index: JMXSetTask.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JMXSetTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JMXSetTask.java   26 May 2004 15:29:30 -  1.4
  +++ JMXSetTask.java   16 Sep 2004 23:19:54 -  1.5
  @@ -108,7 +108,7 @@
   throw new BuildException
   (Must specify 'bean', 'attribute' and 'value' attributes);
   }
  -System.out.println (INFO: Setting attribute  + attribute +
  +log(Setting attribute  + attribute +
in bean  + bean +
to  + value); 
   execute(/jmxproxy/?set= + bean 
  
  
  
  1.18  +5 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
  
  Index: WebdavServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- WebdavServlet.java29 Aug 2004 16:46:12 -  1.17
  +++ WebdavServlet.java16 Sep 2004 23:19:54 -  1.18
  @@ -239,7 +239,7 @@
   
   if (debug  0) {
   String path = getRelativePath(req);
  -System.out.println([ + method + ]  + path);
  +log([ + method + ]  + path);
   }
   
   if (method.equals(METHOD_PROPFIND)) {
  @@ -1483,7 +1483,7 @@
   }
   
   if (debug  0)
  -System.out.println(Dest path : + destinationPath);
  +log(Dest path : + destinationPath);
   
   if ((destinationPath.toUpperCase().startsWith(/WEB-INF)) ||
   (destinationPath.toUpperCase().startsWith(/META-INF))) {
  @@ -1583,7 +1583,7 @@
String source, String dest) {
   
   if (debug  1)
  -System.out.println(Copy:  + source +  To:  + dest);
  +log(Copy:  + source +  To:  + dest);
   
   Object object = null;
   try {
  @@ -1758,7 +1758,7 @@
 String path, Hashtable errorList) {
   
   if (debug  1)
  -System.out.println(Delete: + path);
  +log(Delete: + path);
   
   if ((path.toUpperCase().startsWith(/WEB-INF)) ||
   (path.toUpperCase().startsWith(/META-INF))) {
  
  
  
  1.33  +8 -10 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Catalina.java 2 Sep 2004 10:05:00 -   1.32
  +++ Catalina.java 16 Sep 2004 23:19:54 -  1.33
  @@ -332,7 +332,8 @@
new SetParentClassLoaderRule(parentClassLoader));
   
   long t2

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util CGIProcessEnvironment.java

2004-09-16 Thread amyroh
amyroh  2004/09/16 16:23:37

  Modified:catalina/src/share/org/apache/catalina/util
CGIProcessEnvironment.java
  Log:
  Remove System.out and use commons.logging instead.
  
  Revision  ChangesPath
  1.6   +15 -9 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java
  
  Index: CGIProcessEnvironment.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/CGIProcessEnvironment.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CGIProcessEnvironment.java29 Aug 2004 16:46:13 -  1.5
  +++ CGIProcessEnvironment.java16 Sep 2004 23:23:37 -  1.6
  @@ -36,6 +36,11 @@
*/
   
   public class CGIProcessEnvironment extends ProcessEnvironment {
  +
  +
  +private static org.apache.commons.logging.Log log=
  +org.apache.commons.logging.LogFactory.getLog( CGIProcessEnvironment.class );
  +
   /** cgi command's query parameters */
   private Hashtable queryParameters = null;
   
  @@ -340,8 +345,9 @@
   webAppRootDir = webAppRootDir + File.separator
   + cgiPathPrefix;
   }
  -if (debug = 2) {
  -log(findCGI: start = [ + webAppRootDir
  +
  +if (log.isDebugEnabled()) {
  +log.debug(findCGI: start = [ + webAppRootDir
   + ], pathInfo = [ + pathInfo + ] );
   }
   File currentLocation = new File(webAppRootDir);
  @@ -349,15 +355,15 @@
   while (!currentLocation.isFile()  dirWalker.hasMoreElements()) {
   currentLocation = new
   File(currentLocation, (String) dirWalker.nextElement());
  -if (debug = 3) {
  -log(findCGI: traversing to [ + currentLocation + ]);
  +if (log.isDebugEnabled())  {
  +log.debug(findCGI: traversing to [ + currentLocation + ]);
   }
   }
   if (!currentLocation.isFile()) {
   return new String[] { null, null, null, null };
   } else {
  -if (debug = 2) {
  -log(findCGI: FOUND cgi at [ + currentLocation + ]);
  +if (log.isDebugEnabled())  {
  +log.debug(findCGI: FOUND cgi at [ + currentLocation + ]);
   }
   path = currentLocation.getAbsolutePath();
   name = currentLocation.getName();
  @@ -370,8 +376,8 @@
   scriptname = contextPath + servletPath + cginame;
   }
   }
  -if (debug = 1) {
  -log(findCGI calc: name= + name + , path= + path
  +if (log.isDebugEnabled())  {
  +log.debug(findCGI calc: name= + name + , path= + path
   + , scriptname= + scriptname + , cginame= + cginame);
   }
   return new String[] { path, scriptname, cginame, name };
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ClassLoaderFactory.java

2004-08-24 Thread amyroh
amyroh  2004/08/24 10:53:52

  Modified:catalina/src/share/org/apache/catalina/startup Tag:
TOMCAT_5_0 ClassLoaderFactory.java
  Log:
  Do not load outdated xml-apis.jar  xercesImpl.jar from endorsed if JDK 5.0 is used.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.6.2.1   +20 -2 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
  
  Index: ClassLoaderFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- ClassLoaderFactory.java   27 Feb 2004 14:58:48 -  1.6
  +++ ClassLoaderFactory.java   24 Aug 2004 17:53:52 -  1.6.2.1
  @@ -23,6 +23,7 @@
   import java.util.ArrayList;
   
   import org.apache.catalina.loader.StandardClassLoader;
  +import org.apache.tomcat.util.compat.JdkCompat;
   
   
   /**
  @@ -56,6 +57,12 @@
   private static int debug = 0;
   
   
  +/**
  + * JDK compatibility support
  + */
  +private static final JdkCompat jdkCompat = JdkCompat.getJdkCompat();
  +
  +
   // -- Static Properties
   
   
  @@ -170,7 +177,18 @@
   log(  Including jar file  + file.getAbsolutePath());
   URL url = new URL(file, null,
 file.getCanonicalPath());
  -list.add(url.toString());
  +
  +if (ClassLoaderFactory.jdkCompat.isJava15()) {
  +if (url.toString().endsWith(xml-apis.jar) ||
  +url.toString().endsWith(xercesImpl.jar)) {
  +// Do not load xml-apis.jar  xercesImpl.jar
  +// if JDK 5.0 is used
  +} else {
  +list.add(url.toString());
  +}
  +} else {
  +list.add(url.toString());
  +}
   }
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.50.bat catalina.50.sh

2004-08-24 Thread amyroh
amyroh  2004/08/24 10:57:58

  Added:   catalina/src/bin Tag: TOMCAT_5_0 catalina.50.bat
catalina.50.sh
  Log:
  Add optional startup scripts to Tomcat_5_0 branch for not loading from endorsed on 
JDK 5.0.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.1   +192 -0jakarta-tomcat-catalina/catalina/src/bin/Attic/catalina.50.bat
  
  
  
  
  1.1.2.1   +287 -0jakarta-tomcat-catalina/catalina/src/bin/Attic/catalina.50.sh
  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ConnectorMBean.java

2004-05-27 Thread amyroh
amyroh  2004/05/27 16:43:42

  Modified:catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java
  Log:
  Do not need to use itrospection for CoyoteConnector threadPriority.  Values are not 
persistent when set via introspection - need to fix this.
  
  Revision  ChangesPath
  1.6   +3 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
  
  Index: ConnectorMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConnectorMBean.java   27 May 2004 16:09:28 -  1.5
  +++ ConnectorMBean.java   27 May 2004 23:43:42 -  1.6
  @@ -97,7 +97,7 @@

if ((algorithm).equals(name) || (keystoreType).equals(name) ||
   (maxThreads).equals(name) || (maxSpareThreads).equals(name) ||
  -(minSpareThreads).equals(name) || (threadPriority).equals(name)) {
  +(minSpareThreads).equals(name)) {
   
   if ((keystoreType).equals(name)) {
   name = keyType;
  @@ -163,7 +163,7 @@

   if ((algorithm).equals(name) || (keystoreType).equals(name) ||
   (maxThreads).equals(name) || (maxSpareThreads).equals(name) ||
  -(minSpareThreads).equals(name) || (threadPriority).equals(name)) {
  +(minSpareThreads).equals(name)) {
   
   if ((keystoreType).equals(name)) {
   name = keyType;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector EditConnectorAction.java SaveConnectorAction.java

2004-05-27 Thread amyroh
amyroh  2004/05/27 16:48:04

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
EditConnectorAction.java SaveConnectorAction.java
  Log:
  Do not need to use itrospection for CoyoteConnector threadPriority.  Values are not 
persistent when set via introspection - need to fix this.
  
  Revision  ChangesPath
  1.10  +2 -2  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
  
  Index: EditConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EditConnectorAction.java  27 May 2004 16:11:03 -  1.9
  +++ EditConnectorAction.java  27 May 2004 23:48:04 -  1.10
  @@ -198,7 +198,7 @@
   ((String) mBServer.getAttribute(cname, attribute));
   attribute = threadPriority;
   connectorFm.setThreadPriority
  -((String) mBServer.getAttribute(cname, attribute));
  +(((Integer) mBServer.getAttribute(cname, attribute)).toString());
   attribute = secure;
   connectorFm.setSecure
   (((Boolean) mBServer.getAttribute(cname, attribute)).toString());;  
 
  
  
  
  1.16  +2 -2  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
  
  Index: SaveConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SaveConnectorAction.java  27 May 2004 16:11:08 -  1.15
  +++ SaveConnectorAction.java  27 May 2004 23:48:04 -  1.16
  @@ -378,7 +378,7 @@
   threadPriority = Thread.NORM_PRIORITY;
   }
   mBServer.setAttribute(coname,
  -  new Attribute(attribute, (new 
Integer(threadPriority)).toString()));
  +  new Attribute(attribute, (new 
Integer(threadPriority;
  
   attribute = secure;
   mBServer.setAttribute(coname,
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 mbeans-descriptors.xml

2004-05-27 Thread amyroh
amyroh  2004/05/27 16:48:55

  Modified:catalina/src/share/org/apache/coyote/tomcat5
mbeans-descriptors.xml
  Log:
  Expose CoyoteConnector threadPriority.
  
  Revision  ChangesPath
  1.17  +4 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mbeans-descriptors.xml26 Jan 2004 18:15:01 -  1.16
  +++ mbeans-descriptors.xml27 May 2004 23:48:55 -  1.17
  @@ -177,6 +177,10 @@
  description=Should Tomcat perform all authentications?
 type=boolean/
   
  +attributename=threadPriority
  +   description=The thread priority for processors
  +  type=int/
  +
   attribute   name=URIEncoding
 description=Character encoding used to decode the URI
type=java.lang.String/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardServer.java

2004-05-27 Thread amyroh
amyroh  2004/05/27 19:51:39

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  Persist connector values when saved via introspection.  I just tested for default 
configuration.  Let me know if there're any problems.
  
  Revision  ChangesPath
  1.29  +18 -3 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- StandardServer.java   26 May 2004 15:41:22 -  1.28
  +++ StandardServer.java   28 May 2004 02:51:39 -  1.29
  @@ -79,6 +79,8 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.commons.modeler.Registry;
  +import org.apache.coyote.ProtocolHandler;
  +import org.apache.coyote.tomcat5.CoyoteConnector;
   
   
   
  @@ -122,6 +124,10 @@
   //{ org.apache.catalina.core.StandardContext, workDir },
   { org.apache.catalina.session.StandardManager, distributable },
   { org.apache.catalina.session.StandardManager, entropy },
  +{ org.apache.coyote.http11.Http11Protocol, port},
  +{ org.apache.coyote.http11.Http11Protocol, soTimeout},
  +{ org.apache.jk.server.JkCoyoteHandler, name},
  +
   };
   
   
  @@ -176,7 +182,10 @@
   org.apache.coyote.tomcat5.CoyoteConnector,
   org.apache.catalina.core.StandardEngine,
   org.apache.catalina.core.StandardHost,
  -org.apache.catalina.core.StandardContext
  +org.apache.catalina.core.StandardContext,
  +org.apache.coyote.http11.Http11Protocol,
  +org.apache.jk.server.JkCoyoteHandler
  +
   };
   
   
  @@ -1016,7 +1025,6 @@
   
   // Render the relevant properties of this bean
   String className = bean.getClass().getName();
  -
   // Render a className attribute if requested
   if (include) {
   for (int i = 0; i  standardImplementations.length; i++) {
  @@ -1097,6 +1105,13 @@
   }
   writer.print(Connector);
   storeAttributes(writer, connector);
  +
  +if (connector instanceof CoyoteConnector) {
  +ProtocolHandler protocolHandler = 
  +((CoyoteConnector)connector).getProtocolHandler();
  +storeAttributes(writer, protocolHandler);
  +}
  +
   writer.println();
   
   // Store nested Factory element
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourceUtils.java SetUpDataSourceAction.java

2004-04-30 Thread amyroh
amyroh  2004/04/30 10:54:00

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java SetUpDataSourceAction.java
  Log:
  Change to list any additionally JNDI data-sources that are present
  in the web.xml file, but not defined either globally or at the context level,
  on the context level maintenance page to make it possible to click on the
  data-source and edit it.
  
  Revision  ChangesPath
  1.11  +4 -15 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ResourceUtils.java28 Apr 2004 16:46:03 -  1.10
  +++ ResourceUtils.java30 Apr 2004 17:53:59 -  1.11
  @@ -22,6 +22,7 @@
   import java.util.Iterator;
   import java.util.Collections;
   
  +import javax.management.Attribute;
   import javax.management.AttributeNotFoundException;
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
  @@ -205,20 +206,8 @@
   mserver.getAttribute(oname, driverClassName);
   results.add(oname.toString());
   } catch (AttributeNotFoundException ex) {
  -// if context resource definition doesn't exist
  -// get the global resource definition
  -if (resourcetype.equals(Context)) {
  -rname = new ObjectName( domain + RESOURCE_TYPE + 
  -GLOBAL_TYPE + ,class= + DATASOURCE_CLASS + ,*);
  -Iterator globalIter = (mserver.queryMBeans(rname, 
null).iterator());
  -while (globalIter.hasNext()) {
  -ObjectInstance globalInstance = 
  -(ObjectInstance) globalIter.next();
  -ObjectName globalOname = globalInstance.getObjectName();
  -mserver.getAttribute(globalOname, driverClassName);
  -results.add(globalOname.toString());
  -}
  -}
  +mserver.setAttribute(oname, 
  +new Attribute(driverClassName, ));
   }
   }
   
  
  
  
  1.5   +27 -26
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java
  
  Index: SetUpDataSourceAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SetUpDataSourceAction.java27 Feb 2004 14:59:04 -  1.4
  +++ SetUpDataSourceAction.java30 Apr 2004 17:53:59 -  1.5
  @@ -21,6 +21,7 @@
   import java.util.Iterator;
   import java.util.Locale;
   import javax.management.Attribute;
  +import javax.management.AttributeNotFoundException;
   import javax.management.MBeanServer;
   import javax.management.MBeanServerFactory;
   import javax.management.QueryExp;
  @@ -136,26 +137,33 @@
   String attribute = null;
   try {
   ObjectName oname = new ObjectName(objectName);
  -attribute = name;
  -dataSourceForm.setJndiName
  -((String) mserver.getAttribute(oname, attribute));
  -attribute = url;
  -dataSourceForm.setUrl
  -((String) mserver.getAttribute(oname, attribute));
  -attribute = driverClassName;
  -dataSourceForm.setDriverClass
  -((String) mserver.getAttribute(oname, attribute));
  -attribute = username;
  -dataSourceForm.setUsername
  -((String) mserver.getAttribute(oname, attribute));
  -attribute = password;
  -dataSourceForm.setPassword
  -((String) mserver.getAttribute(oname, attribute));
  +try {
  +attribute = name;
  +dataSourceForm.setJndiName
  +((String) mserver.getAttribute(oname, attribute));
  +attribute = url;
  +dataSourceForm.setUrl
  +((String) mserver.getAttribute(oname, attribute));
  +attribute = driverClassName;
  +dataSourceForm.setDriverClass
  +((String) mserver.getAttribute(oname, attribute));
  +attribute = username

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java

2004-04-29 Thread amyroh
amyroh  2004/04/29 17:44:51

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveDataSourceAction.java
  Log:
  Check for encoded JNDI name for adding DataSource.
  
  Revision  ChangesPath
  1.10  +19 -4 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
  
  Index: SaveDataSourceAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SaveDataSourceAction.java 27 Feb 2004 14:59:04 -  1.9
  +++ SaveDataSourceAction.java 30 Apr 2004 00:44:50 -  1.10
  @@ -18,7 +18,7 @@
   package org.apache.webapp.admin.resources;
   
   import java.io.IOException;
  -import java.net.URLDecoder;
  +import java.net.URLEncoder;
   import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.Locale;
  @@ -133,6 +133,8 @@
   Object params[] = new Object[2];
   params[0] = dataSourceForm.getJndiName();
   params[1] = ResourceUtils.DATASOURCE_CLASS;
  +String encodedJndiName = URLEncoder.encode(params[0].toString(), 
  +   UTF-8);
   
   String resourcetype = dataSourceForm.getResourcetype();
   String path = dataSourceForm.getPath();
  @@ -140,6 +142,7 @@
   String domain = dataSourceForm.getDomain();
   
   ObjectName oname = null;
  +ObjectName encodedOName = null;
   
   try {
   
  @@ -148,15 +151,27 @@
   ResourceUtils.GLOBAL_TYPE + 
   ,class= + params[1] + 
   ,name= + params[0]);
  +encodedOName = new ObjectName( domain + 
  +ResourceUtils.RESOURCE_TYPE + 
  +ResourceUtils.GLOBAL_TYPE + 
  +,class= + params[1] + 
  +,name= + encodedJndiName);
   } else if (resourcetype.equals(Context)) {
   oname = new ObjectName( domain + ResourceUtils.RESOURCE_TYPE + 
   ResourceUtils.CONTEXT_TYPE + 
   ,path= + path + ,host= + host + 
   ,class= + params[1] + 
   ,name= + params[0]);
  +encodedOName = new ObjectName( domain + 
  +ResourceUtils.RESOURCE_TYPE + 
  +ResourceUtils.CONTEXT_TYPE + 
  +,path= + path + ,host= + host + 
  +,class= + params[1] + 
  +,name= + encodedJndiName);
   }
  -
  -if (mserver.isRegistered(oname)) {
  +
  +if (mserver.isRegistered(oname) || 
  +mserver.isRegistered(encodedOName)) {
   ActionErrors errors = new ActionErrors();
   errors.add(jndiName,
  new ActionError(resources.invalid.name));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourceUtils.java

2004-04-28 Thread amyroh
amyroh  2004/04/28 09:46:04

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
  Log:
  Display GlobalNamingResource config if web.xml has resource-ref definition
  without Context Resource config.
  
  Revision  ChangesPath
  1.10  +16 -3 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ResourceUtils.java28 Apr 2004 02:02:46 -  1.9
  +++ ResourceUtils.java28 Apr 2004 16:46:03 -  1.10
  @@ -203,9 +203,22 @@
   try {
   // only add resource mbean if definition exists
   mserver.getAttribute(oname, driverClassName);
  -results.add(instance.getObjectName().toString());
  +results.add(oname.toString());
   } catch (AttributeNotFoundException ex) {
  -// full resource definition doesn't exist
  +// if context resource definition doesn't exist
  +// get the global resource definition
  +if (resourcetype.equals(Context)) {
  +rname = new ObjectName( domain + RESOURCE_TYPE + 
  +GLOBAL_TYPE + ,class= + DATASOURCE_CLASS + ,*);
  +Iterator globalIter = (mserver.queryMBeans(rname, 
null).iterator());
  +while (globalIter.hasNext()) {
  +ObjectInstance globalInstance = 
  +(ObjectInstance) globalIter.next();
  +ObjectName globalOname = globalInstance.getObjectName();
  +mserver.getAttribute(globalOname, driverClassName);
  +results.add(globalOname.toString());
  +}
  +}
   }
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourceUtils.java

2004-04-27 Thread amyroh
amyroh  2004/04/27 19:02:46

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
  Log:
  Fix for 28524 - Exception throw when creating new JNDI data source.
  
  Revision  ChangesPath
  1.9   +11 -2 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ResourceUtils.java27 Feb 2004 14:59:04 -  1.8
  +++ ResourceUtils.java28 Apr 2004 02:02:46 -  1.9
  @@ -22,10 +22,12 @@
   import java.util.Iterator;
   import java.util.Collections;
   
  +import javax.management.AttributeNotFoundException;
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
   import javax.management.ObjectInstance;
   
  +
   /**
* pShared utility methods for the resource administration module./p
*
  @@ -197,7 +199,14 @@
   while (iterator.hasNext()) {
   
   ObjectInstance instance = (ObjectInstance) iterator.next(); 
  -results.add(instance.getObjectName().toString());
  +ObjectName oname = instance.getObjectName();
  +try {
  +// only add resource mbean if definition exists
  +mserver.getAttribute(oname, driverClassName);
  +results.add(instance.getObjectName().toString());
  +} catch (AttributeNotFoundException ex) {
  +// full resource definition doesn't exist
  +}
   }
   
   Collections.sort(results);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/resources dataSources.jspf

2004-04-19 Thread amyroh
amyroh  2004/04/19 14:50:48

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
AddRealmAction.java DataSourceRealmForm.java
EditRealmAction.java
   webapps/admin/realm dataSourceRealm.jsp
   webapps/admin/resources dataSources.jspf
  Log:
  Add minor fixes to complete fix for 28441.
  DataSourceRealm is now supported via admin.
  
  Revision  ChangesPath
  1.8   +2 -1  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
  
  Index: AddRealmAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AddRealmAction.java   17 Apr 2004 02:50:41 -  1.7
  +++ AddRealmAction.java   19 Apr 2004 21:50:48 -  1.8
  @@ -231,6 +231,7 @@
   realmFm.setUserTable();
   realmFm.setDebugLvlVals(Lists.getDebugLevels());
   realmFm.setRealmTypeVals(types);
  +realmFm.setBooleanVals(Lists.getBooleanValues());
   }
   
   
  
  
  
  1.2   +24 -2 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
  
  Index: DataSourceRealmForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DataSourceRealmForm.java  17 Apr 2004 02:53:17 -  1.1
  +++ DataSourceRealmForm.java  19 Apr 2004 21:50:48 -  1.2
  @@ -78,6 +78,10 @@
*/
   private String userTable = null;
   
  +/*
  + * Represent boolean (true, false) values for unpackWARs etc.
  + */
  +private List booleanVals = null;
   
   // - Properties
   
  @@ -226,6 +230,24 @@
   
   }
   
  +/**
  + * Return the booleanVals.
  + */
  +public List getBooleanVals() {
  +
  +return this.booleanVals;
  +
  +}
  +
  +/**
  + * Set the booleanVals.
  + */
  +public void setBooleanVals(List booleanVals) {
  +
  +this.booleanVals = booleanVals;
  +
  +}
  +
   // - Public Methods
   
   /**
  @@ -239,7 +261,7 @@
   super.reset(mapping, request);   
   this.dataSourceName = null;
   this.digest = null;
  -this.localDataSource = null;
  +this.localDataSource = false;
   
   this.roleNameCol = null;
   this.userCredCol = null;
  
  
  
  1.7   +2 -1  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
  
  Index: EditRealmAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EditRealmAction.java  17 Apr 2004 02:50:41 -  1.6
  +++ EditRealmAction.java  19 Apr 2004 21:50:48 -  1.7
  @@ -415,6 +415,7 @@
   realmFm.setRealmType(realmType);
   realmFm.setDebugLvlVals(Lists.getDebugLevels());
   realmFm.setAllowDeletion(allowDeletion(rname));
  +realmFm.setBooleanVals(Lists.getBooleanValues());
   
   String attribute = null;
   try {
  
  
  
  1.2   +3 -3  jakarta-tomcat-catalina/webapps/admin/realm/dataSourceRealm.jsp
  
  Index: dataSourceRealm.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/realm/dataSourceRealm.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dataSourceRealm.jsp   17 Apr 2004 02:53:17 -  1.1
  +++ dataSourceRealm.jsp   19 Apr 2004 21:50:48 -  1.2
  @@ -107,12 +107,12 @@
   html:text property=digest size=30 styleId=digest/
   /controls:data
   /controls:row
  -
  -controls:row labelStyle=table-label-text dataStyle=table-normal-text 
styleId=localDataSource
  +
  +   controls:row labelStyle=table-label-text dataStyle=table-normal-text 
styleId=localDataSource
   controls:labelbean:message 
key=realm.localDataSource/:/controls:label
   controls:data
  html:select property=localDataSource styleId=localDataSource
  - bean:define id=booleanVals name=hostForm 
property=booleanVals

cvs commit: jakarta-tomcat-catalina/webapps/admin/resources dataSources.jspf

2004-04-19 Thread amyroh
amyroh  2004/04/19 16:54:04

  Modified:webapps/admin/resources dataSources.jspf
  Log:
  Revert unwanted change.
  
  Revision  ChangesPath
  1.6   +1 -1  jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf
  
  Index: dataSources.jspf
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/dataSources.jspf,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dataSources.jspf  19 Apr 2004 21:50:48 -  1.5
  +++ dataSources.jspf  19 Apr 2004 23:54:04 -  1.6
  @@ -28,6 +28,7 @@
   input type=checkbox name=dataSources
 value=%= dataSource % styleId=dataSources
 /td
  +/logic:present
   td scope=rowdiv align=left class=table-normal-text
 html:link page='%= /resources/setUpDataSource.do?objectName= + 
  URLEncoder.encode(dataSource) + resourcetype= +
  @@ -41,7 +42,6 @@
   td scope=rowdiv align=left class=table-normal-textnbsp;
 controls:attribute name=dataSource attribute=driverClassName/
   /div/td
  -/logic:present
 /tr
   /logic:iterate
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm mbeans-descriptors.xml

2004-04-16 Thread amyroh
amyroh  2004/04/16 19:50:26

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java mbeans-descriptors.xml
   catalina/src/share/org/apache/catalina/realm
mbeans-descriptors.xml
  Log:
  Add DataSourceRealm support in admin webapp.
  
  Revision  ChangesPath
  1.24  +36 -1 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- MBeanFactory.java 24 Mar 2004 20:00:22 -  1.23
  +++ MBeanFactory.java 17 Apr 2004 02:50:26 -  1.24
  @@ -45,6 +45,7 @@
   import org.apache.catalina.logger.FileLogger;
   import org.apache.catalina.logger.SystemErrLogger;
   import org.apache.catalina.logger.SystemOutLogger;
  +import org.apache.catalina.realm.DataSourceRealm;
   import org.apache.catalina.realm.JDBCRealm;
   import org.apache.catalina.realm.JNDIRealm;
   import org.apache.catalina.realm.MemoryRealm;
  @@ -340,6 +341,40 @@
   
   }
   
  +/**
  + * Create a new DataSource Realm.
  + *
  + * @param parent MBean Name of the associated parent component
  + *
  + * @exception Exception if an MBean cannot be created or registered
  + */
  +public String createDataSourceRealm(String parent, String dataSourceName, 
  +String roleNameCol, String userCredCol, String userNameCol, 
  +String userRoleTable, String userTable) throws Exception {
  +
  +// Create a new DataSourceRealm instance
  +DataSourceRealm realm = new DataSourceRealm();
  + realm.setDataSourceName(dataSourceName);
  + realm.setRoleNameCol(roleNameCol);
  + realm.setUserCredCol(userCredCol);
  + realm.setUserNameCol(userNameCol);
  +realm.setUserRoleTable(userRoleTable);
  +realm.setUserTable(userTable);
  +
  +// Add the new instance to its parent component
  +ObjectName pname = new ObjectName(parent);
  +ContainerBase containerBase = getParentContainerFromParent(pname);
  +// Add the new instance to its parent component
  +containerBase.setRealm(realm);
  +// Return the corresponding MBean name
  +ObjectName oname = realm.getObjectName();
  +if (oname != null) {
  +return (oname.toString());
  +} else {
  +return null;
  +}   
  +
  +}
   
   /**
* Create a new DefaultContext.
  
  
  
  1.25  +30 -0 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mbeans-descriptors.xml19 Aug 2003 16:13:37 -  1.24
  +++ mbeans-descriptors.xml17 Apr 2004 02:50:26 -  1.25
  @@ -35,6 +35,36 @@
type=int/
   /operation
   
  +operation   name=createDataSourceRealm
  +  description=Create a new DataSource Realm
  +   impact=ACTION
  +   returnType=java.lang.String
  +  parameter name=parent
  +  description=MBean Name of the associated parent component
  + type=java.lang.String/
  +  parameter name=dataSourceName
  +  description=The JNDI named JDBC DataSource
  + type=java.lang.String/
  +  parameter name=roleNameCol
  +  description=The column in the user role table that names a role
  + type=java.lang.String/
  +  parameter name=userCredCol
  +  description=The column in the user table that holds the user's
  +credentials
  + type=java.lang.String/
  +  parameter name=userNameCol
  +  description=The column in the user table that holds the user's
  +username
  + type=java.lang.String/
  +  parameter name=userRoleTable
  +  description=The table that holds the relation between user's and
  +roles
  + type=java.lang.String/
  +  parameter name=userTable
  +  description=The table that holds user data
  + type=java.lang.String/
  +/operation
  +
   operation   name=createDefaultContext
 description=Create a new DefaultContext
  impact=ACTION
  
  
  
  1.4   +5 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/mbeans-descriptors.xml
  
  Index: mbeans

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm AddRealmAction.java EditRealmAction.java

2004-04-16 Thread amyroh
amyroh  2004/04/16 19:50:41

  Modified:webapps/admin/WEB-INF struts-config.xml
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources.properties
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
AddRealmAction.java EditRealmAction.java
  Log:
  Add DataSourceRealm support in admin webapp.
  
  Revision  ChangesPath
  1.6   +14 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- struts-config.xml 31 Jul 2003 15:39:13 -  1.5
  +++ struts-config.xml 17 Apr 2004 02:50:41 -  1.6
  @@ -56,6 +56,9 @@
   
   !-- = Realm Module = --
   
  +form-bean  name=dataSourceRealmForm
  +type=org.apache.webapp.admin.realm.DataSourceRealmForm/
  +
   form-bean  name=jdbcRealmForm
   type=org.apache.webapp.admin.realm.JDBCRealmForm/
   
  @@ -288,6 +291,10 @@
   
   !--  Realm Module == --
   
  +forwardname=DataSourceRealm
  +path=/realm/dataSourceRealm.jsp
  +redirect=false/
  +
   forwardname=JDBCRealm
   path=/realm/jdbcRealm.jsp
   redirect=false/
  @@ -663,6 +670,13 @@
  type=org.apache.webapp.admin.realm.SaveUserDatabaseRealmAction
  name=userDatabaseRealmForm
 input=/realm/userDatabaseRealm.jsp
  +   scope=session/
  +
  +   !-- Perform Save DataSource Realm transaction --
  +actionpath=/SaveDataSourceRealm
  +   type=org.apache.webapp.admin.realm.SaveDataSourceRealmAction
  +   name=dataSourceRealmForm
  +  input=/realm/dataSourceRealm.jsp
  scope=session/
   
  !-- Perform Save JDBC Realm transaction --
  
  
  
  1.3   +7 -0  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties
  
  Index: ApplicationResources.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApplicationResources.properties   9 Apr 2004 17:35:33 -   1.2
  +++ ApplicationResources.properties   17 Apr 2004 02:50:41 -  1.3
  @@ -226,6 +226,7 @@
   error.jdbcrealm=Error occured during setting JDBCRealm.
   error.jndirealm=Error occured during setting JNDIRealm.
   error.userdbrealm=Error occured during setting UserdatabaseRealm.
  +error.datasourcerealm=Error occured during setting DataSourceRealm.
   error.realmName.bad=Invalid realm name {0}
   error.realmName.required=liRealm Name required./li
   error.realmName.exists=liA realm already exists./li
  @@ -266,6 +267,9 @@
   realm.userPassword=User Password
   realm.userPattern=User Pattern
   realm.userSearch=User Search
  +realm.dataSourceName=DataSource Name
  +realm.localDataSource=Local DataSource
  +realm.userCredCol=User Credential Column 
   valve.access.properties=Access Logger Properties
   valve.request.properties=Request Filter Properties
   valve.single.properties=Single SignOn Valve Properties
  @@ -310,6 +314,9 @@
   error.connPassword.required=liConnection password is required./li
   error.connURL.required=liConnection URL is required./li
   error.connName.required=liConnection name is required./li
  +error.dataSourceName.required=liDataSource name is required./li
  +error.userCredCol.required=liUser credential is required./li
  +error.userRoleTable.required=liUser role table is required./li
   
   # -- Server Module --
   server.service.treeBuilder.subtreeNode=Service
  
  
  
  1.7   +29 -5 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
  
  Index: AddRealmAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AddRealmAction.java   27 Feb 2004 14:59:03 -  1.6
  +++ AddRealmAction.java   17 Apr 2004 02:50:41 -  1.7
  @@ -82,17 +82,18 @@
   
   // Fill in the form values for display and editing
   
  -String realmTypes[] = new String[4];
  +String realmTypes[] = new String[5];
   realmTypes[0] = UserDatabaseRealm;
   realmTypes[1] = JNDIRealm

cvs commit: jakarta-tomcat-catalina/webapps/admin/realm dataSourceRealm.jsp

2004-04-16 Thread amyroh
amyroh  2004/04/16 19:53:17

  Added:   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
DataSourceRealmForm.java
SaveDataSourceRealmAction.java
   webapps/admin/realm dataSourceRealm.jsp
  Log:
  Add DataSourceRealm support in admin webapp.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DataSourceRealmForm.java
  
  Index: DataSourceRealmForm.java
  ===
  /*
   * Copyright 2001,2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the License);
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *  http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an AS IS BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.webapp.admin.realm;
  
  import javax.servlet.http.HttpServletRequest;
  import org.apache.struts.action.ActionError;
  import org.apache.struts.action.ActionErrors;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionMapping;
  import java.net.InetAddress;
  import java.util.List;
  
  import org.apache.webapp.admin.ApplicationServlet;
  import org.apache.webapp.admin.LabelValueBean;
  
  /**
   * Form bean for the datasource realm page.
   *
   * @author Amy Roh
   * @version $Revision: 1.1 $ $Date: 2004/04/17 02:53:17 $
   */
  
  public final class DataSourceRealmForm extends RealmForm {
  
  // - Instance Variables
  
  /**
   * The text for the JNDI named JDBC DataSource for your database.
   */
  private String dataSourceName = null;

  /**
   * The text for the digest.
   */
  private String digest = null;
  
  /** 
   * The text for if the DataSource is local to the webapp.
   */
  private String localDataSource = false;
  
  /**
   * The text for the roleNameCol.
   */
  private String roleNameCol = null;
  
  /**
   * The text for the userCredCol.
   */
  private String userCredCol = null;
  
  /**
   * The text for the userNameCol.
   */
  private String userNameCol = null;
  
  /**
   * The text for the userRoleTable.
   */
  private String userRoleTable = null;
  
  /**
   * The text for the user table.
   */
  private String userTable = null;
  
  
  // - Properties
  
  
  /**
   * Return the dataSourceName.
   */
  public String getDataSourceName() {
  
  return this.dataSourceName;
  
  }
  
  /**
   * Set the dataSourceName.
   */
  public void setDataSourceName(String dataSourceName) {
  
  this.dataSourceName = dataSourceName;
  
  }
  
  /**
   * Return the digest.
   */
  public String getDigest() {
  
  return this.digest;
  
  }
  
  /**
   * Set the digest.
   */
  public void setDigest(String digest) {
  
  this.digest = digest;
  
  }
  
  /**
   * Return the localDataSource.
   */
  public String getLocalDataSource() {
  
  return this.localDataSource;
  
  }
  
  /**
   * Set the localDataSource.
   */
  public void setLocalDataSource(String localDataSource) {
  
  this.localDataSource = localDataSource;
  
  }
  
  /**
   * Return the roleNameCol.
   */
  public String getRoleNameCol() {
  
  return this.roleNameCol;
  
  }
  
  /**
   * Set the roleNameCol.
   */
  public void setRoleNameCol(String roleNameCol) {
  
  this.roleNameCol = roleNameCol;
  
  }
  
  /**
   * Return the userCredCol.
   */
  public String getUserCredCol() {
  
  return this.userCredCol;
  
  }
  
  /**
   * Set the userCredCol.
   */
  public void setUserCredCol(String userCredCol) {
  
  this.userCredCol = userCredCol;
  
  }
  
  /**
   * Return the userNameCol.
   */
  public String getUserNameCol() {
  
  return this.userNameCol;
  
  }
  
  /**
   * Set the userNameCol

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources.properties

2004-04-09 Thread amyroh
amyroh  2004/04/09 10:35:33

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources.properties
  Log:
  Add missing keys - connector.useBodyEncodingForURI allowTrace.
  
  Revision  ChangesPath
  1.2   +2 -0  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties
  
  Index: ApplicationResources.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationResources.properties   4 Mar 2004 18:44:49 -   1.1
  +++ ApplicationResources.properties   9 Apr 2004 17:35:33 -   1.2
  @@ -122,6 +122,8 @@
   connector.connection.disableUploadTimeout=Disable Upload Timeout
   connector.enable.dns=Enable DNS Lookups
   connector.uriencoding=URI Encoding
  +connector.useBodyEncodingForURI=Use Body Encoding For URI Query Parameters
  +connector.allowTrace=Allow TRACE Method
   connector.address.ip=IP Address
   connector.redirect.portnumber=Redirect Port Number
   connector.min=Minimum
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session mbeans-descriptors.xml

2004-04-08 Thread amyroh
amyroh  2004/04/08 18:37:23

  Modified:catalina/src/share/org/apache/catalina/session
mbeans-descriptors.xml
  Log:
  Shouldn't expose the actual object itself - not getting used and causes serializable 
issue.
  
  Revision  ChangesPath
  1.5   +0 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mbeans-descriptors.xml9 Feb 2004 18:30:38 -   1.4
  +++ mbeans-descriptors.xml9 Apr 2004 01:37:23 -   1.5
  @@ -36,11 +36,6 @@
  entropy of the initialization of our random number
  generator
type=java.lang.String/
  - 
  -!-- What is that ??? --
  -attribute   name=managedResource
  -  description=The managed resource this MBean is associated with
  - type=java.lang.Object/
   
   attribute   name=maxActiveSessions
 description=The maximum number of active Sessions allowed, or -1
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users GroupForm.java UserForm.java

2004-03-09 Thread amyroh
amyroh  2004/03/09 13:45:02

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
GroupForm.java UserForm.java
  Log:
  Fix 24085 - Display group and role list when validation fails.
  
  Revision  ChangesPath
  1.4   +26 -3 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
  
  Index: GroupForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GroupForm.java27 Feb 2004 14:59:05 -  1.3
  +++ GroupForm.java9 Mar 2004 21:45:02 -   1.4
  @@ -16,12 +16,14 @@
   
   package org.apache.webapp.admin.users;
   
  -
  +import java.net.URLDecoder;
  +import javax.management.MBeanServer;
   import javax.servlet.http.HttpServletRequest;
   import org.apache.struts.action.ActionError;
   import org.apache.struts.action.ActionErrors;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
  +import org.apache.webapp.admin.ApplicationServlet;
   
   
   /**
  @@ -37,6 +39,11 @@
   
   // - Instance Variables
   
  +   /**
  + * The MBeanServer we will be interacting with.
  + */
  +private MBeanServer mserver = null;
  +
   
   // - Properties
   
  @@ -117,7 +124,23 @@
*/
   public ActionErrors validate(ActionMapping mapping,
   HttpServletRequest request) {
  -
  +
  +try {
  +// Look up the components we will be using as needed
  +if (mserver == null) {
  +mserver = ((ApplicationServlet) getServlet()).getServer();
  +}
  + 
  +// Set up beans containing all possible groups and roles
  +String databaseName =
  +URLDecoder.decode(request.getParameter(databaseName));
  +request.setAttribute(rolesForm,
  + UserUtils.getRolesForm(mserver,
  +databaseName));
  +} catch (Exception e) {
  +// do nothing since the form returns validation error
  +}
  +
   ActionErrors errors = new ActionErrors();
   
   String submit = request.getParameter(submit);
  
  
  
  1.4   +28 -3 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
  
  Index: UserForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UserForm.java 27 Feb 2004 14:59:05 -  1.3
  +++ UserForm.java 9 Mar 2004 21:45:02 -   1.4
  @@ -17,11 +17,14 @@
   package org.apache.webapp.admin.users;
   
   
  +import java.net.URLDecoder;
  +import javax.management.MBeanServer;
   import javax.servlet.http.HttpServletRequest;
   import org.apache.struts.action.ActionError;
   import org.apache.struts.action.ActionErrors;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
  +import org.apache.webapp.admin.ApplicationServlet;
   
   
   /**
  @@ -37,10 +40,13 @@
   
   // - Instance Variables
   
  +   /**
  + * The MBeanServer we will be interacting with.
  + */
  +private MBeanServer mserver = null;
   
   // - Properties
   
  -
   /**
* The full name of the associated user.
*/
  @@ -149,7 +155,26 @@
*/
   public ActionErrors validate(ActionMapping mapping,
   HttpServletRequest request) {
  -
  +
  +try {
  +// Look up the components we will be using as needed
  +if (mserver == null) {
  +mserver = ((ApplicationServlet) getServlet()).getServer();
  +}
  + 
  +// Set up beans containing all possible groups and roles
  +String databaseName =
  +URLDecoder.decode(request.getParameter(databaseName));
  +request.setAttribute(groupsForm,
  + UserUtils.getGroupsForm(mserver,
  + databaseName));
  +request.setAttribute(rolesForm,
  + UserUtils.getRolesForm(mserver,
  +databaseName));
  +} catch (Exception e) {
  +// do nothing since

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users GroupForm.java UserForm.java

2004-03-09 Thread amyroh
amyroh  2004/03/09 13:49:37

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
GroupForm.java UserForm.java
  Log:
  Port fix for 24085 from TC 5.
  
  Revision  ChangesPath
  1.4   +27 -5 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
  
  Index: GroupForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GroupForm.java8 Mar 2004 16:51:51 -   1.3
  +++ GroupForm.java9 Mar 2004 21:49:36 -   1.4
  @@ -61,12 +61,14 @@
   
   package org.apache.webapp.admin.users;
   
  -
  +import java.net.URLDecoder;
  +import javax.management.MBeanServer;
   import javax.servlet.http.HttpServletRequest;
   import org.apache.struts.action.ActionError;
   import org.apache.struts.action.ActionErrors;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
  +import org.apache.webapp.admin.ApplicationServlet;
   
   
   /**
  @@ -82,6 +84,10 @@
   
   // - Instance Variables
   
  +   /**
  + * The MBeanServer we will be interacting with.
  + */
  +private MBeanServer mserver = null;
   
   // - Properties
   
  @@ -163,6 +169,22 @@
   public ActionErrors validate(ActionMapping mapping,
   HttpServletRequest request) {
   
  +try {
  +// Look up the components we will be using as needed
  +if (mserver == null) {
  +mserver = ((ApplicationServlet) getServlet()).getServer();
  +}
  + 
  +// Set up beans containing all possible groups and roles
  +String databaseName =
  +URLDecoder.decode(request.getParameter(databaseName));
  +request.setAttribute(rolesForm,
  + UserUtils.getRolesForm(mserver,
  +databaseName));
  +} catch (Exception e) {
  +// do nothing since the form returns validation error
  +}
  +
   ActionErrors errors = new ActionErrors();
   
   String submit = request.getParameter(submit);
  
  
  
  1.4   +30 -4 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
  
  Index: UserForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UserForm.java 8 Mar 2004 16:51:51 -   1.3
  +++ UserForm.java 9 Mar 2004 21:49:36 -   1.4
  @@ -62,11 +62,14 @@
   package org.apache.webapp.admin.users;
   
   
  +import java.net.URLDecoder;
  +import javax.management.MBeanServer;
   import javax.servlet.http.HttpServletRequest;
   import org.apache.struts.action.ActionError;
   import org.apache.struts.action.ActionErrors;
   import org.apache.struts.action.ActionForm;
   import org.apache.struts.action.ActionMapping;
  +import org.apache.webapp.admin.ApplicationServlet;
   
   
   /**
  @@ -82,6 +85,10 @@
   
   // - Instance Variables
   
  +   /**
  + * The MBeanServer we will be interacting with.
  + */
  +private MBeanServer mserver = null;
   
   // - Properties
   
  @@ -194,6 +201,25 @@
*/
   public ActionErrors validate(ActionMapping mapping,
   HttpServletRequest request) {
  +
  +try {
  +// Look up the components we will be using as needed
  +if (mserver == null) {
  +mserver = ((ApplicationServlet) getServlet()).getServer();
  +}
  + 
  +// Set up beans containing all possible groups and roles
  +String databaseName =
  +URLDecoder.decode(request.getParameter(databaseName));
  +request.setAttribute(groupsForm,
  + UserUtils.getGroupsForm(mserver,
  + databaseName));
  +request.setAttribute(rolesForm,
  + UserUtils.getRolesForm(mserver,
  +databaseName));
  +} catch (Exception e) {
  +// do nothing since the form returns validation error
  +}
   
   ActionErrors errors = new ActionErrors

cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users GroupForm.java RoleForm.java UserForm.java

2004-03-08 Thread amyroh
amyroh  2004/03/08 08:51:51

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DataSourceForm.java EnvEntryForm.java
MailSessionForm.java ResourceLinkForm.java
UserDatabaseForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
GroupForm.java RoleForm.java UserForm.java
  Log:
  Fix validation.
  
  Revision  ChangesPath
  1.6   +6 -6  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
  
  Index: DataSourceForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DataSourceForm.java   20 Jun 2002 22:53:16 -  1.5
  +++ DataSourceForm.java   8 Mar 2004 16:51:50 -   1.6
  @@ -342,7 +342,7 @@
   
   String submit = request.getParameter(submit);
   
  -if (submit != null) {
  +//if (submit != null) {
   
   // url is a required field
   if ((url == null) || (url.length()  1)) {
  @@ -391,7 +391,7 @@
   errors.add(password,
  new ActionError(users.error.quotes));
   }
  - }
  + //}
   return (errors);
   }

  
  
  
  1.8   +6 -6  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
  
  Index: EnvEntryForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EnvEntryForm.java 14 Jun 2002 13:29:29 -  1.7
  +++ EnvEntryForm.java 8 Mar 2004 16:51:50 -   1.8
  @@ -307,7 +307,7 @@
   errors = new ActionErrors();
   
   String submit = request.getParameter(submit);
  -if (submit != null) {
  +//if (submit != null) {
   
   // name is a required field
   if ((name == null) || (name.length()  1)) {
  @@ -346,7 +346,7 @@
  errors.add(value,
  new ActionError(resources.error.value.mismatch));
   }
  -}
  +//}
   return (errors);
   }
   
  
  
  
  1.2   +6 -6  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
  
  Index: MailSessionForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MailSessionForm.java  20 Jun 2002 02:31:05 -  1.1
  +++ MailSessionForm.java  8 Mar 2004 16:51:50 -   1.2
  @@ -239,14 +239,14 @@
   
   String submit = request.getParameter(submit);
   
  -if (submit != null) {
  +//if (submit != null) {
   
   // mailSmtpHost is a required field
   if ((mailhost == null) || (mailhost.length()  1)) {
   errors.add(mailhost,
 new ActionError(resources.error.mailhost.required));
   }
  - }
  + //}
   
   return (errors);
   }
  
  
  
  1.3   +6 -6  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
  
  Index: ResourceLinkForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceLinkForm.java 14 Jun 2002 13:29:29 -  1.2
  +++ ResourceLinkForm.java 8 Mar 2004 16:51:50 -   1.3
  @@ -239,7 +239,7 @@
   
   String submit = request.getParameter(submit);
   
  -if (submit != null) {
  +//if (submit != null) {
   
   // name is a required field
   if ((name == null) || (name.length()  1)) {
  @@ -259,7 +259,7 @@
  new ActionError(resources.error.type.required));
   }
   
  - }
  + //}
   
   return (errors);
   
  
  
  
  1.3   +6 -6  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
  
  Index: UserDatabaseForm.java
  ===
  RCS file: 
/home/cvs/jakarta

cvs commit: jakarta-tomcat-4.0/webapps/admin login.jsp

2004-03-04 Thread amyroh
amyroh  2004/03/04 11:07:15

  Modified:webapps/admin login.jsp
  Log:
  Fix bugzilla 22268 - Admin truncates user password in 32 characters.
  
  Revision  ChangesPath
  1.8   +2 -2  jakarta-tomcat-4.0/webapps/admin/login.jsp
  
  Index: login.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/login.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- login.jsp 15 Jan 2003 22:25:17 -  1.7
  +++ login.jsp 4 Mar 2004 19:07:15 -   1.8
  @@ -51,7 +51,7 @@
   font color=#FFlabel for=usernamebean:message 
key=prompt.username//label/font
 /th
 td align=left
  -input type=text name=j_username size=16 maxlength=16 
id=username/
  +input type=text name=j_username size=16 id=username/
 /td
   /tr
   p
  @@ -60,7 +60,7 @@
   font color=#FFlabel for=passwordbean:message 
key=prompt.password//label/font
 /th
 td align=left
  -input type=password name=j_password size=16 maxlength=16 
id=password/
  +input type=password name=j_password size=16 id=password/
 /td
   /tr
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardServer.java

2004-03-04 Thread amyroh
amyroh  2004/03/04 13:47:19

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  Fix bugzilla 20770 - Admin Tool removes workDir attribute from context.
  
  Revision  ChangesPath
  1.38  +5 -5  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- StandardServer.java   3 Feb 2003 22:52:19 -   1.37
  +++ StandardServer.java   4 Mar 2004 21:47:18 -   1.38
  @@ -156,7 +156,7 @@
   { org.apache.catalina.core.StandardContext, publicId },
   { org.apache.catalina.core.StandardContext, replaceWelcomeFiles },
   { org.apache.catalina.core.StandardContext, sessionTimeout },
  -{ org.apache.catalina.core.StandardContext, workDir },
  +//{ org.apache.catalina.core.StandardContext, workDir },
   { org.apache.catalina.session.StandardManager, distributable },
   { org.apache.catalina.session.StandardManager, entropy },
   };
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardServer.java

2004-03-04 Thread amyroh
amyroh  2004/03/04 13:47:42

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  Port patch from TC 4.
  
  Revision  ChangesPath
  1.27  +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- StandardServer.java   27 Feb 2004 14:58:42 -  1.26
  +++ StandardServer.java   4 Mar 2004 21:47:42 -   1.27
  @@ -119,7 +119,7 @@
   { org.apache.catalina.core.StandardContext, sessionTimeout },
   { org.apache.catalina.core.StandardContext, startupTime },
   { org.apache.catalina.core.StandardContext, tldScanTime },
  -{ org.apache.catalina.core.StandardContext, workDir },
  +//{ org.apache.catalina.core.StandardContext, workDir },
   { org.apache.catalina.session.StandardManager, distributable },
   { org.apache.catalina.session.StandardManager, entropy },
   };
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java

2004-01-07 Thread amyroh
amyroh  2004/01/07 21:32:25

  Modified:catalina/src/share/org/apache/catalina/core
StandardHost.java
   catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
  Log:
  Fix bugzilla 25878 - Add HostConfig after new Host is created via admin and prevent 
duplicate errorReportValve creation after restart.
  Patch submitted by [EMAIL PROTECTED] (Peter Rossbach).
  
  Revision  ChangesPath
  1.27  +20 -4 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java
  
  Index: StandardHost.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- StandardHost.java 21 Oct 2003 00:18:25 -  1.26
  +++ StandardHost.java 8 Jan 2004 05:32:25 -   1.27
  @@ -176,6 +176,11 @@
   org.apache.catalina.valves.ErrorReportValve;
   
   /**
  + * The object name for the errorReportValve.
  + */
  +private ObjectName errorReportValveObjectName = null;
  +
  +/**
* The descriptive information string for this implementation.
*/
   private static final String info =
  @@ -798,9 +803,20 @@
   if ((errorReportValveClass != null)
(!errorReportValveClass.equals())) {
   try {
  -Valve valve = (Valve) Class.forName(errorReportValveClass)
  -.newInstance();
  -addValve(valve);
  +boolean found = false;
  +if(errorReportValveObjectName != null) {
  +ObjectName[] names = 
  +((StandardPipeline)pipeline).getValveObjectNames();
  +for (int i=0; !found  inames.length; i++)
  +if(errorReportValveObjectName.equals(names[i]))
  +found = true ;
  +}
  +if(!found) { 
  +Valve valve = (Valve) Class.forName(errorReportValveClass)
  +.newInstance();
  +addValve(valve);
  +errorReportValveObjectName = 
((ValveBase)valve).getObjectName() ;
  +}
   } catch (Throwable t) {
   log.error(sm.getString
   (standardHost.invalidErrorReportValveClass, 
  
  
  
  1.21  +9 -4  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- MBeanFactory.java 10 Nov 2003 21:08:09 -  1.20
  +++ MBeanFactory.java 8 Jan 2004 05:32:25 -   1.21
  @@ -98,6 +98,7 @@
   import org.apache.catalina.realm.UserDatabaseRealm;
   import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.startup.ContextConfig;
  +import org.apache.catalina.startup.HostConfig;
   import org.apache.catalina.valves.AccessLogValve;
   import org.apache.catalina.valves.RemoteAddrValve;
   import org.apache.catalina.valves.RemoteHostValve;
  @@ -921,6 +922,10 @@
   host.setUnpackWARs(unpackWARs);
   host.setXmlNamespaceAware(xmlNamespaceAware);
   host.setXmlValidation(xmlValidation);
  + 
  +// add HostConfig for active reloading
  +HostConfig hostConfig = new HostConfig();
  +host.addLifecycleListener(hostConfig);
   
   // Add the new instance to its parent component
   ObjectName pname = new ObjectName(parent);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ApplicationFilterFactory.java

2003-12-08 Thread amyroh
amyroh  2003/12/08 16:50:28

  Modified:catalina/src/share/org/apache/catalina/core
ApplicationFilterFactory.java
  Log:
  Strip out uri parameters (;*) during filter mappings or security constraints 
matching - bugtraq 4903209.
  
  Revision  ChangesPath
  1.12  +7 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
  
  Index: ApplicationFilterFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ApplicationFilterFactory.java 2 Sep 2003 21:22:04 -   1.11
  +++ ApplicationFilterFactory.java 9 Dec 2003 00:50:28 -   1.12
  @@ -156,6 +156,10 @@
   
   if (attribute != null){
   requestPath = attribute.toString();
  +int semicolon = requestPath.indexOf(;);
  +if (semicolon = 0) {
  +requestPath = requestPath.substring(0, semicolon);
  +}
   }
   
   HttpServletRequest hreq = null;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm RealmBase.java

2003-12-08 Thread amyroh
amyroh  2003/12/08 16:50:58

  Modified:catalina/src/share/org/apache/catalina/realm RealmBase.java
  Log:
  Strip out uri parameters (;*) during filter mappings or security constraints 
matching - bugtraq 4903209.
  
  Revision  ChangesPath
  1.18  +16 -4 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
  
  Index: RealmBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- RealmBase.java2 Sep 2003 21:22:05 -   1.17
  +++ RealmBase.java9 Dec 2003 00:50:58 -   1.18
  @@ -460,6 +460,18 @@
   String contextPath = hreq.getContextPath();
   if (contextPath.length()  0)
   uri = uri.substring(contextPath.length());
  +
  +if (uri != null) {
  +int semicolon = uri.indexOf(;);
  +if (semicolon = 0) {
  +String baseuri = uri.substring(0, semicolon);
  +if (debug = 2)
  +log(Request uri ' + uri + ' treated as ' + baseuri +
  +' for security constraint matching.);
  +uri = baseuri;
  +}
  +}
  +
   String method = hreq.getMethod();
   for (int i = 0; i  constraints.length; i++) {
   if (log.isDebugEnabled())
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans ServerLifecycleListener.java

2003-12-08 Thread amyroh
amyroh  2003/12/08 16:51:47

  Modified:catalina/src/share/org/apache/catalina/mbeans
ServerLifecycleListener.java
  Log:
  Fix indentation.
  
  Revision  ChangesPath
  1.12  +38 -38
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
  
  Index: ServerLifecycleListener.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ServerLifecycleListener.java  25 Sep 2003 12:49:01 -  1.11
  +++ ServerLifecycleListener.java  9 Dec 2003 00:51:47 -   1.12
  @@ -152,41 +152,41 @@
   /**
* MX4J adaptor name.
*/
  - protected String adaptor = null;
  +protected String adaptor = null;
   
  - public String getAdaptor() {
  - return (this.adaptor);
  - }
  -
  - public void setAdaptor(String adaptor) {
  - this.adaptor = adaptor;
  - }
  -
  - /**
  -  * MX4J jrmp/iiop listen host
  -  */ 
  - protected String adaptorHost = null;
  -
  - public String getAdaptorHost() {
  - return (this.adaptorHost);
  - }
  -
  - public void setAdaptorHost(String adaptorHost) {
  - this.adaptorHost = adaptorHost;
  - }
  -
  - /**
  -  * MX4J jrmp/iiop listen port
  -  */ 
  - protected int adaptorPort = -1;
  -
  - public int getAdaptorPort() {
  - return (this.adaptorPort);
  - }
  -
  - public void setAdaptorPort(int adaptorPort) {
  - this.adaptorPort = adaptorPort;
  - }
  +public String getAdaptor() {
  +return (this.adaptor);
  +}
  +
  +public void setAdaptor(String adaptor) {
  +this.adaptor = adaptor;
  +}
  +
  +/**
  + * MX4J jrmp/iiop listen host
  + */ 
  +protected String adaptorHost = null;
  +
  +public String getAdaptorHost() {
  +return (this.adaptorHost);
  +}
  +
  +public void setAdaptorHost(String adaptorHost) {
  +this.adaptorHost = adaptorHost;
  +}
  +
  +/**
  + * MX4J jrmp/iiop listen port
  + */ 
  +protected int adaptorPort = -1;
  +
  +public int getAdaptorPort() {
  +return (this.adaptorPort);
  +}
  +
  +public void setAdaptorPort(int adaptorPort) {
  +this.adaptorPort = adaptorPort;
  +}
   
   
   // -- ContainerListener Methods
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm RealmBase.java

2003-12-08 Thread amyroh
amyroh  2003/12/08 17:54:33

  Modified:catalina/src/share/org/apache/catalina/core
ApplicationFilterFactory.java
   catalina/src/share/org/apache/catalina/realm RealmBase.java
  Log:
  Revert the patch.  Seems like this case is already handled in the Mapper in TC5.
  
  Revision  ChangesPath
  1.13  +3 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
  
  Index: ApplicationFilterFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ApplicationFilterFactory.java 9 Dec 2003 00:50:28 -   1.12
  +++ ApplicationFilterFactory.java 9 Dec 2003 01:54:33 -   1.13
  @@ -156,10 +156,6 @@
   
   if (attribute != null){
   requestPath = attribute.toString();
  -int semicolon = requestPath.indexOf(;);
  -if (semicolon = 0) {
  -requestPath = requestPath.substring(0, semicolon);
  -}
   }
   
   HttpServletRequest hreq = null;
  
  
  
  1.19  +4 -15 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java
  
  Index: RealmBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/RealmBase.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- RealmBase.java9 Dec 2003 00:50:58 -   1.18
  +++ RealmBase.java9 Dec 2003 01:54:33 -   1.19
  @@ -461,17 +461,6 @@
   if (contextPath.length()  0)
   uri = uri.substring(contextPath.length());
   
  -if (uri != null) {
  -int semicolon = uri.indexOf(;);
  -if (semicolon = 0) {
  -String baseuri = uri.substring(0, semicolon);
  -if (debug = 2)
  -log(Request uri ' + uri + ' treated as ' + baseuri +
  -' for security constraint matching.);
  -uri = baseuri;
  -}
  -}
  -
   String method = hreq.getMethod();
   for (int i = 0; i  constraints.length; i++) {
   if (log.isDebugEnabled())
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardServer.java

2003-12-03 Thread amyroh
amyroh  2003/12/03 10:53:15

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java
  Log:
  Fix bugzilla 25138 submitted by Takashi Okamoto [EMAIL PROTECTED].
  
  Revision  ChangesPath
  1.23  +10 -7 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- StandardServer.java   2 Sep 2003 21:22:04 -   1.22
  +++ StandardServer.java   3 Dec 2003 18:53:15 -   1.23
  @@ -863,7 +863,7 @@
   // Open an output writer for the new configuration file
   PrintWriter writer = null;
   try {
  -writer = new PrintWriter(new FileWriter(config));
  +writer = new PrintWriter(new OutputStreamWriter(new 
FileOutputStream(config), UTF8));
   } catch (IOException e) {
   if (writer != null) {
   try {
  @@ -874,7 +874,8 @@
   }
   throw (e);
   }
  -
  +
  +writer.println(?xml version='1.0' encoding='utf-8'?);
   writer.print(Context);
   storeAttributes(writer, context);
   writer.println();
  @@ -1202,7 +1203,7 @@
   // Open an output writer for the new configuration file
   writer = null;
   try {
  -writer = new PrintWriter(new FileWriter(config));
  +writer = new PrintWriter(new OutputStreamWriter(new 
FileOutputStream(config), UTF8));
   } catch (IOException e) {
   if (writer != null) {
   try {
  @@ -1214,6 +1215,7 @@
   throw (e);
   }
   
  +writer.println(?xml version='1.0' encoding='utf-8'?);
   indent = 0;
   
   }
  @@ -1222,6 +1224,7 @@
   for (int i = 0; i  indent; i++) {
   writer.print(' ');
   }
  +
   writer.print(Context);
   storeAttributes(writer, context);
   writer.println();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappLoader.java

2003-11-26 Thread amyroh
amyroh  2003/11/26 10:46:02

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  Catch exception when there is an empty jar file.  Ignores the exception and continue 
loading other jar files in the dir - bugtraq 4670099.
  
  Revision  ChangesPath
  1.24  +10 -3 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- WebappLoader.java 22 Sep 2003 12:31:41 -  1.23
  +++ WebappLoader.java 26 Nov 2003 18:46:02 -  1.24
  @@ -1109,8 +1109,15 @@
   continue;
   }
   
  -JarFile jarFile = new JarFile(destFile);
  -classLoader.addJar(filename, jarFile, destFile);
  +try {
  +JarFile jarFile = new JarFile(destFile);
  +classLoader.addJar(filename, jarFile, destFile);
  +} catch (Exception ex) {
  +// Catch the exception if there is an empty jar file
  +// Should ignore and continute loading other jar files 
  +// in the dir
  +}
  +
   loaderRepositories.add( filename );
   
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java

2003-11-24 Thread amyroh
amyroh  2003/11/24 15:01:22

  Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
   util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
  Log:
  Add getters for all attributes defined in MBeanInfo so getAttribute calls suceed.
  
  Revision  ChangesPath
  1.44  +143 -14   
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
  
  Index: Http11Protocol.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Http11Protocol.java   17 Nov 2003 09:42:40 -  1.43
  +++ Http11Protocol.java   24 Nov 2003 23:01:21 -  1.44
  @@ -264,20 +264,36 @@
   
   //  Pool setup 
   
  +public boolean getPools(){
  +return ep.isPoolOn();
  +}
  +
   public void setPools( boolean t ) {
   ep.setPoolOn(t);
   setAttribute(pools,  + t);
   }
   
  +public int getMaxThreads() {
  +return ep.getMaxThreads();
  +}
  +
   public void setMaxThreads( int maxThreads ) {
   ep.setMaxThreads(maxThreads);
   setAttribute(maxThreads,  + maxThreads);
   }
   
  +public int getMaxSpareThreads() {
  +return ep.getMaxSpareThreads();
  +}
  +
   public void setMaxSpareThreads( int maxThreads ) {
   ep.setMaxSpareThreads(maxThreads);
   setAttribute(maxSpareThreads,  + maxThreads);
   }
  +
  +public int getMinSpareThreads() {
  +return ep.getMinSpareThreads();
  +}
   
   public void setMinSpareThreads( int minSpareThreads ) {
   ep.setMinSpareThreads(minSpareThreads);
  @@ -286,11 +302,19 @@
   
   //  Tcp setup 
   
  +public int getBacklog() {
  +return ep.getBacklog();
  +}
  +
   public void setBacklog( int i ) {
   ep.setBacklog(i);
   setAttribute(backlog,  + i);
   }
   
  +public int getPort() {
  +return ep.getPort();
  +}
  +
   public void setPort( int port ) {
   ep.setPort(port);
   setAttribute(port,  + port);
  @@ -301,123 +325,223 @@
   ep.setAddress( ia );
   setAttribute(address,  + ia);
   }
  -
  -public void setHostName( String name ) {
  +
  +// commenting out for now since it's not doing anything
  +//public void setHostName( String name ) {
   // ??? Doesn't seem to be used in existing or prev code
   // vhost=name;
  -}
  +//}
   
  +public String getSocketFactory() {
  +return socketFactoryName;
  +}
  +
   public void setSocketFactory( String valueS ) {
   socketFactoryName = valueS;
   setAttribute(socketFactory, valueS);
   }
  -
  +
  +public String getSSLImplementation() {
  +return sslImplementationName;
  +}
  +
   public void setSSLImplementation( String valueS) {
   sslImplementationName = valueS;
   setAttribute(sslImplementation, valueS);
   }
   
  +public boolean getTcpNoDelay() {
  +return ep.getTcpNoDelay();
  +}
  +
   public void setTcpNoDelay( boolean b ) {
   ep.setTcpNoDelay( b );
   setAttribute(tcpNoDelay,  + b);
   }
   
  +public boolean getDisableUploadTimeout() {
  +return disableUploadTimeout;
  +}
  +
   public void setDisableUploadTimeout(boolean isDisabled) {
   disableUploadTimeout = isDisabled;
   }
   
  +public int getSocketBuffer() {
  +return socketBuffer;
  +}
  +
   public void setSocketBuffer(int valueI) {
   socketBuffer = valueI;
   }
   
  +public String getCompression() {
  +return compression;
  +}
  +
   public void setCompression(String valueS) {
   compression = valueS;
   setAttribute(compression, valueS);
   }
   
  +public int getMaxPostSize() {
  +return maxPostSize;
  +}
  +
   public void setMaxPostSize(int valueI) {
   maxPostSize = valueI;
   setAttribute(maxPostSize,  + valueI);
   }
   
  +public String getRestrictedUserAgents() {
  +return restrictedUserAgents;
  +}
  +
   public void setRestrictedUserAgents(String valueS) {
   restrictedUserAgents = valueS;
   setAttribute(restrictedUserAgents, valueS);
   }
   
  +public String getNoCompressionUserAgents() {
  +return noCompressionUserAgents;
  +}
  +
   public void setNoCompressionUserAgents(String valueS) {
   noCompressionUserAgents = valueS;
   setAttribute(noCompressionUserAgents, valueS);
   }
   
  +public

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java

2003-11-24 Thread amyroh
amyroh  2003/11/24 17:26:26

  Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
  Log:
  Put unused methods back in comments -- accidently removed /* earlier.
  
  Revision  ChangesPath
  1.45  +7 -6  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
  
  Index: Http11Protocol.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- Http11Protocol.java   24 Nov 2003 23:01:21 -  1.44
  +++ Http11Protocol.java   25 Nov 2003 01:26:26 -  1.45
  @@ -321,6 +321,10 @@
   //this.port=port;
   }
   
  +public InetAddress getAddress() {
  +return ep.getAddress();
  +}
  +
   public void setAddress(InetAddress ia) {
   ep.setAddress( ia );
   setAttribute(address,  + ia);
  @@ -774,11 +778,7 @@
   }
   }
   
  -
  -public InetAddress getAddress() {
  -return ep.getAddress();
  -}
  -
  +/*
   public boolean isKeystoreSet() {
   return (attributes.get(keystore) != null);
   }
  @@ -802,7 +802,8 @@
   public PoolTcpEndpoint getEndpoint() {
   return ep;
   }
  -
  +*/
  +
   protected String domain;
   protected ObjectName oname;
   protected MBeanServer mserver;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java

2003-11-21 Thread amyroh
amyroh  2003/11/21 13:10:22

  Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
  Log:
  Fix NPE - was thrown from org.apache.coyote.RequestInfo.getRemoteAddr when getting 
remoteAddr via JMX.
  
  Revision  ChangesPath
  1.88  +18 -9 
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
  
  Index: Http11Processor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- Http11Processor.java  17 Nov 2003 09:42:40 -  1.87
  +++ Http11Processor.java  21 Nov 2003 21:10:21 -  1.88
  @@ -994,21 +994,30 @@
   
   } else if (actionCode == ActionCode.ACTION_REQ_HOST_ADDR_ATTRIBUTE) {
   
  -if ((remoteAddr == null)  (socket != null))
  -remoteAddr = socket.getInetAddress().getHostAddress();
  -
  +if ((remoteAddr == null)  (socket != null)) {
  +InetAddress inetAddr = socket.getInetAddress();
  +if (inetAddr != null) {
  +remoteAddr = inetAddr.getHostAddress();
  +}   
  +}
   request.remoteAddr().setString(remoteAddr);
   
   } else if (actionCode == ActionCode.ACTION_REQ_HOST_ATTRIBUTE) {
   
  -if (remoteAddr == null)
  -remoteAddr = socket.getInetAddress().getHostAddress();
  -
  +if ((remoteAddr == null)  (socket !=null)) {
  +InetAddress inetAddr = socket.getInetAddress();
  +if (inetAddr != null) {
  +remoteAddr = inetAddr.getHostAddress();
  +}
  +}
   request.remoteAddr().setString(remoteAddr);
   
  -if (remoteHost == null)
  -remoteHost = socket.getInetAddress().getHostName();
  -
  +if ((remoteHost == null)  (socket != null)) {
  +InetAddress inetAddr = socket.getInetAddress();
  +if (inetAddr != null) {
  +remoteHost = inetAddr.getHostName();
  +}
  +}
   request.remoteHost().setString(remoteHost);
  
   if (remotePort == -1)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote RequestInfo.java

2003-11-13 Thread amyroh
amyroh  2003/11/13 12:03:33

  Modified:coyote/src/java/org/apache/coyote RequestInfo.java
  Log:
  Add getter for RequestInfo.globalProcessor - it was returning 
AttributeNotFoundException because of missing getter.
  
  Revision  ChangesPath
  1.6   +4 -0  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java
  
  Index: RequestInfo.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/RequestInfo.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestInfo.java  2 Sep 2003 21:34:38 -   1.5
  +++ RequestInfo.java  13 Nov 2003 20:03:33 -  1.6
  @@ -84,6 +84,10 @@
   this.req=req;
   }
   
  +public RequestGroupInfo getGlobalProcessor() {
  +return global;
  +}
  +
   public void setGlobalProcessor(RequestGroupInfo global) {
   if( global != null) {
   this.global=global;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml

2003-11-10 Thread amyroh
amyroh  2003/11/10 12:00:35

  Modified:catalina/src/share/org/apache/catalina/mbeans
mbeans-descriptors.xml
  Log:
  Add MBean description for DatasourceRealm - fixes bugzilla 23853.
  Modified patch from Kyle VanderBeek[EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.78  +53 -1 
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mbeans-descriptors.xml19 Aug 2003 00:43:09 -  1.77
  +++ mbeans-descriptors.xml10 Nov 2003 20:00:35 -  1.78
  @@ -334,6 +334,58 @@
 /mbean
   
   
  +  mbean name=DataSourceRealm
  +className=org.apache.catalina.mbeans.ClassNameMBean
  +  description=Implementation of Realm that works with any JNDI configured 
DataSource
  +   domain=Catalina
  +group=Realm
  + type=org.apache.catalina.realm.DataSourceRealm
  +
  +attribute   name=dataSourceName
  +  description=The JNDI named JDBC DataSource for your database
  + type=java.lang.String/
  +
  +attribute   name=debug
  +  description=The debugging detail level for this component
  + type=int/
  +
  +attribute   name=digest
  +  description=Digest algorithm used in storing passwords in a
  +non-plaintext format
  + type=java.lang.String/
  +
  +attribute   name=roleNameCol
  +  description=The column in the user role table that names a role
  + type=java.lang.String/
  +
  +attribute   name=userCredCol
  +  description=The column in the user table that holds the user's
  +credentials
  + type=java.lang.String/
  +
  +attribute   name=userNameCol
  +  description=The column in the user table that holds the user's
  +username
  + type=java.lang.String/
  +
  +attribute   name=userRoleTable
  +  description=The table that holds the relation between user's and
  +roles
  + type=java.lang.String/
  +
  +attribute   name=userTable
  +  description=The table that holds user data
  + type=java.lang.String/
  +
  +
  +operation name=start description=Start impact=ACTION returnType=void /
  +operation name=stop description=Stop impact=ACTION returnType=void /
  +operation name=init description=Init impact=ACTION returnType=void /
  +operation name=destroy description=Destroy impact=ACTION 
returnType=void /
  +
  +  /mbean
  +
  +
 mbean name=DefaultContext
 className=org.apache.catalina.mbeans.DefaultContextMBean
 description=Used to store the default configuration a Host will use
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm mbeans-descriptors.xml

2003-11-10 Thread amyroh
amyroh  2003/11/10 12:00:50

  Modified:catalina/src/share/org/apache/catalina/realm
mbeans-descriptors.xml
  Log:
  Add MBean description for DatasourceRealm.
  
  Revision  ChangesPath
  1.2   +52 -0 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/realm/mbeans-descriptors.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mbeans-descriptors.xml25 Apr 2003 21:14:36 -  1.1
  +++ mbeans-descriptors.xml10 Nov 2003 20:00:50 -  1.2
  @@ -1,5 +1,57 @@
   ?xml version=1.0?
   mbeans-descriptors
  +
  +  mbean name=DataSourceRealm
  +className=org.apache.catalina.mbeans.ClassNameMBean
  +  description=Implementation of Realm that works with any JNDI configured 
DataSource
  +   domain=Catalina
  +group=Realm
  + type=org.apache.catalina.realm.DataSourceRealm
  +
  +attribute   name=dataSourceName
  +  description=The JNDI named JDBC DataSource for your database
  + type=java.lang.String/
  +
  +attribute   name=debug
  +  description=The debugging detail level for this component
  + type=int/
  +
  +attribute   name=digest
  +  description=Digest algorithm used in storing passwords in a
  +non-plaintext format
  + type=java.lang.String/
  +
  +attribute   name=roleNameCol
  +  description=The column in the user role table that names a role
  + type=java.lang.String/
  +
  +attribute   name=userCredCol
  +  description=The column in the user table that holds the user's
  +credentials
  + type=java.lang.String/
  +
  +attribute   name=userNameCol
  +  description=The column in the user table that holds the user's
  +username
  + type=java.lang.String/
  +
  +attribute   name=userRoleTable
  +  description=The table that holds the relation between user's and
  +roles
  + type=java.lang.String/
  +
  +attribute   name=userTable
  +  description=The table that holds user data
  + type=java.lang.String/
  +
  +
  +operation name=start description=Start impact=ACTION returnType=void /
  +operation name=stop description=Stop impact=ACTION returnType=void /
  +operation name=init description=Init impact=ACTION returnType=void /
  +operation name=destroy description=Destroy impact=ACTION 
returnType=void /
  +
  +  /mbean
  +
 mbean name=JAASRealm
 description=Implmentation of Realm that authenticates users via the
  Java Authentication and Authorization Service (JAAS)
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java

2003-11-10 Thread amyroh
amyroh  2003/11/10 13:08:09

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
   catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java
  Log:
  Encode address property so Connector can handle IPV6 address in ObjectName.  No 
longer throws MalformedObjectNameException with IPV6 address.
  
  Revision  ChangesPath
  1.20  +7 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MBeanFactory.java 1 Oct 2003 01:31:36 -   1.19
  +++ MBeanFactory.java 10 Nov 2003 21:08:09 -  1.20
  @@ -491,9 +491,9 @@
   Method getObjectName = cls.getMethod(getObjectName, null);
   
   // Return the corresponding MBean name
  -//ObjectName coname = (ObjectName)getObjectName.invoke(retobj, null);
  -ObjectName coname = 
  -MBeanUtils.createObjectName(pname.getDomain(), (Connector)retobj);
  +ObjectName coname = (ObjectName)getObjectName.invoke(retobj, null);
  +//ObjectName coname = 
  +//MBeanUtils.createObjectName(pname.getDomain(), (Connector)retobj);
   return (coname.toString());
   } catch (Exception e) {
   throw new MBeanException(e);
  
  
  
  1.31  +7 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- CoyoteConnector.java  6 Oct 2003 08:56:11 -   1.30
  +++ CoyoteConnector.java  10 Nov 2003 21:08:09 -  1.31
  @@ -60,6 +60,7 @@
   
   package org.apache.coyote.tomcat5;
   
  +import java.net.URLEncoder;
   import java.util.HashMap;
   import java.util.Iterator;
   
  @@ -1241,7 +1242,11 @@
   try {
   // we are loaded directly, via API - and no name was given to us
   StandardEngine cb=(StandardEngine)container;
  -String addSuffix=(getAddress()==null) ?: ,address= + 
getAddress();
  +String encodedAddr = null;
  +if (getAddress() != null) {
  +encodedAddr = URLEncoder.encode(getAddress());
  +}
  +String addSuffix=(getAddress()==null) ?: ,address= + 
encodedAddr;
   oname=new ObjectName(cb.getName() + :type=Connector,port=+
   getPort() + addSuffix);
   Registry.getRegistry().registerComponent(this, oname, null);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ErrorReportValve.java

2003-11-06 Thread amyroh
amyroh  2003/11/06 15:43:18

  Modified:catalina/src/share/org/apache/catalina/core
StandardHostValve.java
   catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
  Log:
  Apply patch for bugzilla 9723 and bugtraq 4701571 - Avoid unneccessray calls to 
RequestUtil.filter.
  Patch submitted by Arvind Srinivasan[EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.12  +7 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java
  
  Index: StandardHostValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardHostValve.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardHostValve.java2 Sep 2003 21:22:04 -   1.11
  +++ StandardHostValve.java6 Nov 2003 23:43:18 -   1.12
  @@ -321,9 +321,6 @@
   if (!(response.getResponse() instanceof HttpServletResponse))
   return;
   int statusCode = hresponse.getStatus();
  -String message = RequestUtil.filter(hresponse.getMessage());
  -if (message == null)
  -message = ;
   
   // Handle a custom error page for this status code
   Context context = request.getContext();
  @@ -337,6 +334,9 @@
   ServletResponse sresp = response.getResponse();
   sreq.setAttribute(Globals.STATUS_CODE_ATTR,
 new Integer(statusCode));
  + String message = RequestUtil.filter(hresponse.getMessage());
  +if (message == null)
  +message = ;
   sreq.setAttribute(Globals.ERROR_MESSAGE_ATTR, message);
   sreq.setAttribute
   (ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR,
  
  
  
  1.12  +8 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
  
  Index: ErrorReportValve.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ErrorReportValve.java 12 Sep 2003 13:17:06 -  1.11
  +++ ErrorReportValve.java 6 Nov 2003 23:43:18 -   1.12
  @@ -238,9 +238,6 @@
   return;
   HttpServletResponse hres = (HttpServletResponse) response;
   int statusCode = hresponse.getStatus();
  -String message = RequestUtil.filter(hresponse.getMessage());
  -if (message == null)
  -message = ;
   
   // Do nothing on a 1xx, 2xx and 3xx status
   if (statusCode  400)
  @@ -265,6 +262,10 @@
   
   }
   
  +String message = RequestUtil.filter(hresponse.getMessage());
  +if (message == null)
  +message = ;
  +
   // Do nothing if there is no report for the specified status code
   String report = null;
   try {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector SaveConnectorAction.java

2003-10-06 Thread amyroh
amyroh  2003/10/06 15:11:31

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
  Log:
  Check connectors with the same port number under different domain.
  
  Revision  ChangesPath
  1.10  +8 -5  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
  
  Index: SaveConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SaveConnectorAction.java  21 Sep 2003 23:08:15 -  1.9
  +++ SaveConnectorAction.java  6 Oct 2003 22:11:31 -   1.10
  @@ -180,10 +180,13 @@
   ObjectName soname = new ObjectName(serviceName);
   String domain = soname.getDomain();
   StringBuffer sb = new StringBuffer(domain);
  +StringBuffer searchSB = new StringBuffer(*);
   sb.append(TomcatTreeBuilder.CONNECTOR_TYPE);
  +searchSB.append(TomcatTreeBuilder.CONNECTOR_TYPE);
   sb.append(,port= + cform.getPortText());
  +searchSB.append(,port= + cform.getPortText());
   
  -ObjectName search = new ObjectName(sb.toString()+,*);
  +ObjectName search = new ObjectName(searchSB.toString()+,*);
   
   String address = cform.getAddress();
   if ((address!=null)  (address.length()0)  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TomcatTreeBuilder.java

2003-10-03 Thread amyroh
amyroh  2003/10/03 14:23:34

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TomcatTreeBuilder.java
  Log:
  Fix the way it was querying JAASRealm.
  
  Revision  ChangesPath
  1.9   +11 -8 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
  
  Index: TomcatTreeBuilder.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TomcatTreeBuilder.java23 Sep 2003 19:29:36 -  1.8
  +++ TomcatTreeBuilder.java3 Oct 2003 21:23:34 -   1.9
  @@ -80,6 +80,7 @@
   import org.apache.struts.action.ActionForward;
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.util.MessageResources;
  +import javax.management.AttributeNotFoundException;
   import javax.management.MalformedObjectNameException;
   import javax.management.MBeanServer;
   import javax.management.MBeanServerFactory;
  @@ -436,9 +437,11 @@
   Lists.getRealms(mBServer, containerName).iterator();
   while (realmNames.hasNext()) {
   String realmName = (String) realmNames.next();
  - ManagedBean mb = Registry.getRegistry().findManagedBean(realmName);
  - if (mb!=null  !mb.getName().equals(JAASRealm)) {
  - ObjectName objectName = new ObjectName(realmName);
  + ObjectName objectName = new ObjectName(realmName);
  +// Create tree nodes for non JAASRealm only
  +try {
  +mBServer.getAttribute(objectName, validate);
  +} catch (AttributeNotFoundException e) {
String nodeLabel = Realm for  + containerNode.getLabel();
TreeControlNode realmNode =
new TreeControlNode(realmName,
  @@ -451,7 +454,7 @@
   content,
   false, domain);
   containerNode.addChild(realmNode);
  - }
  +}
   }
   
   }   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans MBeanFactory.java

2003-09-30 Thread amyroh
amyroh  2003/09/30 18:31:36

  Modified:catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
  Log:
  Fix JDBCRealm creation via admin.
  
  Revision  ChangesPath
  1.19  +10 -5 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- MBeanFactory.java 2 Sep 2003 21:22:02 -   1.18
  +++ MBeanFactory.java 1 Oct 2003 01:31:36 -   1.19
  @@ -600,11 +600,16 @@
*
* @exception Exception if an MBean cannot be created or registered
*/
  -public String createJDBCRealm(String parent)
  +public String createJDBCRealm(String parent, String driverName, 
  + String connectionName, String connectionPassword, String connectionURL)
   throws Exception {
   
   // Create a new JDBCRealm instance
   JDBCRealm realm = new JDBCRealm();
  + realm.setDriverName(driverName);
  + realm.setConnectionName(connectionName);
  + realm.setConnectionPassword(connectionPassword);
  + realm.setConnectionURL(connectionURL);
   
   // Add the new instance to its parent component
   ObjectName pname = new ObjectName(parent);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm SaveJDBCRealmAction.java

2003-09-30 Thread amyroh
amyroh  2003/09/30 18:31:49

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java
  Log:
  Fix JDBCRealm creation via admin.
  
  Revision  ChangesPath
  1.7   +13 -5 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
  
  Index: SaveJDBCRealmAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SaveJDBCRealmAction.java  24 Apr 2003 07:56:34 -  1.6
  +++ SaveJDBCRealmAction.java  1 Oct 2003 01:31:49 -   1.7
  @@ -109,6 +109,10 @@
*/
   private String createStandardRealmTypes[] =
   { java.lang.String, // parent
  +  java.lang.String, // driverName
  +  java.lang.String, // connectionName
  +  java.lang.String, // connectionPassword
  +  java.lang.String, // connectionURL
   };
   
   
  @@ -216,8 +220,12 @@
   TomcatTreeBuilder.getMBeanFactory();
   
   // Create a new StandardRealm object
  -values = new String[1];
  +values = new String[5];
   values[0] = parent;
  + values[1] = rform.getDriver();
  + values[2] = rform.getConnectionName();
  + values[3] = rform.getConnectionPassword();
  + values[4] = rform.getConnectionURL();
   operation = createJDBCRealm;
   rObjectName = (String)
   mBServer.invoke(fname, operation,
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger LoggerBase.java

2003-09-27 Thread amyroh
amyroh  2003/09/27 17:43:28

  Modified:catalina/src/share/org/apache/catalina/logger
LoggerBase.java
  Log:
  Remove debugging logs.
  
  Revision  ChangesPath
  1.6   +4 -6  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java
  
  Index: LoggerBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/LoggerBase.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LoggerBase.java   2 Sep 2003 21:22:06 -   1.5
  +++ LoggerBase.java   28 Sep 2003 00:43:28 -  1.6
  @@ -406,7 +406,6 @@
   domain=name.getDomain();
   host=name.getKeyProperty(host);
   path=name.getKeyProperty(path);
  -log(preRegister with +name);
   if( container== null ) {
   // Register with the parent
   try {
  @@ -450,7 +449,6 @@
   }
   
   public ObjectName createObjectName() {
  -log(createObjectName with +container);
   // register
   try {
   StandardEngine engine=null;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TomcatTreeBuilder.java

2003-09-23 Thread amyroh
amyroh  2003/09/23 12:29:36

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TomcatTreeBuilder.java
  Log:
  Fix to not display JAASRealm node since admin doesn't support editing such Realm - 
bugtraq 4926142.
  
  Revision  ChangesPath
  1.8   +14 -9 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
  
  Index: TomcatTreeBuilder.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TomcatTreeBuilder.java24 Apr 2003 07:56:33 -  1.7
  +++ TomcatTreeBuilder.java23 Sep 2003 19:29:36 -  1.8
  @@ -72,6 +72,8 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   import javax.servlet.http.HttpSession;
  +import org.apache.commons.modeler.ManagedBean;
  +import org.apache.commons.modeler.Registry;
   import org.apache.struts.action.Action;
   import org.apache.struts.action.ActionErrors;
   import org.apache.struts.action.ActionForm;
  @@ -434,10 +436,12 @@
   Lists.getRealms(mBServer, containerName).iterator();
   while (realmNames.hasNext()) {
   String realmName = (String) realmNames.next();
  -ObjectName objectName = new ObjectName(realmName);
  -String nodeLabel = Realm for  + containerNode.getLabel();
  -TreeControlNode realmNode =
  -new TreeControlNode(realmName,
  + ManagedBean mb = Registry.getRegistry().findManagedBean(realmName);
  + if (mb!=null  !mb.getName().equals(JAASRealm)) {
  + ObjectName objectName = new ObjectName(realmName);
  + String nodeLabel = Realm for  + containerNode.getLabel();
  + TreeControlNode realmNode =
  + new TreeControlNode(realmName,
   Realm.gif,
   nodeLabel,
   EditRealm.do?select= +
  @@ -446,7 +450,8 @@
   URLEncoder.encode(nodeLabel),
   content,
   false, domain);
  -containerNode.addChild(realmNode);
  +containerNode.addChild(realmNode);
  + }
   }
   
   }   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector SaveConnectorAction.java

2003-09-21 Thread amyroh
amyroh  2003/09/21 16:08:15

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
  Log:
  Do not allow duplicate port connector creation - fix bugtraq 4924866.
  
  Revision  ChangesPath
  1.9   +10 -6 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
  
  Index: SaveConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SaveConnectorAction.java  29 Aug 2003 02:40:51 -  1.8
  +++ SaveConnectorAction.java  21 Sep 2003 23:08:15 -  1.9
  @@ -182,6 +182,9 @@
   StringBuffer sb = new StringBuffer(domain);
   sb.append(TomcatTreeBuilder.CONNECTOR_TYPE);
   sb.append(,port= + cform.getPortText());
  +
  +ObjectName search = new ObjectName(sb.toString()+,*);
  +
   String address = cform.getAddress();
   if ((address!=null)  (address.length()0)  
   (!address.equalsIgnoreCase( ))) {
  @@ -191,8 +194,9 @@
   }
   ObjectName oname = new ObjectName(sb.toString());
   
  -// Ensure that the requested connector name is unique
  -if (mBServer.isRegistered(oname)) {
  +// Ensure that the requested connector name and port is unique
  +if (mBServer.isRegistered(oname) ||
  +(!mBServer.queryNames(search, null).isEmpty())) {
   ActionErrors errors = new ActionErrors();
   errors.add(connectorName,
  new ActionError(error.connectorName.exists));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader WebappLoader.java

2003-09-21 Thread amyroh
amyroh  2003/09/21 16:11:01

  Modified:catalina/src/share/org/apache/catalina/loader
WebappLoader.java
  Log:
  Fix to properly create Loader MBean at webapp restart - bugtraq 4924607.
  
  Revision  ChangesPath
  1.22  +3 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WebappLoader.java 10 Sep 2003 15:40:27 -  1.21
  +++ WebappLoader.java 21 Sep 2003 23:11:01 -  1.22
  @@ -670,9 +670,11 @@
   
   public void destroy() {
   if( controller==oname ) {
  +oname = null;
   // Self-registration, undo it
   Registry.getRegistry().unregisterComponent(oname);
   }
  +initialized = false;
   
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java

2003-09-21 Thread amyroh
amyroh  2003/09/21 16:11:17

  Modified:catalina/src/share/org/apache/catalina/session
ManagerBase.java
  Log:
  Fix to properly create Manager MBean at webapp restart - bugtraq 4924607.
  
  Revision  ChangesPath
  1.21  +2 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
  
  Index: ManagerBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- ManagerBase.java  2 Sep 2003 21:22:01 -   1.20
  +++ ManagerBase.java  21 Sep 2003 23:11:17 -  1.21
  @@ -605,6 +605,7 @@
   if( oname != null )
   Registry.getRegistry().unregisterComponent(oname);
   initialized=false;
  +oname = null;
   }
   
   public void init() {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/docs/appdev build.xml.txt

2003-09-21 Thread amyroh
amyroh  2003/09/21 16:13:03

  Modified:webapps/docs/appdev build.xml.txt
  Log:
  Fix obvious error - bugtraq 4877208.
  
  Revision  ChangesPath
  1.4   +2 -2  jakarta-tomcat-catalina/webapps/docs/appdev/build.xml.txt
  
  Index: build.xml.txt
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/appdev/build.xml.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml.txt 15 Sep 2003 14:07:00 -  1.3
  +++ build.xml.txt 21 Sep 2003 23:13:03 -  1.4
  @@ -318,7 +318,7 @@
  description=Create binary distribution
   
   !-- Copy documentation subdirectories --
  -mkdir   todir=${dist.home}/docs/
  +mkdir   dir=${dist.home}/docs/
   copytodir=${dist.home}/docs
 fileset dir=${docs.home}/
   /copy
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets CGIServlet.java

2003-09-02 Thread amyroh
amyroh  2003/09/02 15:44:32

  Modified:catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
  Log:
  Apply patch for bug 22857 and bug 22858 submitted by Mark Thomas [EMAIL PROTECTED] 
and fix obvious indentation errors.
  
  Revision  ChangesPath
  1.7   +23 -21
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
  
  Index: CGIServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CGIServlet.java   2 Sep 2003 21:22:05 -   1.6
  +++ CGIServlet.java   2 Sep 2003 22:44:32 -   1.7
  @@ -357,7 +357,7 @@
   //Wrapper wrapper = (Wrapper) getServletConfig();
   //context = (Context) wrapper.getParent();
   
  -context = config.getServletContext();
  +context = config.getServletContext();
   if (debug = 1) {
   //log(init: Associated with Context ' + context.getPath() + ');
   }
  @@ -429,10 +429,10 @@
   out.println(libcontextPath/b =  +
  req.getContextPath());
   Cookie cookies[] = req.getCookies();
  -if (cookies!=null) {
  -for (int i = 0; i  cookies.length; i++)
  +if (cookies!=null) {
  +for (int i = 0; i  cookies.length; i++)
   out.println(libcookie/b  + cookies[i].getName() + =  
+cookies[i].getValue());
  -}
  +}
   Enumeration headers = req.getHeaderNames();
   while (headers.hasMoreElements()) {
   String header = (String) headers.nextElement();
  @@ -567,8 +567,6 @@
   out.println(/ul);
   out.println(hr);
   
  -
  -
   }
   
   
  @@ -743,7 +741,7 @@
*
*/
   protected CGIEnvironment(HttpServletRequest req,
  - ServletContext context) {
  + ServletContext context) throws IOException {
   setupFromContext(context);
   setupFromRequest(req);
   
  @@ -939,7 +937,7 @@
* @return   true if environment was set OK, false if there
*   was a problem and no environment was set
*/
  -protected boolean setCGIEnvironment(HttpServletRequest req) {
  +protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {
   
   /*
* This method is slightly ugly; c'est la vie.
  @@ -1092,8 +1090,8 @@
   //NOOP per CGI specification section 11.2
   } else if(HOST.equalsIgnoreCase(header)) {
   String host = req.getHeader(header);
  -int idx =  host.indexOf(:);
  -if(idx  0) idx = host.length();
  +int idx =  host.indexOf(:);
  +if(idx  0) idx = host.length();
   envp.put(HTTP_ + header.replace('-', '_'),
host.substring(0, idx));
   } else {
  @@ -1102,7 +1100,9 @@
   }
   }
   
  -command = sCGIFullPath;
  +File fCGIFullPath = new File(sCGIFullPath);
  +command = fCGIFullPath.getCanonicalPath();
  +
   envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks
   
   this.env = envp;
  @@ -1543,17 +1543,19 @@
   
   //create query arguments
   Enumeration paramNames = params.keys();
  -StringBuffer cmdAndArgs = new StringBuffer(command);
  +StringBuffer cmdAndArgs = new StringBuffer(\ + command + \);
   if (paramNames != null  paramNames.hasMoreElements()) {
   cmdAndArgs.append( );
   while (paramNames.hasMoreElements()) {
   String k = (String) paramNames.nextElement();
   String v = params.get(k).toString();
   if ((k.indexOf(=)  0)  (v.indexOf(=)  0)) {
  +cmdAndArgs.append(\);
   cmdAndArgs.append(k);
   cmdAndArgs.append(=);
   v = java.net.URLEncoder.encode(v);
   cmdAndArgs.append(v);
  +cmdAndArgs.append(\);
   cmdAndArgs.append( );
   }
   }
  @@ -1566,11 +1568,11 @@
   env.put(CONTENT_LENGTH, new Integer(contentLength));
   }*/
   
  -if (command.endsWith(.pl) || command.endsWith(.cgi)) {
  +//if (command.endsWith(.pl) || command.endsWith(.cgi)) {
   StringBuffer perlCommand = new StringBuffer(perl );
   perlCommand.append(cmdAndArgs.toString());
   cmdAndArgs = perlCommand

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets CGIServlet.java

2003-09-02 Thread amyroh
amyroh  2003/09/02 15:44:54

  Modified:catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
  Log:
  Back port patch.
  
  Revision  ChangesPath
  1.12  +22 -19
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
  
  Index: CGIServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CGIServlet.java   4 Dec 2002 21:09:07 -   1.11
  +++ CGIServlet.java   2 Sep 2003 22:44:54 -   1.12
  @@ -364,7 +364,7 @@
   //Wrapper wrapper = (Wrapper) getServletConfig();
   //context = (Context) wrapper.getParent();
   
  -context = config.getServletContext();
  +context = config.getServletContext();
   if (debug = 1) {
   //log(init: Associated with Context ' + context.getPath() + ');
   }
  @@ -436,10 +436,10 @@
   out.println(libcontextPath/b =  +
  req.getContextPath());
   Cookie cookies[] = req.getCookies();
  -if (cookies!=null) {
  -for (int i = 0; i  cookies.length; i++)
  +if (cookies!=null) {
  +for (int i = 0; i  cookies.length; i++)
   out.println(libcookie/b  + cookies[i].getName() + =  
+cookies[i].getValue());
  -}
  +}
   Enumeration headers = req.getHeaderNames();
   while (headers.hasMoreElements()) {
   String header = (String) headers.nextElement();
  @@ -750,7 +750,7 @@
*
*/
   protected CGIEnvironment(HttpServletRequest req,
  - ServletContext context) {
  + ServletContext context) throws IOException {
   setupFromContext(context);
   setupFromRequest(req);
   
  @@ -946,7 +946,7 @@
* @return   true if environment was set OK, false if there
*   was a problem and no environment was set
*/
  -protected boolean setCGIEnvironment(HttpServletRequest req) {
  +protected boolean setCGIEnvironment(HttpServletRequest req) throws 
IOException {
   
   /*
* This method is slightly ugly; c'est la vie.
  @@ -1104,8 +1104,8 @@
   //NOOP per CGI specification section 11.2
   } else if(HOST.equalsIgnoreCase(header)) {
   String host = req.getHeader(header);
  -int idx =  host.indexOf(:);
  -if(idx  0) idx = host.length();
  +int idx =  host.indexOf(:);
  +if(idx  0) idx = host.length();
   envp.put(HTTP_ + header.replace('-', '_'),
host.substring(0, idx));
   } else {
  @@ -1114,7 +1114,8 @@
   }
   }
   
  -command = sCGIFullPath;
  +File fCGIFullPath = new File(sCGIFullPath);
  +command = fCGIFullPath.getCanonicalPath();
   envp.put(X_TOMCAT_SCRIPT_PATH, command);  //for kicks
   
   this.env = envp;
  @@ -1555,17 +1556,19 @@
   
   //create query arguments
   Enumeration paramNames = params.keys();
  -StringBuffer cmdAndArgs = new StringBuffer(command);
  +StringBuffer cmdAndArgs = new StringBuffer(\ + command + \);
   if (paramNames != null  paramNames.hasMoreElements()) {
   cmdAndArgs.append( );
   while (paramNames.hasMoreElements()) {
   String k = (String) paramNames.nextElement();
   String v = params.get(k).toString();
   if ((k.indexOf(=)  0)  (v.indexOf(=)  0)) {
  +cmdAndArgs.append(\);
   cmdAndArgs.append(k);
   cmdAndArgs.append(=);
   v = java.net.URLEncoder.encode(v);
   cmdAndArgs.append(v);
  +cmdAndArgs.append(\);
   cmdAndArgs.append( );
   }
   }
  @@ -1578,11 +1581,11 @@
   env.put(CONTENT_LENGTH, new Integer(contentLength));
   }*/
   
  -if (command.endsWith(.pl) || command.endsWith(.cgi)) {
  +//if (command.endsWith(.pl) || command.endsWith(.cgi)) {
   StringBuffer perlCommand = new StringBuffer(perl );
   perlCommand.append(cmdAndArgs.toString());
   cmdAndArgs = perlCommand;
  -}
  +//}
   
   rt = Runtime.getRuntime();
   proc = rt.exec(cmdAndArgs.toString(), hashToStringArray(env), wd

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java LocalStrings.properties

2003-08-29 Thread amyroh
amyroh  2003/08/28 19:34:47

  Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
LocalStrings.properties
  Log:
  Implement getAttribute(key).
  
  Revision  ChangesPath
  1.34  +3 -1  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
  
  Index: Http11Protocol.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Http11Protocol.java   11 Aug 2003 21:44:49 -  1.33
  +++ Http11Protocol.java   29 Aug 2003 02:34:47 -  1.34
  @@ -115,7 +115,9 @@
   }
   
   public Object getAttribute( String key ) {
  -return null;
  +if( log.isTraceEnabled())
  +log.trace(sm.getString(http11protocol.getattribute, key));
  +return attributes.get(key);
   }
   
   /**
  
  
  
  1.6   +2 -1  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/LocalStrings.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LocalStrings.properties   5 Nov 2002 09:37:34 -   1.5
  +++ LocalStrings.properties   29 Aug 2003 02:34:47 -  1.6
  @@ -16,6 +16,7 @@
   http11protocol.proto.ioexception.info=IOException reading request, ignored
   http11protocol.proto.socketexception.debug=SocketException reading request
   http11protocol.proto.socketexception.info=SocketException reading request, ignored
  +http11protocol.getattribute=Attribute {0}
   http11protocol.setattribute=Attribute {0}: {1}
   http11protocol.socketfactory.initerror=Error initializing socket factory
   http11protocol.start=Starting Coyote HTTP/1.1 on port {0}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 mbeans-descriptors.xml

2003-08-29 Thread amyroh
amyroh  2003/08/28 19:35:57

  Modified:catalina/src/share/org/apache/catalina/mbeans
ConnectorMBean.java
   catalina/src/share/org/apache/coyote/tomcat5
mbeans-descriptors.xml
  Log:
  Add ConnectorMBean implementation and force CoyoteConnector to use the 
ConnectorMBean for its configuration.
  
  Revision  ChangesPath
  1.2   +128 -176  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
  
  Index: ConnectorMBean.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectorMBean.java   18 Jul 2002 16:47:58 -  1.1
  +++ ConnectorMBean.java   29 Aug 2003 02:35:57 -  1.2
  @@ -1,4 +1,4 @@
  -/*
  +/*l
* $Header$
* $Revision$
* $Date$
  @@ -64,16 +64,24 @@
   package org.apache.catalina.mbeans;
   
   import java.lang.reflect.Method;
  +import javax.management.Attribute;
  +import javax.management.AttributeNotFoundException;
  +import javax.management.InstanceNotFoundException;
   import javax.management.MBeanException;
  +import javax.management.ReflectionException;
   import javax.management.RuntimeOperationsException;
  +import javax.management.modelmbean.InvalidTargetObjectTypeException;
   import org.apache.catalina.Connector;
   import org.apache.catalina.Service;
   import org.apache.commons.modeler.BaseModelMBean;
  +import org.apache.coyote.ProtocolHandler;
  +import org.apache.coyote.tomcat5.CoyoteConnector;
  +import org.apache.tomcat.util.IntrospectionUtils;
   
   
   /**
* pA strongModelMBean/strong implementation for the
  - * codeorg.apache.coyote.tomcat4.CoyoteConnector/code component./p
  + * codeorg.apache.coyote.tomcat5.CoyoteConnector/code component./p
*
* @author Amy Roh
* @version $Revision$ $Date$
  @@ -105,191 +113,135 @@
   // - Attributes
   
   
  -
  -// - Operations
  -
  -
   /**
  - * Return Client authentication info
  + * Obtain and return the value of a specific attribute of this MBean.
*
  - * @exception Exception if an MBean cannot be created or registered
  - */
  -public boolean getClientAuth()
  -throws Exception {
  -
  -Object clientAuthObj = null;
  -Class coyoteConnectorCls = 
Class.forName(org.apache.coyote.tomcat4.CoyoteConnector);
  -if (coyoteConnectorCls.isInstance(this.resource)) {
  -// get factory
  -Method meth1 = coyoteConnectorCls.getMethod(getFactory, null);
  -Object factory = meth1.invoke(this.resource, null);
  -Class coyoteServerSocketFactoryCls = 
Class.forName(org.apache.coyote.tomcat4.CoyoteServerSocketFactory);
  -if (coyoteServerSocketFactoryCls.isInstance(factory)) {
  -// get clientAuth
  -Method meth2 = 
coyoteServerSocketFactoryCls.getMethod(getClientAuth, null);
  -clientAuthObj = meth2.invoke(factory, null);
  -}
  -   
  -}
  -if (clientAuthObj instanceof Boolean) {
  -return ((Boolean)clientAuthObj).booleanValue();
  -} else return false;
  -
  -}
  -
  -
  -/**
  - * Set Client authentication info
  + * @param name Name of the requested attribute
*
  - * @exception Exception if an MBean cannot be created or registered
  + * @exception AttributeNotFoundException if this attribute is not
  + *  supported by this MBean
  + * @exception MBeanException if the initializer of an object
  + *  throws an exception
  + * @exception ReflectionException if a Java reflection exception
  + *  occurs when invoking the getter
*/
  -public void setClientAuth(boolean clientAuth)
  -throws Exception {
  -
  -Class coyoteConnectorCls = 
Class.forName(org.apache.coyote.tomcat4.CoyoteConnector);
  -if (coyoteConnectorCls.isInstance(this.resource)) {
  -// get factory
  -Method meth1 = coyoteConnectorCls.getMethod(getFactory, null);
  -Object factory = meth1.invoke(this.resource, null);
  -Class coyoteServerSocketFactoryCls = 
Class.forName(org.apache.coyote.tomcat4.CoyoteServerSocketFactory);
  -if (coyoteServerSocketFactoryCls.isInstance(factory)) {
  -// set clientAuth
  -Class partypes2 [] = new Class[1];
  -partypes2[0] = Boolean.TYPE;
  -Method meth2 = 
coyoteServerSocketFactoryCls.getMethod(setClientAuth, partypes2);
  -Object arglist2[] = new Object

cvs commit: jakarta-tomcat-catalina/webapps/admin/connector connector.jsp

2003-08-29 Thread amyroh
amyroh  2003/08/28 19:40:52

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
   webapps/admin/connector connector.jsp
  Log:
  Update Admin with new connector properties including thread pool configuration.
  
  Revision  ChangesPath
  1.17  +3 -0  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ApplicationResources_en.properties25 Aug 2003 22:16:38 -  1.16
  +++ ApplicationResources_en.properties29 Aug 2003 02:40:51 -  1.17
  @@ -127,6 +127,9 @@
   connector.milliseconds=milliseconds
   connector.max=Maximum
   connector.maxkeepalive=Max KeepAlive Requests
  +connector.maxspare=Max Spare Threads
  +connector.maxthreads=Max Threads
  +connector.minspare=Min Spare Threads
   connector.proxy.name=Proxy Name
   connector.proxy.portnumber=Proxy Port Number
   connector.algorithm=Algorithm
  
  
  
  1.5   +7 -4  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
  
  Index: AddConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AddConnectorAction.java   25 Aug 2003 22:16:38 -  1.4
  +++ AddConnectorAction.java   29 Aug 2003 02:40:51 -  1.5
  @@ -158,6 +158,9 @@
   connectorFm.setMinProcessorsText(5);
   connectorFm.setMaxProcessorsText(20);
   connectorFm.setMaxKeepAliveText(100);
  +connectorFm.setMaxSpare(50);
  +connectorFm.setMaxThreads(200);
  +connectorFm.setMinSpare(4);
   connectorFm.setSecure(false);
   connectorFm.setTcpNoDelay(true);
   connectorFm.setXpoweredBy(false);
  
  
  
  1.5   +92 -19
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
  
  Index: ConnectorForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConnectorForm.java25 Aug 2003 22:16:38 -  1.4
  +++ ConnectorForm.java29 Aug 2003 02:40:51 -  1.5
  @@ -188,6 +188,21 @@
   private String maxKeepAliveText = null;
   
   /**
  + * The text for the maxSpare.
  + */
  +private String maxSpare = null;
  +
  +/**
  + * The text for the maxThreads.
  + */
  +private String maxThreads = null;
  +
  +/**
  + * The text for the minSpare.
  + */
  +private String minSpare = null;
  +
  +/**
* The text for the port.
*/
   private String portText = null;
  @@ -824,7 +839,6 @@
   
   }
   
  -
   /**
* Set the maxKeepAliveText.
*/
  @@ -836,6 +850,63 @@
   }
   
   /**
  + * Return the maxSpare.
  + */
  +public String getMaxSpare() {
  +
  +return this.maxSpare;
  +
  +}
  +
  +/**
  + * Set the maxSpare.
  + */
  +
  +public void setMaxSpare(String maxSpare) {
  +
  +this.maxSpare = maxSpare;
  +
  +} 
  +
  +/**
  + * Return the maxThreads.
  + */
  +public String getMaxThreads() {
  +
  +return this.maxThreads;
  +
  +}
  +
  +/**
  + * Set the maxThreads.
  + */
  +
  +public void setMaxThreads(String maxThreads) {
  +
  +this.maxThreads = maxThreads;
  +
  +} 
  +
  +/**
  + * Return the minSpare.
  + */
  +public String getMinSpare() {
  +
  +return this.minSpare;
  +
  +}
  +
  +/**
  + * Set the minSpare.
  + */
  +
  +public void setMinSpare(String minSpare) {
  +
  +this.minSpare = minSpare;
  +
  +}  
  +
  +/**
* Return the port text.
*/
   public String getPortText() {
  @@ -986,6 +1057,9

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java

2003-08-29 Thread amyroh
amyroh  2003/08/28 19:44:16

  Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java
  Log:
  Remove get/set I added previously.  JMX management is done in ConnectorMBean now.  I 
think we can remove other get/setters too.
  
  Revision  ChangesPath
  1.26  +1 -47 
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- CoyoteConnector.java  25 Aug 2003 22:08:24 -  1.25
  +++ CoyoteConnector.java  29 Aug 2003 02:44:16 -  1.26
  @@ -1459,26 +1459,6 @@
   
   //  Management methods 
   
  -
  -public String getAlgorithm() {
  -String ret = (String) getProperty(algorithm);
  -if (ret == null) {
  -ServerSocketFactory factory = this.getFactory();
  -if (factory instanceof CoyoteServerSocketFactory) {
  -ret = ((CoyoteServerSocketFactory)factory).getAlgorithm();
  -}
  -}
  -
  -return ret;
  -}
  -
  -public void setAlgorithm(String algorithm) {
  -setProperty(algorithm, algorithm);
  -ServerSocketFactory factory = this.getFactory();
  -if (factory instanceof CoyoteServerSocketFactory) {
  -((CoyoteServerSocketFactory)factory).setAlgorithm(algorithm);
  -}
  -}
   
   public boolean getClientAuth() {
   boolean ret = false;
  @@ -1548,32 +1528,6 @@
   ServerSocketFactory factory = getFactory();
   if( factory instanceof CoyoteServerSocketFactory ) {
   ((CoyoteServerSocketFactory)factory).setKeystorePass(keystorePass);
  -}
  -}
  -
  -/**
  - * Return keystoreType
  - */
  -public String getKeystoreType() {
  -String ret = (String) getProperty(keytype);
  -if (ret == null) {
  -ServerSocketFactory factory = getFactory();
  -if (factory instanceof CoyoteServerSocketFactory ) {
  -return ((CoyoteServerSocketFactory)factory).getKeystoreType();
  -}
  -}
  -
  -return ret;
  -}
  -
  -/**
  - * Set keystoreType
  - */
  -public void setKeystoreType(String keystoreType) {
  -setProperty(keytype, keystoreType);
  -ServerSocketFactory factory = getFactory();
  -if( factory instanceof CoyoteServerSocketFactory ) {
  -((CoyoteServerSocketFactory)factory).setKeystoreType(keystoreType);
   }
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_es.properties

2003-08-29 Thread amyroh
amyroh  2003/08/29 12:09:36

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_es.properties
  Log:
  Forgot these properties in Spanish properties file.
  
  Revision  ChangesPath
  1.16  +3 -0  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApplicationResources_es.properties25 Aug 2003 22:16:38 -  1.15
  +++ ApplicationResources_es.properties29 Aug 2003 19:09:36 -  1.16
  @@ -127,6 +127,9 @@
   connector.milliseconds=milisegundos
   connector.max=M\u00e1ximo
   connector.maxkeepalive=Peticiones Máximas De KeepAlive
  +connector.maxspare=Max Spare Threads
  +connector.maxthreads=Max Threads
  +connector.minspare=Min Spare Threads
   connector.proxy.name=Nombre del Proxy
   connector.proxy.portnumber=N\u00fmero de Puerto del Proxy
   connector.algorithm=Algoritmo
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/users user.jsp

2003-08-28 Thread amyroh
amyroh  2003/08/27 16:32:30

  Modified:webapps/admin login.jsp
   webapps/admin/users user.jsp
  Log:
  Get rid of the maximum size of the username and password fields.
  Fix 22268 to allow to use SHA digest.
  
  Revision  ChangesPath
  1.4   +2 -2  jakarta-tomcat-catalina/webapps/admin/login.jsp
  
  Index: login.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/login.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- login.jsp 23 Jan 2003 00:07:07 -  1.3
  +++ login.jsp 27 Aug 2003 23:32:30 -  1.4
  @@ -51,7 +51,7 @@
   font color=#FFlabel for=usernamebean:message 
key=prompt.username//label/font
 /th
 td align=left
  -input type=text name=j_username size=16 maxlength=16 
id=username/
  +input type=text name=j_username size=16 id=username/
 /td
   /tr
   p
  @@ -60,7 +60,7 @@
   font color=#FFlabel for=passwordbean:message 
key=prompt.password//label/font
 /th
 td align=left
  -input type=password name=j_password size=16 maxlength=16 
id=password/
  +input type=password name=j_password size=16 id=password/
 /td
   /tr
   
  
  
  
  1.7   +2 -2  jakarta-tomcat-catalina/webapps/admin/users/user.jsp
  
  Index: user.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/user.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- user.jsp  28 Mar 2003 22:38:35 -  1.6
  +++ user.jsp  27 Aug 2003 23:32:30 -  1.7
  @@ -85,7 +85,7 @@
   html:hidden property=username/
 /logic:present
 logic:notPresent name=userForm property=objectName
  -html:text property=username size=24 maxlength=32 
styleId=username/
  +html:text property=username size=24 styleId=username/
 /logic:notPresent
   /controls:data
 /controls:row
  @@ -96,7 +96,7 @@
 bean:message key=users.prompt.password/
   /controls:label
   controls:data
  -  html:password property=password size=24 maxlength=32 
styleId=password/
  +  html:password property=password size=24 styleId=password/
   /controls:data
 /controls:row
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users ListUsersAction.java

2003-08-27 Thread amyroh
amyroh  2003/08/27 11:38:46

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
ListUsersAction.java
  Log:
  Fix to return null when an error response is sent- patch submitted by Jeff Tulley 
[EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.2   +5 -4  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java
  
  Index: ListUsersAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ListUsersAction.java  18 Jul 2002 16:48:22 -  1.1
  +++ ListUsersAction.java  27 Aug 2003 18:38:46 -  1.2
  @@ -164,6 +164,7 @@
   (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage
(locale, users.error.attribute.get, users));
  +return null;
   }
   
   // Stash the results in request scope
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users ListGroupsAction.java ListRolesAction.java

2003-08-27 Thread amyroh
amyroh  2003/08/27 11:38:58

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
ListGroupsAction.java ListRolesAction.java
  Log:
  Fix to return null when an error response is sent- patch submitted by Jeff Tulley 
[EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.2   +5 -4  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java
  
  Index: ListGroupsAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ListGroupsAction.java 18 Jul 2002 16:48:22 -  1.1
  +++ ListGroupsAction.java 27 Aug 2003 18:38:58 -  1.2
  @@ -164,6 +164,7 @@
   (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage
(locale, users.error.attribute.get, groups));
  +return null;
   }
   
   // Stash the results in request scope
  
  
  
  1.2   +5 -4  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java
  
  Index: ListRolesAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ListRolesAction.java  18 Jul 2002 16:48:22 -  1.1
  +++ ListRolesAction.java  27 Aug 2003 18:38:58 -  1.2
  @@ -164,6 +164,7 @@
   (HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage
(locale, users.error.attribute.get, roles));
  +return null;
   }
   
   // Stash the results in request scope
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/connector connector.jsp

2003-08-26 Thread amyroh
amyroh  2003/08/25 15:16:39

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
   webapps/admin/connector connector.jsp
  Log:
  Update admin with the latest connector changes.
  
  Revision  ChangesPath
  1.16  +12 -0 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApplicationResources_en.properties24 Aug 2003 22:52:45 -  1.15
  +++ ApplicationResources_en.properties25 Aug 2003 22:16:38 -  1.16
  @@ -114,20 +114,32 @@
   connector.type=Type
   connector.scheme=Scheme
   connector.accept.count=Accept Count
  +connector.compression=Compression
  +connector.connection.linger=Connection Linger
   connector.connection.timeout=Connection Timeout
  +connector.connection.uploadTimeout=Connection Upload Timeout
   connector.default.buffer=Default Buffer Size
  +connector.connection.disableUploadTimeout=Disable Upload Timeout
   connector.enable.dns=Enable DNS Lookups
   connector.address.ip=IP Address
   connector.redirect.portnumber=Redirect Port Number
   connector.min=Minimum
   connector.milliseconds=milliseconds
   connector.max=Maximum
  +connector.maxkeepalive=Max KeepAlive Requests
   connector.proxy.name=Proxy Name
   connector.proxy.portnumber=Proxy Port Number
  +connector.algorithm=Algorithm
  +connector.ciphers=Ciphers
   connector.client.auth=Client Authentication
   connector.keystore.filename=Keystore Filename
   connector.keystore.password=Keystore Password
  +connector.keystore.type=Keystore Type
  +connector.sslProtocol=SSL Protocol
   connector.keyPass.warning=liPlease use keytool to generate certificate./li
  +connector.secure=Secure
  +connector.tcpNoDelay=TCP No Delay 
  +connector.xpoweredby=X Powered By 
   host.properties=Host Properties
   host.name=Name
   host.base=Application Base
  
  
  
  1.15  +12 -0 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApplicationResources_es.properties24 Aug 2003 22:52:45 -  1.14
  +++ ApplicationResources_es.properties25 Aug 2003 22:16:38 -  1.15
  @@ -114,20 +114,32 @@
   connector.type=Tipo
   connector.scheme=Esquema
   connector.accept.count=Accept Count
  +connector.compression=Compresión
  +connector.connection.linger=La Conexión Se rezaga
   connector.connection.timeout=Tiempo De Espera De La Conexi\u00f3n
  +connector.connection.uploadTimeout=Descanso Del Upload De la Conexión
   connector.default.buffer=Tama\u00f1o por defecto del Buffer
  +connector.connection.disableUploadTimeout=Inhabilite El Descanso Del Upload
   connector.enable.dns=Permitir Busquedas en el DNS
   connector.address.ip=Direcci\u00f3n IP
   connector.redirect.portnumber=N\u00fmero del puerto de redireccionamiento
   connector.min=M\u00ednimo
   connector.milliseconds=milisegundos
   connector.max=M\u00e1ximo
  +connector.maxkeepalive=Peticiones Máximas De KeepAlive
   connector.proxy.name=Nombre del Proxy
   connector.proxy.portnumber=N\u00fmero de Puerto del Proxy
  +connector.algorithm=Algoritmo
  +connector.ciphers=Cifras
   connector.client.auth=Client Authentication
   connector.keystore.filename=Keystore Filename
   connector.keystore.password=Keystore Password
  +connector.keystore.type=Keystore Type
  +connector.sslProtocol=SSL Protocol
   connector.keyPass.warning=liUtilice por favor el keytool para generar el 
certificado/li
  +connector.secure=seguro
  +connector.tcpNoDelay=TCP No Delay 
  +connector.xpoweredby=X Powered By 
   host.properties=Propiedades del ordenador principal
   host.name=Nombre
   host.base=Base De la Aplicacion
  
  
  
  1.4   +16 -4 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
  
  Index: AddConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat

cvs commit: jakarta-tomcat-catalina/webapps/admin/host host.jsp

2003-08-25 Thread amyroh
amyroh  2003/08/24 15:52:46

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
ApplicationResources_es.properties
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
AddHostAction.java EditHostAction.java
HostForm.java SaveHostAction.java
   webapps/admin/host host.jsp
  Log:
  Update the host properties in admin.
- liveDeploy - autoDeploy: dynamic deployement of webapps put in the host appBase
- autoDeploy - deployOnStartup: Deploy webapps from appBase on startup
  
  Revision  ChangesPath
  1.15  +1 -1  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ApplicationResources_en.properties13 May 2003 08:33:14 -  1.14
  +++ ApplicationResources_en.properties24 Aug 2003 22:52:45 -  1.15
  @@ -133,7 +133,7 @@
   host.base=Application Base
   host.autoDeploy=Auto Deploy
   host.deployXML=Deploy XML
  -host.liveDeploy=Live Deploy
  +host.deployOnStartup=Deploy On Startup
   host.wars=Unpack WARs
   host.aliases=Aliases
   host.alias.name=Alias Name
  
  
  
  1.14  +1 -1  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ApplicationResources_es.properties13 May 2003 08:33:14 -  1.13
  +++ ApplicationResources_es.properties24 Aug 2003 22:52:45 -  1.14
  @@ -133,7 +133,7 @@
   host.base=Base De la Aplicacion
   host.autoDeploy=El Automóvil Despliega 
   host.deployXML=Despliegue XML 
  -host.liveDeploy=Vivo Despliegue 
  +host.deployOnStartup=Despliegue En Arranque 
   host.wars=Desempaquetar WARs
   host.aliases=Aliases
   host.alias.name=Alias Nombre
  
  
  
  1.7   +5 -5  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java
  
  Index: AddHostAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AddHostAction.java24 Apr 2003 07:56:33 -  1.6
  +++ AddHostAction.java24 Aug 2003 22:52:45 -  1.7
  @@ -137,7 +137,7 @@
   hostFm.setAppBase();
   hostFm.setAutoDeploy(true);
   hostFm.setDeployXML(true);
  -hostFm.setLiveDeploy(true);
  +hostFm.setDeployOnStartup(true);
   hostFm.setUnpackWARs(true);   
   hostFm.setXmlNamespaceAware(false);
   hostFm.setXmlValidation(false);
  
  
  
  1.6   +6 -6  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java
  
  Index: EditHostAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EditHostAction.java   18 Mar 2003 10:48:22 -  1.5
  +++ EditHostAction.java   24 Aug 2003 22:52:45 -  1.6
  @@ -209,8 +209,8 @@
   attribute = deployXML;
   hostFm.setDeployXML
   (((Boolean) mBServer.getAttribute(hname, attribute)).toString());
  -attribute = liveDeploy;
  -hostFm.setLiveDeploy
  +attribute = deployOnStartup;
  +hostFm.setDeployOnStartup
   (((Boolean) mBServer.getAttribute(hname, attribute)).toString());   
 
   attribute = unpackWARs;
   hostFm.setUnpackWARs
  
  
  
  1.8   +15 -15
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java
  
  Index: HostForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5 CoyoteConnector.java mbeans-descriptors.xml

2003-08-25 Thread amyroh
amyroh  2003/08/25 15:08:24

  Modified:catalina/src/share/org/apache/coyote/tomcat5
CoyoteConnector.java mbeans-descriptors.xml
  Log:
  Update connector mbean management attributes.
  
  Revision  ChangesPath
  1.25  +48 -1 
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteConnector.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CoyoteConnector.java  20 Aug 2003 16:27:35 -  1.24
  +++ CoyoteConnector.java  25 Aug 2003 22:08:24 -  1.25
  @@ -1459,6 +1459,27 @@
   
   //  Management methods 
   
  +
  +public String getAlgorithm() {
  +String ret = (String) getProperty(algorithm);
  +if (ret == null) {
  +ServerSocketFactory factory = this.getFactory();
  +if (factory instanceof CoyoteServerSocketFactory) {
  +ret = ((CoyoteServerSocketFactory)factory).getAlgorithm();
  +}
  +}
  +
  +return ret;
  +}
  +
  +public void setAlgorithm(String algorithm) {
  +setProperty(algorithm, algorithm);
  +ServerSocketFactory factory = this.getFactory();
  +if (factory instanceof CoyoteServerSocketFactory) {
  +((CoyoteServerSocketFactory)factory).setAlgorithm(algorithm);
  +}
  +}
  +
   public boolean getClientAuth() {
   boolean ret = false;
   
  @@ -1530,6 +1551,32 @@
   }
   }
   
  +/**
  + * Return keystoreType
  + */
  +public String getKeystoreType() {
  +String ret = (String) getProperty(keytype);
  +if (ret == null) {
  +ServerSocketFactory factory = getFactory();
  +if (factory instanceof CoyoteServerSocketFactory ) {
  +return ((CoyoteServerSocketFactory)factory).getKeystoreType();
  +}
  +}
  +
  +return ret;
  +}
  +
  +/**
  + * Set keystoreType
  + */
  +public void setKeystoreType(String keystoreType) {
  +setProperty(keytype, keystoreType);
  +ServerSocketFactory factory = getFactory();
  +if( factory instanceof CoyoteServerSocketFactory ) {
  +((CoyoteServerSocketFactory)factory).setKeystoreType(keystoreType);
  +}
  +}
  +
   /**
* Gets the list of SSL cipher suites that are to be enabled
*
  
  
  
  1.7   +48 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/mbeans-descriptors.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mbeans-descriptors.xml19 Aug 2003 16:13:37 -  1.6
  +++ mbeans-descriptors.xml25 Aug 2003 22:08:24 -  1.7
  @@ -15,6 +15,10 @@
 description=The IP address on which to bind
type=java.lang.String/
   
  +attribute   name=algorithm
  +  description=The certificate encoding algorithm to be used
  + type=java.lang.String/
  +
   attribute   name=bufferSize
 description=The input buffer size we should create on input streams
type=int/
  @@ -32,26 +36,30 @@
 description=Comma-separated list of SSL cipher suites to be enabled
type=java.lang.String/
   
  -attribute   name=keyAlias
  -  description=Alias name of this connector's keypair and supporting 
certificate chain
  - type=java.lang.String/
  -
  -attribute   name=sslProtocol
  -  description=SSL protocol variant to be used
  +attribute   name=compression
  +  description=Compression value
type=java.lang.String/
   
  -attribute   name=sslProtocols
  -  description=Comma-separated list of SSL protocol variants to be enabled
  - type=java.lang.String/
  +attribute   name=connectionLinger
  +  description=Linger value on the incoming connection
  + type=int/
   
   attribute   name=connectionTimeout
 description=Timeout value on the incoming connection
type=int/
   
  +attribute   name=connectionUploadTimeout
  +  description=Timeout value on the incoming connection during request 
processing
  + type=int/
  +
   attribute   name=debug
 description=The debugging detail level for this component
type=int/
   
  +attribute

cvs commit: jakarta-tomcat-catalina/webapps/admin build.xml

2003-08-18 Thread amyroh
amyroh  2003/08/18 16:53:49

  Modified:webapps/admin build.xml
  Log:
  Fix typo - bugzilla 19469.
  
  Revision  ChangesPath
  1.8   +1 -1  jakarta-tomcat-catalina/webapps/admin/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml 11 Feb 2003 03:34:43 -  1.7
  +++ build.xml 18 Aug 2003 23:53:49 -  1.8
  @@ -72,7 +72,7 @@
classpath=${struts.jar} /
   available property=beanutils.present
classname=org.apache.commons.beanutils.PropertyUtils
  - classpath=${common-beanutils.jar} /
  + classpath=${commons-beanutils.jar} /
   available property=regexp.present
classname=org.apache.regexp.RE
classpath=${regexp.jar} /
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/webapps/admin build.xml

2003-08-18 Thread amyroh
amyroh  2003/08/18 16:54:26

  Modified:webapps/admin build.xml
  Log:
  Backport patch.  Fix typo - bugzilla 19469.
  
  Revision  ChangesPath
  1.6   +1 -1  jakarta-tomcat-4.0/webapps/admin/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml 11 Feb 2003 02:27:15 -  1.5
  +++ build.xml 18 Aug 2003 23:54:26 -  1.6
  @@ -67,7 +67,7 @@
classpath=${struts.jar} /
   available property=beanutils.present
classname=org.apache.commons.beanutils.PropertyUtils
  - classpath=${common-beanutils.jar} /
  + classpath=${commons-beanutils.jar} /
   
   
   !-- JAR files availability flags --
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml

2003-08-18 Thread amyroh
amyroh  2003/08/18 17:43:09

  Modified:catalina/src/share/org/apache/catalina/mbeans
mbeans-descriptors.xml
  Log:
  Add missing className property for mbean description.
  It seems like it was accidently removed by previous commit.
  Should fix bugzilla 22328.
  
  Revision  ChangesPath
  1.77  +8 -6  
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- mbeans-descriptors.xml8 Jul 2003 23:12:51 -   1.76
  +++ mbeans-descriptors.xml19 Aug 2003 00:43:09 -  1.77
  @@ -10,11 +10,12 @@
--
   
   mbeans-descriptors
  -  mbean name=AccessLogValve
  - description=Valve that generates a web server access log
  - domain=Catalina
  - group=Valve
  - type=org.apache.catalina.valves.AccessLogValve
  +  mbean  name=AccessLogValve
  + className=org.apache.catalina.mbeans.ClassNameMBean
  +   description=Valve that generates a web server access log
  +   domain=Catalina
  +group=Valve
  + type=org.apache.catalina.valves.AccessLogValve
   
   attribute name=className
  description=Fully qualified class name of the managed object
  @@ -499,6 +500,7 @@
 /mbean
   
 mbean name=ExtendedAccessLogValve
  + className=org.apache.catalina.mbeans.ClassNameMBean
description=Valve that generates a web server access log
domain=Catalina
group=Valve
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java StandardWrapper.java

2003-07-29 Thread amyroh
amyroh  2003/07/29 08:55:15

  Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java StandardWrapper.java
  Log:
  Fix the obvious typos.
  
  Revision  ChangesPath
  1.76  +3 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- StandardContext.java  29 Jul 2003 00:09:42 -  1.75
  +++ StandardContext.java  29 Jul 2003 15:55:15 -  1.76
  @@ -4218,10 +4218,10 @@
   // Notify our interested LifecycleListeners
   lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
   
  -// Send j2ee.state.stoping notification 
  +// Send j2ee.state.stopping notification 
   if (this.getObjectName() != null) {
   Notification notification = 
  -new Notification(j2ee.state.stoping, this.getObjectName(), 
  +new Notification(j2ee.state.stopping, this.getObjectName(), 
   sequenceNumber++);
   broadcaster.sendNotification(notification);
   }
  
  
  
  1.31  +7 -7  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- StandardWrapper.java  29 Jul 2003 00:09:42 -  1.30
  +++ StandardWrapper.java  29 Jul 2003 15:55:15 -  1.31
  @@ -1567,10 +1567,10 @@
   
   setAvailable(Long.MAX_VALUE);
   
  -// Send j2ee.state.stoping notification 
  +// Send j2ee.state.stopping notification 
   if (this.getObjectName() != null) {
   Notification notification = 
  -new Notification(j2ee.state.stoping, this.getObjectName(), 
  +new Notification(j2ee.state.stopping, this.getObjectName(), 
   sequenceNumber++);
   broadcaster.sendNotification(notification);
   }
  @@ -1586,7 +1586,7 @@
   // Shut down this component
   super.stop();
   
  -// Send j2ee.state.stopped notification 
  +// Send j2ee.state.stoppped notification 
   if (this.getObjectName() != null) {
   Notification notification = 
   new Notification(j2ee.state.stopped, this.getObjectName(), 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core ContainerBase.java StandardContext.java StandardWrapper.java

2003-07-28 Thread amyroh
amyroh  2003/07/28 17:09:43

  Modified:catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardContext.java
StandardWrapper.java
  Log:
  Send JSR77 spec required notifications for J2EE mbeans.
  
  Revision  ChangesPath
  1.26  +3 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
  
  Index: ContainerBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ContainerBase.java26 May 2003 22:03:59 -  1.25
  +++ ContainerBase.java29 Jul 2003 00:09:42 -  1.26
  @@ -1461,7 +1461,9 @@
   }
   
   public String getObjectName() {
  -return oname.toString();
  +if (oname != null) {
  +return oname.toString();
  +} else return null;
   }
   
   public String getDomain() {
  
  
  
  1.75  +70 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- StandardContext.java  22 Jul 2003 21:01:26 -  1.74
  +++ StandardContext.java  29 Jul 2003 00:09:42 -  1.75
  @@ -85,11 +85,13 @@
   import javax.servlet.ServletRequestListener;
   import javax.naming.NamingException;
   import javax.naming.directory.DirContext;
  -import javax.management.ObjectName;
  -import javax.management.MBeanServer;
  -import javax.management.MalformedObjectNameException;
   import javax.management.InstanceNotFoundException;
  +import javax.management.MalformedObjectNameException;
   import javax.management.MBeanRegistrationException;
  +import javax.management.MBeanServer;
  +import javax.management.Notification;
  +import javax.management.NotificationBroadcasterSupport;
  +import javax.management.ObjectName;
   import org.apache.naming.ContextBindings;
   import org.apache.naming.resources.BaseDirContext;
   import org.apache.naming.resources.FileDirContext;
  @@ -155,6 +157,7 @@
   super();
   pipeline.setBasic(new StandardContextValve());
   namingResources.setContainer(this);
  +broadcaster = new NotificationBroadcasterSupport();
   
   }
   
  @@ -199,8 +202,12 @@
* The application available flag for this Context.
*/
   private boolean available = false;
  -
  -
  +
  +/**
  + * The broadcaster that sends j2ee notifications. 
  + */
  +private NotificationBroadcasterSupport broadcaster = null;
  +
   /**
* The Locale to character set mapper for this application.
*/
  @@ -441,7 +448,11 @@
*/
   private int sessionTimeout = 30;
   
  -
  +/**
  + * The notification sequence number.
  + */
  +private long sequenceNumber = 0;
  +
   /**
* The status code error pages for this web application, keyed by
* HTTP status code (as an Integer).
  @@ -640,8 +651,7 @@
  new Boolean(this.available));
   
   }
  -
  -
  +
   /**
* Return the Locale to character set mapper for this Context.
*/
  @@ -4118,6 +4128,15 @@
   lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
   startTime=System.currentTimeMillis();
   
  +
  +// Send j2ee.state.running notification 
  +if (this.getObjectName() != null) {
  +Notification notification = 
  +new Notification(j2ee.state.running, this.getObjectName(), 
  +sequenceNumber++);
  +broadcaster.sendNotification(notification);
  +}
  +
   // Close all JARs right away to avoid always opening a peak number 
   // of files on startup
   if (getLoader() instanceof WebappLoader) {
  @@ -4198,7 +4217,15 @@
   
   // Notify our interested LifecycleListeners
   lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
  -
  +
  +// Send j2ee.state.stoping notification 
  +if (this.getObjectName() != null) {
  +Notification notification = 
  +new Notification(j2ee.state.stoping, this.getObjectName(), 
  +sequenceNumber++);
  +broadcaster.sendNotification(notification);
  +}
  +
   // Mark this application as unavailable while we shut down
   setAvailable(false);
   
  @@ -4262,6 +4289,14 @@
   
   }
   
  +// Send

cvs commit: jakarta-tomcat-catalina/webapps/admin/context context.jsp

2003-05-27 Thread amyroh
amyroh  2003/05/27 16:11:25

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
AddContextAction.java EditContextAction.java
SaveContextAction.java
   webapps/admin/context context.jsp
  Log:
  Remove checkInterval attribute since it no longer exists.
  
  Revision  ChangesPath
  1.4   +6 -6  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
  
  Index: AddContextAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddContextAction.java 18 Mar 2003 10:48:15 -  1.3
  +++ AddContextAction.java 27 May 2003 23:11:25 -  1.4
  @@ -151,11 +151,11 @@
   contextFm.setPath();
   contextFm.setDebugLvl(0);
   //loader initialization
  -contextFm.setLdrCheckInterval(15);
  +//contextFm.setLdrCheckInterval(15);
   contextFm.setLdrDebugLvl(0);
   contextFm.setLdrReloadable(false);
   //manager initialization
  -contextFm.setMgrCheckInterval(60);
  +//contextFm.setMgrCheckInterval(60);
   contextFm.setMgrDebugLvl(0);
   contextFm.setMgrMaxSessions(-1);
   contextFm.setMgrSessionIDInit();
  
  
  
  1.5   +10 -10
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java
  
  Index: EditContextAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EditContextAction.java20 Mar 2003 05:40:09 -  1.4
  +++ EditContextAction.java27 May 2003 23:11:25 -  1.5
  @@ -257,9 +257,9 @@
   attribute = debug;
   contextFm.setLdrDebugLvl
   (((Integer) mBServer.getAttribute(lname, attribute)).toString());
  -attribute = checkInterval;
  -contextFm.setLdrCheckInterval
  -(((Integer) mBServer.getAttribute(lname, attribute)).toString());
  +//attribute = checkInterval;
  +//contextFm.setLdrCheckInterval
  +//(((Integer) mBServer.getAttribute(lname, attribute)).toString());
   attribute = reloadable;
   contextFm.setLdrReloadable
   (((Boolean) mBServer.getAttribute(lname, attribute)).toString());
  @@ -274,9 +274,9 @@
   attribute = maxActiveSessions;
   contextFm.setMgrMaxSessions
   (((Integer) mBServer.getAttribute(mname, attribute)).toString());
  -attribute = checkInterval;
  -contextFm.setMgrCheckInterval
  -(((Integer) mBServer.getAttribute(mname, attribute)).toString());
  +//attribute = checkInterval;
  +//contextFm.setMgrCheckInterval
  +//(((Integer) mBServer.getAttribute(mname, attribute)).toString());
   
   } catch (Throwable t) {
   getServlet().log
  
  
  
  1.11  +21 -21
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
  
  Index: SaveContextAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SaveContextAction.java13 May 2003 01:15:08 -  1.10
  +++ SaveContextAction.java27 May 2003 23:11:25 -  1.11
  @@ -404,15 +404,15 @@
   mBServer.setAttribute(loname,
 new Attribute(debug, new Integer(debug)));
   
  -attribute = checkInterval;
  -int checkInterval = 15;
  -try {
  -checkInterval = Integer.parseInt(cform.getLdrCheckInterval());
  -} catch (Throwable t) {
  -checkInterval = 15;
  -}
  -mBServer.setAttribute(loname,
  -  new Attribute(checkInterval, new 
Integer(checkInterval)));
  +//attribute = checkInterval;
  +//int checkInterval = 15;
  +//try {
  +//checkInterval = Integer.parseInt(cform.getLdrCheckInterval());
  +//} catch (Throwable t) {
  +//checkInterval = 15;
  +//}
  +//mBServer.setAttribute(loname,
  +//  new Attribute

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming ContextBindings.java

2003-05-27 Thread amyroh
amyroh  2003/05/27 16:15:06

  Modified:catalina/src/share/org/apache/catalina/loader
mbeans-descriptors.xml
   catalina/src/share/org/apache/catalina/session
mbeans-descriptors.xml
   catalina/src/share/org/apache/naming ContextBindings.java
  Log:
  Remove checkInterval since it no longer exists.  Also, check for NPE in 
unblindClassLoader.  It was thorwing NPE when newly added context was removed.
  
  Revision  ChangesPath
  1.2   +1 -6  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/mbeans-descriptors.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mbeans-descriptors.xml25 Apr 2003 21:14:35 -  1.1
  +++ mbeans-descriptors.xml27 May 2003 23:15:06 -  1.2
  @@ -7,12 +7,7 @@
  domain=Catalina
   group=Loader
type=org.apache.catalina.loader.WebappLoader
  -
  -attribute   name=checkInterval
  -  description=The number of seconds between checks for modified
  -   classes
  - type=int/
  -
  + 
   attribute   name=className
 description=Fully qualified class name of the managed object
type=java.lang.String
  
  
  
  1.2   +0 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/mbeans-descriptors.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mbeans-descriptors.xml25 Apr 2003 21:14:36 -  1.1
  +++ mbeans-descriptors.xml27 May 2003 23:15:06 -  1.2
  @@ -17,11 +17,6 @@
 description=File source of random - /dev/urandom or a pipe
type=java.lang.String/
   
  -attribute   name=checkInterval
  -  description=The interval (in seconds) between checks for expired
  -   sessions
  - type=int/
  -
   attribute   name=className
 description=Fully qualified class name of the managed object
type=java.lang.String
  
  
  
  1.2   +5 -6  
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ContextBindings.java
  
  Index: ContextBindings.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/ContextBindings.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContextBindings.java  18 Jul 2002 16:47:31 -  1.1
  +++ ContextBindings.java  27 May 2003 23:15:06 -  1.2
  @@ -347,7 +347,7 @@
ClassLoader classLoader) {
   if (ContextAccessController.checkSecurityToken(name, token)) {
   Object n = clNameBindings.get(classLoader);
  -if (!(n.equals(name))) {
  +if ((n==null) || !(n.equals(name))) {
   return;
   }
   clBindings.remove(classLoader);
  @@ -407,4 +407,3 @@
   
   
   }
  -
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context ContextForm.java

2003-04-06 Thread amyroh
amyroh  2003/04/06 19:38:15

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java
  Log:
  Uncomment path validation on context page.
  
  Revision  ChangesPath
  1.4   +7 -7  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
  
  Index: ContextForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextForm.java  25 Mar 2003 08:29:04 -  1.3
  +++ ContextForm.java  7 Apr 2003 02:38:15 -   1.4
  @@ -799,9 +799,9 @@
   
   // if path is empty, it's root context
   // validate context starting with / only at the time of context 
creation.
  -//if (Create.equalsIgnoreCase(adminAction)  !path.startsWith(/)) {
  -//errors.add(path, new ActionError(error.path.prefix)); 
   
  -//}
  +if (Create.equalsIgnoreCase(adminAction)  !path.startsWith(/)) {
  +errors.add(path, new ActionError(error.path.prefix));   
 
  +}
   
   //if ((workDir == null) || (workDir.length()  1)) {
   //errors.add(workDir, new ActionError(error.workDir.required));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context ContextForm.java

2003-04-06 Thread amyroh
amyroh  2003/04/06 20:28:31

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java
  Log:
  Uncomment path validation on context path.
  
  Revision  ChangesPath
  1.12  +7 -7  
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
  
  Index: ContextForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ContextForm.java  14 Mar 2003 16:00:16 -  1.11
  +++ ContextForm.java  7 Apr 2003 03:28:31 -   1.12
  @@ -798,9 +798,9 @@
   
   // if path is empty, it's root context
   // validate context starting with / only at the time of context 
creation.
  -//if (Create.equalsIgnoreCase(adminAction)  !path.startsWith(/)) {
  -//errors.add(path, new ActionError(error.path.prefix)); 
   
  -//}
  +if (Create.equalsIgnoreCase(adminAction)  !path.startsWith(/)) {
  +errors.add(path, new ActionError(error.path.prefix));   
 
  +}
   
   //if ((workDir == null) || (workDir.length()  1)) {
   //errors.add(workDir, new ActionError(error.workDir.required));
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/users group.jsp groups.jspf roles.jspf user.jsp

2003-03-28 Thread amyroh
amyroh  2003/03/28 14:38:36

  Modified:webapps/admin/users group.jsp groups.jspf roles.jspf
user.jsp
  Log:
  Fix tomcat-user page.
  
  Revision  ChangesPath
  1.6   +2 -1  jakarta-tomcat-catalina/webapps/admin/users/group.jsp
  
  Index: group.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/group.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- group.jsp 12 Feb 2003 10:08:45 -  1.5
  +++ group.jsp 28 Mar 2003 22:38:35 -  1.6
  @@ -108,7 +108,8 @@
 /table
   
 bean:define id=checkboxes scope=page value=true/
  -
  +  br
  +  %@ include file=roles.jspf %
   
 %@ include file=../buttons.jsp %
   
  
  
  
  1.4   +11 -9 jakarta-tomcat-catalina/webapps/admin/users/groups.jspf
  
  Index: groups.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/groups.jspf,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- groups.jspf   28 Mar 2003 02:51:07 -  1.3
  +++ groups.jspf   28 Mar 2003 22:38:35 -  1.4
  @@ -7,22 +7,23 @@
  cellspacing=0 cellpadding=0 width=100%
   tr class=header-row
 logic:present name=checkboxes
  -th scope=col width=5%div align=left class=table-header-text
  +td width=5%div align=left class=table-header-text
 nbsp;
  -/th
  +/td
 /logic:present
  -  th scope=col width=20%div align=left class=table-header-text
  +  td width=20%div align=left class=table-header-text
   bean:message key=users.list.groupname/
  -  /div/th
  -  th scope=coldiv align=left class=table-header-text
  +  /div/td
  +  tddiv align=left class=table-header-text
   bean:message key=users.list.description/
  -  /div/th
  +  /div/td
   /tr
  +logic:present name=groupsForm
   logic:iterate name=groupsForm property=groups
id=group type=java.lang.String
 tr class=line-row
   logic:present name=checkboxes
  -  td scope=rowdiv align=center class=table-normal-text
  +  tddiv align=center class=table-normal-text
   logic:present name=userForm
label for=groups/label
 html:multibox property=groups value=%= group % 
styleId=groups/
  @@ -34,7 +35,7 @@
   /logic:notPresent
 /td
   /logic:present
  -td scope=rowdiv align=left class=table-normal-textnbsp;
  +tddiv align=left class=table-normal-textnbsp;
 html:link page='%= /users/setUpGroup.do?objectName= + 
  URLEncoder.encode(group) +
  databaseName= +
  @@ -42,11 +43,12 @@
   controls:attribute name=group attribute=groupname/
 /html:link
   /div/td
  -td scope=rowdiv align=left class=table-normal-textnbsp;
  +tddiv align=left class=table-normal-textnbsp;
 controls:attribute name=group attribute=description/
   /div/td
 /tr
   /logic:iterate
  +/logic:present
 /table
   
   /td/tr/table
  
  
  
  1.4   +9 -7  jakarta-tomcat-catalina/webapps/admin/users/roles.jspf
  
  Index: roles.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/roles.jspf,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- roles.jspf28 Mar 2003 02:51:07 -  1.3
  +++ roles.jspf28 Mar 2003 22:38:35 -  1.4
  @@ -11,18 +11,19 @@
 nbsp;
   /td
 /logic:present
  -  th scope=col width=20%div align=left class=table-header-text
  +  td width=20%div align=left class=table-header-text
   bean:message key=users.list.rolename/
  -  /div/th
  -  th scope=coldiv align=left class=table-header-text
  +  /div/td
  +  tddiv align=left class=table-header-text
   bean:message key=users.list.description/
  -  /div/th
  +  /div/td
   /tr
  +logic:present name=rolesForm
   logic:iterate name=rolesForm property=roles
id=role type=java.lang.String
 tr class=line-row
   logic:present name=checkboxes
  -  td scope=rowdiv align=center class=table-normal-text
  +  tddiv align=center class=table-normal-text
   logic:present name=groupForm
 label for=roles/label
 html:multibox property=roles value=%= role % styleId=roles/
  @@ -40,7 +41,7 @@
   /logic:notPresent
 /td
   /logic:present
  -td scope=rowdiv align=left class=table-normal-textnbsp;
  +tddiv align=left class=table-normal

cvs commit: jakarta-tomcat-4.0/webapps/admin/users group.jsp groups.jspf roles.jspf user.jsp

2003-03-28 Thread amyroh
amyroh  2003/03/28 14:46:38

  Modified:webapps/admin/users group.jsp groups.jspf roles.jspf
user.jsp
  Log:
  Fix bugzilla 18268.
  
  Revision  ChangesPath
  1.8   +1 -0  jakarta-tomcat-4.0/webapps/admin/users/group.jsp
  
  Index: group.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/group.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- group.jsp 12 Feb 2003 10:04:10 -  1.7
  +++ group.jsp 28 Mar 2003 22:46:38 -  1.8
  @@ -109,6 +109,7 @@
   
 bean:define id=checkboxes scope=page value=true/
 br
  +  %@ include file=roles.jspf %
   
 %@ include file=../buttons.jsp %
   
  
  
  
  1.4   +2 -0  jakarta-tomcat-4.0/webapps/admin/users/groups.jspf
  
  Index: groups.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/groups.jspf,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- groups.jspf   15 Jan 2003 22:25:22 -  1.3
  +++ groups.jspf   28 Mar 2003 22:46:38 -  1.4
  @@ -18,6 +18,7 @@
   bean:message key=users.list.description/
 /div/td
   /tr
  +logic:present name=groupsForm
   logic:iterate name=groupsForm property=groups
id=group type=java.lang.String
 tr class=line-row
  @@ -47,6 +48,7 @@
   /div/td
 /tr
   /logic:iterate
  +/logic:present
 /table
   
   /td/tr/table
  
  
  
  1.5   +2 -0  jakarta-tomcat-4.0/webapps/admin/users/roles.jspf
  
  Index: roles.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/roles.jspf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- roles.jspf15 Jan 2003 22:25:22 -  1.4
  +++ roles.jspf28 Mar 2003 22:46:38 -  1.5
  @@ -18,6 +18,7 @@
   bean:message key=users.list.description/
 /div/td
   /tr
  +logic:present name=rolesForm
   logic:iterate name=rolesForm property=roles
id=role type=java.lang.String
 tr class=line-row
  @@ -53,6 +54,7 @@
   /div/td
 /tr
   /logic:iterate
  +/logic:present
 /table
   
   /td/tr/table
  
  
  
  1.9   +3 -0  jakarta-tomcat-4.0/webapps/admin/users/user.jsp
  
  Index: user.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/user.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- user.jsp  12 Feb 2003 10:04:10 -  1.8
  +++ user.jsp  28 Mar 2003 22:46:38 -  1.9
  @@ -120,6 +120,9 @@
   
 bean:define id=checkboxes scope=page value=true/
 br
  +  %@ include file=groups.jspf %
  +  br
  +  %@ include file=roles.jspf %
   
 %@ include file=../buttons.jsp %
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/users groups.jspf roles.jspf

2003-03-28 Thread amyroh
amyroh  2003/03/28 14:56:33

  Modified:webapps/admin/users groups.jspf roles.jspf
  Log:
  Put back scope for accessibility.
  
  Revision  ChangesPath
  1.5   +9 -9  jakarta-tomcat-catalina/webapps/admin/users/groups.jspf
  
  Index: groups.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/groups.jspf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- groups.jspf   28 Mar 2003 22:38:35 -  1.4
  +++ groups.jspf   28 Mar 2003 22:56:32 -  1.5
  @@ -7,23 +7,23 @@
  cellspacing=0 cellpadding=0 width=100%
   tr class=header-row
 logic:present name=checkboxes
  -td width=5%div align=left class=table-header-text
  +th scope=col width=5%div align=left class=table-header-text
 nbsp;
  -/td
  +/th
 /logic:present
  -  td width=20%div align=left class=table-header-text
  +  th scope=col width=20%div align=left class=table-header-text
   bean:message key=users.list.groupname/
  -  /div/td
  -  tddiv align=left class=table-header-text
  +  /div/th
  +  th scope=coldiv align=left class=table-header-text
   bean:message key=users.list.description/
  -  /div/td
  +  /div/th
   /tr
   logic:present name=groupsForm
   logic:iterate name=groupsForm property=groups
id=group type=java.lang.String
 tr class=line-row
   logic:present name=checkboxes
  -  tddiv align=center class=table-normal-text
  +  td scope=rowdiv align=center class=table-normal-text
   logic:present name=userForm
label for=groups/label
 html:multibox property=groups value=%= group % 
styleId=groups/
  @@ -35,7 +35,7 @@
   /logic:notPresent
 /td
   /logic:present
  -tddiv align=left class=table-normal-textnbsp;
  +td scope=rowdiv align=left class=table-normal-textnbsp;
 html:link page='%= /users/setUpGroup.do?objectName= + 
  URLEncoder.encode(group) +
  databaseName= +
  @@ -43,7 +43,7 @@
   controls:attribute name=group attribute=groupname/
 /html:link
   /div/td
  -tddiv align=left class=table-normal-textnbsp;
  +td scope=rowdiv align=left class=table-normal-textnbsp;
 controls:attribute name=group attribute=description/
   /div/td
 /tr
  
  
  
  1.5   +7 -7  jakarta-tomcat-catalina/webapps/admin/users/roles.jspf
  
  Index: roles.jspf
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/roles.jspf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- roles.jspf28 Mar 2003 22:38:35 -  1.4
  +++ roles.jspf28 Mar 2003 22:56:32 -  1.5
  @@ -11,19 +11,19 @@
 nbsp;
   /td
 /logic:present
  -  td width=20%div align=left class=table-header-text
  +  th scope=col width=20%div align=left class=table-header-text
   bean:message key=users.list.rolename/
  -  /div/td
  -  tddiv align=left class=table-header-text
  +  /div/th
  +  th scope=coldiv align=left class=table-header-text
   bean:message key=users.list.description/
  -  /div/td
  +  /div/th
   /tr
   logic:present name=rolesForm
   logic:iterate name=rolesForm property=roles
id=role type=java.lang.String
 tr class=line-row
   logic:present name=checkboxes
  -  tddiv align=center class=table-normal-text
  +  td scope=rowdiv align=center class=table-normal-text
   logic:present name=groupForm
 label for=roles/label
 html:multibox property=roles value=%= role % styleId=roles/
  @@ -41,7 +41,7 @@
   /logic:notPresent
 /td
   /logic:present
  -tddiv align=left class=table-normal-textnbsp;
  +td scope=rowdiv align=left class=table-normal-textnbsp;
 html:link page='%= /users/setUpRole.do?objectName= + 
  URLEncoder.encode(role) +
  databaseName= +
  @@ -49,7 +49,7 @@
   controls:attribute name=role attribute=rolename/
 /html:link
   /div/td
  -tddiv align=left class=table-normal-textnbsp;
  +td scope=rowdiv align=left class=table-normal-textnbsp;
 controls:attribute name=role attribute=description/
   /div/td
 /tr
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/service service.jsp

2003-03-27 Thread amyroh
amyroh  2003/03/27 00:26:26

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
SaveServiceAction.java
   webapps/admin/host host.jsp
   webapps/admin/service service.jsp
  Log:
  Minor fix for input length and correct tree node display.
  
  Revision  ChangesPath
  1.7   +25 -4 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java
  
  Index: SaveServiceAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SaveServiceAction.java24 Mar 2003 09:17:02 -  1.6
  +++ SaveServiceAction.java27 Mar 2003 08:26:25 -  1.7
  @@ -87,6 +87,7 @@
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.util.MessageResources;
   import org.apache.webapp.admin.ApplicationServlet;
  +import org.apache.webapp.admin.Lists;
   import org.apache.webapp.admin.TomcatTreeBuilder;
   import org.apache.webapp.admin.TreeControl;
   import org.apache.webapp.admin.TreeControlNode;
  @@ -296,6 +297,26 @@
   content,
   true, engineName);
   parentNode.addChild(childNode);
  +// update tree to display the newly added realm
  +Iterator realmNames =
  +Lists.getRealms(mBServer, sObjectName).iterator();
  +while (realmNames.hasNext()) {
  +String realmName = (String) realmNames.next();
  +ObjectName objectName = new ObjectName(realmName);
  +nodeLabel = Realm for service ( + 
  +sform.getServiceName() + );
  +TreeControlNode realmNode =
  +new TreeControlNode(realmName,
  +Realm.gif,
  +nodeLabel,
  +EditRealm.do?select= +
  +URLEncoder.encode(realmName) +
  +nodeLabel= +
  +URLEncoder.encode(nodeLabel),
  +content,
  +false, engineName);
  +childNode.addChild(realmNode);   
  +} 
   // FIXME - force a redisplay
   } else {
   getServlet().log
  
  
  
  1.9   +1 -1  jakarta-tomcat-catalina/webapps/admin/host/host.jsp
  
  Index: host.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/host/host.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- host.jsp  25 Mar 2003 08:29:06 -  1.8
  +++ host.jsp  27 Mar 2003 08:26:25 -  1.9
  @@ -150,7 +150,7 @@
   controls:data
   %-- input only allowed on create transaction --%
logic:equal name=hostForm property=adminAction value=Create
  -  html:text property=hostName size=255 maxlength=24 
styleId=name/
  +  html:text property=hostName size=50 maxlength=50 
styleId=name/
/logic:equal
logic:equal name=hostForm property=adminAction value=Edit
 bean:write name=hostForm property=hostName/
  
  
  
  1.8   +2 -2  jakarta-tomcat-catalina/webapps/admin/service/service.jsp
  
  Index: service.jsp
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/service/service.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- service.jsp   25 Mar 2003 08:29:06 -  1.7
  +++ service.jsp   27 Mar 2003 08:26:26 -  1.8
  @@ -168,7 +168,7 @@
   /controls:label
   controls:data
 logic:equal name=serviceForm property=adminAction value=Create
  -html:text property=serviceName size=24 maxlength=24 
styleId=serviceName/
  +html:text property=serviceName size=50 maxlength=50 
styleId=serviceName/
 /logic:equal
 logic:equal name=serviceForm property=adminAction value=Edit
   html:hidden property=serviceName/
  @@ -212,7 +212,7

cvs commit: jakarta-tomcat-catalina/webapps/admin savefail.jsp

2003-03-27 Thread amyroh
amyroh  2003/03/27 00:27:11

  Added:   webapps/admin savefail.jsp
  Log:
  Add an error page for realms
  
  Revision  ChangesPath
  1.1  jakarta-tomcat-catalina/webapps/admin/savefail.jsp
  
  Index: savefail.jsp
  ===
  !-- Standard Struts Entries --
  
  %@ page language=java contentType=text/html;charset=utf-8 %
  %@ taglib uri=/WEB-INF/struts-bean.tld prefix=bean %
  %@ taglib uri=/WEB-INF/struts-html.tld prefix=html %
  %@ taglib uri=/WEB-INF/struts-logic.tld prefix=logic %
  
  html:html locale=true
  
body bgcolor=white background=images/PaperTexture.gif
  
  %-- Cause our tree control to refresh itself --%
  script language=JavaScript
!--
  parent.tree.location='treeControlTest.do';
--
  /script
  
  %@ include file=header.jsp %
  centerh2
  %-- display warnings if any --%
  logic:present name=warning
  bean:message key=warning.header/
  /h2/center
  h3center
  bean:message key='%= (String) request.getAttribute(warning) %'/
  br
  /logic:present
  /h3/center
  centerh2
bean:message key=save.fail/
  /h2/center
  
  %@ include file=footer.jsp %
  
/body
  
  /html:html
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/webapps/admin/users groups.jspf roles.jspf users.jspf

2003-03-27 Thread amyroh
amyroh  2003/03/27 18:51:07

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TableTag.java
   webapps/admin/resources dataSources.jspf envEntries.jspf
mailSessions.jspf resourceLinks.jspf
userDatabases.jspf
   webapps/admin/users groups.jspf roles.jspf users.jspf
  Log:
  Accessibility improvement.  Change header cells from td to th.
  
  Per the Access Board's guidelines for 508 compliance in the case of
  Web-based applications, HTML tables should use the scope attribute
  to indicate the row and column associations for each cell in the table
  (This needs to be done alongwith marking the header cells using th
  tags instead of td)
  
  For further details, please see the Access Board Guidelines at
  http://www.access-board.gov/sec508/guide/1194.22.htm#(g)
  
  Revision  ChangesPath
  1.3   +56 -29
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java
  
  Index: TableTag.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TableTag.java 23 Jan 2003 00:07:07 -  1.2
  +++ TableTag.java 28 Mar 2003 02:51:07 -  1.3
  @@ -244,35 +244,62 @@
   String dataStyle = (String) dataStyles.get(i);
   String styleId = (String) styleIds.get(i);
   
  -if (header)
  +if (header) {
   out.println(tr class=\header-row\ );
  -else out.println(tr);
  +out.println(  th scope=\col\ width=\27%\ );
   
  -out.println(  td width=\27%\ );
  +out.print(div align=\left\);
  +if (labelStyle != null)
  +out.print(  class=\ + labelStyle +\);
  +out.print();
  +if (styleId != null) {
  +out.print(label for=\ + styleId + \);
  +}
  +out.print(label);
  +if (styleId != null) {
  +out.print(/label);
  +}
  +out.println(/div);
  +out.println(  /th);
   
  -out.print(div align=\left\);
  -if (labelStyle != null)
  -out.print(  class=\ + labelStyle +\);
  -out.print();
  -if (styleId != null) {
  -out.print(label for=\ + styleId + \);
  -}
  -out.print(label);
  -if (styleId != null) {
  -out.print(/label);
  -}
  -out.println(/div);
  -out.println(  /td);
  +out.println(  th scope=\col\ width=\73%\ );
  +out.print(div align=\left\ );
  +if (dataStyle != null)
  +out.print( class=\ + dataStyle + \);
  +out.print();
  +out.print(data);
  +out.println(/div);
  +out.print(  /th);
  +out.println(/tr);
  +} else {
  +out.println(tr);
  +
  +out.println(  td scope=\row\ width=\27%\ );
   
  -out.println(  td width=\73%\ );
  -out.print(div align=\left\ );
  -if (dataStyle != null)
  -out.print( class=\ + dataStyle + \);
  -out.print();
  -out.print(data);
  -out.println(/div);
  -out.print(  /td);
  -out.println(/tr);
  +out.print(div align=\left\);
  +if (labelStyle != null)
  +out.print(  class=\ + labelStyle +\);
  +out.print();
  +if (styleId != null) {
  +out.print(label for=\ + styleId + \);
  +}
  +out.print(label);
  +if (styleId != null) {
  +out.print(/label);
  +}
  +out.println(/div);
  +out.println(  /td);
  +
  +out.println(  td width=\73%\ );
  +out.print(div align=\left\ );
  +if (dataStyle != null)
  +out.print( class=\ + dataStyle + \);
  +out.print();
  +out.print(data

cvs commit: jakarta-tomcat-catalina/webapps/admin/resources deleteUserDatabases.jsp listUserDatabases.jsp listUserDatabases.jspf userDatabase.jsp userDatabases.jspf

2003-03-26 Thread amyroh
amyroh  2003/03/26 00:05:22

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ListUserDatabasesAction.java ResourceUtils.java
SaveUserDatabaseAction.java
SetUpUserDatabaseAction.java UserDatabaseForm.java
UserDatabasesForm.java
   webapps/admin/resources deleteUserDatabases.jsp
listUserDatabases.jsp listUserDatabases.jspf
userDatabase.jsp userDatabases.jspf
  Log:
  Fix UserDatabase.
  
  Revision  ChangesPath
  1.2   +11 -5 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java
  
  Index: ListUserDatabasesAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ListUserDatabasesAction.java  18 Jul 2002 16:48:27 -  1.1
  +++ ListUserDatabasesAction.java  26 Mar 2003 08:05:19 -  1.2
  @@ -147,10 +147,16 @@
   HttpSession session = request.getSession();
   Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
   
  +String domain = request.getParameter(domain);
  +if (domain != null) {
  +domain = URLDecoder.decode(domain);
  +}
   // Create a form bean containing the requested MBean Names
   UserDatabasesForm userDatabasesForm = null;
   try {
  -  userDatabasesForm = ResourceUtils.getUserDatabasesForm(mserver);
  +  userDatabasesForm = 
  +ResourceUtils.getUserDatabasesForm(mserver, domain);
  +  userDatabasesForm.setDomain(domain);
   } catch (Exception e) {
   getServlet().log(resources.getMessage
(locale,
  
  
  
  1.7   +6 -6  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
  
  Index: ResourceUtils.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourceUtils.java23 Mar 2003 02:10:27 -  1.6
  +++ ResourceUtils.java26 Mar 2003 08:05:19 -  1.7
  @@ -426,10 +426,10 @@
*
* @exception Exception if an error occurs
*/
  -public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver)
  +public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver,String 
domain)
   throws Exception {
   
  -ObjectName rname = new ObjectName( RESOURCE_TYPE + GLOBAL_TYPE +
  +ObjectName rname = new ObjectName( domain + RESOURCE_TYPE + GLOBAL_TYPE +
   ,class= + USERDB_CLASS + ,*);
   
   Iterator iterator = (mserver.queryMBeans(rname, null).iterator());
  
  
  
  1.3   +5 -5  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
  
  Index: SaveUserDatabaseAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SaveUserDatabaseAction.java   18 Mar 2003 10:48:24 -  1.2
  +++ SaveUserDatabaseAction.java   26 Mar 2003 08:05:19 -  1.3
  @@ -186,7 +186,7 @@
   ObjectName oname = null;
   
   try {
  -String domain = (new ObjectName(objectName)).getDomain();
  +String domain = userDatabaseForm.getDomain();
   // Construct the MBean Name for the naming source
   oname = new ObjectName(domain + 
   ResourceUtils.NAMINGRESOURCES_TYPE + 
  
  
  
  1.2   +7 -5  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java
  
  Index: SetUpUserDatabaseAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpUserDatabaseAction.java  18 Jul 2002 16:48:27 -  1.1
  +++ SetUpUserDatabaseAction.java  26 Mar 2003 08:05:19 -  1.2
  @@ -153,12 +153,14

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/valves ValveBase.java

2003-03-26 Thread amyroh
amyroh  2003/03/26 19:06:40

  Modified:catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardPipeline.java
StandardService.java
   catalina/src/share/org/apache/catalina/logger
FileLogger.java LoggerBase.java
   catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java
   catalina/src/share/org/apache/catalina/realm RealmBase.java
   catalina/src/share/org/apache/catalina/valves ValveBase.java
  Log:
  Add deregistration code for container, service, valve/logger dynamic registration.
  Use getObjectName() instead of MBeanUtils for most of cases.
  
  Revision  ChangesPath
  1.17  +12 -2 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
  
  Index: ContainerBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ContainerBase.java26 Mar 2003 19:20:29 -  1.16
  +++ ContainerBase.java27 Mar 2003 03:06:39 -  1.17
  @@ -1322,6 +1322,16 @@
   }
   }
   
  +// unregister this component
  +if( oname != null ) {
  +try {
  +Registry.getRegistry().unregisterComponent(oname);
  +log.info(unregistering  + oname);
  +} catch( Throwable t ) {
  +log.error(Error unregistering , t );
  +}
  +}
  +
   // Notify our interested LifecycleListeners
   lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
   
  @@ -1667,11 +1677,11 @@
   host=context.getParent();
   servlet=container;
   }
  -if( host!=null ) suffix.append(,host=).append( host.getName() );
   if( context!=null ) {
   String path=((StandardContext)context).getPath();
  -suffix.append(,path=).append((path==) ? / : path);
  +suffix.append(,path=).append((path.equals()) ? / : path);
   } 
  +if( host!=null ) suffix.append(,host=).append( host.getName() );
   if( servlet != null ) {
   String name=container.getName();
   suffix.append(,servlet=);
  
  
  
  1.6   +7 -3  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
  
  Index: StandardPipeline.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StandardPipeline.java 26 Mar 2003 19:20:29 -  1.5
  +++ StandardPipeline.java 27 Mar 2003 03:06:39 -  1.6
  @@ -486,6 +486,8 @@
   results[valves.length] = valve;
   valves = results;
   }
  +// register the newly added valve
  +registerValve(valve);
   
   }
   
  @@ -601,6 +603,8 @@
   log.error(StandardPipeline.removeValve: stop: , e);
   }
   }
  +// unregister the removed valave
  +unregisterValve(valve);
   
   }
   
  
  
  
  1.5   +14 -4 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java
  
  Index: StandardService.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StandardService.java  21 Mar 2003 08:16:20 -  1.4
  +++ StandardService.java  27 Mar 2003 03:06:39 -  1.5
  @@ -582,6 +582,16 @@
   }
   }
   }
  +
  +// unregister this service
  +if( oname!=null ) {
  +try {
  +Registry.getRegistry().unregisterComponent(oname);
  +log.info(unregistering  + oname);
  +} catch (Exception e) {
  +log.error(Error unregistering ,e);
  +}
  +}
   
   // Notify our interested LifecycleListeners
   lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null);
  
  
  
  1.2   +9 -51 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/FileLogger.java
  
  Index: FileLogger.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/logger/FileLogger.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FileLogger.java   18 Jul 2002 16:48

cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service EditServiceAction.java

2003-03-26 Thread amyroh
amyroh  2003/03/26 19:08:05

  Modified:webapps/admin/WEB-INF struts-config.xml
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties Lists.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveUserDatabaseRealmAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
  Log:
  Add error pages for realm creation failures, etc.
  
  Revision  ChangesPath
  1.3   +4 -0  jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- struts-config.xml 16 Sep 2002 04:46:18 -  1.2
  +++ struts-config.xml 27 Mar 2003 03:08:05 -  1.3
  @@ -199,6 +199,10 @@
   forwardname=Save Successful
   path=/saved.jsp
   redirect=false/
  +
  +forwardname=Save Unsuccessful
  +path=/savefail.jsp
  +redirect=false/
   
   forwardname=Blank
   path=/blank.jsp
  
  
  
  1.10  +4 -0  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApplicationResources_en.properties11 Feb 2003 03:34:43 -  1.9
  +++ ApplicationResources_en.properties27 Mar 2003 03:08:05 -  1.10
  @@ -21,6 +21,7 @@
   sample.someText.required=liSome Text cannot be empty/li
   sample.moreText.required=liMore Text cannot be empty/li
   save.success=Save sucessful!
  +save.fail=Save failed!
   server.portnumber=Port Number
   server.debuglevel=Debug Level
   server.shutdown=Shutdown
  @@ -201,6 +202,9 @@
   error.serviceName.bad=Invalid service name {0}
   error.serviceName.required=liService Name required/li
   error.serviceName.exists=liService Name already exists/li
  +error.jdbcrealm=Error occured during setting JDBCRealm.
  +error.jndirealm=Error occured during setting JNDIRealm.
  +error.userdbrealm=Error occured during setting UserdatabaseRealm.
   error.realmName.bad=Invalid realm name {0}
   error.realmName.required=liRealm Name required./li
   error.realmName.exists=liA realm already exists./li
  
  
  
  1.9   +6 -5  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Lists.java23 Mar 2003 02:10:26 -  1.8
  +++ Lists.java27 Mar 2003 03:08:05 -  1.9
  @@ -470,6 +470,7 @@
   StringBuffer sb = new StringBuffer(container.getDomain());
   sb.append(:type=Valve);
   String type = container.getKeyProperty(type);
  +String j2eeType = container.getKeyProperty(j2eeType);
   sb.append(TomcatTreeBuilder.WILDCARD);
   String host = ;
   String path = ;
  @@ -520,7 +521,7 @@
   }
   }
   
  -if (Context.equalsIgnoreCase(type)) {
  +if (WebModule.equalsIgnoreCase(j2eeType)) {
   if ((path.equalsIgnoreCase(vpath))  
(host.equalsIgnoreCase(vhost))) {
   valves.add(valve.toString());  
   }
  
  
  
  1.4   +9 -4  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
  
  Index: SaveJDBCRealmAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SaveJDBCRealmAction.java  20 Mar 2003 05:40:10 -  1.3
  +++ SaveJDBCRealmAction.java  27 Mar 2003 03:08:05 -  1.4
  @@ -222,6 +222,11 @@
   rObjectName = (String)
   mBServer.invoke(fname, operation,
   values, createStandardRealmTypes

cvs commit: jakarta-tomcat-catalina/webapps/admin/service service.jsp

2003-03-25 Thread amyroh
amyroh  2003/03/25 00:29:06

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java SaveContextAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext
AddDefaultContextAction.java
SaveDefaultContextAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
AliasForm.java HostForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
LoggerForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
JDBCRealmForm.java JNDIRealmForm.java
MemoryRealmForm.java UserDatabaseRealmForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DataSourceForm.java EnvEntryForm.java
MailSessionForm.java ResourceLinkForm.java
UserDatabaseForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server
ServerForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
ServiceForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
GroupForm.java RoleForm.java UserForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
AccessLogValveForm.java RemoteAddrValveForm.java
RemoteHostValveForm.java
   webapps/admin/host host.jsp
   webapps/admin/service service.jsp
  Log:
  Fix validation.
  
  Revision  ChangesPath
  1.3   +7 -8  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
  
  Index: ConnectorForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConnectorForm.java21 Mar 2003 08:19:13 -  1.2
  +++ ConnectorForm.java25 Mar 2003 08:29:04 -  1.3
  @@ -727,13 +727,12 @@
   
   public ActionErrors validate(ActionMapping mapping,
   HttpServletRequest request) {
  -
  +
   errors = new ActionErrors();
   
   String submit = request.getParameter(submit);
  -
   // front end validation when save is clicked.
  -if (submit != null) {
  +//if (submit != null) {
   
   /* general */
   numberCheck(acceptCountText, acceptCountText, true, 0, 128);
  @@ -779,7 +778,7 @@
   // supported only by Coyote HTTP and HTTPS connectors
   if (!(AJP.equalsIgnoreCase(connectorType)))
   numberCheck(proxyPortText,  proxyPortText, true, 0, 65535);   
 
  -}
  +//}
   
   return errors;
   }
  
  
  
  1.3   +6 -6  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
  
  Index: ContextForm.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextForm.java  8 Dec 2002 13:42:10 -   1.2
  +++ ContextForm.java  25 Mar 2003 08:29:04 -  1.3
  @@ -790,7 +790,7 @@
   String submit = request.getParameter(submit);
   
   // front end validation when save is clicked.
  -if (submit != null) {
  +//if (submit != null) {
   
   // docBase cannot be null
   if ((docBase == null) || (docBase.length()  1)) {
  @@ -818,7 +818,7 @@
   //if ((mgrSessionIDInit == null) || (mgrSessionIDInit.length()  1)) {
   //errors.add(mgrSessionIDInit, new 
ActionError(error.mgrSessionIDInit.required));
   //}
  -}
  +//}
   
   return errors;
   }
  
  
  
  1.8   +4 -12 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
  
  Index: SaveContextAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8

cvs commit: jakarta-tomcat-catalina/webapps/admin/context contexts.jsp

2003-03-24 Thread amyroh
amyroh  2003/03/24 01:17:02

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
CommitChangesAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
DeleteContextAction.java SaveContextAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
DeleteLoggerAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
SaveServiceAction.java
   webapps/admin/context contexts.jsp
  Log:
  More admin update.  Items left to be fixed/tested are
  deregistration of MBeans, DefaultContext, Valve, Logger, Realm pages.
  
  Revision  ChangesPath
  1.2   +7 -6  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java
  
  Index: CommitChangesAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CommitChangesAction.java  18 Jul 2002 16:48:20 -  1.1
  +++ CommitChangesAction.java  24 Mar 2003 09:17:01 -  1.2
  @@ -144,7 +144,8 @@
   
  ObjectName sname = null;
   try {
  -   sname = new ObjectName(TomcatTreeBuilder.SERVER_TYPE);
  +   sname = new ObjectName(TomcatTreeBuilder.DEFAULT_DOMAIN +
  +TomcatTreeBuilder.SERVER_TYPE);
   } catch (Exception e) {
   String message = Could not get Server Object;
   getServlet().log(message);
  @@ -152,7 +153,7 @@
   return (null);
   }
   
  -   String operation = store;
  +   String operation = storeConfig;
  try {   
   mBServer.invoke(sname, operation, null, null);
   } catch (Throwable t) {
  
  
  
  1.5   +12 -8 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
  
  Index: SaveConnectorAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SaveConnectorAction.java  21 Mar 2003 08:19:13 -  1.4
  +++ SaveConnectorAction.java  24 Mar 2003 09:17:01 -  1.5
  @@ -179,10 +179,14 @@
   String serviceName = cform.getServiceName();
   ObjectName soname = new ObjectName(serviceName);
   String domain = soname.getDomain();
  -ObjectName oname =
  -new ObjectName(domain + TomcatTreeBuilder.CONNECTOR_TYPE +
  -   ,port= + cform.getPortText() +
  -   ,address= + cform.getAddress());
  +StringBuffer sb = new StringBuffer(domain);
  +sb.append(TomcatTreeBuilder.CONNECTOR_TYPE);
  +sb.append(,port= + cform.getPortText());
  +String address = cform.getAddress();
  +if ((address!=null)  (address.length()0)) {
  +sb.append(,address= + address);
  +}
  +ObjectName oname = new ObjectName(sb.toString());
   
   // Ensure that the requested connector name is unique
   if (mBServer.isRegistered(oname)) {
  
  
  
  1.3   +26 -9 
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
  
  Index: DeleteContextAction.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeleteContextAction.java  18 Mar 2003 10:48:15 -  1.2
  +++ DeleteContextAction.java  24 Mar 2003 09:17:01 -  1.3
  @@ -180,14 +180,31 @@
   try {
   ObjectName poname = new ObjectName(patternObject);
   String domain = poname.getDomain();
  -String pattern = domain + TomcatTreeBuilder.CONTEXT_TYPE +
  - TomcatTreeBuilder.WILDCARD +
  - ,host= + poname.getKeyProperty(host); 
  +StringBuffer sb = new StringBuffer(domain);
  +sb.append(:j2eeType=WebModule,*);
  +ObjectName

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets ManagerServlet.java

2003-03-24 Thread amyroh
amyroh  2003/03/24 01:18:27

  Modified:catalina/src/share/org/apache/catalina/core
ContainerBase.java StandardServer.java
mbeans-descriptors.xml
   catalina/src/share/org/apache/catalina/mbeans
MBeanFactory.java MBeanUtils.java
StandardServerMBean.java
   catalina/src/share/org/apache/catalina/servlets
ManagerServlet.java
  Log:
  More admin update.  Items left to be fixed/tested are
  deregistration of MBeans, DefaultContext, Valve, Logger, Realm pages.
  
  Revision  ChangesPath
  1.15  +1 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
  
  Index: ContainerBase.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ContainerBase.java21 Mar 2003 07:33:14 -  1.14
  +++ ContainerBase.java24 Mar 2003 09:18:26 -  1.15
  @@ -1714,7 +1714,7 @@
   if( host!=null ) suffix.append(,host=).append( host.getName() );
   if( context!=null ) {
   String path=((StandardContext)context).getPath();
  -suffix.append(,path=).append((path==) ? // : path);
  +suffix.append(,path=).append((path==) ? / : path);
   } 
   if( servlet != null ) {
   String name=container.getName();
  @@ -1726,4 +1726,3 @@
   
   
   }
  -
  
  
  
  1.14  +5 -5  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StandardServer.java   17 Mar 2003 19:22:07 -  1.13
  +++ StandardServer.java   24 Mar 2003 09:18:26 -  1.14
  @@ -734,7 +734,7 @@
* @exception RuntimeOperationsException if an exception is reported
*  by the persistence mechanism
*/
  -public synchronized void store() throws Exception {
  +public synchronized void storeConfig() throws Exception {
   
   // Calculate file objects for the old and new configuration files.
   String configFile = conf/server.xml; // FIXME - configurable?
  
  
  
  1.5   +1 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mbeans-descriptors.xml20 Mar 2003 18:28:28 -  1.4
  +++ mbeans-descriptors.xml24 Mar 2003 09:18:26 -  1.5
  @@ -513,7 +513,7 @@
  description=Object names of all services we know about
  type=[Ljavax.management.ObjectName;/
 
  -operation name=store
  +operation name=storeConfig
  description=Save current state to server.xml file
  impact=ACTION
  returnType=void
  
  
  
  1.10  +38 -24
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MBeanFactory.java 23 Mar 2003 02:12:22 -  1.9
  +++ MBeanFactory.java 24 Mar 2003 09:18:26 -  1.10
  @@ -353,11 +353,13 @@
   Class partypes1 [] = new Class[1];
   // Set address
   String str = new String();
  -partypes1[0] = str.getClass();
  -Method meth1 = cls.getMethod(setAddress, partypes1);
  -Object arglist1[] = new Object[1];
  -arglist1[0] = address;
  -meth1.invoke(retobj, arglist1);
  +if ((address!=null)  (address.length()0)) {
  +partypes1[0] = str.getClass();
  +Method meth1 = cls.getMethod(setAddress, partypes1);
  +Object arglist1[] = new Object[1];
  +arglist1[0] = address;
  +meth1.invoke(retobj, arglist1);
  +}
   // Set port number
   Class partypes2 [] = new Class[1];
   partypes2[0] = Integer.TYPE;
  @@ -380,7 +382,9 @@
   Method

cvs commit: jakarta-tomcat-catalina/webapps/admin/service service.jsp

2003-03-22 Thread amyroh
amyroh  2003/03/22 18:10:30

  Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
AddHostAction.java DeleteHostAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DataSourceForm.java DataSourcesForm.java
DeleteDataSourcesAction.java
DeleteEnvEntriesAction.java
DeleteMailSessionsAction.java
DeleteResourceLinksAction.java EnvEntriesForm.java
EnvEntryForm.java ListDataSourcesAction.java
MailSessionForm.java MailSessionsForm.java
ResourceLinkForm.java ResourceLinksForm.java
ResourceUtils.java SaveDataSourceAction.java
SaveEnvEntryAction.java SaveMailSessionAction.java
SaveResourceLinkAction.java
SetUpDataSourceAction.java SetUpEnvEntryAction.java
SetUpMailSessionAction.java
SetUpResourceLinkAction.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
AddServiceAction.java DeleteServiceAction.java
SaveServiceAction.java
   webapps/admin/resources dataSource.jsp dataSources.jspf
deleteDataSources.jsp deleteEnvEntries.jsp
deleteMailSessions.jsp deleteResourceLinks.jsp
envEntries.jspf envEntry.jsp listDataSources.jsp
listDataSources.jspf listEnvEntries.jsp
listEnvEntries.jspf listMailSessions.jsp
listMailSessions.jspf listResourceLinks.jsp
listResourceLinks.jspf mailSession.jsp
mailSessions.jspf resourceLink.jsp
resourceLinks.jspf
   webapps/admin/server server.jsp
   webapps/admin/service service.jsp
  Removed: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
DeleteConnectorForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
DeleteContextForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext
DeleteDefaultContextForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
DeleteHostForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
DeleteLoggerForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
DeleteRealmForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
DeleteServiceForm.java
   webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
DeleteValveForm.java
  Log:
  Update naming resource handling in admin.
  
  Revision  ChangesPath
  1.8   +9 -7  
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
  
  Index: Lists.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Lists.java21 Mar 2003 08:19:12 -  1.7
  +++ Lists.java23 Mar 2003 02:10:26 -  1.8
  @@ -628,8 +628,9 @@
   (MBeanServer mbserver, String domain, HttpServletRequest request)
   throws Exception {
   
  +String adminDomain = TomcatTreeBuilder.DEFAULT_DOMAIN;
   // Get the admin app's service name
  -StringBuffer sb = new StringBuffer(domain);
  +StringBuffer sb = new StringBuffer(adminDomain);
   sb.append(:type=Service,*);
   ObjectName search = new ObjectName(sb.toString());
   Iterator names = mbserver.queryNames(search, null).iterator();
  @@ -656,7 +657,8 @@
   throws Exception {
   
   // Get the admin app's host name
  -StringBuffer sb = new StringBuffer(domain);
  +String adminDomain = TomcatTreeBuilder.DEFAULT_DOMAIN;
  +StringBuffer sb = new StringBuffer(adminDomain);
   sb.append(:j2eeType=WebModule,*); 
   ObjectName search = new ObjectName(sb.toString());
   Iterator names = mbserver.queryNames(search, null).iterator();
  @@ -675,7 +677,7 @@
   return host;
   }
   }
  -return ;
  +return host;
   
   }
   
  
  
  
  1.4   +5 -5  
jakarta-tomcat-catalina/webapps/admin/WEB-INF

  1   2   3   4   >