cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp
markt 2005/01/14 15:30:32 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context AddContextAction.java ContextForm.java DeleteContextAction.java DeleteContextForm.java DeleteContextsAction.java EditContextAction.java SaveContextAction.java webapps/admin/context context.jsp Log: Fix bug 33085. Expose privileged attribute of context through admin webapp. Also, remove unused imports in o.a.c.webapp.admin.context package Revision ChangesPath 1.84 +5 -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.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- mbeans-descriptors.xml19 Nov 2004 20:52:02 - 1.83 +++ mbeans-descriptors.xml14 Jan 2005 23:30:31 - 1.84 @@ -2125,6 +2125,10 @@ application type=boolean/ +attribute name=privileged + description=The privileged flag for this web application + type=boolean/ + attribute name=path description=The context path for this Context type=java.lang.String/ 1.76 +1 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties Index: ApplicationResources_en.properties === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- ApplicationResources_en.properties22 Jan 2004 02:39:33 - 1.75 +++ ApplicationResources_en.properties14 Jan 2005 23:30:31 - 1.76 @@ -146,6 +146,7 @@ context.cross.context=Cross Context context.docBase=Document Base context.override=Override +context.privileged=Privileged context.path=Path context.reloadable=Reloadable context.swallowOutput=Swallow Output 1.7 +2 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java Index: AddContextAction.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AddContextAction.java 26 Aug 2004 21:56:08 - 1.6 +++ AddContextAction.java 14 Jan 2005 23:30:31 - 1.7 @@ -18,18 +18,15 @@ import java.io.IOException; 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 org.apache.struts.util.MessageResources; -import org.apache.webapp.admin.LabelValueBean; import org.apache.webapp.admin.Lists; import org.apache.webapp.admin.TomcatTreeBuilder; /** @@ -96,6 +93,7 @@ contextFm.setCrossContext(false); contextFm.setDocBase(); contextFm.setOverride(false); +contextFm.setPrivileged(false); contextFm.setPath(); contextFm.setReloadable(false); contextFm.setSwallowOutput(false); 1.14 +24 -2 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ContextForm.java 26 Aug 2004 21:56:08 - 1.13 +++ ContextForm.java 14 Jan 2005 23:30:31 - 1.14 @@ -22,7 +22,6 @@ import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; -import
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp
amyroh 2002/09/04 18:56:40
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/context
AddContextAction.java ContextForm.java
EditContextAction.java SaveContextAction.java
webapps/admin/context context.jsp
Log:
Add swallowOutput property to Context admin page.
Revision ChangesPath
1.68 +1 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ApplicationResources_en.properties16 Aug 2002 00:30:45 - 1.67
+++ ApplicationResources_en.properties5 Sep 2002 01:56:39 - 1.68
@@ -137,6 +137,7 @@
context.override=Override
context.path=Path
context.reloadable=Reloadable
+context.swallowOutput=Swallow Output
context.usenaming=Use Naming
context.workdir=Working Directory
context.loader.properties=Loader Properties
1.57 +1 -0
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ApplicationResources_es.properties16 Aug 2002 00:30:45 - 1.56
+++ ApplicationResources_es.properties5 Sep 2002 01:56:39 - 1.57
@@ -138,6 +138,7 @@
context.override=Invalidaci\u00f3n
context.path=Camino
context.reloadable=Reloadable
+context.swallowOutput=Salida Del Trago
context.usenaming=Utilice El Nombramiento
context.workdir=Directorio De Trabajo
context.loader.properties=Propiedades del cargador
1.3 +5 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
Index: AddContextAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddContextAction.java 26 Mar 2002 00:04:44 - 1.2
+++ AddContextAction.java 5 Sep 2002 01:56:39 - 1.3
@@ -143,6 +143,7 @@
contextFm.setOverride(false);
contextFm.setPath();
contextFm.setReloadable(false);
+contextFm.setSwallowOutput(false);
contextFm.setUseNaming(false);
contextFm.setWorkDir();
contextFm.setPath();
1.9 +37 -10
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ContextForm.java 20 Jun 2002 22:53:15 - 1.8
+++ ContextForm.java 5 Sep 2002 01:56:39 - 1.9
@@ -145,7 +145,12 @@
* The text for reloadable boolean.
*/
private String reloadable = false;
-
+
+/**
+ * The text for swallowOutput boolean.
+ */
+private String swallowOutput = false;
+
/**
* The text for use naming boolean.
*/
@@ -472,22 +477,41 @@
/**
* Return the reloadable boolean value.
*/
-
+
public String getReloadable() {
return this.reloadable;
-
+
}
-
+
/**
* Set the reloadable value.
*/
public void setReloadable(String reloadable) {
-
+
this.reloadable = reloadable;
+
+}
+
+/**
+ * Return the swallowOutput boolean value.
+ */
+
+public String getSwallowOutput() {
+return this.swallowOutput;
+
}
-
+
+/**
+ * Set the swallowOutput value.
+ */
+public void setSwallowOutput(String swallowOutput) {
+
+this.swallowOutput = swallowOutput;
+
+}
+
/**
* Return the use naming boolean value.
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp
amyroh 2002/08/19 16:10:17 Modified:webapps/admin/context context.jsp Log: Change so that workDir is not editable since when Catalina starts up, it calculates a value for this property. Let it just use the default value. Revision ChangesPath 1.10 +2 -2 jakarta-tomcat-4.0/webapps/admin/context/context.jsp Index: context.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/context.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- context.jsp 24 Jul 2002 00:03:23 - 1.9 +++ context.jsp 19 Aug 2002 23:10:17 - 1.10 @@ -203,7 +203,7 @@ /controls:data /controls:row -%-- input only allowed on create transaction --% +%-- input only allowed on create transaction controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=context.workdir/:/controls:label controls:data @@ -215,7 +215,7 @@ html:hidden property=workDir/ /logic:equal /controls:data -/controls:row +/controls:row--% /controls:table /td /tr -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp
manveen 02/05/02 11:16:10 Modified:webapps/admin/context context.jsp Log: cannot add or delete a realm from the admin context. Revision ChangesPath 1.6 +4 -1 jakarta-tomcat-4.0/webapps/admin/context/context.jsp Index: context.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/context.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- context.jsp 26 Apr 2002 19:15:52 - 1.5 +++ context.jsp 2 May 2002 18:16:10 - 1.6 @@ -51,6 +51,9 @@ URLEncoder.encode(thisObjectName) %' bean:message key=actions.loggers.deletes/ /controls:action +%-- cannot delete or add the realm of the context of the admin app --% +logic:notEqual name=contextForm property=path +value='%= request.getContextPath() %' controls:action disabled=true - /controls:action controls:action url='%= /AddRealm.do?parent= + URLEncoder.encode(thisObjectName) %' @@ -60,7 +63,7 @@ URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.deletes/ /controls:action ---% +/logic:notEqual controls:action disabled=true - /controls:action controls:action url='%= /AddValve.do?parent= + URLEncoder.encode(thisObjectName) %' -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp contexts.jsp
manveen 02/04/26 12:15:52 Modified:webapps/admin/connector connectors.jsp webapps/admin/context context.jsp contexts.jsp Log: * disable delete this context operation from /admin * mark connector and context that cant be deleted from the admin tool with a red* Revision ChangesPath 1.3 +3 -0 jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp Index: connectors.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connectors.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- connectors.jsp26 Apr 2002 03:50:41 - 1.2 +++ connectors.jsp26 Apr 2002 19:15:52 - 1.3 @@ -66,6 +66,9 @@ tddiv align=left class=table-normal-textnbsp; %-- the connector the admin app is running on cannot be deleted through the tool --% + logic:match name=connector value='%= Integer.toString(request.getServerPort()) %' +font color='red'*/font + /logic:match logic:notMatch name=connector value='%= Integer.toString(request.getServerPort()) %' html:multibox property=connectors value=%= connector.toString() %/ 1.5 +4 -0 jakarta-tomcat-4.0/webapps/admin/context/context.jsp Index: context.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/context.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- context.jsp 16 Apr 2002 17:04:19 - 1.4 +++ context.jsp 26 Apr 2002 19:15:52 - 1.5 @@ -70,11 +70,15 @@ URLEncoder.encode(thisObjectName) %' bean:message key=actions.valves.deletes/ /controls:action +%-- cannot delete the context of the admin app from the tool --% +logic:notEqual name=contextForm property=path +value='%= request.getContextPath() %' controls:action disabled=true - /controls:action controls:action url='%= /DeleteContext.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.contexts.delete/ /controls:action +/logic:notEqual /logic:notEqual /controls:actions /div 1.4 +3 -0 jakarta-tomcat-4.0/webapps/admin/context/contexts.jsp Index: contexts.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/contexts.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- contexts.jsp 26 Apr 2002 04:06:44 - 1.3 +++ contexts.jsp 26 Apr 2002 19:15:52 - 1.4 @@ -65,6 +65,9 @@ tr class=line-row tddiv align=left class=table-normal-textnbsp; %-- admin context cannot be deleted from the tool --% + logic:match name=context value='%= request.getContextPath() %' +font color='red'*/font + /logic:match logic:notMatch name=context value='%= request.getContextPath() %' html:multibox property=contexts value=%= context.toString() %/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp contexts.jsp
manveen 02/03/23 13:52:27 Added: webapps/admin/context context.jsp contexts.jsp Log: refactoring context.. creating a new dir for context related jsp's. Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/context/context.jsp Index: context.jsp === !-- Standard Struts Entries -- %@ page language=java import=java.net.URLEncoder % %@ 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 %@ include file=../users/header.jsp % !-- Body -- body bgcolor=white !--Form -- html:errors/ html:form method=POST action=/SaveContext bean:define id=thisObjectName type=java.lang.String name=contextForm property=objectName/ html:hidden property=adminAction/ html:hidden property=objectName/ html:hidden property=loaderObjectName/ html:hidden property=managerObjectName/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 td width=81% div class=page-title-text align=left logic:equal name=contextForm property=adminAction value=Create bean:message key=actions.contexts.create/ /logic:equal logic:equal name=contextForm property=adminAction value=Edit bean:message key=actions.contexts.edit/ /logic:equal /div /td td width=19% div align=right controls:actions controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action disabled=true - /controls:action controls:action url='%= /AddLogger.do?parent= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.loggers.create/ /controls:action controls:action url='%= /DeleteLogger.do?parent= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.loggers.deletes/ /controls:action %-- controls:action disabled=true - /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.realms.create/ /controls:action controls:action url='%= /DeleteRealm.do?parent= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.deletes/ /controls:action controls:action disabled=true - /controls:action controls:action url= bean:message key=actions.valves.create/ /controls:action controls:action url= bean:message key=actions.valves.deletes/ /controls:action controls:action - /controls:action controls:action url= bean:message key=actions.thiscontext.delete/ /controls:action --% /controls:actions /div /td /tr /table %@ include file=../buttons.jsp % br %-- Context Properties table --% table border=0 cellspacing=0 cellpadding=0 width=100% tr td div class=table-title-text bean:message key=context.properties/ /div /td /tr /table table class=back-table border=0 cellspacing=0 cellpadding=1 width=100% tr td controls:table tableStyle=front-table lineStyle=line-row controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelbean:message key=service.property//controls:label controls:databean:message key=service.value//controls:data /controls:row controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=context.cookies/:/controls:label controls:data html:select property=cookies bean:define id=booleanVals name=contextForm property=booleanVals/ html:options collection=booleanVals property=value labelProperty=label/ /html:select /controls:data /controls:row controls:row labelStyle=table-label-text
cvs commit: jakarta-tomcat-4.0/webapps/admin/context context.jsp contexts.jsp
manveen 02/03/23 18:44:30 Modified:webapps/admin/context context.jsp contexts.jsp Log: Enabled delete context operation from context page. Revision ChangesPath 1.2 +9 -4 jakarta-tomcat-4.0/webapps/admin/context/context.jsp Index: context.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/context.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- context.jsp 23 Mar 2002 21:52:27 - 1.1 +++ context.jsp 24 Mar 2002 02:44:30 - 1.2 @@ -41,6 +41,7 @@ controls:actions controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action disabled=true - /controls:action +logic:notEqual name=contextForm property=adminAction value=Create controls:action url='%= /AddLogger.do?parent= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.loggers.create/ @@ -62,10 +63,14 @@ controls:action disabled=true - /controls:action controls:action url= bean:message key=actions.valves.create/ /controls:action controls:action url= bean:message key=actions.valves.deletes/ /controls:action -controls:action - /controls:action -controls:action url= bean:message key=actions.thiscontext.delete/ /controls:action - --% - /controls:actions +--% + controls:action disabled=true - /controls:action + controls:action url='%= /DeleteContext.do?select= + +URLEncoder.encode(thisObjectName) %' +bean:message key=actions.contexts.delete/ + /controls:action +/logic:notEqual +/controls:actions /div /td /tr 1.2 +1 -1 jakarta-tomcat-4.0/webapps/admin/context/contexts.jsp Index: contexts.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context/contexts.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- contexts.jsp 23 Mar 2002 21:52:27 - 1.1 +++ contexts.jsp 24 Mar 2002 02:44:30 - 1.2 @@ -70,7 +70,7 @@ tddiv align=left class=table-normal-textnbsp; html:link page='%= /EditContext.do?select= + java.net.URLEncoder.encode(context.toString()) %' -controls:attribute name=context attribute=name/ +controls:attribute name=context attribute=path/ /html:link /div/td /tr -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
