PATCH: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties

2002-04-22 Thread Adrian Almenar



Its not all done but now its a lot betterthan 
before.

Cheers,

Adrian Almenar




ApplicationResources_es.properties.patch
Description: Binary data

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


RE: [PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties

2002-01-10 Thread GOMEZ Henri

I saw many post from this gentleman but they are never commited.

Any reasons ?

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



-Original Message-
From: Adrian Almenar [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, January 09, 2002 8:31 PM
To: Tomcat List
Subject: [PATCH]:
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web
app/admin
/ApplicationResources_es.properties


  Here are some more enhancements for
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web
app/admin/App
licationResources_es.properties

Please Commit these,

Cheers,

Adrian Almenar


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




Re: [PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties

2002-01-10 Thread jean-frederic clere

GOMEZ Henri wrote:
 
 I saw many post from this gentleman but they are never commited.
 
 Any reasons ?

My Spanish is good enough to tell that the translation sounds better after the
patch than before ;-)
 

 
 -
 Henri Gomez ___[_]
 EMAIL : [EMAIL PROTECTED](. .)
 PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
 PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6
 
 -Original Message-
 From: Adrian Almenar [mailto:[EMAIL PROTECTED]]
 Sent: Wednesday, January 09, 2002 8:31 PM
 To: Tomcat List
 Subject: [PATCH]:
 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web
 app/admin
 /ApplicationResources_es.properties
 
 
   Here are some more enhancements for
 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/web
 app/admin/App
 licationResources_es.properties
 
 Please Commit these,
 
 Cheers,
 
 Adrian Almenar
 
 
 --
 To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
 For additional commands, e-mail: mailto:[EMAIL PROTECTED]

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




[PATCH] jakarta-tomcat-4.0/webapps/admin

2002-01-10 Thread Manveen Kaur

Hi,

Encoded the node label names as they contain spaces and other reserved
characters.

Please commit my patch to the head branch.

thanks,
Manveen


Index: WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
retrieving revision 1.5
diff -u -r1.5 TomcatTreeBuilder.java
--- WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java  10 Jan 2002 
03:41:13 -  1.5
+++ WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java  10 Jan 2002 
+19:01:55 -
@@ -140,11 +140,13 @@
 // because Tomcat does this automatically
 
 String encodedServerName =  URLEncoder.encode(serverObjName);
+String encodedNodeLabel =  URLEncoder.encode(SERVER_LABEL);
+
 TreeControlNode serverNode =
 new TreeControlNode(serverObjName,
 folder_16_pad.gif, SERVER_LABEL,
 setUpServer.do?select= + encodedServerName
-+nodeLabel= + SERVER_LABEL,
++nodeLabel= + encodedNodeLabel,
 content, true);
 
 return serverNode;
@@ -175,13 +177,14 @@
 encodedServiceName =  
URLEncoder.encode(service.getObjectName().toString());
 
 String nodeLabel = Service ( + serviceName + );
-
+String encodedNodeLabel =  URLEncoder.encode(nodeLabel);
+
 TreeControlNode serviceNode =
 new TreeControlNode(service.getObjectName().toString(),
 folder_16_pad.gif,
 nodeLabel,
 setUpService.do?select= + encodedServiceName
-+nodeLabel= + nodeLabel,
++nodeLabel= + encodedNodeLabel,
 content, true);
 
 serverNode.addChild(serviceNode);
@@ -213,17 +216,19 @@
 
 encodedConnectorName =  
URLEncoder.encode(connectorObj.getObjectName().toString());
 
+String nodeLabel = Connector ( + connectorName + );
+String encodedNodeLabel =  URLEncoder.encode(nodeLabel);
+
 // Do not display the connector node if it is a warp connector.
 // This is because warp connector doesn't conform to the
 // standard Engine/Host/Context hierarchy and we don't support it.
 if (!warp.equalsIgnoreCase(connectorName)) {
-String nodeLabel = Connector ( + connectorName + );
 connectorNode =
 new TreeControlNode(connectorObj.getObjectName().toString(),
 folder_16_pad.gif, 
 nodeLabel,
 setUpConnector.do?select= + encodedConnectorName
-+ nodeLabel=+nodeLabel,
++ nodeLabel=+ encodedNodeLabel,
 content, true);
 
 serviceNode.addChild(connectorNode);
@@ -264,13 +269,14 @@
 encodedHostName =  URLEncoder.encode(hostObj.getObjectName().toString());
 
 String nodeLabel=Host ( + hostName + );
-
+String encodedNodeLabel =  URLEncoder.encode(nodeLabel);
+
 hostNode =
 new TreeControlNode(hostObj.getObjectName().toString(),
 folder_16_pad.gif,
 nodeLabel,
 setUpHost.do?select= + encodedHostName
-+nodeLabel=+nodeLabel,
++nodeLabel=+ encodedNodeLabel,
 content, true);
 
 serviceNode.addChild(hostNode);
cvs server: Diffing images



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


[PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties

2002-01-09 Thread Adrian Almenar

  Here are some more enhancements for
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/App
licationResources_es.properties

Please Commit these,

Cheers,

Adrian Almenar



ApplicationResources_es.properties.patch
Description: Binary data

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


[PATCH] jakarta-tomcat-4.0/webapps/admin

2002-01-09 Thread Manveen Kaur

Hi,

Please commit my patch to the head branch.

thanks,
Manveen

Comments:
---
* Made the main page title for each screen  the same as (i.e. in sync
with) the label of the node that is selected.
* Added Host editing and viewing functionality. The values are
read/written to the corresponding mBean.

New files to be added:
host.jsp - jakarta-tomcat-4.0/webapps/admin
HostAction, HostForm, SetUpHostAction.java --
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin


Index: connector.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/connector.jsp,v
retrieving revision 1.1
diff -u -r1.1 connector.jsp
--- connector.jsp   5 Jan 2002 20:45:03 -   1.1
+++ connector.jsp   10 Jan 2002 02:30:57 -
@@ -21,9 +21,9 @@
 tr bgcolor=7171A5
   td width=81% 
html:hidden property=connectorName/
-   div class=page-title-text align=leftConnector ( 
- bean:write name=connectorForm property=scheme scope=session/
-) /div
+   div class=page-title-text align=left
+ bean:write name=connectorForm property=nodeLabel scope=session/
+   /div
   /td
   td width=19% 
 div align=right
Index: server.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/server.jsp,v
retrieving revision 1.5
diff -u -r1.5 server.jsp
--- server.jsp  5 Jan 2002 21:09:15 -   1.5
+++ server.jsp  10 Jan 2002 02:30:58 -
@@ -21,7 +21,9 @@
   table width=100% border=0 cellspacing=0 cellpadding=0
 tr class=page-title-row
   td align=left nowrap
-div class=page-title-textbean:message key=server.heading//div
+div class=page-title-text
+ bean:write name=serverForm property=nodeLabel scope=session/
+/div
   /td
   td align=right nowrap 
 div class=page-title-text
Index: service.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/service.jsp,v
retrieving revision 1.3
diff -u -r1.3 service.jsp
--- service.jsp 3 Jan 2002 23:21:53 -   1.3
+++ service.jsp 10 Jan 2002 02:30:59 -
@@ -22,10 +22,8 @@
 tr class=page-title-row
   td width=81% 
 div class=page-title-text align=left
-bean:message key=service.service/ (
-bean:write name=serviceForm property=serviceName 
-  scope=session/
- ) /div
+bean:write name=serviceForm property=nodeLabel scope=session/
+/div
   /td
   td width=19% 
 div align=right
cvs server: Diffing WEB-INF
Index: WEB-INF/struts-config.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.13
diff -u -r1.13 struts-config.xml
--- WEB-INF/struts-config.xml   5 Jan 2002 20:45:03 -   1.13
+++ WEB-INF/struts-config.xml   10 Jan 2002 02:31:00 -
@@ -27,6 +27,10 @@
 form-bean  name=connectorForm
 type=org.apache.webapp.admin.ConnectorForm/
 
+!-- Host form bean --
+form-bean  name=hostForm
+type=org.apache.webapp.admin.HostForm/
+
 !-- Set Locale form bean --
 form-bean  name=setLocaleForm
 type=org.apache.webapp.admin.SetLocaleForm/
@@ -65,7 +69,11 @@
 forwardname=Connector
 path=/connector.jsp
 redirect=false/
-
+
+forwardname=Host
+path=/host.jsp
+redirect=false/
+
 forwardname=Save Successful
 path=/saved.jsp
 redirect=false/
@@ -124,6 +132,16 @@
   redirect=true/
 /action
 
+ !-- Set up Host datastructure --
+actionpath=/setUpHost
+   type=org.apache.webapp.admin.SetUpHostAction
+   name=hostForm
+   scope=session
+  forwardname=SetUpHost
+  path=/host.jsp
+  redirect=true/
+/action
+
 !-- Log out of the application --
 actionpath=/logOut
type=org.apache.webapp.admin.LogOutAction
@@ -156,6 +174,14 @@
   input=/connector.jsp
 /action
 
+!-- Process a host change --
+actionpath=/host
+   type=org.apache.webapp.admin.HostAction
+   name=hostForm
+  scope=session
+  input=/host.jsp
+/action
+
 !-- Process a set-locale action --
 actionpath=/setLocale
type=org.apache.webapp.admin.SetLocaleAction
@@ -168,6 +194,6 @@
type=org.apache.webapp.admin.TreeControlTestAction/
 
   /action-mappings
-
-
+  
+
 /struts-config
cvs server: Diffing WEB-INF/classes
cvs 

[PATCH]jakarta-tomcat-4.0/webapps/admin

2002-01-05 Thread Manveen Kaur

Please commit my patch to the HEAD branch.

Thanks,
Manveen

Comments:


Connector functionality that enables connectors and their attributes to
be viewed and edited through the admin tool.

New files :Location to be added
--
connector.jsp : jakarta-tomcat-4.0/webapps/admin/
SetUpConnector, ConnectorForm, ConnectorAction.java :
WEB-INF/classes/org/apache/webapp/admin/



Index: WEB-INF/struts-config.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.12
diff -u -r1.12 struts-config.xml
--- WEB-INF/struts-config.xml   20 Dec 2001 09:31:51 -  1.12
+++ WEB-INF/struts-config.xml   5 Jan 2002 07:37:41 -
@@ -148,6 +148,14 @@
   input=/service.jsp
 /action
 
+!-- Process a connector change --
+actionpath=/connector
+   type=org.apache.webapp.admin.ConnectorAction
+   name=connectorForm
+  scope=session
+  input=/connector.jsp
+/action
+
 !-- Process a set-locale action --
 actionpath=/setLocale
type=org.apache.webapp.admin.SetLocaleAction
cvs server: Diffing WEB-INF/classes
cvs server: Diffing WEB-INF/classes/org
cvs server: Diffing WEB-INF/classes/org/apache
cvs server: Diffing WEB-INF/classes/org/apache/webapp
cvs server: Diffing WEB-INF/classes/org/apache/webapp/admin
Index: WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.10
diff -u -r1.10 ApplicationResources_en.properties
--- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties  3 Jan 
2002 23:21:53 -   1.10
+++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties  5 Jan 
+2002 07:37:42 -
@@ -27,11 +27,34 @@
 server.debuglevel=Debug Level
 server.shutdown=Shutdown
 server.properties=Properties
-error.portNumberText.required=liPortNumber cannot be empty/li
-error.shutdownText.length=liShutdown Text must be atleast 6 characters/li
+error.portNumber.required=liPortNumber cannot be empty/li
 error.portNumber.format=liPortNumber not a valid integer!/li
 error.portNumber.range=liPortNumber seems out of range. Valid range is 1-65535. 
/li
-error.engineName.required=liEngine name is required/li 
+error.shutdownText.length=liShutdown Text must be atleast 6 characters/li
+error.engineName.required=liEngine name is required/li
+error.acceptCountText.required=liAccept count required/li
+error.acceptCountText.format=liAccept count not a valid integer!/li
+error.acceptCountText.range=liAccept count seems out of range. Valid range is 
+1-218. /li
+error.connTimeOutText.required=liConnection time out required/li
+error.connTimeOutText.format=liConnection time out not a valid integer!/li
+error.connTimeOutText.range=liConnection time out seems out of range. Valid range 
+is 0-6. /li
+error.bufferSizeText.required=liBuffer Size required/li
+error.bufferSizeText.format=liBuffer Size not a valid integer!/li
+error.bufferSizeText.range=liBuffer Size seems out of range. Valid range is 1-8192. 
+/li
+error.address.invalid=liIP Address invalid/li
+error.redirectPortText.required=liRedirect Port Number cannot be empty/li
+error.redirectPortText.format=liRedirect Port Number not a valid integer!/li
+error.redirectPortText.range=liRedirect Port Number seems out of range. Valid range 
+is 1-65535. /li
+error.minProcessorsText.required=liMinimum Processors cannot be empty/li
+error.minProcessorsText.format=liMinimum Processors not a valid integer!/li
+error.minProcessorsText.range=liMinimum Processors seems out of range. Valid range 
+is 1-512. /li
+error.maxProcessorsText.required=liMaximum Processors cannot be empty/li
+error.maxProcessorsText.format=liMaximum Processors not a valid integer!/li
+error.maxProcessorsText.range=liMaximum Processors seems out of range. Valid range 
+is 1-512. Also, maximum = minimum. /li
+error.proxyName.invalid=liProxy name is invalid/li
+error.proxyPortText.required=liProxy Port Number cannot be empty/li
+error.proxyPortText.format=liProxy Port Number not a valid integer!/li
+error.proxyPortText.range=liProxy Port Number seems out of range. Valid range is 
+1-65535. /li
 service.service=Service
 service.name=Name
 service.engine.props=Engine properties
@@ -69,4 +92,3 @@
 connector.max=Maximum
 connector.proxy.name=Proxy Name
 connector.proxy.portnumber=Proxy Port Number
-error.acceptCountText.required=liAccept count required/li
Index: WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
===
RCS file: 

[PATCH]: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties

2002-01-04 Thread Adrian Almenar

Just some enhancements for Spanish Language.

Cheers,

Adrian Almenar
Systems  Development Department
Conectium Limited



ApplicationResources_en.properties.patch
Description: Binary data

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


[PATCH] jakarta-tomcat-4.0/webapps/admin/

2002-01-03 Thread Manveen Kaur

Please commit my changes to the HEAD branch.

Thanks!
--Manveen

Comments:

* Created a new tag that renders HTML tables containing property values,
a property, value pair per row.
* Created a buttons.jsp file that renders the save and cancel buttons
and included this in the server and serivce screens.

New files to be added:
---
TableTag, RowTag, LabelTag, ValueTag.java --
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/
buttons.jsp -- webapps/admin


Index: server.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/server.jsp,v
retrieving revision 1.3
diff -u -r1.3 server.jsp
--- server.jsp  20 Dec 2001 09:31:51 -  1.3
+++ server.jsp  3 Jan 2002 15:13:44 -
@@ -16,6 +16,7 @@
 !--Form --
 
 html:errors/
+
 html:form method=POST action=/server focus=portNumberText
   table width=100% border=0 cellspacing=0 cellpadding=0
 tr class=page-title-row
@@ -34,96 +35,53 @@
 /div
   /td
 /tr
-tr
-  tdnbsp;/td
-/tr
-tr
-  td colspan=2 align=right nowrap
-html:submit styleClass=button
-   bean:message key=button.save/ 
-/html:submit  
-nbsp;
-html:reset styleClass=button
-bean:message key=button.cancel/ 
-/html:reset 
-  /td
-/tr
-tr
-  tdnbsp;/td
-/tr
   /table
+
+  %@ include file=buttons.jsp %
+br
+
   table class=back-table border=0 cellspacing=0 cellpadding=1 width=100%
 tr 
   td 
-table class=front-table border=0 cellspacing=0 cellpadding=0 
width=100%
-  tr class=header-row 
-td width=27% 
-  div class=table-header-text align=leftProperties/div
-/td
-td width=73% 
-  div class=table-header-text align=leftnbsp;/div
-/td
-  /tr
-  tr 
-td
-  div class=table-label-textbean:message 
key=server.portnumber/:/div
-/td
-td
-  div class=table-normal-text 
-html:text property=portNumberText size=24 maxlength=24/
-  /div
-/td
-  /tr
-  tr
-td class=line-row colspan=2img src= alt= width=1 height=1 
border=0/td
-  /tr
-  tr 
-td
-  div class=table-label-textbean:message 
key=server.debuglevel/:/div
-/td
-td
-  div class=table-normal-text 
+controls:table tableStyle=front-table lineStyle=line-row
+controls:row header=true 
+labelStyle=table-header-text dataStyle=table-header-text
+controls:labelbean:message key=server.properties//controls:label
+controls:datanbsp;/controls:data
+/controls:row
+
+controls:row labelStyle=table-label-text dataStyle=table-normal-text
+controls:labelbean:message key=server.portnumber/:/controls:label
+controls:data
+  html:text property=portNumberText size=24 maxlength=24/
+/controls:data
+/controls:row
+
+controls:row labelStyle=table-label-text dataStyle=table-normal-text
+controls:labelbean:message key=server.debuglevel/:/controls:label
+controls:data
 html:select property=debugLvl
- bean:define id=debugLvlVals name=serverForm 
property=debugLvlVals/
+ bean:define id=debugLvlVals name=serviceForm 
+property=debugLvlVals/
  html:options collection=debugLvlVals property=value
labelProperty=label/
 /html:select
-  /div
-/td
-  /tr
-  tr
-td class=line-row colspan=2img src= alt= width=1 height=1 
border=0/td
-  /tr
-  tr 
-td
-  div class=table-label-textbean:message 
key=server.shutdown/:/div
-/td
-td
-  div class=table-normal-text 
-html:text property=shutdownText size=24 maxlength=24/
-  /div
-/td
-  /tr
-/table
-  /td
-/tr
-  /table
-  table width=100% border=0 cellspacing=0 cellpadding=0
-tr
-  tdnbsp;/td
-/tr
-tr
-  td colspan=2 align=right nowrap
-html:submit styleClass=button
-   bean:message key=button.save/ 
-/html:submit  
-nbsp;
-html:reset styleClass=button
-bean:message key=button.cancel/ 
-/html:reset 
+/controls:data
+/controls:row
+
+   controls:row labelStyle=table-label-text dataStyle=table-normal-text
+controls:labelbean:message key=server.shutdown/:/controls:label
+controls:data
+   html:text property=shutdownText size=24 maxlength=24/
+/controls:data
+/controls:row
+  /controls:table

[PATCH] jakarta-tomcat-4.0/webapps/admin

2001-12-19 Thread Manveen Kaur

Hi,

Please commit my patch to the Head branch.

thanks,
Manveen

Comments:
---
Modified server.jsp and service.jsp to use custom tags to generate the
list of available actions from each page.
Using these custom tags eliminates the need of setting ActionVals in
SetUpServer and SetUpService.java


Index: server.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/server.jsp,v
retrieving revision 1.2
diff -u -r1.2 server.jsp
--- server.jsp  2001/12/11 22:54:12 1.2
+++ server.jsp  2001/12/19 22:58:49
@@ -4,6 +4,7 @@
 %@ 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 %
+%@ taglib uri=/WEB-INF/controls.tld prefix=controls %
 
 html:html locale=true
 
@@ -23,11 +24,13 @@
   /td
   td align=right nowrap 
 div class=page-title-text
-  html:select property=action
-  bean:define id=actionVals name=serverForm property=actionVals/
-  html:options collection=actionVals 
-property=value labelProperty=label/
-/html:select
+controls:actions
+controls:action selected=true bean:message 
+key=actions.available.actions/ /controls:action
+controls:action - /controls:action
+!-- will add the urls later once those screens get implemented --
+controls:action url=  bean:message key=actions.services.create/ 
+/controls:action
+controls:action url=  bean:message key=actions.services.delete/ 
+/controls:action
+/controls:actions
 /div
   /td
 /tr
Index: service.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/service.jsp,v
retrieving revision 1.1
diff -u -r1.1 service.jsp
--- service.jsp 2001/12/14 23:22:33 1.1
+++ service.jsp 2001/12/19 22:58:50
@@ -4,6 +4,7 @@
 %@ 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 %
+%@ taglib uri=/WEB-INF/controls.tld prefix=controls %
 
 html:html locale=true
 
@@ -28,11 +29,33 @@
   /td
   td width=19% 
 div align=right
-  html:select property=action
-  bean:define id=actionVals name=serviceForm property=actionVals/
-  html:options collection=actionVals 
-   property=value labelProperty=label/
-/html:select
+controls:actions
+controls:action selected=true -bean:message 
+key=actions.available.actions/- /controls:action
+controls:action - /controls:action
+!-- will add the urls later once those screens get implemented --
+controls:action url=  bean:message 
+key=actions.accesslogger.create/ /controls:action
+controls:action url=  bean:message 
+key=actions.accesslogger.delete/ /controls:action
+controls:action - /controls:action
+controls:action url=  bean:message key=actions.connector.create/ 
+/controls:action
+controls:action url=  bean:message key=actions.connector.delete/ 
+/controls:action
+controls:action - /controls:action
+controls:action url=  bean:message key=actions.host.create/ 
+/controls:action
+controls:action url=  bean:message key=actions.host.delete/ 
+/controls:action
+controls:action - /controls:action
+controls:action url=  bean:message key=actions.logger.create/ 
+/controls:action
+controls:action url=  bean:message key=actions.logger.delete/ 
+/controls:action
+controls:action - /controls:action
+controls:action url=  bean:message 
+key=actions.requestfilter.create/ /controls:action
+controls:action url=  bean:message 
+key=actions.requestfilter.delete/ /controls:action
+controls:action - /controls:action
+controls:action url=  bean:message key=actions.userrealm.create/ 
+/controls:action
+controls:action url=  bean:message key=actions.userrealm.delete/ 
+/controls:action
+controls:action - /controls:action
+controls:action url=  bean:message key=actions.valve.create/ 
+/controls:action
+controls:action url=  bean:message key=actions.valve.delete/ 
+/controls:action
+controls:action - /controls:action
+controls:action url=  bean:message key=actions.service.delete/ 
+/controls:action
+/controls:actions
   /div
   /td
 

[PATCH] jakarta-tomcat-4.0/webapps/admin

2001-12-18 Thread Manveen Kaur

Hi,

Please commit my patch to the HEAD branch.

Sincerely,
Manveen

==

Comments:
-

This is a fix for the bug:

The selected node does not get highlighted when the node is selected.
Made changes so that the tree also gets refreshed with each node selection,
along with loading the  appropriate content in the content frame.



Index: WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.5
diff -u -r1.5 TreeControlTag.java
--- WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java 2001/12/16 19:38:02
 1.5
+++ WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java 2001/12/18 20:10:38
@@ -397,6 +397,9 @@
 
 String action = replace(getAction(), ${name}, encodedNodeName);
 
+String updateTreeAction =
+replace(getAction(), tree=${name}, select= + 
+encodedNodeName);
+
 out.print(td);
 if ((action != null)  !node.isLeaf()) {
 out.print(a href=\);
@@ -448,6 +451,10 @@
 out.print(target);
 out.print(\);
 }
+ // to refresh the tree in the same 'self' frame
+out.print( onclick=\);
+out.print(self.location.href=' + updateTreeAction + ');
+out.print(\);
 out.print();
 }
 out.print(img src=\);
@@ -484,6 +491,10 @@
 out.print(labelStyle);
 out.print(\);
 }
+ // to refresh the tree in the same 'self' frame
+out.print( onclick=\);
+out.print(self.location.href=' + updateTreeAction + ');
+out.print(\);
 out.print();
 } else if (labelStyle != null) {
 out.print(span class=\);



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


[PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-14 Thread Manveen Kaur

Hi, 

Please add these files to the HEAD branch.

Added functionality (end-to-end) for displaying/modifying services.
 
 New files:
 
service.jsp goes into webapps/admin
*.java go into webapps/admin/WEB-INF/classes/org/apache/webapp/admin
 
 Thanks,
--Manveen
 



ServiceForm.java
Description: Binary data


SetUpServiceAction.java
Description: Binary data


ServiceAction.java
Description: Binary data


service.jsp
Description: Binary data

Index: WEB-INF/struts-config.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.10
diff -u -r1.10 struts-config.xml
--- WEB-INF/struts-config.xml   2001/12/06 23:49:19 1.10
+++ WEB-INF/struts-config.xml   2001/12/14 18:38:11
@@ -19,6 +19,10 @@
 form-bean  name=serverForm
 type=org.apache.webapp.admin.ServerForm/
 
+!-- Service form bean --
+form-bean  name=serviceForm
+type=org.apache.webapp.admin.ServiceForm/
+
 !-- Set Locale form bean --
 form-bean  name=setLocaleForm
 type=org.apache.webapp.admin.SetLocaleForm/
@@ -50,6 +54,10 @@
 path=/server.jsp
 redirect=false/
 
+forwardname=Service
+path=/service.jsp
+redirect=false/
+
 forwardname=Save Successful
 path=/saved.jsp
 redirect=false/
@@ -77,7 +85,7 @@
   redirect=true/
 /action
 
-!-- Set up Tree datastructure --
+!-- Set up Server --
 actionpath=/setUpServer
type=org.apache.webapp.admin.SetUpServerAction
name=serverForm
@@ -87,6 +95,16 @@
   redirect=true/
 /action
 
+   !-- Set up Service datastructure --
+actionpath=/setUpService
+   type=org.apache.webapp.admin.SetUpServiceAction
+   name=serviceForm
+   scope=session
+  forwardname=SetUpService
+  path=/service.jsp
+  redirect=true/
+/action
+
 !-- Log out of the application --
 actionpath=/logOut
type=org.apache.webapp.admin.LogOutAction
@@ -101,6 +119,14 @@
name=serverForm
   scope=session
   input=/server.jsp
+/action
+
+   !-- Process a user server change --
+actionpath=/service
+   type=org.apache.webapp.admin.ServiceAction
+   name=serviceForm
+  scope=session
+  input=/service.jsp
 /action
 
 !-- Process a set-locale action --
cvs server: Diffing WEB-INF/classes
cvs server: Diffing WEB-INF/classes/org
cvs server: Diffing WEB-INF/classes/org/apache
cvs server: Diffing WEB-INF/classes/org/apache/webapp
cvs server: Diffing WEB-INF/classes/org/apache/webapp/admin
Index: WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.6
diff -u -r1.6 ApplicationResources_en.properties
--- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties  
2001/12/11 22:54:12 1.6
+++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties  
+2001/12/14 18:38:11
@@ -30,3 +30,11 @@
 error.shutdownText.length=liShutdown Text must be atleast 6 characters/li
 error.portNumber.format=liPortNumber not a valid integer!/li
 error.portNumber.range=liPortNumber seems out of range. Valid range is 1-65535. 
/li
+error.engineName.required=liEngine name is required/li 
+service.service=Service
+service.name=Name
+service.engine.props=Engine properties
+service.defaulthostname=Default Hostname
+service.properties=Service Properties
+service.property=Property
+service.value=Value
Index: WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.8
diff -u -r1.8 ApplicationResources_es.properties
--- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties  
2001/12/12 18:25:43 1.8
+++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties  
+2001/12/14 18:38:11
@@ -30,3 +30,11 @@
 error.shutdownText.length=liEl texto de la para Detener debe ser de al menos 6 
caracteres!/li
 error.portNumber.format=liEl numero de puerto es un entero no valido! /li
 error.portNumber.range=liEl numero de puerto esta fuera del rango. El rango valido 
es 1-65535./li
+error.engineName.required=liSe requiere el nombre del motor/li 
+service.service=Mantienen
+service.name=Nombre

[PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-11 Thread Manveen Kaur

Please commit these changes to the HEAD branch.

thanks,
--Manveen

Comments:
-

1)
Front-end validation added for the server screen.

Checks added:
-Portnumber :
   * cannot be null,
   * must be a valid integer (cannot be random characters)
   * in the range 1-65535.
-ShutdownText:
* must be atleast characters.

2)
The I18N is also in place for this. Added corresponding front end validation
error messages to ApplicationResources.properties files for english and
spanish.

3)
Navigation tree.
Modified colors of selected/unselected nodes from red/green to black
Bold/black.
Changed style sheet to use arial font.


Index: admin.css
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/admin.css,v
retrieving revision 1.2
diff -u -r1.2 admin.css
--- admin.css   2001/12/06 21:46:09 1.2
+++ admin.css   2001/12/11 21:23:28
@@ -2,34 +2,35 @@
   color: #FF;
   margin: 3px 5px 5px 3px;
   font-size: large;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family:  Arial, Verdana,Helvetica, Sans-Serif;
 }
 
 .page-title-text {
   color: #FF;
+  font-weight: bold;
   margin: 3px 5px 5px 3px;
-  font-size: large;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-size: normal;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .table-title-text {
   color: #00;
   font-weight: bold;
   margin: 3px 5px 5px 4px;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .table-header-text {
   color: #FF;
-  font-weight: bold;
+  font-weight: normal;
   margin: 3px 5px 1px 15px;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family:  Arial, Verdana,Helvetica, Sans-Serif;
 }
 
 .table-label-text {
   color: #00;
   margin: 3px 5px 3px 15px;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .table-normal-text {
@@ -46,42 +47,42 @@
 
 .front-table {
   background-color: #FF;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .page-title-row {
   background-color: #7171A5;
   text-align: right;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .header-row {
   background-color: #CC;
   text-align: center;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .sort-row {
   background-color: #CECEFF;
   text-align: center;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .line-row {
   background-color:#CC;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 .button {
   background-color: #FF;
-  font-family: Verdana, Arial, Helvetica, Sans-Serif;
+  font-family: Arial, Verdana, Helvetica, Sans-Serif;
 }
 
 a.button-link-text:visited, a.button-link-text:link, a.button-link-text:active {
   color: #00;
   background-color: #FF;
   font-weight: bold;
-  font-family: Verdana, Geneva, Helvetica, Arial, Sans-Serif;
+  font-family: Arial, Verdana, Geneva, Helvetica, Sans-Serif;
   text-decoration: none;
 }
 
@@ -89,6 +90,6 @@
   color: #00;
   background-color: #FF;
   font-weight: bold;
-  font-family: Verdana, Geneva, Helvetica, Arial, Sans-Serif;
+  font-family: Arial, Verdana, Geneva, Helvetica, Sans-Serif;
   text-decoration: underline;
 }
Index: index.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/index.jsp,v
retrieving revision 1.7
diff -u -r1.7 index.jsp
--- index.jsp   2001/12/06 23:49:19 1.7
+++ index.jsp   2001/12/11 21:23:28
@@ -13,9 +13,9 @@
 
 !-- Body --
 
-frameset rows=100,* border=1
+frameset rows=100,* border=2
   frame name=banner src='%= response.encodeURL(banner.jsp) %' scrolling=no
-  frameset cols=300,* border=1
+  frameset cols=300,* border=2
 frame name=tree src='%= response.encodeURL(setUpTree.do) %' 
scrolling=auto
 frame name=content src='%= response.encodeURL(blank.jsp) %' 
scrolling=auto
   /frameset
Index: server.jsp
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/server.jsp,v
retrieving revision 1.1
diff -u -r1.1 server.jsp
--- server.jsp  2001/12/06 23:38:29 1.1
+++ server.jsp  2001/12/11 21:23:28
@@ -24,8 +24,9 @@
   td align=right nowrap 
 div class=page-title-text
   html:select property=action
-html:options collection=actionVals property=value
-   labelProperty=label/
+  bean:define id=actionVals name=serverForm property=actionVals/
+  html:options collection=actionVals 
+property=value labelProperty=label/
  

[PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-06 Thread Manveen Kaur

Enhanced the admin tool by adding a new server screen and its related 
backend functionality.

Please add these files to the HEAD branch.
( *.java under 
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/
server.jsp under jakarta-tomcat-4.0/webapps/admin/
PaperTexture.gif under jakarta-tomcat-4.0/webapps/admin/images/)

Thanks!




/*
 * $Header: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
 1.1 2001/11/06 20:40:13 craigmcc Exp $
 * $Revision: 1.1 $
 * $Date: 2001/11/06 20:40:13 $
 *
 * 
 *
 * The Apache Software License, Version 1.1
 *
 * Copyright (c) 2001 The Apache Software Foundation.  All rights
 * reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *notice, this list of conditions and the following disclaimer.
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *notice, this list of conditions and the following disclaimer in
 *the documentation and/or other materials provided with the
 *distribution.
 *
 * 3. The end-user documentation included with the redistribution, if
 *any, must include the following acknowlegement:
 *   This product includes software developed by the
 *Apache Software Foundation (http://www.apache.org/).
 *Alternately, this acknowlegement may appear in the software itself,
 *if and wherever such third-party acknowlegements normally appear.
 *
 * 4. The names The Jakarta Project, Tomcat, and Apache Software
 *Foundation must not be used to endorse or promote products derived
 *from this software without prior written permission. For written
 *permission, please contact [EMAIL PROTECTED]
 *
 * 5. Products derived from this software may not be called Apache
 *nor may Apache appear in their names without prior written
 *permission of the Apache Group.
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
 * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of the Apache Software Foundation.  For more
 * information on the Apache Software Foundation, please see
 * http://www.apache.org/.
 *
 */


package org.apache.webapp.admin;


import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.QueryExp;
import javax.management.Query;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.JMException;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanOperationInfo;
import javax.management.MBeanInfo;

import javax.management.modelmbean.ModelMBean;
import javax.management.modelmbean.ModelMBeanInfo;
/**
 * Test codeAction/code that handles events from the tree control test
 * page.
 *
 * @author Jazmin Jonson
 * @version $Revision: 1.1 $ $Date: 2001/11/06 20:40:13 $
 */

public class SetUpServerAction extends Action {

private static MBeanServer mBServer = null;

public final static String PORT_PROP_NAME = port; 
public final static String SHUTDOWN_PROP_NAME = shutdown;
public final static String DEBUG_PROP_NAME = debug;

private ArrayList debugLvlList = null; 
private ArrayList actionList = null;
 
// - Public Methods

/**
 * Process the specified HTTP request, and create the corresponding HTTP
 * response (or forward to another 

[PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-06 Thread Manveen Kaur

Please commit my patch in the HEAD branch.

Made changes to struts-config, internationalization 
ApplicationResources.properties files, and tree builder for the new 
server screen.



Index: ./WEB-INF/struts-config.xml
===
RCS file: /home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.8
diff -u -r1.8 struts-config.xml
--- WEB-INF/struts-config.xml   2001/11/21 01:10:09 1.8
+++ WEB-INF/struts-config.xml   2001/12/06 21:10:42
@@ -19,6 +19,10 @@
 form-bean  name=sampleForm
 type=org.apache.webapp.admin.SampleForm/
 
+!-- Server form bean --
+form-bean  name=serverForm
+type=org.apache.webapp.admin.ServerForm/
+
 !-- Set Locale form bean --
 form-bean  name=setLocaleForm
 type=org.apache.webapp.admin.SetLocaleForm/
@@ -46,6 +50,10 @@
 path=/tree-control-test.jsp
 redirect=false/
 
+forwardname=Server
+path=/server.jsp
+redirect=false/
+
 forwardname=Save Successful
 path=/saved.jsp
 redirect=false/
@@ -73,6 +81,16 @@
   redirect=true/
 /action
 
+!-- Set up Tree datastructure --
+actionpath=/setUpServer
+   type=org.apache.webapp.admin.SetUpServerAction
+   name=serverForm
+   scope=session
+  forwardname=SetUpServer
+  path=/server.jsp
+  redirect=true/
+/action
+
 !-- Log out of the application --
 actionpath=/logOut
type=org.apache.webapp.admin.LogOutAction
@@ -87,6 +105,14 @@
name=sampleForm
   scope=session
   input=/sample.jsp
+/action
+
+!-- Process a user server change --
+actionpath=/server
+   type=org.apache.webapp.admin.ServerAction
+   name=serverForm
+  scope=session
+  input=/server.jsp
 /action
 
 !-- Process a set-locale action --
Index: ./WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.4
diff -u -r1.4 ApplicationResources_en.properties
--- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties  
2001/11/18 17:17:08 1.4
+++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties  
+2001/12/06 21:10:42
@@ -8,6 +8,7 @@
 button.reset=Reset
 button.save=Save
 button.change=Change
+button.cancel=Cancel
 login.enter=Enter a username and password to start a new session
 login.changeLanguage=Change the language
 index.success=Login successful!
@@ -21,3 +22,7 @@
 sample.someText.required=liSome Text cannot be empty/li
 sample.moreText.required=liMore Text cannot be empty/li
 save.success=Save sucessful!
+server.heading=Tomcat Server
+server.portnumber=Port Number
+server.debuglevel=Debug Level
+server.shutdown=Shutdown
Index: ./WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.4
diff -u -r1.4 ApplicationResources_es.properties
--- WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties  
2001/11/18 17:17:08 1.4
+++ WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties  
+2001/12/06 21:10:42
@@ -8,6 +8,7 @@
 button.reset=Reiniciar
 button.save=Guardar
 button.change=Cambiar
+button.cancel=Cancelan
 login.enter=Introduzca un nombre de usuario y una contrase\u00f1a que empezar una 
sesi\u00f3n nueva
 login.changeLanguage=Cambie el idioma
 index.success=\u00a1Autenticaci\u00f3n tiene \u00e9xito!
@@ -21,3 +22,7 @@
 sample.someText.required=li\u00abAlg\u00fan Texto\u00bb no puede ser vac\u00edo/li
 sample.moreText.required=li\u00abM\u00e1s Texto\u00bb no puede ser vac\u00edo/li
 save.success=\u00a1Guardar tiene \u00e9xito!
+server.heading=Tomcat Servidor
+server.portnumber=NĂºmero de acceso
+server.debuglevel=Ponga a punto Llano
+server.shutdown=Parada normal
Index: ./WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
===
RCS file: 
/home/cvspublic/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
retrieving revision 1.1
diff -u -r1.1 TomcatTreeBuilder.java
--- WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java  2001/11/27 
02:46:28 1.1
+++ 

Re: [PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-06 Thread patrick.luby

Manveen,

I committed all of your new files except for the PaperTexture.gif. I didn't
commit the .gif file as it is not clear to me if that is copyrighted by
someone other than Apache.

Patrick

 
 Enhanced the admin tool by adding a new server screen and its related
 backend functionality.
 
 Please add these files to the HEAD branch.
 ( *.java under
 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/
 server.jsp under jakarta-tomcat-4.0/webapps/admin/
 PaperTexture.gif under jakarta-tomcat-4.0/webapps/admin/images/)
 
 Thanks!
 
   ---
  Name: SetUpServerAction.java
SetUpServerAction.javaType: Plain Text (text/plain)
  Encoding: 7bit
 
   Name: LabelValueBean.java
LabelValueBean.javaType: Plain Text (text/plain)
   Encoding: 7bit
 
 Name: ServerAction.java
ServerAction.javaType: Plain Text (text/plain)
 Encoding: 7bit
 
   Name: ServerForm.java
ServerForm.javaType: Plain Text (text/plain)
   Encoding: 7bit
 
Name: PaperTexture.gif
PaperTexture.gifType: GIF Image (image/gif)
Encoding: base64
 
Part 1.7Type: Plain Text (text/plain)

-- 
_
Patrick Luby  Email: [EMAIL PROTECTED]
Sun Microsystems  Phone: 408-276-7471
901 San Antonio Road, USCA14-303
Palo Alto, CA 94303-4900
_

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




[PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-06 Thread Manveen Kaur

Please add this file to the HEAD branch.
(I'd forgotten to attach it in my last mail.)

New Server screen added to admin tool.




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


Resend: [PATCH] jakarta-tomcat-4.0/webapps/admin/

2001-12-06 Thread Manveen Kaur


Resending...

On Thu, 6 Dec 2001, Manveen Kaur wrote:

 Please add this file to the HEAD branch.
 (I'd forgotten to attach it in my last mail.)
 
 New Server screen added to admin tool.
 


!-- Standard Struts Entries --

%@ page language=java %
%@ 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

%@ include file=header.jsp %

!-- Body --
body bgcolor=white

!--Form --

html:errors/
html:form method=POST action=/server focus=portNumberText
  table width=100% border=0 cellspacing=0 cellpadding=0
tr class=page-title-row
  td align=left nowrap
div class=page-title-textbean:message key=server.heading//div
  /td
  td align=right nowrap 
div class=page-title-text
  html:select property=action
html:options collection=actionVals property=value
   labelProperty=label/
/html:select
/div
  /td
/tr
tr
  tdnbsp;/td
/tr
tr
  td colspan=2 align=right nowrap
html:submit styleClass=button
   bean:message key=button.save/ 
/html:submit  
nbsp;
html:reset styleClass=button
bean:message key=button.cancel/ 
/html:reset 
  /td
/tr
tr
  tdnbsp;/td
/tr
  /table
  table class=back-table border=0 cellspacing=0 cellpadding=1 width=100%
tr 
  td 
table class=front-table border=0 cellspacing=0 cellpadding=0 
width=100%
  tr class=header-row 
td width=27% 
  div class=table-header-text align=leftProperties/div
/td
td width=73% 
  div class=table-header-text align=leftnbsp;/div
/td
  /tr
  tr 
td
  div class=table-label-textbean:message 
key=server.portnumber/:/div
/td
td
  div class=table-normal-text 
html:text property=portNumberText size=24 maxlength=24/
  /div
/td
  /tr
  tr
td class=line-row colspan=2img src= alt= width=1 height=1 
border=0/td
  /tr
  tr 
td
  div class=table-label-textbean:message 
key=server.debuglevel/:/div
/td
td
  div class=table-normal-text 
html:select property=debugLvl
 html:options collection=debugLvlVals property=value
   labelProperty=label/
/html:select
  /div
/td
  /tr
  tr
td class=line-row colspan=2img src= alt= width=1 height=1 
border=0/td
  /tr
  tr 
td
  div class=table-label-textbean:message 
key=server.shutdown/:/div
/td
td
  div class=table-normal-text 
html:text property=shutdownText size=24 maxlength=24/
  /div
/td
  /tr
/table
  /td
/tr
  /table
  table width=100% border=0 cellspacing=0 cellpadding=0
tr
  tdnbsp;/td
/tr
tr
  td colspan=2 align=right nowrap
html:submit styleClass=button
   bean:message key=button.save/ 
/html:submit  
nbsp;
html:reset styleClass=button
bean:message key=button.cancel/ 
/html:reset 
  /td
/tr
  /table
/html:form

!-- Standard Footer --

%@ include file=footer.jsp %

/body

/html:html


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


[PATCH] jakarta-tomcat-4.0/webapps/admin

2001-11-27 Thread tangojaz

Removing decoding for special characters like = and 
because Tomcat does this automatically. Below is the
cvs diff

Jazmin
-- 




__
Your favorite stores, helpful shopping tools and great gift ideas. Experience the 
convenience of buying online with Shop@Netscape! http://shopnow.netscape.com/

Get your own FREE, personal Netscape Mail account today at http://webmail.netscape.com/



cvsdiff
Description: cvsdiff

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


Re: [PATCH] jakarta-tomcat-4.0/webapps/admin

2001-11-27 Thread Bill Barker

I don't like to step on 4.x toes, or I'd do it my self.  But isn't it time
to change the subject to [VOTE] and make Jazmin a committer?
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Tuesday, November 27, 2001 7:04 PM
Subject: [PATCH] jakarta-tomcat-4.0/webapps/admin


 Removing decoding for special characters like = and 
 because Tomcat does this automatically. Below is the
 cvs diff

 Jazmin
 --




 __
 Your favorite stores, helpful shopping tools and great gift ideas.
Experience the convenience of buying online with Shop@Netscape!
http://shopnow.netscape.com/

 Get your own FREE, personal Netscape Mail account today at
http://webmail.netscape.com/







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


**

This message is intended only for the use of the person(s) listed above 
as the intended recipient(s), and may contain information that is 
PRIVILEGED and CONFIDENTIAL.  If you are not an intended recipient, 
you may not read, copy, or distribute this message or any attachment.  
If you received this communication in error, please notify us immediately 
by e-mail and then delete all copies of this message and any attachments.


In addition you should be aware that ordinary (unencrypted) e-mail sent 
through the Internet is not secure. Do not send confidential or sensitive 
information, such as social security numbers, account numbers, personal 
identification numbers and passwords, to us via ordinary (unencrypted) 
e-mail. 

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




[PATCH] jakarta-tomcat-4.0/webapps/admin

2001-11-26 Thread tangojaz

Below is the code to build the tree control nodes
for Tomcat Server, Service/Engine, and Connector
There is one new file: TomcatTreeBuilder.java
that goes in the following directory:

jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin 

The rest are cvs diffs of existing files

Jazmin

-- 




__
Your favorite stores, helpful shopping tools and great gift ideas. Experience the 
convenience of buying online with Shop@Netscape! http://shopnow.netscape.com/

Get your own FREE, personal Netscape Mail account today at http://webmail.netscape.com/



TomcatTreeBuilder.java
Description: TomcatTreeBuilder.java


cvsdiff
Description: cvsdiff

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


[PATCH] jakarta-tomcat-4.0/webapps/admin

2001-11-20 Thread tangojaz

Role Based Admin Change


I am thinking that a web server admin tool
my not have just one admin that controls everything
but there maybe be other less powerful admins with
limited control. For example there may be admins
that control properties for a certain subset of
webapps. In this case the less powerful
admins should be only be allowed to see what they
have access to. Thus the user's tree of configurable and readable objects
should be built according to their priviledges or
roles. In this case, the tree controller cannot be built
in the session listener code because the user has
not logged in yet at that point. I have moved the code for
the tree building to a new file SetUpTreeAction.java
which gets called from index.jsp after the user
has logged in.

SetUpTreeAction.java builds the root node and then
gets the init parameters set in web.xml of a classes that 
implement the TreeBuilder interface. That way anyone
can input nodes into the tree in the implementation
of the method buildTree() of the interface. One of the
parameters of the of the buildTree method is the request
so the user can do a getUserPrincipal() to do role checks.

Attached are the cvs diffs of the existing files and
the added files SetUpTreeAction.java and TreeBuilder.java
The new files should be checked into the following directory:

$TOMCAT_HOME/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin 

Also we should probably get rid of TreeControlTestListener.java


Jazmin

-- 




__
Your favorite stores, helpful shopping tools and great gift ideas. Experience the 
convenience of buying online with Shop@Netscape! http://shopnow.netscape.com/

Get your own FREE, personal Netscape Mail account today at http://webmail.netscape.com/



cvsdiff
Description: cvsdiff


TreeBuilder.java
Description: TreeBuilder.java


SetUpTreeAction.java
Description: SetUpTreeAction.java

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


[PATCH] jakarta-tomcat-4.0/webapps/admin files

2001-11-17 Thread tangojaz

Hi,

I have been looking into the details of the admin and
from what I can figure out, it is suppose to use frames.
I have changed the index.jsp to set the borders of the
frames to 1 so the user can see the frames. Also from
studying the code, I figured that clicking on a tree
node should change the right frame. However, the code
is not implemented to do so. I figured one had to do
something with the target parameter from the treeControlNode
so I added the code to have the link clicked render in
the target frame. Attached is the cvs diff.


Jazmin
-- 




__
Your favorite stores, helpful shopping tools and great gift ideas. Experience the 
convenience of buying online with Shop@Netscape! http://shopnow.netscape.com/

Get your own FREE, personal Netscape Mail account today at http://webmail.netscape.com/



cvsdiff
Description: cvsdiff

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