MissingResourceException on ResourceBundle.getBundle()
Hi, I have a web-app that looks up a properties file. I'm getting a java.util.MissingResourceException on ResourceBundle.getBundle(..); The jar containg the properties file is in WEB-INF/lib. Is this a classpath issue? Is there a workaround? Any help would be greatly appreciated. thanks Manveen -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources listEnvEntries.jsp
manveen 2002/06/13 12:31:30 Modified:webapps/admin/resources listEnvEntries.jsp Log: envEntries.jspf should be included from within the html:form so that the value of defined beans are available to it. Revision ChangesPath 1.4 +1 -2 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jsp Index: listEnvEntries.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- listEnvEntries.jsp13 Jun 2002 18:19:48 - 1.3 +++ listEnvEntries.jsp13 Jun 2002 19:31:30 - 1.4 @@ -38,13 +38,12 @@ /tr /table -/html:form - br %@ include file=envEntries.jspf % br +/html:form /body /html:html -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourcesTreeBuilder.java
manveen 2002/06/13 12:34:18 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourcesTreeBuilder.java Log: Placeholders for parent and parentType added. these should be available as request parameters from ListEnvEntriesAction.java. Revision ChangesPath 1.6 +6 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java Index: ResourcesTreeBuilder.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ResourcesTreeBuilder.java 7 May 2002 18:54:49 - 1.5 +++ ResourcesTreeBuilder.java 13 Jun 2002 19:34:18 - 1.6 @@ -150,7 +150,8 @@ EnvironmentEntries.gif, resources.getMessage(resources.env.entries), resources/listEnvEntries.do?forward= + - URLEncoder.encode(EnvEntries List Setup), + URLEncoder.encode(EnvEntries List Setup) + + parent=myParentparentType=myParentType, content, false); root.addChild(subtree); -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntries.jspf listEnvEntries.jspf
manveen 2002/06/13 12:44:42 Modified:webapps/admin/resources envEntries.jspf listEnvEntries.jspf Log: Adding parent info and pasing it to SetUpEnvEntry. Revision ChangesPath 1.6 +2 -1 jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf Index: envEntries.jspf === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- envEntries.jspf 13 Jun 2002 18:34:45 - 1.5 +++ envEntries.jspf 13 Jun 2002 19:44:42 - 1.6 @@ -32,7 +32,8 @@ /logic:present tddiv align=left class=table-normal-text html:link page='%= /resources/setUpEnvEntry.do?objectName= + - URLEncoder.encode(envEntry) + parent= + + URLEncoder.encode(envEntry) + +parent= + URLEncoder.encode(parentInfo) %' controls:attribute name=envEntry attribute=name/ /html:link 1.3 +2 -1 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf Index: listEnvEntries.jspf === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- listEnvEntries.jspf 4 May 2002 17:16:51 - 1.2 +++ listEnvEntries.jspf 13 Jun 2002 19:44:42 - 1.3 @@ -8,7 +8,8 @@ - /controls:action - controls:action url=/resources/setUpEnvEntry.do + controls:action url='%= /resources/setUpEnvEntry.do?parent= + +URLEncoder.encode(parentInfo) %' bean:message key=resources.actions.env.create/ /controls:action -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourceUtils.java
manveen 2002/06/13 16:38:26
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourceUtils.java
Log:
Set parent and parentType to empty strings (for global resources) . these are not
needed for computing the mBean for the global env entries case.
Revision ChangesPath
1.7 +18 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/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.java13 Jun 2002 23:17:57 - 1.6
+++ ResourceUtils.java13 Jun 2002 23:38:26 - 1.7
@@ -111,7 +111,7 @@
ename = new ObjectName( ENVIRONMENT_TYPE +
,+parentType+= + parent);
}
-
+
Iterator iterator = (mserver.queryMBeans(ename, null).iterator());
ArrayList results = new ArrayList();
@@ -124,9 +124,19 @@
EnvEntriesForm envEntriesForm = new EnvEntriesForm();
envEntriesForm.setEnvEntries((String[])
-results.toArray(new String[results.size()]));
-envEntriesForm.setParentName(parent);
-envEntriesForm.setParentType(parentType);
+results.toArray(new String[results.size()]));
+
+if (parent != null) {
+envEntriesForm.setParentName(parent);
+} else {
+envEntriesForm.setParentName();
+}
+
+if (parentType != null) {
+envEntriesForm.setParentType(parentType);
+} else {
+envEntriesForm.setParentType();
+}
return (envEntriesForm);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml
manveen 02/05/30 10:03:01 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml Log: Added some missing attributes under JNDIRealm. Revision ChangesPath 1.58 +18 -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.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- mbeans-descriptors.xml16 May 2002 20:46:00 - 1.57 +++ mbeans-descriptors.xml30 May 2002 17:03:01 - 1.58 @@ -6,7 +6,7 @@ !-- Descriptions of JMX MBeans for Catalina - $Id: mbeans-descriptors.xml,v 1.57 2002/05/16 20:46:00 amyroh Exp $ + $Id: mbeans-descriptors.xml,v 1.58 2002/05/30 17:03:01 manveen Exp $ -- mbeans-descriptors @@ -1011,13 +1011,30 @@ description=The message format used to select roles for a user type=java.lang.String/ +attribute name=roleName + description=The name of the attribute containing roles held elsewhere + type=java.lang.String/ + attribute name=roleSubtree description=Should we search the entire subtree for matching memberships? type=boolean/ +attribute name=userSubtree + description=Should we search the entire subtree for matching + users? + type=boolean/ + +attribute name=userPassword + description=The attribute name used to retrieve the user password + type=java.lang.String/ + attribute name=userPattern description=The message format used to select a user + type=java.lang.String/ + +attribute name=contextFactory + description=The JNDI context factory for this Realm type=java.lang.String/ /mbean -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
manveen 02/05/30 10:22:04
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
EditRealmAction.java SaveJNDIRealmAction.java
webapps/admin/realm jndiRealm.jsp
Log:
Fix for jndi realm throwing exception while adding a new realm.
Revision ChangesPath
1.7 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/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 30 May 2002 06:23:08 - 1.6
+++ EditRealmAction.java 30 May 2002 17:22:04 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.6 2002/05/30 06:23:08 manveen Exp $
- * $Revision: 1.6 $
- * $Date: 2002/05/30 06:23:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.7 2002/05/30 17:22:04 manveen Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/30 17:22:04 $
*
*
*
@@ -92,7 +92,7 @@
* Realm /em transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.6 $ $Date: 2002/05/30 06:23:08 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/30 17:22:04 $
*/
public class EditRealmAction extends Action {
@@ -383,16 +383,16 @@
attribute = digest;
realmFm.setDigest
((String) mBServer.getAttribute(rname, attribute));
-attribute = roleSearch;
+attribute = roleSubtree;
realmFm.setSearch
-((String) mBServer.getAttribute(rname, attribute));
+(((Boolean) mBServer.getAttribute(rname,
attribute)).toString());
attribute = roleName;
realmFm.setRoleAttribute
((String) mBServer.getAttribute(rname, attribute));
attribute = roleBase;
realmFm.setRoleBase
((String) mBServer.getAttribute(rname, attribute));
-attribute = roleSubtree;
+attribute = roleSearch;
realmFm.setRolePattern
((String) mBServer.getAttribute(rname, attribute));
attribute = contextFactory;
1.4 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Index: SaveJNDIRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveJNDIRealmAction.java 9 May 2002 01:07:31 - 1.3
+++ SaveJNDIRealmAction.java 30 May 2002 17:22:04 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
1.3 2002/05/09 01:07:31 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/09 01:07:31 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
1.4 2002/05/30 17:22:04 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/30 17:22:04 $
*
*
*
@@ -96,7 +96,7 @@
* emEdit Realm/em transactions for JNDI realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/09 01:07:31 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/30 17:22:04 $
*/
public final class SaveJNDIRealmAction extends Action {
@@ -288,7 +288,7 @@
attribute = roleSearch;
mBServer.setAttribute(roname,
- new Attribute(roleSearch, rform.getSearch()));
+ new Attribute(roleSearch,
rform.getRolePattern()));
attribute = roleName;
mBServer.setAttribute(roname,
@@ -300,7 +300,7 @@
attribute = roleSubtree;
mBServer.setAttribute(roname,
- new Attribute(roleSubtree,
rform.getRolePattern()));
+ new Attribute(roleSubtree, new
Boolean(rform.getSearch(;
attribute = roleBase;
mBServer.setAttribute(roname,
1.7 +1 -1 jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm memoryRealm.jsp
manveen 02/05/30 10:27:31 Modified:webapps/admin/realm memoryRealm.jsp Log: Realm form name should be memoryRealmForm Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp Index: memoryRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- memoryRealm.jsp 21 May 2002 00:36:43 - 1.6 +++ memoryRealm.jsp 30 May 2002 17:27:31 - 1.7 @@ -43,7 +43,7 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=memoryRealmForm property=adminAction value=Create -logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false +logic:notEqual name=memoryRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
manveen 02/05/30 11:30:36
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/realm
AddRealmAction.java EditRealmAction.java
JNDIRealmForm.java SaveJNDIRealmAction.java
webapps/admin/realm jndiRealm.jsp
Log:
Add provision to be able to set userSubtree property from the admintool.
Revision ChangesPath
1.60 +2 -1
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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ApplicationResources_en.properties30 May 2002 06:23:08 - 1.59
+++ ApplicationResources_en.properties30 May 2002 18:30:35 - 1.60
@@ -221,7 +221,8 @@
realm.roleBase=Role Base Element
realm.Attribute=Role Name Attribute
realm.pattern=Role Search Pattern
-realm.search=Search Subtrees
+realm.role.subtree=Search Role Subtree
+realm.user.subtree=Search User Subtree
realm.userPassword=User Password
realm.userPattern=User Search Pattern
valve.access.properties=Access Logger Properties
1.51 +2 -1
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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ApplicationResources_es.properties30 May 2002 06:23:08 - 1.50
+++ ApplicationResources_es.properties30 May 2002 18:30:35 - 1.51
@@ -221,7 +221,8 @@
realm.roleBase=Elemento Bajo Del Papel
realm.Attribute=Role Name Attribute
realm.pattern=Modelo De la Busqueda Del Papel
-realm.search=Search Subtrees
+realm.role.subtree=Search Role Subtree
+realm.user.subtree=Search User Subtree
realm.userPassword=Palabra de paso Del Utilizador
realm.userPattern=User Search Pattern
valve.access.properties=Propiedades del Access Logger
1.2 +7 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
Index: AddRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddRealmAction.java 16 Apr 2002 06:00:17 - 1.1
+++ AddRealmAction.java 30 May 2002 18:30:35 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
1.1 2002/04/16 06:00:17 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/16 06:00:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
1.2 2002/05/30 18:30:35 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/30 18:30:35 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Realm/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/16 06:00:17 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/30 18:30:35 $
*/
public class AddRealmAction extends Action {
@@ -194,8 +194,9 @@
realmFm.setRealmType(realmType);
realmFm.setDebugLvl(0);
realmFm.setDigest();
-realmFm.setRoleBase();
-realmFm.setSearch(false);
+realmFm.setRoleBase();
+realmFm.setUserSubtree(false);
+realmFm.setRoleSubtree(false);
realmFm.setRolePattern();
realmFm.setRoleAttribute();
realmFm.setRoleBase();
1.8 +8 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
manveen 02/05/30 12:42:23 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/realm AddRealmAction.java EditRealmAction.java JNDIRealmForm.java SaveJNDIRealmAction.java webapps/admin/realm jndiRealm.jsp Log: Add the userRoleName attribute to jndirealm. Revision ChangesPath 1.61 +4 -2 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.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ApplicationResources_en.properties30 May 2002 18:30:35 - 1.60 +++ ApplicationResources_en.properties30 May 2002 19:42:22 - 1.61 @@ -219,7 +219,8 @@ realm.connURL=Connection URL realm.connFactory=Context Factory realm.roleBase=Role Base Element -realm.Attribute=Role Name Attribute +realm.roleName=Role Name +realm.user.roleName=User Role Name realm.pattern=Role Search Pattern realm.role.subtree=Search Role Subtree realm.user.subtree=Search User Subtree @@ -248,7 +249,8 @@ error.connectionPassword.required=liDatabase password is required./li error.connectionURL.required=liDatabase URL is required./li error.connectionName.required=liDatabase username is required./li -error.roleAttribute.required=liRole name attribute is required./li +error.roleName.required=liRole name is required./li +error.userRoleName.required=liUser Role name is required./li error.digest.required=liDigest algorithm is required./li error.roleBase.required=liRole base element is required./li error.rolePattern.required=liRole search pattern is required./li 1.52 +4 -2 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ApplicationResources_es.properties30 May 2002 18:30:35 - 1.51 +++ ApplicationResources_es.properties30 May 2002 19:42:23 - 1.52 @@ -219,7 +219,8 @@ realm.connURL=URL De la Conexion realm.connFactory=Fabrica Del Contexto realm.roleBase=Elemento Bajo Del Papel -realm.Attribute=Role Name Attribute +realm.roleName=Role Name +realm.user.roleName=User Role Name realm.pattern=Modelo De la Busqueda Del Papel realm.role.subtree=Search Role Subtree realm.user.subtree=Search User Subtree @@ -248,7 +249,8 @@ error.connectionPassword.required=liSe requiere la palabra de paso de la base de datos./li error.connectionURL.required=liSe requiere el URL de la base de datos./li error.connectionName.required=liSe requiere el username de la base de datos./li -error.roleAttribute.required=liSe requiere el atributo del nombre del role./li +error.roleName.required=liRole name attribute requiredo./li +error.userRoleName.required=liUser Role name attribute requiredo./li error.digest.required=liSe requiere el algoritmo del digest/li error.roleBase.required=liSe requiere el elemento bajo del papel./li error.rolePattern.required=liSe requiere el modelo de la busqueda del papel./li 1.3 +6 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java Index: AddRealmAction.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AddRealmAction.java 30 May 2002 18:30:35 - 1.2 +++ AddRealmAction.java 30 May 2002 19:42:23 - 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v 1.2 2002/05/30 18:30:35 manveen Exp $ - * $Revision: 1.2 $ - * $Date: 2002/05/30 18:30:35 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v 1.3 2002/05/30 19:42:23 manveen Exp $ + * $Revision: 1.3 $ + * $Date: 2002/05/30 19:42:23
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml
manveen 02/05/30 12:43:29 Modified:catalina/src/share/org/apache/catalina/mbeans mbeans-descriptors.xml Log: add userRoleName attribute to JNDIRealm. Revision ChangesPath 1.59 +6 -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.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- mbeans-descriptors.xml30 May 2002 17:03:01 - 1.58 +++ mbeans-descriptors.xml30 May 2002 19:43:29 - 1.59 @@ -6,7 +6,7 @@ !-- Descriptions of JMX MBeans for Catalina - $Id: mbeans-descriptors.xml,v 1.58 2002/05/30 17:03:01 manveen Exp $ + $Id: mbeans-descriptors.xml,v 1.59 2002/05/30 19:43:29 manveen Exp $ -- mbeans-descriptors @@ -1009,6 +1009,11 @@ attribute name=roleSearch description=The message format used to select roles for a user + type=java.lang.String/ + + attribute name=userRoleName + description=The name of the attribute in the user's entry containing + roles for that user type=java.lang.String/ attribute name=roleName -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties
manveen 02/05/30 16:29:32 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties Log: missing / in /li. Revision ChangesPath 1.62 +1 -1 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.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- ApplicationResources_en.properties30 May 2002 19:42:22 - 1.61 +++ ApplicationResources_en.properties30 May 2002 23:29:32 - 1.62 @@ -327,7 +327,7 @@ users.error.rolename.required=Role Name is required users.error.select=Error selecting managed objects users.error.token=Transaction submitted out of order -users.error.username.required=liUser Name is requiredli +users.error.username.required=liUser Name is required/li users.group.newGroup=Create New Group Properties users.group.oldGroup=Edit Existing Group Properties users.group.properties=Group Properties -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] New committer: Denis Benoit
+1 --Manveen On Tue, 21 May 2002, Remy Maucherat wrote: I'd like to propose Denis Benoit Denis.Benoit at fbn.ca as a committer on the Tomcat project. Denis has contributed patches to Jasper 2 which brings an impressive performance improvement when using JSP pages which rely heavily on tags, such as the administration web application available in Tomcat 4.1.x. He appears willing to spend time to further improve Jasper 2 performance. He has my +1 as a committer. Remy -- 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]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context ContextForm.java
manveen 02/05/21 12:34:38
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java
Log:
Check for context path validation only while creation of a context.
Revision ChangesPath
1.6 +7 -6
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContextForm.java 29 Apr 2002 01:07:53 - 1.5
+++ ContextForm.java 21 May 2002 19:34:38 - 1.6
@@ -1,7 +1,7 @@
-/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.5 2002/04/29 01:07:53 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/29 01:07:53 $
+p/*
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.6 2002/05/21 19:34:38 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/21 19:34:38 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the context page.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/04/29 01:07:53 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/21 19:34:38 $
*/
public final class ContextForm extends ActionForm {
@@ -769,7 +769,8 @@
errors.add(docBase, new ActionError(error.docBase.required));
}
-if (!path.startsWith(/)) {
+// 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));
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context ContextForm.java
manveen 02/05/21 12:47:10
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context
ContextForm.java
Log:
cleaning up.
Revision ChangesPath
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextForm.java 21 May 2002 19:34:38 - 1.6
+++ ContextForm.java 21 May 2002 19:47:10 - 1.7
@@ -1,7 +1,7 @@
-p/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.6 2002/05/21 19:34:38 manveen Exp $
- * $Revision: 1.6 $
- * $Date: 2002/05/21 19:34:38 $
+/*
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.7 2002/05/21 19:47:10 manveen Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/21 19:47:10 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the context page.
*
* @author Manveen Kaur
- * @version $Revision: 1.6 $ $Date: 2002/05/21 19:34:38 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/21 19:47:10 $
*/
public final class ContextForm extends ActionForm {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/host hosts.jsp
manveen 02/05/21 16:45:38 Modified:webapps/admin/context contexts.jsp webapps/admin/host hosts.jsp Log: Look for the host name pattern in the ObjectName to identify the host and context the admin app is running on. Revision ChangesPath 1.6 +2 -2 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- contexts.jsp 10 May 2002 22:41:40 - 1.5 +++ contexts.jsp 21 May 2002 23:45:38 - 1.6 @@ -65,10 +65,10 @@ 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() %' + logic:match name=context value='%= path=+request.getContextPath()+, %' font color='red'*/font /logic:match - logic:notMatch name=context value='%= request.getContextPath() %' + logic:notMatch name=context value='%= path=+request.getContextPath()+, %' html:multibox property=contexts value=%= context.toString() %/ /logic:notMatch 1.4 +2 -2 jakarta-tomcat-4.0/webapps/admin/host/hosts.jsp Index: hosts.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/host/hosts.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hosts.jsp 10 May 2002 22:41:40 - 1.3 +++ hosts.jsp 21 May 2002 23:45:38 - 1.4 @@ -57,10 +57,10 @@ logic:iterate name=hostsList id=host tr class=line-row tddiv align=left class=table-normal-textnbsp; - logic:match name=host value='%= request.getServerName() %' + logic:match name=host value='%= host=+request.getServerName()+, %' font color='red'*/font /logic:match - logic:notMatch name=host value='%= request.getServerName() %' + logic:notMatch name=host value='%= host=+request.getServerName()+, %' html:multibox property=hosts value=%= host.toString() %/ /logic:notMatch -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp
manveen 02/05/20 17:36:43
Modified:webapps/admin admin.css
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
EditLoggerAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
EditRealmAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
EditValveAction.java
webapps/admin/connector connector.jsp
webapps/admin/context context.jsp
webapps/admin/host host.jsp
webapps/admin/logger logger.jsp
webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp
memoryRealm.jsp userDatabaseRealm.jsp
webapps/admin/service service.jsp
webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp
remoteHostValve.jsp requestDumperValve.jsp
singleSignOnValve.jsp
Log:
Property page banners show location in hierarchy.
Revision ChangesPath
1.4 +1 -1 jakarta-tomcat-4.0/webapps/admin/admin.css
Index: admin.css
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/admin.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- admin.css 11 Dec 2001 22:54:12 - 1.3
+++ admin.css 21 May 2002 00:36:42 - 1.4
@@ -69,7 +69,7 @@
}
.line-row {
- background-color:#CC;
+ background-color: #CC;
font-family: Arial, Verdana, Helvetica, Sans-Serif;
}
1.3 +15 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java
Index: EditLoggerAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditLoggerAction.java 21 Mar 2002 17:11:28 - 1.2
+++ EditLoggerAction.java 21 May 2002 00:36:42 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
1.2 2002/03/21 17:11:28 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/03/21 17:11:28 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.java,v
1.3 2002/05/21 00:36:42 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/21 00:36:42 $
*
*
*
@@ -91,7 +91,7 @@
* The codeAction/code that sets up emEdit Logger/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/03/21 17:11:28 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/21 00:36:42 $
*/
public class EditLoggerAction extends Action {
@@ -166,10 +166,17 @@
session.setAttribute(loggerForm, loggerFm);
loggerFm.setAdminAction(Edit);
loggerFm.setObjectName(lname.toString());
-loggerFm.setParentObjectName();
-sb = new StringBuffer(Logger ();
-sb.append(lname.getKeyProperty(className));
-sb.append());
+loggerFm.setParentObjectName();
+sb = new StringBuffer();
+String host = lname.getKeyProperty(host);
+String context = lname.getKeyProperty(path);
+if (host!=null) {
+sb.append(Host ( + host + ) );
+}
+if (context!=null) {
+sb.append(Context ( + context + ) );
+}
+sb.append(Logger);
loggerFm.setNodeLabel(sb.toString());
loggerFm.setDebugLvlVals(Lists.getDebugLevels());
loggerFm.setVerbosityLvlVals(Lists.getVerbosityLevels());
1.5 +14 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditRealmAction.java 3 May 2002 07:19:23 - 1.4
+++ EditRealmAction.java 21 May 2002 00:36:43 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.4 2002/05/03 07:19:23 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/03 07:19:23 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java SetUpDataSourceAction.java
manveen 02/05/16 14:47:30 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java SetUpDataSourceAction.java Log: Replaced username attribute with user. Revision ChangesPath 1.5 +5 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java Index: SaveDataSourceAction.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SaveDataSourceAction.java 9 May 2002 21:32:43 - 1.4 +++ SaveDataSourceAction.java 16 May 2002 21:47:30 - 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v 1.4 2002/05/09 21:32:43 manveen Exp $ - * $Revision: 1.4 $ - * $Date: 2002/05/09 21:32:43 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v 1.5 2002/05/16 21:47:30 manveen Exp $ + * $Revision: 1.5 $ + * $Date: 2002/05/16 21:47:30 $ * * * @@ -96,7 +96,7 @@ * updated data source entry./p * * @author Manveen Kaur - * @version $Revision: 1.4 $ $Date: 2002/05/09 21:32:43 $ + * @version $Revision: 1.5 $ $Date: 2002/05/16 21:47:30 $ * @since 4.1 */ @@ -217,7 +217,7 @@ mserver.setAttribute (oname, new Attribute(attribute, dataSourceForm.getDriverClass())); -attribute = username; +attribute = user; mserver.setAttribute (oname, new Attribute(attribute, dataSourceForm.getUsername())); 1.6 +5 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java Index: SetUpDataSourceAction.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- SetUpDataSourceAction.java9 May 2002 21:27:27 - 1.5 +++ SetUpDataSourceAction.java16 May 2002 21:47:30 - 1.6 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v 1.5 2002/05/09 21:27:27 manveen Exp $ - * $Revision: 1.5 $ - * $Date: 2002/05/09 21:27:27 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v 1.6 2002/05/16 21:47:30 manveen Exp $ + * $Revision: 1.6 $ + * $Date: 2002/05/16 21:47:30 $ * * * @@ -96,7 +96,7 @@ * being added, or a non-null value for an existing DataSource./p * * @author Manveen Kaur - * @version $Revision: 1.5 $ $Date: 2002/05/09 21:27:27 $ + * @version $Revision: 1.6 $ $Date: 2002/05/16 21:47:30 $ * @since 4.1 */ @@ -181,7 +181,7 @@ attribute = driverClassName; dataSourceForm.setDriverClass ((String) mserver.getAttribute(oname, attribute)); -attribute = username; +attribute = user; dataSourceForm.setUsername ((String) mserver.getAttribute(oname, attribute)); attribute = password; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/05/14 09:57:06 Modified:webapps/admin/connector connector.jsp Log: Fix for keystore Password value always null. Revision ChangesPath 1.16 +1 -4 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- connector.jsp 10 May 2002 22:41:40 - 1.15 +++ connector.jsp 14 May 2002 16:57:06 - 1.16 @@ -261,13 +261,10 @@ logic:equal name=connectorForm property=adminAction value=Create html:password property=keyStorePassword size=30/ /logic:equal - %-- display password only while creating connector. Do not display - password as cleartext --% - %-- + %-- display password only while creating connector --% logic:equal name=connectorForm property=adminAction value=Edit bean:write name=connectorForm property=keyStorePassword/ /logic:equal - --% /controls:data /controls:row /logic:equal -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: Password and username for Tomcat Web Server Admin Tool???
Hi Bill, The admin tool allows users with the role admin to login in. You can edit conf/tomcat-users.xml, and add the role admin to a user and use this username and password to login. thanks Manveen Bill Blackmon wrote: I've just installed Tomcat and want to lookover the Admin Tool. What are the default username and password? What file are they kept in? Thanks, Bill -- 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]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector SaveConnectorAction.java
manveen 02/05/14 16:30:30
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
SaveConnectorAction.java
Log:
Set proxyName attribute only if the user enters a value through the admin tool.
Revision ChangesPath
1.10 +11 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/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 9 May 2002 01:07:30 - 1.9
+++ SaveConnectorAction.java 14 May 2002 23:30:30 - 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.9 2002/05/09 01:07:30 manveen Exp $
- * $Revision: 1.9 $
- * $Date: 2002/05/09 01:07:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
1.10 2002/05/14 23:30:30 manveen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/05/14 23:30:30 $
*
*
*
@@ -95,7 +95,7 @@
* emEdit Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.9 $ $Date: 2002/05/09 01:07:30 $
+ * @version $Revision: 1.10 $ $Date: 2002/05/14 23:30:30 $
*/
public final class SaveConnectorAction extends Action {
@@ -339,9 +339,13 @@
// proxy name and port do not exist for AJP connector
if (!(AJP.equalsIgnoreCase(connectorType))) {
-attribute = proxyName;
-mBServer.setAttribute(coname,
- new Attribute(proxyName,
cform.getProxyName()));
+attribute = proxyName;
+String proxyName = cform.getProxyName();
+if ((proxyName != null) || (proxyName.length()0)) {
+mBServer.setAttribute(coname,
+ new Attribute(proxyName, proxyName));
+}
+
attribute = proxyPort;
int proxyPort = 0;
try {
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp valves.jsp
manveen 02/05/10 15:41:42 Modified:webapps/admin blank.jsp error.jsp saved.jsp webapps/admin/connector connector.jsp connectors.jsp webapps/admin/context context.jsp contexts.jsp webapps/admin/host alias.jsp aliases.jsp host.jsp hosts.jsp webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp realms.jsp userDatabaseRealm.jsp webapps/admin/resources dataSource.jsp deleteDataSources.jsp deleteEnvEntries.jsp deleteUserDatabases.jsp envEntry.jsp listDataSources.jsp listEnvEntries.jsp listUserDatabases.jsp userDatabase.jsp webapps/admin/server server.jsp webapps/admin/service service.jsp services.jsp webapps/admin/users deleteGroups.jsp deleteRoles.jsp deleteUsers.jsp group.jsp listGroups.jsp listRoles.jsp listUsers.jsp role.jsp user.jsp webapps/admin/valve accessLogValve.jsp remoteAddrValve.jsp remoteHostValve.jsp requestDumperValve.jsp singleSignOnValve.jsp valves.jsp Log: - fix for addHost and addConnector when the service name contains blanks and other special characters. - minor cosmetic change, added a background imange to all content pages. Revision ChangesPath 1.2 +1 -1 jakarta-tomcat-4.0/webapps/admin/blank.jsp Index: blank.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/blank.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- blank.jsp 6 Dec 2001 23:49:19 - 1.1 +++ blank.jsp 10 May 2002 22:41:40 - 1.2 @@ -13,7 +13,7 @@ !-- Body -- -body bgcolor=white +body bgcolor=white background=images/PaperTexture.gif /body 1.6 +1 -1 jakarta-tomcat-4.0/webapps/admin/error.jsp Index: error.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/error.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- error.jsp 20 Nov 2001 13:57:44 - 1.5 +++ error.jsp 10 May 2002 22:41:40 - 1.6 @@ -13,7 +13,7 @@ !-- Body -- -body bgcolor=white +body bgcolor=white background=images/PaperTexture.gif center 1.4 +1 -1 jakarta-tomcat-4.0/webapps/admin/saved.jsp Index: saved.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/saved.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- saved.jsp 24 Apr 2002 06:02:40 - 1.3 +++ saved.jsp 10 May 2002 22:41:40 - 1.4 @@ -7,7 +7,7 @@ html:html locale=true - body bgcolor=white + body bgcolor=white background=images/PaperTexture.gif %-- Cause our tree control to refresh itself --% script language=JavaScript 1.15 +1 -1 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- connector.jsp 3 May 2002 06:15:13 - 1.14 +++ connector.jsp 10 May 2002 22:41:40 - 1.15 @@ -11,7 +11,7 @@ %@ include file=../users/header.jsp % !-- Body -- -body bgcolor=white +body bgcolor=white background=../images/PaperTexture.gif !--Form -- 1.5 +1 -1 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connectors.jsp1 May 2002 02:37:22 - 1.4 +++ connectors.jsp10 May 2002 22:41:40 - 1.5 @@ -10,7 +10,7 @@ %@ include file=../users/header.jsp % !-- Body -- -body bgcolor=white +body bgcolor=white background=../images/PaperTexture.gif !--Form -- 1.7 +1 -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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- context.jsp 2 May 2002 18:16:10 - 1.6 +++ context.jsp 10 May 2002 22:41:40 - 1.7 @@ -10,7 +10,7 @@ %@ include file=../users/header.jsp
cvs commit: jakarta-tomcat-4.0/webapps/admin/images PaperTexture.gif
manveen 02/05/10 15:42:23 Added: webapps/admin/images PaperTexture.gif Log: *Background image for all content pages. Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/images/PaperTexture.gif Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/service service.jsp
manveen 02/05/10 17:39:48 Modified:webapps/admin/service service.jsp Log: * Fix for validation messages not being shown on service page for create new service operation. Revision ChangesPath 1.17 +2 -1 jakarta-tomcat-4.0/webapps/admin/service/service.jsp Index: service.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- service.jsp 10 May 2002 22:41:41 - 1.16 +++ service.jsp 11 May 2002 00:39:48 - 1.17 @@ -24,9 +24,10 @@ name=serviceForm property=objectName/ bean:define id=thisServiceName type=java.lang.String name=serviceForm property=serviceName/ - html:hidden property=adminAction/ + html:hidden property=adminServiceName/ html:hidden property=objectName/ html:hidden property=engineObjectName/ + html:hidden property=adminAction/ bean:define id=adminServiceName type=java.lang.String name=serviceForm property=adminServiceName/ -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources dataSources.jspf
manveen 02/05/09 13:17:54 Modified:webapps/admin banner.jsp webapps/admin/resources dataSources.jspf Log: * Fix for displaying the (decoded) URL name in the list of Data Source names. - While creating a new data source resource, the URL is used as the name in the object name to uniquely identify the mBean. -It had to be encoded to void MalformedObjectName exception since it contains special charactes : which the ObjectName c'tor doesn't like. * Minor fix for the banner. Removed width attribute from the banner image to prevent it from stretching and distorting. Revision ChangesPath 1.7 +1 -1 jakarta-tomcat-4.0/webapps/admin/banner.jsp Index: banner.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/banner.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- banner.jsp3 May 2002 22:59:30 - 1.6 +++ banner.jsp9 May 2002 20:17:54 - 1.7 @@ -18,7 +18,7 @@ table width=100% border=0 cellspacing=0 cellpadding=0 tr td align=left valign=middle -div class=masthead-title-text align=leftimg src=images/TomcatBanner.jpg width=430 height=120/div +div class=masthead-title-text align=leftimg src=images/TomcatBanner.jpg height=120/div /td form method='post' action='/admin/commitChanges.do' target='_self' td align=right valign=middle 1.6 +1 -1 jakarta-tomcat-4.0/webapps/admin/resources/dataSources.jspf Index: dataSources.jspf === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/dataSources.jspf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dataSources.jspf 8 May 2002 02:50:05 - 1.5 +++ dataSources.jspf 9 May 2002 20:17:54 - 1.6 @@ -30,7 +30,7 @@ tddiv align=left class=table-normal-text html:link page='%= /resources/setUpDataSource.do?objectName= + URLEncoder.encode(dataSource) %' -controls:attribute name=dataSource attribute=name/ +controls:attribute name=dataSource attribute=url/ /html:link /div/td tddiv align=left class=table-normal-textnbsp; -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources dataSource.jsp dataSources.jspf
manveen 02/05/09 14:27:27
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/resources
DataSourceForm.java SaveDataSourceAction.java
SetUpDataSourceAction.java
webapps/admin/resources dataSource.jsp dataSources.jspf
Log:
* Added JNDI name to Data Source, used this attribute for the resource Name while
creating a new mBean for this Resource..
* Display list now displays JNDI name, JDBC class.
* Added a validation check that JNDI name is required while creating a new resource.
* JNDI Name can is editable only on create, while now URL can be edited any time.
Revision ChangesPath
1.58 +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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ApplicationResources_en.properties9 May 2002 01:41:51 - 1.57
+++ ApplicationResources_en.properties9 May 2002 21:27:27 - 1.58
@@ -298,6 +298,7 @@
resources.userdb.factory=Factory
resources.treeBuilder.databases=User Databases
resources.error.path.required=liPath is required/li
+resources.error.jndiName.required=liJNDI Name is required/li
# -- User Database Module --
users.actions.group.create=Create New Group
1.49 +2 -1
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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ApplicationResources_es.properties8 May 2002 00:41:18 - 1.48
+++ ApplicationResources_es.properties9 May 2002 21:27:27 - 1.49
@@ -297,7 +297,8 @@
resources.userdb.location=Location
resources.userdb.factory=Factory
resources.treeBuilder.userdbs=User Databases
-resources.error.path.required=liPath is required/li
+resources.error.path.required=liPath requerido/li
+resources.error.jndiName.required=liJNDI Nombre requerido/li
# -- User Database Module --
users.actions.group.create=Cree Al Nuevo Grupo
1.3 +26 -7
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSourceForm.java 7 May 2002 23:37:55 - 1.2
+++ DataSourceForm.java 9 May 2002 21:27:27 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
1.2 2002/05/07 23:37:55 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/07 23:37:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
1.3 2002/05/09 21:27:27 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/09 21:27:27 $
*
*
*
@@ -75,7 +75,7 @@
* Form bean for the individual data source page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/07 23:37:55 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/09 21:27:27 $
* @since 4.1
*/
@@ -101,6 +101,18 @@
this.url = url;
}
+/**
+ * The JNDI name of the data source.
+ */
+private String jndiName = null;
+
+public String getJndiName() {
+return (this.jndiName);
+}
+
+public void setJndiName(String jndiName) {
+this.jndiName = jndiName;
+}
/**
* The JDBC driver class of the data source.
@@ -220,12 +232,13 @@
public void reset(ActionMapping mapping, HttpServletRequest request) {
super.reset(mapping, request);
-url = null;
+url = null;
+jndiName = null;
driverClass = null;
username
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java
manveen 02/05/09 14:32:43 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java Log: * no need to set the name attribute on update operation. This is needed only for addResource during create. Revision ChangesPath 1.4 +4 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java Index: SaveDataSourceAction.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SaveDataSourceAction.java 9 May 2002 21:27:27 - 1.3 +++ SaveDataSourceAction.java 9 May 2002 21:32:43 - 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v 1.3 2002/05/09 21:27:27 manveen Exp $ - * $Revision: 1.3 $ - * $Date: 2002/05/09 21:27:27 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v 1.4 2002/05/09 21:32:43 manveen Exp $ + * $Revision: 1.4 $ + * $Date: 2002/05/09 21:32:43 $ * * * @@ -96,7 +96,7 @@ * updated data source entry./p * * @author Manveen Kaur - * @version $Revision: 1.3 $ $Date: 2002/05/09 21:27:27 $ + * @version $Revision: 1.4 $ $Date: 2002/05/09 21:32:43 $ * @since 4.1 */ @@ -209,9 +209,6 @@ ObjectName oname = new ObjectName(objectName); -attribute = name; -mserver.setAttribute -(oname, new Attribute(attribute,dataSourceForm.getJndiName())); attribute = url; mserver.setAttribute (oname, -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/images Roles.gif
manveen 02/05/06 15:35:33 Modified:webapps/admin/images Roles.gif Log: Updated image for Roles Revision ChangesPath 1.2 +3 -1 jakarta-tomcat-4.0/webapps/admin/images/Roles.gif Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java
manveen 02/05/06 15:50:10
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
Log:
Using the mBean name created by the addEnvironment operation.
Revision ChangesPath
1.5 +5 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveEnvEntryAction.java 5 May 2002 19:08:26 - 1.4
+++ SaveEnvEntryAction.java 6 May 2002 22:50:10 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.4 2002/05/05 19:08:26 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/05 19:08:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.5 2002/05/06 22:50:10 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/06 22:50:10 $
*
*
*
@@ -96,7 +96,7 @@
* updated Env Entry./p
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/05/05 19:08:26 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/06 22:50:10 $
* @since 4.1
*/
@@ -189,13 +189,7 @@
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, addEnvironment,
params, signature);
-
-// FIX ME
-// addEnvironment should return the name of the new
-// mBean just created
-objectName = ResourceUtils.ENVIRONMENT_TYPE +
- ,name= + params[0];
-
+
} catch (Exception e) {
getServlet().log
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm userDatabaseRealm.jsp
manveen 02/05/06 16:31:57 Modified:webapps/admin/realm userDatabaseRealm.jsp Log: UserDataBaseRealm's resourceName should only be editable in create. Revision ChangesPath 1.5 +6 -1 jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp Index: userDatabaseRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- userDatabaseRealm.jsp 3 May 2002 07:16:58 - 1.4 +++ userDatabaseRealm.jsp 6 May 2002 23:31:57 - 1.5 @@ -97,7 +97,12 @@ controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=realm.resource/:/controls:label controls:data -html:text property=resource size=25 maxlength=25/ +logic:equal name=userDatabaseRealmForm property=adminAction value=Create +html:text property=resource size=25 maxlength=25/ +/logic:equal +logic:equal name=userDatabaseRealmForm property=adminAction value=Edit +bean:write name=userDatabaseRealmForm property=resource scope=session/ +/logic:equal /controls:data /controls:row -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java SaveEnvEntryAction.java SetUpEnvEntryAction.java
manveen 02/05/05 12:08:26
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java SaveEnvEntryAction.java
SetUpEnvEntryAction.java
Log:
Support for adding override attribute in the form bean and action classes.
Revision ChangesPath
1.4 +22 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnvEntryForm.java 4 May 2002 19:56:29 - 1.3
+++ EnvEntryForm.java 5 May 2002 19:08:26 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
1.3 2002/05/04 19:56:29 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/04 19:56:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
1.4 2002/05/05 19:08:26 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/05 19:08:26 $
*
*
*
@@ -77,7 +77,7 @@
* Form bean for the individual environment entry page.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/04 19:56:29 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/05 19:08:26 $
* @since 4.1
*/
@@ -144,6 +144,20 @@
}
/**
+ * The value of override appl level entries.
+ */
+private boolean override = true;
+
+public boolean getOverride() {
+return (this.override);
+}
+
+public void setOverride(boolean override) {
+this.override = override;
+}
+
+
+/**
* Precomputed list of entry type labels and values.
*/
private static List typeVals = new ArrayList();
@@ -194,6 +208,7 @@
entryType = null;
value = null;
description = null;
+override = false;
}
@@ -247,6 +262,9 @@
errors.add(description,
new ActionError(users.error.quotes));
}
+
+// if cehcked, override will be sent as a request parameter
+override = (request.getParameter(override) != null);
if (validateType(entryType, value)) {
errors.add(value,
1.4 +8 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveEnvEntryAction.java 4 May 2002 16:36:22 - 1.3
+++ SaveEnvEntryAction.java 5 May 2002 19:08:26 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.3 2002/05/04 16:36:22 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/05/04 16:36:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.4 2002/05/05 19:08:26 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/05 19:08:26 $
*
*
*
@@ -96,7 +96,7 @@
* updated Env Entry./p
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/05/04 16:36:22 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/05 19:08:26 $
* @since 4.1
*/
@@ -218,6 +218,10 @@
ObjectName oname = new ObjectName(objectName);
// Update the specified env entry
+attribute = override;
+mserver.setAttribute
+(oname,
+ new Attribute(attribute, new Boolean(envEntryForm.getOverride(;
attribute = description;
mserver.setAttribute
(oname,
1.2 +7 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java
Index: SetUpEnvEntryAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java,v
retrieving revision 1.1
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources dataSources.jspf listDataSources.jsp listDataSources.jspf
manveen 02/05/05 13:20:33 Added: webapps/admin/resources dataSources.jspf listDataSources.jsp listDataSources.jspf Log: Jsps to list data source entries Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/resources/dataSources.jspf Index: dataSources.jspf === %-- DataSources List --% table class=back-table border=0 cellspacing=0 cellpadding=1 width=100%trtd table class=front-table border=1 cellspacing=0 cellpadding=0 width=100% tr class=header-row logic:present name=checkboxes td width=5%div align=left class=table-header-text nbsp; /td /logic:present td width=20%div align=left class=table-header-text bean:message key=resources.datasrc.jndi/ /div/td tddiv align=left class=table-header-text %-- FIX ME - this should be JDBC URL bean:message key=resources.datasrc.url/ --% bean:message key=users.list.description/ /div/td /tr logic:iterate name=dataSourcesForm property=dataSources id=dataSource type=java.lang.String tr class=line-row logic:present name=checkboxes tddiv align=center class=table-normal-text input type=checkbox name=dataSources value=%= dataSource % /td /logic:present tddiv align=left class=table-normal-text html:link page='%= /resources/setUpDataSource.do?objectName= + URLEncoder.encode(dataSource) %' controls:attribute name=dataSource attribute=name/ /html:link /div/td tddiv align=left class=table-normal-textnbsp; controls:attribute name=dataSource attribute=description/ /div/td /tr /logic:iterate /table /td/tr/table 1.1 jakarta-tomcat-4.0/webapps/admin/resources/listDataSources.jsp Index: listDataSources.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 action=/resources/listDataSources table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 td width=81% div class=page-title-text align=left bean:message key=resources.actions.datasrc/ /div /td td width=19% div align=right %@ include file=listDataSources.jspf % /div /td /tr /table /html:form br %@ include file=dataSources.jspf % br /body /html:html 1.1 jakarta-tomcat-4.0/webapps/admin/resources/listDataSources.jspf Index: listDataSources.jspf === controls:actions controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action disabled=true - /controls:action %-- FIX ME controls:action url=/resources/setDataSource.do bean:message key=resources.actions.datasrc.create/ /controls:action controls:action url='%= /resources/listDataSources.do?forward= + URLEncoder.encode(DataSources Delete List) %' bean:message key=resources.actions.datasrc.delete/ /controls:action --% /controls:actions -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntries.jspf
manveen 02/05/04 06:52:44 Modified:webapps/admin/resources envEntries.jspf Log: Add link from env entries list to display propertries of the env entry. Revision ChangesPath 1.2 +0 -5 jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf Index: envEntries.jspf === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- envEntries.jspf 4 May 2002 05:14:28 - 1.1 +++ envEntries.jspf 4 May 2002 13:52:44 - 1.2 @@ -31,19 +31,14 @@ /td /logic:present tddiv align=left class=table-normal-text - %-- FIX ME-- add link once the operation is implemented html:link page='%= /resources/setUpEnvEntry.do?objectName= + URLEncoder.encode(envEntry) %' controls:attribute name=envEntry attribute=name/ /html:link - --% controls:attribute name=envEntry attribute=name/ /div/td tddiv align=left class=table-normal-textnbsp; controls:attribute name=envEntry attribute=value/ -/div/td -tddiv align=left class=table-normal-textnbsp; - controls:attribute name=envEntry attribute=description/ /div/td /tr /logic:iterate -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java SetUpEnvEntryAction.java
manveen 02/05/04 07:40:09
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java SetUpEnvEntryAction.java
Log:
Added classes that display /edit an environment entry.
Revision ChangesPath
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
Index: EnvEntryForm.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
1.1 2002/05/04 14:40:09 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/05/04 14:40:09 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 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, Struts, 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.resources;
import java.util.List;
import java.util.ArrayList;
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.LabelValueBean;
/**
* Form bean for the individual environment entry page.
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/05/04 14:40:09 $
* @since 4.1
*/
public final class EnvEntryForm extends BaseForm {
// - Instance Variables
// - Properties
/**
* The name of the associated entry.
*/
private String name = null;
public String getName() {
return (this.name);
}
public void setName(String name) {
this.name = name;
}
/**
* The type of the associated entry.
*/
private String entryType = null;
public String getEntryType() {
return (this.entryType);
}
public void setEntryType(String entryType) {
this.entryType = entryType;
}
/**
* The value of the associated entry.
*/
private String value = null;
public String getValue() {
return (this.value
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntry.jsp envEntries.jspf
manveen 02/05/04 07:41:22 Modified:webapps/admin/resources envEntries.jspf Added: webapps/admin/resources envEntry.jsp Log: Display/edit environment entry jsp. Revision ChangesPath 1.3 +3 -1 jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf Index: envEntries.jspf === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- envEntries.jspf 4 May 2002 13:52:44 - 1.2 +++ envEntries.jspf 4 May 2002 14:41:22 - 1.3 @@ -35,10 +35,12 @@ URLEncoder.encode(envEntry) %' controls:attribute name=envEntry attribute=name/ /html:link -controls:attribute name=envEntry attribute=name/ /div/td tddiv align=left class=table-normal-textnbsp; controls:attribute name=envEntry attribute=value/ +/div/td +tddiv align=left class=table-normal-textnbsp; + controls:attribute name=envEntry attribute=description/ /div/td /tr /logic:iterate 1.1 jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp Index: envEntry.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=/resources/saveEnvEntry html:hidden property=objectName/ table width=100% border=0 cellspacing=0 cellpadding=0 tr class=page-title-row td align=left nowrap div class=page-title-text bean:write name=envEntryForm property=nodeLabel/ /div /td td align=right nowrap div class=page-title-text controls:actions controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action %-- controls:action url='%= /users/setUpEnvEntry.do %' bean:message key=resources.actions.env.create/ /controls:action controls:action url='%= /users/listEnvEntries.do?forward= + URLEncoder.encode(Users Delete List) %' bean:message key=resources.actions.env.delete/ /controls:action --% /controls:actions /div /td /tr /table %@ include file=../buttons.jsp % br table border=0 cellspacing=0 cellpadding=0 width=100% trtddiv class=table-title-text bean:message key=resources.env.props/ /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:label bean:message key=service.name/: /controls:label controls:data logic:present name=envEntryForm property=objectName bean:write name=envEntryForm property=name/ html:hidden property=name/ /logic:present logic:notPresent name=envEntryForm property=objectName html:text property=name size=24 maxlength=32/ /logic:notPresent /controls:data /controls:row controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:label bean:message key=connector.type/: /controls:label controls:data html:select property=entryType bean:define id=typeVals name=envEntryForm property=typeVals/ html:options collection=typeVals property=value labelProperty=label/ /html:select
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntry.jsp
manveen 02/05/04 08:37:09 Modified:webapps/admin/resources envEntry.jsp Log: Save entries operational. Create new environment entry enabled. Revision ChangesPath 1.2 +4 -4 jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp Index: envEntry.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- envEntry.jsp 4 May 2002 14:41:22 - 1.1 +++ envEntry.jsp 4 May 2002 15:37:09 - 1.2 @@ -37,12 +37,12 @@ controls:action - /controls:action -%-- -controls:action url='%= /users/setUpEnvEntry.do %' + +controls:action url=/resources/setUpEnvEntry.do bean:message key=resources.actions.env.create/ /controls:action - -controls:action url='%= /users/listEnvEntries.do?forward= +%-- +controls:action url='%= /resources/listEnvEntries.do?forward= + URLEncoder.encode(Users Delete List) %' bean:message key=resources.actions.env.delete/ /controls:action -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java
manveen 02/05/04 08:38:32
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
Log:
Implementation for save existing envirnment entry changes in place.
Revision ChangesPath
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.1 2002/05/04 15:38:32 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/05/04 15:38:32 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 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, Struts, 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.resources;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
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.Attribute;
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 org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
/**
* pImplementation of strongAction/strong that saves a new or
* updated Env Entry./p
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/05/04 15:38:32 $
* @since 4.1
*/
public final class SaveEnvEntryAction extends Action {
// - Instance
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans NamingResourcesMBean.java
manveen 02/05/04 08:48:54
Modified:catalina/src/share/org/apache/catalina/mbeans
NamingResourcesMBean.java
Log:
Minor type on addEnvironment operation on the NamingResource mBean.
Also, this operation should take value as a parameter while creating a new env entry.
Revision ChangesPath
1.2 +7 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamingResourcesMBean.java 3 May 2002 23:42:48 - 1.1
+++ NamingResourcesMBean.java 4 May 2002 15:48:54 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.1 2002/05/03 23:42:48 amyroh Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/03 23:42:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.2 2002/05/04 15:48:54 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/04 15:48:54 $
*
*
*
@@ -83,7 +83,7 @@
* codeorg.apache.catalina.deploy.NamingResources/code component./p
*
* @author Amy Roh
- * @version $Revision: 1.1 $ $Date: 2002/05/03 23:42:48 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/04 15:48:54 $
*/
public class NamingResourcesMBean extends BaseModelMBean {
@@ -181,7 +181,7 @@
*
* @param envName New environment entry name
*/
-public void addEnvironment(String envName, String type) {
+public void addEnvironment(String envName, String type, String value) {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
@@ -194,7 +194,8 @@
}
env = new ContextEnvironment();
env.setName(envName);
-env.setName(type);
+env.setType(type);
+env.setValue(value);
nresources.addEnvironment(env);
// FIXME add to the javax.naming.directory.DirContext
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java
manveen 02/05/04 08:49:47
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
Log:
Implemented add new env entry. Its working now.
Revision ChangesPath
1.2 +4 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveEnvEntryAction.java 4 May 2002 15:38:32 - 1.1
+++ SaveEnvEntryAction.java 4 May 2002 15:49:47 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.1 2002/05/04 15:38:32 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/04 15:38:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.2 2002/05/04 15:49:47 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/04 15:49:47 $
*
*
*
@@ -96,7 +96,7 @@
* updated Env Entry./p
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/04 15:38:32 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/04 15:49:47 $
* @since 4.1
*/
@@ -178,9 +178,9 @@
Object params[] = new Object[3];
params[0] = envEntryForm.getName();
-params[1] = envEntryForm.getValue();
-params[2] = envEntryForm.getDescription();
-
+params[1] = envEntryForm.getEntryType();
+params[2] = envEntryForm.getValue();
+
ObjectName oname = null;
try {
@@ -196,7 +196,7 @@
getServlet().log
(resources.getMessage(locale, users.error.invoke,
- createUser), e);
+ addEnvironment), e);
response.sendError
(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
resources.getMessage(locale, users.error.invoke,
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans NamingResourcesMBean.java
manveen 02/05/04 09:10:34
Modified:catalina/src/share/org/apache/catalina/mbeans
NamingResourcesMBean.java
Log:
Env name and type are sufficient to form the key for the env entry.
Revision ChangesPath
1.3 +5 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Index: NamingResourcesMBean.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamingResourcesMBean.java 4 May 2002 15:48:54 - 1.2
+++ NamingResourcesMBean.java 4 May 2002 16:10:34 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.2 2002/05/04 15:48:54 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/04 15:48:54 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java,v
1.3 2002/05/04 16:10:34 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/04 16:10:34 $
*
*
*
@@ -83,7 +83,7 @@
* codeorg.apache.catalina.deploy.NamingResources/code component./p
*
* @author Amy Roh
- * @version $Revision: 1.2 $ $Date: 2002/05/04 15:48:54 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/04 16:10:34 $
*/
public class NamingResourcesMBean extends BaseModelMBean {
@@ -181,7 +181,7 @@
*
* @param envName New environment entry name
*/
-public void addEnvironment(String envName, String type, String value) {
+public void addEnvironment(String envName, String type) {
NamingResources nresources = (NamingResources) this.resource;
if (nresources == null) {
@@ -195,7 +195,6 @@
env = new ContextEnvironment();
env.setName(envName);
env.setType(type);
-env.setValue(value);
nresources.addEnvironment(env);
// FIXME add to the javax.naming.directory.DirContext
}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveEnvEntryAction.java
manveen 02/05/04 09:36:22
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveEnvEntryAction.java
Log:
Save all attributes while creating a new entry.
Revision ChangesPath
1.3 +43 -45
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveEnvEntryAction.java 4 May 2002 15:49:47 - 1.2
+++ SaveEnvEntryAction.java 4 May 2002 16:36:22 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.2 2002/05/04 15:49:47 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/04 15:49:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
1.3 2002/05/04 16:36:22 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/04 16:36:22 $
*
*
*
@@ -96,7 +96,7 @@
* updated Env Entry./p
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/04 15:49:47 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/04 16:36:22 $
* @since 4.1
*/
@@ -171,15 +171,13 @@
// Perform an Add Entry transaction
if (objectName == null) {
-String signature[] = new String[3];
+String signature[] = new String[2];
signature[0] = java.lang.String;
signature[1] = java.lang.String;
-signature[2] = java.lang.String;
-Object params[] = new Object[3];
+Object params[] = new Object[2];
params[0] = envEntryForm.getName();
-params[1] = envEntryForm.getEntryType();
-params[2] = envEntryForm.getValue();
+params[1] = envEntryForm.getEntryType();
ObjectName oname = null;
@@ -191,7 +189,13 @@
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, addEnvironment,
params, signature);
-
+
+// FIX ME
+// addEnvironment should return the name of the new
+// mBean just created
+objectName = ResourceUtils.ENVIRONMENT_TYPE +
+ ,name= + params[0];
+
} catch (Exception e) {
getServlet().log
@@ -207,42 +211,36 @@
}
// Perform an Update Environment Entry transaction
-else {
-
-ObjectName oname = null;
-String attribute = null;
-
-try {
-
-// Construct an object name for this object
-oname = new ObjectName(objectName);
-
-// Update the specified env entry
-attribute = description;
-mserver.setAttribute
-(oname,
- new Attribute(attribute, envEntryForm.getDescription()));
-attribute = type;
-mserver.setAttribute
-(oname,
- new Attribute(attribute, envEntryForm.getEntryType()));
-attribute = value;
-mserver.setAttribute
-(oname,
- new Attribute(attribute, envEntryForm.getValue()));
-
-} catch (Exception e) {
-
-getServlet().log
-(resources.getMessage(locale, users.error.set.attribute,
- attribute), e);
-response.sendError
-(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
- resources.getMessage(locale, users.error.set.attribute,
- attribute));
-return (null);
+String attribute = null;
+try {
+
+// Construct an object name for this object
+ObjectName oname = new ObjectName(objectName);
-}
+// Update the specified env entry
+attribute = description;
+mserver.setAttribute
+(oname,
+ new Attribute(attribute, envEntryForm.getDescription()));
+attribute
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources DeleteEnvEntriesAction.java
manveen 02/05/04 10:14:15
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DeleteEnvEntriesAction.java
Log:
Implementation class for delete env entry operation.
Revision ChangesPath
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java
Index: DeleteEnvEntriesAction.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.java,v
1.1 2002/05/04 17:14:15 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/05/04 17:14:15 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 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-envEntry 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, Struts, 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.resources;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
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.Attribute;
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 org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
/**
* pImplementation of strongAction/strong that deletes the
* specified set of env entries./p
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/05/04 17:14:15 $
* @since 4.1
*/
public final class DeleteEnvEntriesAction extends Action {
// - Instance Variables
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources deleteEnvEntries.jsp envEntry.jsp listEnvEntries.jspf
manveen 02/05/04 10:16:51 Modified:webapps/admin/resources envEntry.jsp listEnvEntries.jspf Added: webapps/admin/resources deleteEnvEntries.jsp Log: added jsp for delete Env Entries enabled delete operation from action properties menu. Revision ChangesPath 1.3 +1 -3 jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp Index: envEntry.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntry.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- envEntry.jsp 4 May 2002 15:37:09 - 1.2 +++ envEntry.jsp 4 May 2002 17:16:51 - 1.3 @@ -41,12 +41,10 @@ controls:action url=/resources/setUpEnvEntry.do bean:message key=resources.actions.env.create/ /controls:action -%-- controls:action url='%= /resources/listEnvEntries.do?forward= -+ URLEncoder.encode(Users Delete List) %' ++ URLEncoder.encode(EnvEntries Delete List) %' bean:message key=resources.actions.env.delete/ /controls:action ---% /controls:actions /div /td 1.2 +3 -3 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf Index: listEnvEntries.jspf === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- listEnvEntries.jspf 4 May 2002 05:14:28 - 1.1 +++ listEnvEntries.jspf 4 May 2002 17:16:51 - 1.2 @@ -8,12 +8,12 @@ - /controls:action - %-- FIX ME-- add these operations once they are implemented --% - controls:action url= + controls:action url=/resources/setUpEnvEntry.do bean:message key=resources.actions.env.create/ /controls:action - controls:action url= + controls:action url='%= /resources/listEnvEntries.do?forward= ++ URLEncoder.encode(EnvEntries Delete List) %' bean:message key=resources.actions.env.delete/ /controls:action 1.1 jakarta-tomcat-4.0/webapps/admin/resources/deleteEnvEntries.jsp Index: deleteEnvEntries.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 action=/resources/listEnvEntries table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 td width=81% div class=page-title-text align=left bean:message key=resources.actions.env.delete/ /div /td td width=19% div align=right %@ include file=listEnvEntries.jspf % /div /td /tr /table /html:form br bean:define id=checkboxes scope=page value=true/ html:form action=/resources/deleteEnvEntries %@ include file=../buttons.jsp % br %@ include file=envEntries.jspf % %@ include file=../buttons.jsp % /html:form br %@ include file=../users/footer.jsp % /body /html:html -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/05/04 12:45:07 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: Properties for env entry validation added. Revision ChangesPath 1.53 +7 -1 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.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ApplicationResources_en.properties4 May 2002 06:12:19 - 1.52 +++ ApplicationResources_en.properties4 May 2002 19:45:07 - 1.53 @@ -263,7 +263,8 @@ resources.env.entry=Entry Name resources.env.props=Environment Entry Properties resources.env.override=Override Application Level Entries -resources.actions.env.create=Create New Environment Entry +resources.actions.env.create=Create New Env Entry +resources.actions.env.edit=Edit Environment Entry resources.actions.env.delete=Delete Environment Entries resources.actions.env.list=List Existing Entries resources.datasrc.jdbc=JDBC Driver @@ -279,6 +280,11 @@ resources.datasrc.wait=Max. Wait for Connection resources.datasrc.validation=Validation Query resources.datasrc.jndi=JNDI Name +resources.error.name.required=liName is required./li +resources.error.value.required=liValue is required./li +resources.error.value.mismatch=liType and value do not seem to match./li +resources.error.entryType.invalid=liEntry Type not recognized./li +resources.error.entryType.notimpl=liValidation for this type not implemented yet./li # -- User Database Module -- users.actions.group.create=Create New Group 1.47 +6 -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.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ApplicationResources_es.properties4 May 2002 06:12:19 - 1.46 +++ ApplicationResources_es.properties4 May 2002 19:45:07 - 1.47 @@ -264,6 +264,7 @@ resources.env.props=Caracteristicas De la Entrada Del Ambiente resources.env.override=Entradas Del Nivel Del Uso De la Invalidacion resources.actions.env.create=Cree La Nueva Entrada Del Ambiente +resources.actions.env.edit=Corrija La Entrada Existente Del Ambiente resources.actions.env.delete=Entradas Del Ambiente De la Cancelacion resources.actions.env.list=Entradas Existentes De la Lista resources.datasrc.jdbc=JDBC Driver @@ -279,6 +280,11 @@ resources.datasrc.wait=Max. Espera para la conexion resources.datasrc.validation=Validation Query resources.datasrc.jndi=JNDI Name +resources.error.name.required=liNombre requiredo./li +resources.error.value.required=liValue requiredo./li +resources.error.value.mismatch=liEl tipo y el valor no se parecen emparejar./li +resources.error.entryType.invalid=liEl tipo de la entrada no recognized./li +resources.error.entryType.notimpl=liValidation for this type not implemented yet./li # -- User Database Module -- users.actions.group.create=Cree Al Nuevo Grupo -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java
manveen 02/05/04 12:46:57
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java
Log:
Added validation check that the value entered must match entry type chosen.
Revision ChangesPath
1.2 +68 -11
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnvEntryForm.java 4 May 2002 14:40:09 - 1.1
+++ EnvEntryForm.java 4 May 2002 19:46:57 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
1.1 2002/05/04 14:40:09 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/04 14:40:09 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
1.2 2002/05/04 19:46:57 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/04 19:46:57 $
*
*
*
@@ -71,12 +71,13 @@
import org.apache.struts.action.ActionMapping;
import org.apache.webapp.admin.LabelValueBean;
+import java.lang.reflect.Constructor;
/**
* Form bean for the individual environment entry page.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/04 14:40:09 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/04 19:46:57 $
* @since 4.1
*/
@@ -156,7 +157,10 @@
typeVals.add(new LabelValueBean(java.lang.Integer, java.lang.Integer));
typeVals.add(new LabelValueBean(java.lang.Long, java.lang.Long));
typeVals.add(new LabelValueBean(java.lang.Short, java.lang.Short));
-typeVals.add(new LabelValueBean(java.lang.String, java.lang.String));
+typeVals.add(new LabelValueBean(java.lang.String, java.lang.String));
+typeVals.add(new LabelValueBean(java.lang.hehe, java.lang.hehe));
+typeVals.add(new LabelValueBean(java.util.Vector, java.util.Vector));
+
}
/**
@@ -195,7 +199,6 @@
}
-
/**
* Validate the properties that have been set from this HTTP request,
* and return an codeActionErrors/code object that encapsulates any
@@ -206,10 +209,13 @@
* @param mapping The mapping used to select this instance
* @param request The servlet request we are processing
*/
+
+private ActionErrors errors = null;
+
public ActionErrors validate(ActionMapping mapping,
HttpServletRequest request) {
-ActionErrors errors = new ActionErrors();
+errors = new ActionErrors();
String submit = request.getParameter(submit);
if (submit != null) {
@@ -243,12 +249,63 @@
errors.add(description,
new ActionError(users.error.quotes));
}
-
+
+if (validateType(entryType, value)) {
+ errors.add(value,
+ new ActionError(resources.error.value.mismatch));
+}
}
-
return (errors);
-
}
-
+/**
+ * Entry type must match type of value.
+ */
+private boolean validateType(String entryType, String value) {
+Class cls = null;
+boolean mismatch = false;
+try {
+cls = Class.forName(entryType);
+
+if (Character.class.isAssignableFrom(cls)) {
+// Special handling is needed because the UI returns
+// a string even if it is a character (single length string).
+if (value.length() != 1) {
+mismatch = true;
+}
+} else if (Boolean.class.isAssignableFrom(cls)) {
+// Special handling is needed because Boolean
+// string constructor accepts anything other than
+// true to be false
+if (!(true.equalsIgnoreCase(value) ||
+false.equalsIgnoreCase(value))) {
+mismatch = true;
+}
+} else if (Number.class.isAssignableFrom(cls)) {
+// all numbers throw NumberFormatException if they are
+// constructed with an incorrect number string
+// We use the general string constructor to do this job
+try {
+Class[] parameterTypes = {String.class
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java
manveen 02/05/04 12:56:29 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources EnvEntryForm.java Log: Removed entry types used just for testing. Revision ChangesPath 1.3 +4 -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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EnvEntryForm.java 4 May 2002 19:46:57 - 1.2 +++ EnvEntryForm.java 4 May 2002 19:56:29 - 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v 1.2 2002/05/04 19:46:57 manveen Exp $ - * $Revision: 1.2 $ - * $Date: 2002/05/04 19:46:57 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v 1.3 2002/05/04 19:56:29 manveen Exp $ + * $Revision: 1.3 $ + * $Date: 2002/05/04 19:56:29 $ * * * @@ -77,7 +77,7 @@ * Form bean for the individual environment entry page. * * @author Manveen Kaur - * @version $Revision: 1.2 $ $Date: 2002/05/04 19:46:57 $ + * @version $Revision: 1.3 $ $Date: 2002/05/04 19:56:29 $ * @since 4.1 */ @@ -158,8 +158,6 @@ typeVals.add(new LabelValueBean(java.lang.Long, java.lang.Long)); typeVals.add(new LabelValueBean(java.lang.Short, java.lang.Short)); typeVals.add(new LabelValueBean(java.lang.String, java.lang.String)); -typeVals.add(new LabelValueBean(java.lang.hehe, java.lang.hehe)); -typeVals.add(new LabelValueBean(java.util.Vector, java.util.Vector)); } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp
manveen 02/05/03 00:16:58 Modified:webapps/admin/realm jdbcRealm.jsp jndiRealm.jsp memoryRealm.jsp userDatabaseRealm.jsp Log: Add a check if the realm can be deleted or not. Revision ChangesPath 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp Index: jdbcRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jdbcRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jdbcRealm.jsp 24 Mar 2002 04:13:24 - 1.3 +++ jdbcRealm.jsp 3 May 2002 07:16:58 - 1.4 @@ -23,6 +23,7 @@ html:hidden property=adminAction/ html:hidden property=parentObjectName/ html:hidden property=objectName/ + html:hidden property=allowDeletion/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 @@ -42,10 +43,12 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=jdbcRealmForm property=adminAction value=Create +logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ - /controls:action + /controls:action + /logic:notEqual /logic:notEqual /controls:actions /div 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp Index: jndiRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jndiRealm.jsp 24 Mar 2002 04:13:24 - 1.3 +++ jndiRealm.jsp 3 May 2002 07:16:58 - 1.4 @@ -22,6 +22,7 @@ html:hidden property=adminAction/ html:hidden property=objectName/ html:hidden property=parentObjectName/ + html:hidden property=allowDeletion/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 @@ -41,11 +42,13 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=jndiRealmForm property=adminAction value=Create +logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ /controls:action - /logic:notEqual + /logic:notEqual +/logic:notEqual /controls:actions /div /td 1.4 +3 -0 jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp Index: memoryRealm.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/memoryRealm.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- memoryRealm.jsp 24 Mar 2002 04:13:24 - 1.3 +++ memoryRealm.jsp 3 May 2002 07:16:58 - 1.4 @@ -23,6 +23,7 @@ html:hidden property=parentObjectName/ html:hidden property=adminAction/ html:hidden property=objectName/ + html:hidden property=allowDeletion/ table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 @@ -42,10 +43,12 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=memoryRealmForm property=adminAction value=Create +logic:notEqual name=userDatabaseRealmForm property=allowDeletion value=false controls:action url='%= /DeleteRealm.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.delete/ /controls:action +/logic:notEqual /logic:notEqual /controls:actions /div 1.4 +4 -1 jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp Index: userDatabaseRealm.jsp
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm EditRealmAction.java JDBCRealmForm.java JNDIRealmForm.java MemoryRealmForm.java UserDatabaseRealmForm.java
manveen 02/05/03 00:19:23
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
EditRealmAction.java JDBCRealmForm.java
JNDIRealmForm.java MemoryRealmForm.java
UserDatabaseRealmForm.java
Log:
Add a check is delete this realm operation should be enabled from the realm page.
Realms under the service, host or context same as the admin app should not be deleted.
Revision ChangesPath
1.4 +52 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
Index: EditRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EditRealmAction.java 16 Apr 2002 06:00:17 - 1.3
+++ EditRealmAction.java 3 May 2002 07:19:23 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.3 2002/04/16 06:00:17 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/16 06:00:17 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.4 2002/05/03 07:19:23 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/05/03 07:19:23 $
*
*
*
@@ -92,7 +92,7 @@
* Realm /em transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/16 06:00:17 $
+ * @version $Revision: 1.4 $ $Date: 2002/05/03 07:19:23 $
*/
public class EditRealmAction extends Action {
@@ -111,6 +111,7 @@
private HttpSession session = null;
private Locale locale = null;
+private HttpServletRequest request = null;
// - Public Methods
@@ -137,6 +138,7 @@
// Acquire the resources that we need
session = request.getSession();
+this.request = request;
locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
if (resources == null) {
resources = getServlet().getResources();
@@ -217,6 +219,8 @@
realmFm.setNodeLabel(sb.toString());
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -254,6 +258,8 @@
realmFm.setNodeLabel(sb.toString());
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -291,6 +297,8 @@
realmFm.setNodeLabel(sb.toString());
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -353,6 +361,8 @@
realmFm.setRealmType(realmType);
realmFm.setDebugLvlVals(Lists.getDebugLevels());
realmFm.setSearchVals(Lists.getBooleanValues());
+realmFm.setAllowDeletion(allowDeletion(rname));
+
String attribute = null;
try {
@@ -404,4 +414,42 @@
attribute));
}
}
+
+/*
+ * Check if delete this realm operation should be enabled.
+ * this operation is not allowed in case the realm is under service,
+ * host or context that the admin app runs on.
+ * return true if deletion is allowed.
+ */
+
+private String allowDeletion(ObjectName rname) {
+
+ boolean retVal = true;
+ try{
+// admin app's values
+String adminService = Lists.getAdminAppService(
+ mBServer, rname.getDomain(),request);
+String adminHost = request.getServerName();
+String adminContext = request.getContextPath();
+
+String thisService = rname.getKeyProperty(service);
+String thisHost = rname.getKeyProperty(host);
+String thisContext = rname.getKeyProperty(path);
+
+// realm is under context
+if (thisContext!=null) {
+retVal = !(thisContext.equalsIgnoreCase(adminContext));
+} else if (thisHost != null) {
+// realm is under host
+retVal = !(thisHost.equalsIgnoreCase
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm RealmForm.java JDBCRealmForm.java JNDIRealmForm.java MemoryRealmForm.java UserDatabaseRealmForm.java
manveen 02/05/03 11:34:14
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
JDBCRealmForm.java JNDIRealmForm.java
MemoryRealmForm.java UserDatabaseRealmForm.java
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
RealmForm.java
Log:
Created a generic realm base form.
Refactored Realms to reuse code between them.
Revision ChangesPath
1.5 +14 -227
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
Index: JDBCRealmForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JDBCRealmForm.java3 May 2002 07:19:23 - 1.4
+++ JDBCRealmForm.java3 May 2002 18:34:14 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.4 2002/05/03 07:19:23 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/03 07:19:23 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
1.5 2002/05/03 18:34:14 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/03 18:34:14 $
*
*
*
@@ -76,45 +76,19 @@
* Form bean for the jdbc realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/05/03 07:19:23 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/03 18:34:14 $
*/
-public final class JDBCRealmForm extends ActionForm {
+public final class JDBCRealmForm extends RealmForm {
// - Instance Variables
- /**
- * The administrative action represented by this form.
- */
-private String adminAction = Edit;
-
-/**
- * The object name of the Realm this bean refers to.
- */
-private String objectName = null;
-
-/**
- * The text for the debug level.
- */
-private String debugLvl = 0;
-
/**
* The text for the realm name, used to retrieve
* the corresponding realm mBean.
*/
private String realmName = null;
-
-/**
- * The text for the realm type.
- * Specifies if it is a JNDI, JDBC or MemoryRealm.
- */
-private String realmType = null;
-
-/**
- * Set of valid values for debug level.
- */
-private List debugLvlVals = null;
-
+
/**
* The text for the digest.
*/
@@ -134,12 +108,7 @@
* The text for the driver.
*/
private String driver = null;
-
-/**
- * The text for the node label.
- */
-private String nodeLabel = null;
-
+
/**
* The text for the role table.
*/
@@ -165,113 +134,8 @@
*/
private String connectionURL = null;
-/**
- * The object name of the parent of this Realm.
- */
-private String parentObjectName = null;
-
-/**
- * Set of valid values for realms.
- */
-private List realmTypeVals = null;
-
-/**
- * The text for whether delete this realm operation is allowed
- * on the realm or not.
- */
-private String allowDeletion = null;
-
// - Properties
-
- /**
- * Return the administrative action represented by this form.
- */
-public String getAdminAction() {
-
-return this.adminAction;
-
-}
-
-/**
- * Set the administrative action represented by this form.
- */
-public void setAdminAction(String adminAction) {
-
-this.adminAction = adminAction;
-
-}
-
-/**
- * Return the Object Name.
- */
-public String getObjectName() {
-
-return this.objectName;
-
-}
-
-/**
- * Set the Object Name.
- */
-public void setObjectName(String objectName) {
-
-this.objectName = objectName;
-
-}
-
-/**
- * Return the Realm type.
- */
-public String getRealmType() {
-
-return this.realmType;
-
-}
-
-/**
- * Set the Realm type.
- */
-public void setRealmType(String realmType) {
-
-this.realmType = realmType;
-
-}
-
-/**
- * Return the debugVals.
- */
-public List getDebugLvlVals
cvs commit: jakarta-tomcat-4.0/webapps/admin/images BlueTile.gif EnvironmentEntries.gif TomcatBanner.jpg Users.gif
manveen 02/05/03 14:04:12 Modified:webapps/admin/images Users.gif Added: webapps/admin/images BlueTile.gif EnvironmentEntries.gif TomcatBanner.jpg Log: Images for the banner. Revision ChangesPath 1.3 +3 -4 jakarta-tomcat-4.0/webapps/admin/images/Users.gif Binary file 1.1 jakarta-tomcat-4.0/webapps/admin/images/BlueTile.gif Binary file 1.1 jakarta-tomcat-4.0/webapps/admin/images/EnvironmentEntries.gif Binary file 1.1 jakarta-tomcat-4.0/webapps/admin/images/TomcatBanner.jpg Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin banner.jsp index.jsp
manveen 02/05/03 14:07:17 Modified:webapps/admin banner.jsp index.jsp Log: Replace button links on banner with buttons. Updated banner to use new images. Revision ChangesPath 1.5 +22 -24jakarta-tomcat-4.0/webapps/admin/banner.jsp Index: banner.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/banner.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- banner.jsp2 May 2002 23:49:36 - 1.4 +++ banner.jsp3 May 2002 21:07:17 - 1.5 @@ -13,36 +13,34 @@ !-- Body -- -body bgcolor=white +body leftmargin=0 topmargin=0 marginwidth=0 marginheight=0 bgcolor=7171A5 background=images/BlueTile.gif -h2 align=centerbean:message key=index.success//h2 -p - -%-- -h3 align=center - bean:message key=index.logout/ - html:link page=/logOut.do target=_top -bean:message key=index.here/ - /html:link -/h3 ---% - -table width=100% border=0 cellspacing=0 cellpadding=0 align=center +table width=100% border=0 cellspacing=0 cellpadding=0 tr - td colspan=2 align=center nowrap - html:link page=/commitChanges.do target=_self styleClass=button -bean:message key=button.commit/ - /html:link -nbsp; - html:link page=/logOut.do target=_top styleClass=button -bean:message key=button.logout/ - /html:link + td align=left valign=middle +div class=masthead-title-text align=leftimg src=images/TomcatBanner.jpg width=430 height=120/div + /td + form method='post' action='/admin/commitChanges.do' target='_self' + td align=left valign=middle +html:submit + bean:message key=button.commit/ +/html:submit /td -/tr + /form + td width=1% +div class=table-normal-text align=leftnbsp /div + /td +form method='post' action='/admin/logOut.do' target='_top' + td align=left valign=middle +html:submit + bean:message key=button.logout/ +/html:submit + /td +/form + /tr /table !-- Select language -- - !-- h2bean:message key=login.changeLanguage//h2 1.10 +1 -2 jakarta-tomcat-4.0/webapps/admin/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/index.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- index.jsp 1 May 2002 06:02:56 - 1.9 +++ index.jsp 3 May 2002 21:07:17 - 1.10 @@ -12,8 +12,7 @@ %@ include file=header.jsp % !-- Body -- - -frameset rows=100,* border=2 framespacing=2 +frameset rows=117,685* cols=* frameborder=NO border=3 framespacing=3 frame name=banner src='%= response.encodeURL(banner.jsp) %' scrolling=no frameset cols=300,* frameborder=YES border=2 frame name=tree src='%= response.encodeURL(setUpTree.do) %' scrolling=auto -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/05/03 14:12:05 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: Added entries for resources, updated properties. Revision ChangesPath 1.50 +9 -6 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.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ApplicationResources_en.properties2 May 2002 23:49:36 - 1.49 +++ ApplicationResources_en.properties3 May 2002 21:12:05 - 1.50 @@ -10,10 +10,9 @@ button.change=Change button.cancel=Reset button.commit=Commit Changes -button.logout=Logout +button.logout=Log Out login.enter=Enter a username and password to start a new session login.changeLanguage=Change the language -index.success=Tomcat Server Administration Application error.login=Invalid username or password error.tryagain=To try again, click error.here=here @@ -257,6 +256,10 @@ error.connURL.required=liConnection URL is required./li error.connName.required=liConnection name is required./li +# -- Resources Module -- +resources.env.entries=Environment Entries +resources.env.entry=Entry Name + # -- User Database Module -- users.actions.group.create=Create New Group users.actions.group.delete=Delete Existing Groups @@ -300,10 +303,10 @@ users.role.newRole=Create New Role Properties users.role.oldRole=Edit Existing Role Properties users.role.properties=Role Properties -users.treeBuilder.groupsNode=Group Administration -users.treeBuilder.rolesNode=Role Administration -users.treeBuilder.subtreeNode=User and Group Administration -users.treeBuilder.usersNode=User Administration +users.treeBuilder.groupsNode=Groups +users.treeBuilder.rolesNode=Roles +users.treeBuilder.subtreeNode=User Definition +users.treeBuilder.usersNode=Users users.user.newUser=Create New User Properties users.user.oldUser=Edit Existing User Properties users.user.properties=User Properties 1.44 +9 -6 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.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- ApplicationResources_es.properties2 May 2002 23:49:36 - 1.43 +++ ApplicationResources_es.properties3 May 2002 21:12:05 - 1.44 @@ -10,10 +10,9 @@ button.change=Cambiar button.cancel=Reajuste button.commit=Confie Cambiar -button.logout=Logout +button.logout=Log Out login.enter=Introduzca un nombre de usuario y una contrase\u00f1a para iniciar una nueva sesi\u00f3n login.changeLanguage=Cambio de idioma -index.success=Tomcat Server Administration Application error.login=Nombre de usuario o contrase\u00f1a inv\u00e1lidos error.tryagain=Para intentar de nuevo, presione error.here=aqu\u00ed @@ -257,6 +256,10 @@ error.connURL.required=liSe requiere el URL de la conexion./li error.connName.required=liSe requiere el nombre de conexion./li +# -- Resources Module -- +resources.env.entries=Entradas Del Ambiente +resources.env.entry=Nombre De la Entrada + # -- User Database Module -- users.actions.group.create=Cree Al Nuevo Grupo users.actions.group.delete=Grupos Existentes De la Cancelacion @@ -299,10 +302,10 @@ users.role.newRole=Cree Las Nuevas Caracteristicas Del Role users.role.oldRole=Corrija Las Caracteristicas Existentes Del Rol users.role.properties=Propiedades del Rol -users.treeBuilder.groupsNode=Administracion De Grupo -users.treeBuilder.rolesNode=Administracion de Roles -users.treeBuilder.subtreeNode=Administracion de Grupos y Usuarios -users.treeBuilder.usersNode=Administracion de Usuarios +users.treeBuilder.groupsNode=Grupos +users.treeBuilder.rolesNode=Roles +users.treeBuilder.subtreeNode=Definicion Del Usuario +users.treeBuilder.usersNode=Usuarios users.user.newUser=Crear Nuevas Propiedades del Usuario users.user.oldUser=Editar Propiedades del Usuario users.user.properties=Propiedades del Usuario -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/images Roles.gif
manveen 02/05/03 15:55:24 Added: webapps/admin/images Roles.gif Log: Adding image for the Roles icon. Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/images/Roles.gif Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin banner.jsp
manveen 02/05/03 15:59:30 Modified:webapps/admin banner.jsp Log: minor formatting changes Revision ChangesPath 1.6 +6 -3 jakarta-tomcat-4.0/webapps/admin/banner.jsp Index: banner.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/banner.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- banner.jsp3 May 2002 21:07:17 - 1.5 +++ banner.jsp3 May 2002 22:59:30 - 1.6 @@ -21,7 +21,7 @@ div class=masthead-title-text align=leftimg src=images/TomcatBanner.jpg width=430 height=120/div /td form method='post' action='/admin/commitChanges.do' target='_self' - td align=left valign=middle + td align=right valign=middle html:submit bean:message key=button.commit/ /html:submit @@ -31,11 +31,14 @@ div class=table-normal-text align=leftnbsp /div /td form method='post' action='/admin/logOut.do' target='_top' - td align=left valign=middle + td align=right valign=middle html:submit bean:message key=button.logout/ /html:submit /td + td width=1% +div class=table-normal-text align=leftnbsp /div + /td /form /tr /table @@ -45,7 +48,7 @@ h2bean:message key=login.changeLanguage//h2 -html:form action=/setLocale method=POST +html:form action=/setLocale method=POST target=_self table border=0 cellspacing=5 tr td align=right -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users UsersTreeBuilder.java
manveen 02/05/03 18:40:59 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users UsersTreeBuilder.java Log: Use roles icon. Revision ChangesPath 1.5 +5 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java Index: UsersTreeBuilder.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- UsersTreeBuilder.java 3 May 2002 05:40:05 - 1.4 +++ UsersTreeBuilder.java 4 May 2002 01:40:59 - 1.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v 1.4 2002/05/03 05:40:05 manveen Exp $ - * $Revision: 1.4 $ - * $Date: 2002/05/03 05:40:05 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v 1.5 2002/05/04 01:40:59 manveen Exp $ + * $Revision: 1.5 $ + * $Date: 2002/05/04 01:40:59 $ * * * @@ -77,7 +77,7 @@ * for administering the user database. * * @author Craig R. McClanahan - * @version $Revision: 1.4 $ $Date: 2002/05/03 05:40:05 $ + * @version $Revision: 1.5 $ $Date: 2002/05/04 01:40:59 $ * @since 4.1 */ @@ -145,7 +145,7 @@ false); TreeControlNode roles = new TreeControlNode (Global Administer Roles, - folder_16_pad.gif, + Roles.gif, resources.getMessage(users.treeBuilder.rolesNode), users/listRoles.do?databaseName= + URLEncoder.encode(databaseName) + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourcesTreeBuilder.java
manveen 02/05/03 18:58:39
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ResourcesTreeBuilder.java
Log:
Add a treebuilder class to generate the resources subtree
Revision ChangesPath
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java
Index: ResourcesTreeBuilder.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v
1.1 2002/05/04 01:58:39 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/05/04 01:58:39 $
*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 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.resources;
import java.net.URLEncoder;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.Action;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TreeBuilder;
import org.apache.webapp.admin.TreeControl;
import org.apache.webapp.admin.TreeControlNode;
/**
* Implementation of codeTreeBuilder/code that adds the nodes required
* for administering the resources (data sources).
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/05/04 01:58:39 $
* @since 4.1
*/
public class ResourcesTreeBuilder implements TreeBuilder {
// - Instance Variables
// TreeBuilder Methods
/**
* Add the required nodes to the specified codetreeControl/code
* instance.
*
* @param treeControl The codeTreeControl/code to which we should
* add our nodes
* @param servlet The controller servlet for the admin application
* @param request The servlet request we are processing
*/
public void buildTree(TreeControl treeControl,
ApplicationServlet servlet,
HttpServletRequest request) {
MessageResources resources = (MessageResources
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/05/03 19:05:35 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: Added entries for Environment Entries under resources. Revision ChangesPath 1.51 +5 -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.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ApplicationResources_en.properties3 May 2002 21:12:05 - 1.50 +++ ApplicationResources_en.properties4 May 2002 02:05:34 - 1.51 @@ -257,8 +257,13 @@ error.connName.required=liConnection name is required./li # -- Resources Module -- +resources.treeBuilder.subtreeNode=Resources +resources.treeBuilder.datasources=Data Sources resources.env.entries=Environment Entries resources.env.entry=Entry Name +resources.actions.env.create=Create New Environment Entry +resources.actions.env.delete=Delete Environment Entries +resources.actions.env.list=List Existing Entries # -- User Database Module -- users.actions.group.create=Create New Group 1.45 +5 -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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ApplicationResources_es.properties3 May 2002 21:12:05 - 1.44 +++ ApplicationResources_es.properties4 May 2002 02:05:34 - 1.45 @@ -257,8 +257,13 @@ error.connName.required=liSe requiere el nombre de conexion./li # -- Resources Module -- +resources.treeBuilder.subtreeNode=Recursos +resources.treeBuilder.datasources=Fuentes De Datos resources.env.entries=Entradas Del Ambiente resources.env.entry=Nombre De la Entrada +resources.actions.env.create=Cree La Nueva Entrada Del Ambiente +resources.actions.env.delete=Entradas Del Ambiente De la Cancelacion +resources.actions.env.list=Entradas Existentes De la Lista # -- User Database Module -- users.actions.group.create=Cree Al Nuevo Grupo -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF web.xml
manveen 02/05/03 19:06:16 Modified:webapps/admin/WEB-INF web.xml Log: Enable resources subtree to be visible from the main tree control. Revision ChangesPath 1.12 +1 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- web.xml 1 May 2002 00:53:55 - 1.11 +++ web.xml 4 May 2002 02:06:15 - 1.12 @@ -53,6 +53,7 @@ param-nametreebuilders/param-name param-value org.apache.webapp.admin.TomcatTreeBuilder, +org.apache.webapp.admin.resources.ResourcesTreeBuilder, org.apache.webapp.admin.users.UsersTreeBuilder /param-value /init-param -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources - New directory
manveen 02/05/03 22:12:21 jakarta-tomcat-4.0/webapps/admin/resources - New directory -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources envEntries.jspf listEnvEntries.jsp listEnvEntries.jspf
manveen 02/05/03 22:14:28 Added: webapps/admin/resources envEntries.jspf listEnvEntries.jsp listEnvEntries.jspf Log: jsp's to display the list of existing environment entries Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf Index: envEntries.jspf === %-- Env Entries List --% table class=back-table border=0 cellspacing=0 cellpadding=1 width=100%trtd table class=front-table border=1 cellspacing=0 cellpadding=0 width=100% tr class=header-row logic:present name=checkboxes td width=5%div align=left class=table-header-text nbsp; /td /logic:present td width=20%div align=left class=table-header-text bean:message key=resources.env.entry/ /div/td tddiv align=left class=table-header-text bean:message key=service.value/ /div/td tddiv align=left class=table-header-text bean:message key=users.list.description/ /div/td /tr logic:iterate name=envEntriesForm property=envEntries id=envEntry type=java.lang.String tr class=line-row logic:present name=checkboxes tddiv align=center class=table-normal-text input type=checkbox name=envEntries value=%= envEntry % /td /logic:present tddiv align=left class=table-normal-text %-- FIX ME-- add link once the operation is implemented html:link page='%= /resources/setUpEnvEntry.do?objectName= + URLEncoder.encode(envEntry) %' controls:attribute name=envEntry attribute=name/ /html:link --% controls:attribute name=envEntry attribute=name/ /div/td tddiv align=left class=table-normal-textnbsp; controls:attribute name=envEntry attribute=value/ /div/td tddiv align=left class=table-normal-textnbsp; controls:attribute name=envEntry attribute=description/ /div/td /tr /logic:iterate /table /td/tr/table 1.1 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jsp Index: listEnvEntries.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 action=/resources/listEnvEntries table width=100% border=0 cellspacing=0 cellpadding=0 tr bgcolor=7171A5 td width=81% div class=page-title-text align=left bean:message key=resources.env.entries/ /div /td td width=19% div align=right %@ include file=listEnvEntries.jspf % /div /td /tr /table /html:form br %@ include file=envEntries.jspf % br /body /html:html 1.1 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf Index: listEnvEntries.jspf === controls:actions controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action disabled=true - /controls:action %-- FIX ME-- add these operations once they are implemented --% controls:action url= bean:message key=resources.actions.env.create/ /controls:action controls:action url= bean:message key=resources.actions.env.delete/ /controls:action /controls:actions -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources BaseForm.java EnvEntriesForm.java ListEnvEntriesAction.java ResourceUtils.java ResourcesTreeBuilder.java
manveen 02/05/03 22:17:53 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ResourcesTreeBuilder.java Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources BaseForm.java EnvEntriesForm.java ListEnvEntriesAction.java ResourceUtils.java Log: Added classes to display list of environment entries. Added appropriate action from ResourcesTreeBuilder Revision ChangesPath 1.2 +6 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java Index: ResourcesTreeBuilder.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ResourcesTreeBuilder.java 4 May 2002 01:58:39 - 1.1 +++ ResourcesTreeBuilder.java 4 May 2002 05:17:53 - 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v 1.1 2002/05/04 01:58:39 manveen Exp $ - * $Revision: 1.1 $ - * $Date: 2002/05/04 01:58:39 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v 1.2 2002/05/04 05:17:53 manveen Exp $ + * $Revision: 1.2 $ + * $Date: 2002/05/04 05:17:53 $ * * * @@ -76,7 +76,7 @@ * for administering the resources (data sources). * * @author Manveen Kaur - * @version $Revision: 1.1 $ $Date: 2002/05/04 01:58:39 $ + * @version $Revision: 1.2 $ $Date: 2002/05/04 05:17:53 $ * @since 4.1 */ @@ -141,8 +141,8 @@ (Global Administer Environment Entries, EnvironmentEntries.gif, resources.getMessage(resources.env.entries), - // FIX ME -- add URL once its implemented - null, + resources/listEnvEntries.do?forward= + + URLEncoder.encode(EnvEntries List Setup), content, false); root.addChild(subtree); 1.1 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java Index: BaseForm.java === /* * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.java,v 1.1 2002/05/04 05:17:53 manveen Exp $ * $Revision: 1.1 $ * $Date: 2002/05/04 05:17:53 $ * * * * The Apache Software License, Version 1.1 * * Copyright (c) 2002 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, Struts, 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
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF struts-config.xml
manveen 02/05/03 22:25:24 Modified:webapps/admin/WEB-INF struts-config.xml Log: Added form beans defns, forward definitions, action mapping definitions for the resources module Revision ChangesPath 1.46 +89 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml Index: struts-config.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- struts-config.xml 2 May 2002 23:49:36 - 1.45 +++ struts-config.xml 4 May 2002 05:25:23 - 1.46 @@ -107,6 +107,20 @@ form-bean name=valvesForm type=org.apache.webapp.admin.valve.ValvesForm/ +!-- == Resources Module == -- + +form-bean name=envEntryForm +type=org.apache.webapp.admin.resources.EnvEntryForm/ + +form-bean name=envEntriesForm +type=org.apache.webapp.admin.resources.EnvEntriesForm/ + +form-bean name=dataSourceForm +type=org.apache.webapp.admin.resources.DataSourceForm/ + +form-bean name=dataSourcesForm +type=org.apache.webapp.admin.resources.DataSourcesForm/ + !-- == User Database Module == -- form-bean name=databaseForm @@ -289,6 +303,40 @@ forwardname=Valves path=/valve/valves.jsp redirect=false/ + +!-- == Resources Module == -- + +forwardname=EnvEntry +path=/resources/envEntry.jsp +redirect=false/ + +forwardname=EnvEntries Delete List +path=/resources/deleteEnvEntries.jsp +redirect=false/ + +forwardname=EnvEntries List +path=/resources/listEnvEntries.jsp +redirect=false/ + +forwardname=EnvEntries List Setup +path=/resources/listEnvEntries.do?forward=EnvEntries+List +redirect=false/ + +forwardname=DataSource +path=/resources/dataSource.jsp +redirect=false/ + +forwardname=DataSources Delete List +path=/resources/deleteDataSources.jsp +redirect=false/ + +forwardname=DataSources List +path=/resources/listDataSources.jsp +redirect=false/ + +forwardname=DataSources List Setup +path=/resources/listDataSources.do?forward=DataSources+List +redirect=false/ !-- == User Database Module == -- @@ -697,6 +745,47 @@ input=/valve/singleSignOnValve.jsp scope=session/ + !-- == Resources Module == -- + + actionpath=/resources/deleteEnvEntries + name=envEntriesForm + scope=request + type=org.apache.webapp.admin.resources.DeleteEnvEntriesAction/ + +actionpath=/resources/deleteDataSources + name=dataSourcesForm + scope=request + type=org.apache.webapp.admin.resources.DeleteDataSourcesAction/ + +actionpath=/resources/listEnvEntries + name=envEntriesForm + scope=request + type=org.apache.webapp.admin.resources.ListEnvEntriesAction/ + +actionpath=/resources/listDataSources + name=dataSourcesForm + scope=request + type=org.apache.webapp.admin.resources.ListDataSourcesAction/ + + actionpath=/resources/saveEnvEntry + input=/resources/envEntry.jsp + name=envEntryForm + scope=request + type=org.apache.webapp.admin.resources.SaveEnvEntryAction/ + +actionpath=/resources/saveDataSource + input=/resources/dataSource.jsp + name=dataSourceForm + scope=request + type=org.apache.webapp.admin.resources.SaveDataSourceAction/ + + actionpath=/resources/setUpEnvEntry + type=org.apache.webapp.admin.resources.SetUpEnvEntryAction/ + +actionpath=/resources/setUpDataSource + type=org.apache.webapp.admin.resources.SetUpDataSourceAction/ + + !-- == User Database Module == -- actionpath=/users/deleteGroups -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/05/03 23:12:19 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: Added properties for environment entries and datasources in the resource module. Revision ChangesPath 1.52 +15 -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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ApplicationResources_en.properties4 May 2002 02:05:34 - 1.51 +++ ApplicationResources_en.properties4 May 2002 06:12:19 - 1.52 @@ -261,9 +261,24 @@ resources.treeBuilder.datasources=Data Sources resources.env.entries=Environment Entries resources.env.entry=Entry Name +resources.env.props=Environment Entry Properties +resources.env.override=Override Application Level Entries resources.actions.env.create=Create New Environment Entry resources.actions.env.delete=Delete Environment Entries resources.actions.env.list=List Existing Entries +resources.datasrc.jdbc=JDBC Driver +resources.actions.datasrc=Datasources +resources.actions.datasrc.create=Create New Datasource +resources.actions.datasrc.delete=Delete Datasources +resources.actions.datasrc.edit=Edit Datasource +resources.datasrc.url=Datasource URL +resources.datasrc.jdbcclass=JDBC Driver Class +resources.datasrc.connections=Connections +resources.datasrc.active=Max. Active Connections +resources.datasrc.idle=Max. Idle Connections +resources.datasrc.wait=Max. Wait for Connection +resources.datasrc.validation=Validation Query +resources.datasrc.jndi=JNDI Name # -- User Database Module -- users.actions.group.create=Create New Group 1.46 +15 -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.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ApplicationResources_es.properties4 May 2002 02:05:34 - 1.45 +++ ApplicationResources_es.properties4 May 2002 06:12:19 - 1.46 @@ -261,9 +261,24 @@ resources.treeBuilder.datasources=Fuentes De Datos resources.env.entries=Entradas Del Ambiente resources.env.entry=Nombre De la Entrada +resources.env.props=Caracteristicas De la Entrada Del Ambiente +resources.env.override=Entradas Del Nivel Del Uso De la Invalidacion resources.actions.env.create=Cree La Nueva Entrada Del Ambiente resources.actions.env.delete=Entradas Del Ambiente De la Cancelacion resources.actions.env.list=Entradas Existentes De la Lista +resources.datasrc.jdbc=JDBC Driver +resources.actions.datasrc=Datasources +resources.actions.datasrc.create=Cree Datasource Nuevo +resources.actions.datasrc.delete=Cancelacion Datasources +resources.actions.datasrc.edit=Edit Datasource +resources.datasrc.url=Datasource URL +resources.datasrc.jdbcclass=JDBC Driver Class +resources.datasrc.connections=Conexiones +resources.datasrc.active=Max. Active Conexiones +resources.datasrc.idle=Max. Idle Conexiones +resources.datasrc.wait=Max. Espera para la conexion +resources.datasrc.validation=Validation Query +resources.datasrc.jndi=JNDI Name # -- User Database Module -- users.actions.group.create=Cree Al Nuevo Grupo -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] New committer: Christopher St John
+1 Manveen Remy Maucherat wrote: I'd like to propose Christopher St John cks at distributopia.com as a committer on Tomcat. Christopher has contributed ideas and code to do some improvements to the design of Catalina. More importantly, he seems very motivated and willing to contribute very significant time and effort on Tomcat. He has my +1. Remy -- 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]
cvs commit: jakarta-tomcat-4.0/webapps/admin/service service.jsp
manveen 02/05/02 11:15:40 Modified:webapps/admin/service service.jsp Log: cannot add or delete a realm for the service the admin app is running on. Revision ChangesPath 1.15 +3 -0 jakarta-tomcat-4.0/webapps/admin/service/service.jsp Index: service.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- service.jsp 26 Apr 2002 19:05:12 - 1.14 +++ service.jsp 2 May 2002 18:15:40 - 1.15 @@ -80,6 +80,8 @@ URLEncoder.encode(thisObjectName) %' bean:message key=actions.loggers.deletes/ /controls:action + %-- cannot delete or add a Realm for the service the admin app runs on --% + logic:notEqual name=serviceName value='%= adminServiceName %' controls:action disabled=true - /controls:action @@ -91,6 +93,7 @@ URLEncoder.encode(thisObjectName) %' bean:message key=actions.realms.deletes/ /controls:action + /logic:notEqual controls:action disabled=true - /controls:action -- 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/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/05/02 16:49:36 Modified:webapps/admin banner.jsp webapps/admin/WEB-INF struts-config.xml webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: * Added a link from the banner to save configuration changes to server.xml Revision ChangesPath 1.4 +17 -0 jakarta-tomcat-4.0/webapps/admin/banner.jsp Index: banner.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/banner.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- banner.jsp27 Feb 2002 05:40:57 - 1.3 +++ banner.jsp2 May 2002 23:49:36 - 1.4 @@ -17,12 +17,29 @@ h2 align=centerbean:message key=index.success//h2 p + +%-- h3 align=center bean:message key=index.logout/ html:link page=/logOut.do target=_top bean:message key=index.here/ /html:link /h3 +--% + +table width=100% border=0 cellspacing=0 cellpadding=0 align=center +tr + td colspan=2 align=center nowrap + html:link page=/commitChanges.do target=_self styleClass=button +bean:message key=button.commit/ + /html:link +nbsp; + html:link page=/logOut.do target=_top styleClass=button +bean:message key=button.logout/ + /html:link + /td +/tr +/table !-- Select language -- 1.45 +8 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml Index: struts-config.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- struts-config.xml 18 Apr 2002 06:55:09 - 1.44 +++ struts-config.xml 2 May 2002 23:49:36 - 1.45 @@ -374,6 +374,14 @@ redirect=true/ /action +!-- Save current settings to server.xml -- +actionpath=/commitChanges + type=org.apache.webapp.admin.CommitChangesAction + forwardname=Banner + path=/banner.jsp + redirect=true/ +/action + !-- Process a set-locale action -- actionpath=/setLocale type=org.apache.webapp.admin.SetLocaleAction 1.49 +4 -4 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.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ApplicationResources_en.properties30 Apr 2002 18:10:47 - 1.48 +++ ApplicationResources_en.properties2 May 2002 23:49:36 - 1.49 @@ -8,12 +8,12 @@ button.reset=Reset button.save=Save button.change=Change -button.cancel=Cancel +button.cancel=Reset +button.commit=Commit Changes +button.logout=Logout login.enter=Enter a username and password to start a new session login.changeLanguage=Change the language index.success=Tomcat Server Administration Application -index.logout=To end this session, click -index.here=here error.login=Invalid username or password error.tryagain=To try again, click error.here=here @@ -223,7 +223,7 @@ realm.pattern=Role Search Pattern realm.search=Search Subtrees realm.userPassword=User Password -realm.userPattern=User Search pattern +realm.userPattern=User Search Pattern valve.access.properties=Access Logger Properties valve.request.properties=Request Filter Properties valve.single.properties=Single SignOn Valve Properties 1.43 +5 -5 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.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- ApplicationResources_es.properties30 Apr 2002 18:10:47 - 1.42 +++ ApplicationResources_es.properties2 May 2002 23:49:36 - 1.43 @@ -8,12 +8,12 @@ button.reset=Reiniciar button.save=Guardar button.change=Cambiar -button.cancel=Cancelar +button.cancel=Reajuste +button.commit=Confie Cambiar +button.logout=Logout login.enter=Introduzca un nombre de usuario y una
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin CommitChangesAction.java
manveen 02/05/02 16:50:51
Added: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
CommitChangesAction.java
Log:
Action class that implements the store/commit changes to server.xml
Revision ChangesPath
1.1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java
Index: CommitChangesAction.java
===
/*
* $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.java,v
1.1 2002/05/02 23:50:51 manveen Exp $
* $Revision: 1.1 $
* $Date: 2002/05/02 23:50:51 $
*
*
*
* 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, Struts, 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 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 javax.management.MBeanServer;
import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.JMException;
/**
* Implementation of strongAction/strong that saves the current settings
* and writes them out to server.xml
*
* @author Manveen Kaur
* @version $Revision: 1.1 $ $Date: 2002/05/02 23:50:51 $
*/
public final class CommitChangesAction extends Action {
/**
* The MBeanServer we will be interacting with.
*/
private MBeanServer mBServer = null;
/**
* The MessageResources we will be retrieving messages from.
*/
private MessageResources resources = null;
// - Public Methods
/**
* Process the specified HTTP request, and create the corresponding HTTP
* response (or forward
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin TomcatTreeBuilder.java
manveen 02/05/02 17:57:23 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin TomcatTreeBuilder.java Log: Display the new images in the tree control node, change image depending on the type of node. Revision ChangesPath 1.29 +12 -12 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java Index: TomcatTreeBuilder.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- TomcatTreeBuilder.java22 Apr 2002 18:53:51 - 1.28 +++ TomcatTreeBuilder.java3 May 2002 00:57:23 - 1.29 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.28 2002/04/22 18:53:51 manveen Exp $ - * $Revision: 1.28 $ - * $Date: 2002/04/22 18:53:51 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v 1.29 2002/05/03 00:57:23 manveen Exp $ + * $Revision: 1.29 $ + * $Date: 2002/05/03 00:57:23 $ * * * @@ -93,7 +93,7 @@ * * @author Jazmin Jonson * @author Manveen Kaur - * @version $Revision: 1.28 $ $Date: 2002/04/22 18:53:51 $ + * @version $Revision: 1.29 $ $Date: 2002/05/03 00:57:23 $ */ @@ -162,7 +162,7 @@ String nodeLabel = SERVER_LABEL; TreeControlNode serverNode = new TreeControlNode(serverName, -folder_16_pad.gif, +Server.gif, nodeLabel, EditServer.do?select= + URLEncoder.encode(serverName) + @@ -197,7 +197,7 @@ Service ( + objectName.getKeyProperty(name) + ); TreeControlNode serviceNode = new TreeControlNode(serviceName, -folder_16_pad.gif, +Service.gif, nodeLabel, EditService.do?select= + URLEncoder.encode(serviceName) + @@ -236,7 +236,7 @@ Connector ( + objectName.getKeyProperty(port) + ); TreeControlNode connectorNode = new TreeControlNode(connectorName, -folder_16_pad.gif, +Connector.gif, nodeLabel, EditConnector.do?select= + URLEncoder.encode(connectorName) + @@ -269,7 +269,7 @@ Host ( + objectName.getKeyProperty(host) + ); TreeControlNode hostNode = new TreeControlNode(hostName, -folder_16_pad.gif, +Host.gif, nodeLabel, EditHost.do?select= + URLEncoder.encode(hostName) + @@ -306,7 +306,7 @@ Context ( + objectName.getKeyProperty(path) + ); TreeControlNode contextNode = new TreeControlNode(contextName, -folder_16_pad.gif, +Context.gif, nodeLabel, EditContext.do?select= + URLEncoder.encode(contextName) + @@ -341,7 +341,7 @@ String nodeLabel = Logger for + containerNode.getLabel(); TreeControlNode loggerNode = new TreeControlNode(loggerName, -folder_16_pad.gif, +Logger.gif, nodeLabel, EditLogger.do?select= + URLEncoder.encode(loggerName) + @@ -374,7 +374,7 @@ String nodeLabel = Realm for + containerNode.getLabel(); TreeControlNode realmNode = new TreeControlNode(realmName, -folder_16_pad.gif, +Realm.gif, nodeLabel, EditRealm.do?select= + URLEncoder.encode(realmName) + @@ -406,7 +406,7
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users UsersTreeBuilder.java
manveen 02/05/02 18:04:49 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users UsersTreeBuilder.java Log: Use new images for Groups/Users in the tree control. Revision ChangesPath 1.3 +6 -6 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java Index: UsersTreeBuilder.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UsersTreeBuilder.java 10 Feb 2002 05:48:57 - 1.2 +++ UsersTreeBuilder.java 3 May 2002 01:04:49 - 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v 1.2 2002/02/10 05:48:57 craigmcc Exp $ - * $Revision: 1.2 $ - * $Date: 2002/02/10 05:48:57 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v 1.3 2002/05/03 01:04:49 manveen Exp $ + * $Revision: 1.3 $ + * $Date: 2002/05/03 01:04:49 $ * * * @@ -77,7 +77,7 @@ * for administering the user database. * * @author Craig R. McClanahan - * @version $Revision: 1.2 $ $Date: 2002/02/10 05:48:57 $ + * @version $Revision: 1.3 $ $Date: 2002/05/03 01:04:49 $ * @since 4.1 */ @@ -135,7 +135,7 @@ true); TreeControlNode groups = new TreeControlNode (Global Administer Groups, - folder_16_pad.gif, + Groups.gif, resources.getMessage(users.treeBuilder.groupsNode), users/listGroups.do?databaseName= + URLEncoder.encode(databaseName) + @@ -155,7 +155,7 @@ false); TreeControlNode users = new TreeControlNode (Global Administer Users, - folder_16_pad.gif, + Users.gif, resources.getMessage(users.treeBuilder.usersNode), users/listUsers.do?databaseName= + URLEncoder.encode(databaseName) + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/images Groups.gif Users.gif
manveen 02/05/02 18:05:54 Added: webapps/admin/images Groups.gif Users.gif Log: Images for User Administration tree. Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/images/Groups.gif Binary file 1.1 jakarta-tomcat-4.0/webapps/admin/images/Users.gif Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/images Datasource.gif Login.jpg LoginBackgroundTile.gif
manveen 02/05/02 18:13:49 Added: webapps/admin/images Datasource.gif Login.jpg LoginBackgroundTile.gif Log: Images for Login page and datasources. Revision ChangesPath 1.1 jakarta-tomcat-4.0/webapps/admin/images/Datasource.gif Binary file 1.1 jakarta-tomcat-4.0/webapps/admin/images/Login.jpg Binary file 1.1 jakarta-tomcat-4.0/webapps/admin/images/LoginBackgroundTile.gif Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin login.jsp
manveen 02/05/02 18:14:11 Modified:webapps/admin login.jsp Log: Modified look and feel of login page Revision ChangesPath 1.5 +38 -14jakarta-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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- login.jsp 1 Dec 2001 03:09:19 - 1.4 +++ login.jsp 3 May 2002 01:14:11 - 1.5 @@ -25,42 +25,66 @@ !-- Body -- -body bgcolor=white +body background=images/LoginBackgroundTile.gif center !-- Login -- -h2bean:message key=login.enter//h2 - form method=POST action='%= response.encodeURL(j_security_check) %' name=loginForm - table border=0 cellspacing=5 + table border=0 cellspacing=5 background=images/LoginBackgroundTile.gif + +tr +!-- banner -- + td height=183 +div align=centerimg src=images/Login.jpg width=490 height=228/div + /td +/tr + +!-- username password prompts fields layout -- tr +td background=images/LoginBackgroundTile.gif + table width=100% border=0 cellspacing=2 cellpadding=5 + tr th align=right -bean:message key=prompt.username/ +font color=#FFbean:message key=prompt.username//font /th td align=left input type=text name=j_username size=16 maxlength=16/ /td /tr +p tr th align=right -bean:message key=prompt.password/ +font color=#FFbean:message key=prompt.password//font /th td align=left input type=password name=j_password size=16 maxlength=16/ /td /tr + tr - td align=right -input type=submit value='bean:message key=button.login/' - /td - td align=left -input type=reset value='bean:message key=button.reset/' - /td -/tr + td width=50% valign=top div align=right/div /td + td width=55% valign=topnbsp;/td + /tr + +!-- login reset buttons layout -- +tr + td width=50% valign=top +div align=right + input type=submit value='bean:message key=button.login/'nbsp;nbsp; +/div + /td + td width=55% valign=top + nbsp;nbsp;input type=reset value='bean:message key=button.reset/' + /td + /tr /table + p nbsp; + /td + /tr + /table /form script language=JavaScript type=text/javascript @@ -75,4 +99,4 @@ %@ include file=footer.jsp % -/html:html +/html:html \ No newline at end of file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/images Users.gif
manveen 02/05/02 18:48:30 Modified:webapps/admin/images Users.gif Log: Updating image Revision ChangesPath 1.2 +4 -3 jakarta-tomcat-4.0/webapps/admin/images/Users.gif Binary file -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/users user.jsp
manveen 02/05/02 21:45:46 Modified:webapps/admin/users user.jsp Log: * Password should not be displayed in clear text. * Add URLs to create and delete users. Revision ChangesPath 1.3 +10 -9 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- user.jsp 10 Feb 2002 08:06:20 - 1.2 +++ user.jsp 3 May 2002 04:45:46 - 1.3 @@ -38,16 +38,17 @@ controls:action - /controls:action -!-- will add the urls later once those screens get implemented -- -%-- -controls:action url= - bean:message key=users.actions.user.create/ +controls:action url='%= /users/setUpUser.do?databaseName= + +URLEncoder.encode(request.getParameter(databaseName)) %' +bean:message key=users.actions.user.create/ /controls:action -controls:action url= - bean:message key=users.actions.user.delete/ + +controls:action url='%= /users/listUsers.do?databaseName= + +URLEncoder.encode(request.getParameter(databaseName)) + +forward= + URLEncoder.encode(Users Delete List) %' +bean:message key=users.actions.user.delete/ /controls:action ---% - /controls:actions + /controls:actions /div /td /tr @@ -95,7 +96,7 @@ bean:message key=users.prompt.password/ /controls:label controls:data - html:text property=password size=24 maxlength=32/ + html:password property=password size=24 maxlength=32/ /controls:data /controls:row -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users UsersTreeBuilder.java
manveen 02/05/02 22:40:05 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users UsersTreeBuilder.java Log: Rearrange the order in which Users, Groups, and Roles appear in the subtree. Revision ChangesPath 1.4 +5 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java Index: UsersTreeBuilder.java === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- UsersTreeBuilder.java 3 May 2002 01:04:49 - 1.3 +++ UsersTreeBuilder.java 3 May 2002 05:40:05 - 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v 1.3 2002/05/03 01:04:49 manveen Exp $ - * $Revision: 1.3 $ - * $Date: 2002/05/03 01:04:49 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.java,v 1.4 2002/05/03 05:40:05 manveen Exp $ + * $Revision: 1.4 $ + * $Date: 2002/05/03 05:40:05 $ * * * @@ -77,7 +77,7 @@ * for administering the user database. * * @author Craig R. McClanahan - * @version $Revision: 1.3 $ $Date: 2002/05/03 01:04:49 $ + * @version $Revision: 1.4 $ $Date: 2002/05/03 05:40:05 $ * @since 4.1 */ @@ -165,9 +165,9 @@ false); root.addChild(subtree); +subtree.addChild(users); subtree.addChild(groups); subtree.addChild(roles); -subtree.addChild(users); } -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/05/02 23:15:14 Modified:webapps/admin/connector connector.jsp Log: Missing comment in last checkin. Revision ChangesPath 1.14 +1 -0 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- connector.jsp 3 May 2002 06:14:04 - 1.13 +++ connector.jsp 3 May 2002 06:15:13 - 1.14 @@ -263,6 +263,7 @@ /logic:equal %-- display password only while creating connector. Do not display password as cleartext --% + %-- logic:equal name=connectorForm property=adminAction value=Edit bean:write name=connectorForm property=keyStorePassword/ /logic:equal -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/30 11:10:48
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 SaveConnectorAction.java
webapps/admin/connector connector.jsp
Log:
Trying to use the new createConnector methods -- testing
Revision ChangesPath
1.48 +2 -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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ApplicationResources_en.properties29 Apr 2002 01:07:53 - 1.47
+++ ApplicationResources_en.properties30 Apr 2002 18:10:47 - 1.48
@@ -129,6 +129,8 @@
host.wars=Unpack WARs
host.aliases=Aliases
host.alias.name=Alias Name
+error.aliasName.exists=liAlias already exists/li
+error.aliasName.required=liAlias name is required/li
context.properties=Context Properties
context.cookies=Cookies
context.cross.context=Cross Context
1.42 +2 -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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ApplicationResources_es.properties29 Apr 2002 01:07:53 - 1.41
+++ ApplicationResources_es.properties30 Apr 2002 18:10:47 - 1.42
@@ -130,6 +130,8 @@
host.wars=Desempaquetar WARs
host.aliases=Aliases
host.alias.name=Alias Nombre
+error.aliasName.exists=liAlias ya existe/li
+error.aliasName.required=liAlias nombre requiredo/li
context.properties=Propiedades del contexto
context.cookies=Cookies
context.cross.context=Cross Context
1.6 +5 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AddConnectorAction.java 26 Apr 2002 19:05:12 - 1.5
+++ AddConnectorAction.java 30 Apr 2002 18:10:47 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.5 2002/04/26 19:05:12 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/04/26 19:05:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.6 2002/04/30 18:10:47 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/04/30 18:10:47 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/04/26 19:05:12 $
+ * @version $Revision: 1.6 $ $Date: 2002/04/30 18:10:47 $
*/
public class AddConnectorAction extends Action {
@@ -169,7 +169,7 @@
String schemeTypes[]= new String[3];
schemeTypes[0] = HTTP;
schemeTypes[1] = HTTPS;
-schemeTypes[2] = HTTP(AJP);
+schemeTypes[2] = AJP;
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
1.6 +13 -11
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java
Index: SaveConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveConnectorAction.java 26 Apr 2002 07:11:02 - 1.5
+++ SaveConnectorAction.java 30 Apr 2002 18:10:47 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java
manveen 02/04/30 14:38:20
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java EditConnectorAction.java
SaveConnectorAction.java
Log:
Integrating with new mBean create operations.
Revision ChangesPath
1.10 +6 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConnectorForm.java26 Apr 2002 07:11:01 - 1.9
+++ ConnectorForm.java30 Apr 2002 21:38:20 - 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.9 2002/04/26 07:11:01 manveen Exp $
- * $Revision: 1.9 $
- * $Date: 2002/04/26 07:11:01 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.10 2002/04/30 21:38:20 manveen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/04/30 21:38:20 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.9 $ $Date: 2002/04/26 07:11:01 $
+ * @version $Revision: 1.10 $ $Date: 2002/04/30 21:38:20 $
*/
public final class ConnectorForm extends ActionForm {
@@ -459,7 +459,7 @@
}
- /**
+/**
* Return the object name of the service this connector belongs to.
*/
public String getKeyStoreFileName() {
@@ -777,7 +777,7 @@
}
/* supported only by Coyote HTTP/1.1 connectors */
-if (!(HTTP(AJP).equalsIgnoreCase(connectorType)))
+if (!(AJP.equalsIgnoreCase(connectorType)))
numberCheck(proxyPortText, proxyPortText, true, 0, 65535);
}
1.5 +22 -16
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
Index: EditConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditConnectorAction.java 26 Apr 2002 07:04:14 - 1.4
+++ EditConnectorAction.java 30 Apr 2002 21:38:20 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
1.4 2002/04/26 07:04:14 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/26 07:04:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java,v
1.5 2002/04/30 21:38:20 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/30 21:38:20 $
*
*
*
@@ -91,7 +91,7 @@
* The codeAction/code that sets up emEdit Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/30 21:38:20 $
*/
public class EditConnectorAction extends Action {
@@ -173,22 +173,29 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
-String scheme = null;
String attribute = null;
try {
// Copy scalar properties
// General properties
-attribute = className;
-String className =
+attribute = scheme;
+String scheme = (String) mBServer.getAttribute(cname, attribute);
+connectorFm.setScheme(scheme);
+
+attribute = protocolHandlerClassName;
+String handlerClassName =
(String) mBServer.getAttribute(cname, attribute);
-int period = className.lastIndexOf('.');
-String connectorType = className.substring(period + 1);
+int period = handlerClassName.lastIndexOf('.');
+String connType = handlerClassName.substring(period + 1);
+String connectorType = HTTPS;
+if (JkCoyoteHandler.equalsIgnoreCase(connType)) {
+connectorType = AJP;
+} else
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF web.xml
manveen 02/04/30 17:53:55 Modified:webapps/admin/WEB-INF web.xml Log: do not render tomcat root node by default. Revision ChangesPath 1.11 +2 -0 jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/web.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- web.xml 4 Apr 2002 20:30:34 - 1.10 +++ web.xml 1 May 2002 00:53:55 - 1.11 @@ -43,10 +43,12 @@ param-valuetrue/param-value /init-param !-- Label to be displayed for rootnode. If absent, rootnode is not rendered -- +!-- init-param param-namerootnodename/param-name param-valueTomcat Root/param-value /init-param +-- init-param param-nametreebuilders/param-name param-value -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connectors.jsp
manveen 02/04/30 19:37:22
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
ConnectorForm.java
webapps/admin/connector connectors.jsp
Log:
Display the list of connectors to be deletd with their port numbers instead of calss
name attributes.
Revision ChangesPath
1.11 +8 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConnectorForm.java30 Apr 2002 21:38:20 - 1.10
+++ ConnectorForm.java1 May 2002 02:37:22 - 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.10 2002/04/30 21:38:20 manveen Exp $
- * $Revision: 1.10 $
- * $Date: 2002/04/30 21:38:20 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.11 2002/05/01 02:37:22 manveen Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/05/01 02:37:22 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.10 $ $Date: 2002/04/30 21:38:20 $
+ * @version $Revision: 1.11 $ $Date: 2002/05/01 02:37:22 $
*/
public final class ConnectorForm extends ActionForm {
@@ -742,7 +742,7 @@
/* The IP address can also be null -- which means open the
server socket on *all* IP addresses for this host */
-if (address.length() 0) {
+if ((address.length() 0) !address.equalsIgnoreCase( )) {
try {
InetAddress.getByName(address);
} catch (Exception e) {
@@ -767,7 +767,7 @@
numberCheck(maxProcessorsText, maxProcessorsText, true, 1, 512);
}
-/* proxy*/
+// proxy
if ((proxyName!= null) (proxyName.length() 0)) {
try {
InetAddress.getByName(proxyName);
@@ -776,7 +776,7 @@
}
}
-/* supported only by Coyote HTTP/1.1 connectors */
+// supported only by Coyote HTTP and HTTPS connectors
if (!(AJP.equalsIgnoreCase(connectorType)))
numberCheck(proxyPortText, proxyPortText, true, 0, 65535);
}
@@ -785,7 +785,7 @@
}
/*
- * Helper method to check that it is a reuired number and
+ * Helper method to check that it is a required number and
* is a valid integer within the given range. (min, max).
*
* @param field The field name in the form for which this error occured.
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- connectors.jsp26 Apr 2002 19:15:52 - 1.3
+++ connectors.jsp1 May 2002 02:37:22 - 1.4
@@ -77,7 +77,7 @@
tddiv align=left class=table-normal-textnbsp;
html:link page='%= /EditConnector.do?select= +
java.net.URLEncoder.encode(connector.toString()) %'
-controls:attribute name=connector attribute=className/
+Connector (controls:attribute name=connector attribute=port/)
/html:link
/div/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 index.jsp
manveen 02/04/30 23:02:57 Modified:webapps/admin index.jsp Log: * Made the borders of the various frames visible so that the user knows they can be resized. Revision ChangesPath 1.9 +2 -2 jakarta-tomcat-4.0/webapps/admin/index.jsp Index: index.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/index.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- index.jsp 11 Dec 2001 22:54:12 - 1.8 +++ index.jsp 1 May 2002 06:02:56 - 1.9 @@ -13,9 +13,9 @@ !-- Body -- -frameset rows=100,* border=2 +frameset rows=100,* border=2 framespacing=2 frame name=banner src='%= response.encodeURL(banner.jsp) %' scrolling=no - frameset cols=300,* border=2 + frameset cols=300,* frameborder=YES border=2 frame name=tree src='%= response.encodeURL(setUpTree.do) %' scrolling=auto frame name=content src='%= response.encodeURL(blank.jsp) %' scrolling=auto /frameset -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host SaveAliasAction.java
manveen 02/04/29 12:31:48
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host
SaveAliasAction.java
Log:
Added a check to validate if the alias name already exists.
Revision ChangesPath
1.2 +16 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java
Index: SaveAliasAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveAliasAction.java 16 Apr 2002 18:54:46 - 1.1
+++ SaveAliasAction.java 29 Apr 2002 19:31:48 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java,v
1.1 2002/04/16 18:54:46 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/16 18:54:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.java,v
1.2 2002/04/29 19:31:48 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/29 19:31:48 $
*
*
*
@@ -61,10 +61,10 @@
package org.apache.webapp.admin.host;
-
import java.net.URLEncoder;
import java.util.Iterator;
import java.util.Locale;
+import java.util.List;
import java.io.IOException;
import javax.management.Attribute;
import javax.management.MBeanServer;
@@ -97,7 +97,7 @@
* emEdit Alias/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/16 18:54:46 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/29 19:31:48 $
*/
public final class SaveAliasAction extends Action {
@@ -174,7 +174,17 @@
values[0] = aform.getAliasName();
String hostName = aform.getHostName();
-
+
+// validate if this alias already exists.
+List aliasVals = aform.getAliasVals();
+if (aliasVals.contains(values[0])) {
+ ActionErrors errors = new ActionErrors();
+errors.add(aliasName,
+ new ActionError(error.aliasName.exists));
+saveErrors(request, errors);
+return (new ActionForward(mapping.getInput()));
+}
+
try {
ObjectName hname = new ObjectName(hostName);
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm SaveJDBCRealmAction.java SaveJNDIRealmAction.java SaveMemoryRealmAction.java SaveUserDatabaseRealmAction.java
manveen 02/04/29 14:47:08
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveMemoryRealmAction.java
SaveUserDatabaseRealmAction.java
Log:
Fix for new realm's nodelabel.
Revision ChangesPath
1.2 +5 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveJDBCRealmAction.java 24 Mar 2002 04:18:21 - 1.1
+++ SaveJDBCRealmAction.java 29 Apr 2002 21:47:08 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
1.1 2002/03/24 04:18:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/24 04:18:21 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
1.2 2002/04/29 21:47:08 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/29 21:47:08 $
*
*
*
@@ -96,7 +96,7 @@
* emEdit Realm/em transactions for JDBC realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/24 04:18:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/29 21:47:08 $
*/
public final class SaveJDBCRealmAction extends Action {
@@ -229,8 +229,7 @@
if (control != null) {
TreeControlNode parentNode =
control.findNode(rform.getParentObjectName());
if (parentNode != null) {
-String nodeLabel =
-Realm ( + rform.getRealmType() + );
+String nodeLabel = rform.getNodeLabel();
String encodedName =
URLEncoder.encode(rObjectName);
TreeControlNode childNode =
1.2 +6 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Index: SaveJNDIRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveJNDIRealmAction.java 24 Mar 2002 04:18:21 - 1.1
+++ SaveJNDIRealmAction.java 29 Apr 2002 21:47:08 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
1.1 2002/03/24 04:18:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/03/24 04:18:21 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
1.2 2002/04/29 21:47:08 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/29 21:47:08 $
*
*
*
@@ -96,7 +96,7 @@
* emEdit Realm/em transactions for JNDI realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/03/24 04:18:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/29 21:47:08 $
*/
public final class SaveJNDIRealmAction extends Action {
@@ -228,9 +228,8 @@
session.getAttribute(treeControlTest);
if (control != null) {
TreeControlNode parentNode =
control.findNode(rform.getParentObjectName());
-if (parentNode != null) {
-String nodeLabel =
-Realm ( + rform.getRealmType() + );
+if (parentNode != null) {
+String nodeLabel = rform.getNodeLabel();
String encodedName =
URLEncoder.encode(rObjectName);
TreeControlNode childNode =
1.2 +5 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
Index: SaveMemoryRealmAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context ContextForm.java
manveen 02/04/28 18:07:53
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
ContextForm.java
Log:
Minor bug fixes while testing context.
* check that path begins with '/'
* validate with appropriate error message if context already exists.
Revision ChangesPath
1.47 +2 -1
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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ApplicationResources_en.properties27 Apr 2002 01:05:03 - 1.46
+++ ApplicationResources_en.properties29 Apr 2002 01:07:53 - 1.47
@@ -192,7 +192,8 @@
error.realmName.required=liRealm Name required./li
error.realmName.exists=liA realm already exists./li
error.contextName.bad=Invalid context name {0}
-error.adminContext.delete=liCannot delete admin context/li
+error.contextName.exists=liContext already exists./li
+error.path.prefix=liPath must begin with a '/'./li
error.loaderName.bad=Invalid loader name {0}
error.managerName.bad=Invalid manager name {0}
error.connectorName.bad=Invalid connector name {0}
1.41 +2 -1
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ApplicationResources_es.properties26 Apr 2002 03:39:04 - 1.40
+++ ApplicationResources_es.properties29 Apr 2002 01:07:53 - 1.41
@@ -192,7 +192,8 @@
error.realmName.required=liRealm nombre requiredo/li
error.realmName.exists=liRealm ya existe/li
error.contextName.bad=Invalido context nombre {0}
-error.adminContext.delete=liNo puede suprimir contexto del admin/li
+error.contextName.exists=liContext ya existe./li
+error.path.prefix=liLa path debe comenzar con un '/'./li
error.loaderName.bad=Invalido loader nombre {0}
error.managerName.bad=Invalido manager nombre {0}
error.connectorName.bad=Invalido connector nombre {0}
1.5 +7 -9
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ContextForm.java 26 Mar 2002 00:04:44 - 1.4
+++ ContextForm.java 29 Apr 2002 01:07:53 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.4 2002/03/26 00:04:44 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/03/26 00:04:44 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java,v
1.5 2002/04/29 01:07:53 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/29 01:07:53 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the context page.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/03/26 00:04:44 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/29 01:07:53 $
*/
public final class ContextForm extends ActionForm {
@@ -769,12 +769,10 @@
errors.add(docBase, new ActionError(error.docBase.required));
}
-/* FIXME - zero length path ok on the root context
-if ((path == null) || (path.length() 1)) {
-errors.add(path, new ActionError(error.path.required));
+if (!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: mailto:[EMAIL PROTECTED]
For additional
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/26 00:02:15 Modified:webapps/admin/connector connector.jsp Log: Support for HTTP, HTTPS (Coyote http1.1) and AJP (HTTP) connectors. Revision ChangesPath 1.7 +8 -3 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- connector.jsp 26 Apr 2002 02:11:28 - 1.6 +++ connector.jsp 26 Apr 2002 07:02:15 - 1.7 @@ -199,7 +199,11 @@ /controls:data /controls:row -%-- The following properties are supported for both Coyote and JK2 Connectors --% +%-- The following properties are supported only for Coyote Connectors --% + logic:notEqual name=connectorForm property=connectorType scope=session + value=Ajp13Connector + logic:notEqual name=connectorForm property=connectorType scope=session + value=HTTP(AJP) controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelProxy/controls:label controls:datanbsp;/controls:data @@ -218,12 +222,13 @@ html:text property=proxyPortText size=5/ /controls:data /controls:row +/logic:notEqual +/logic:notEqual -%-- The following properties are supported only on HTTPS JK2 Connector --% +%-- The following properties are supported only on HTTPS Connector --% logic:equal name=connectorForm property=connectorType scope=session value=HTTPS br - controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelFactory Properties:/controls:label controls:datanbsp;/controls:data -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java
manveen 02/04/26 00:04:14
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
Log:
Support through admin tool for:
HTTP - Coyote Http/1.1
HTTPS - Coyote Http/1.1
AJP (HTTP) connectors
Revision ChangesPath
1.4 +11 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AddConnectorAction.java 26 Apr 2002 02:13:48 - 1.3
+++ AddConnectorAction.java 26 Apr 2002 07:04:14 - 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.3 2002/04/26 02:13:48 manveen Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/26 02:13:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.4 2002/04/26 07:04:14 manveen Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/26 07:04:14 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.3 $ $Date: 2002/04/26 02:13:48 $
+ * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
*/
public class AddConnectorAction extends Action {
@@ -149,21 +149,24 @@
connectorFm.setRedirectPortText(-1);
connectorFm.setMinProcessorsText(5);
connectorFm.setMaxProcessorsText(20);
+
+//supported only by HTTPS
connectorFm.setClientAuthentication(false);
connectorFm.setKeyStoreFileName();
connectorFm.setKeyStorePassword();
-// supported by both JK2 and Coyote
+// supported only by Coyote connectors
connectorFm.setProxyName();
connectorFm.setProxyPortText(0);
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
-String schemeTypes[]= new String[2];
+String schemeTypes[]= new String[3];
schemeTypes[0] = HTTP;
-schemeTypes[1] = HTTPS;
-
+schemeTypes[1] = HTTPS;
+schemeTypes[2] = HTTP(AJP);
+
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
1.8 +7 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConnectorForm.java25 Apr 2002 23:27:59 - 1.7
+++ ConnectorForm.java26 Apr 2002 07:04:14 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.7 2002/04/25 23:27:59 manveen Exp $
- * $Revision: 1.7 $
- * $Date: 2002/04/25 23:27:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
1.8 2002/04/26 07:04:14 manveen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/26 07:04:14 $
*
*
*
@@ -74,7 +74,7 @@
* Form bean for the connector page.
*
* @author Manveen Kaur
- * @version $Revision: 1.7 $ $Date: 2002/04/25 23:27:59 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/26 07:04:14 $
*/
public final class ConnectorForm extends ActionForm {
@@ -776,9 +776,9 @@
}
}
-// supported by both Coyote and JK2 connectors
-numberCheck(proxyPortText, proxyPortText, true, 0, 65535);
-
+// supported by only HTTP and HTTPS connectors
+if (!(HTTP(AJP).equalsIgnoreCase(connectorType)))
+numberCheck(proxyPortText, proxyPortText, true, 0, 65535
cvs commit: jakarta-tomcat-4.0/webapps/admin/service service.jsp services.jsp
manveen 02/04/26 12:05:13
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
Lists.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
DeleteServiceAction.java EditServiceAction.java
ServiceForm.java
webapps/admin/connector connector.jsp
webapps/admin/server server.jsp
webapps/admin/service service.jsp services.jsp
Log:
* Added a check that cannot delete the service the admin tool is running on from the
tool.
* Added methods to get the name of the service.
Revision ChangesPath
1.8 +34 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/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.java11 Apr 2002 07:44:22 - 1.7
+++ Lists.java26 Apr 2002 19:05:12 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
1.7 2002/04/11 07:44:22 manveen Exp $
- * $Revision: 1.7 $
- * $Date: 2002/04/11 07:44:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
1.8 2002/04/26 19:05:12 manveen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/26 19:05:12 $
*
*
*
@@ -66,6 +66,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -77,7 +78,7 @@
* is returned.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2002/04/11 07:44:22 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/26 19:05:12 $
*/
public class Lists {
@@ -598,5 +599,34 @@
}
+/**
+ * Return the codeService/code object name string
+ * that the admin app belongs to.
+ *
+ * @param mbserver MBeanServer from which to retrieve the list
+ * @param request Http request
+ *
+ * @exception Exception if thrown while retrieving the list
+ */
+public static String getAdminAppService(MBeanServer mbserver,
+ String domain, HttpServletRequest request)
+throws Exception {
+// Get the admin app's service name
+StringBuffer sb = new StringBuffer(domain);
+sb.append(:type=Context);
+sb.append(,path=);
+sb.append(request.getContextPath());
+sb.append(,host=);
+sb.append(request.getServerName());
+sb.append(,*);
+ObjectName search = new ObjectName(sb.toString());
+Iterator names = mbserver.queryNames(search, null).iterator();
+String service = null;
+while (names.hasNext()) {
+service = ((ObjectName)names.next()).getKeyProperty(service);
+}
+return service;
+}
+
}
1.5 +9 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/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 26 Apr 2002 07:04:14 - 1.4
+++ AddConnectorAction.java 26 Apr 2002 19:05:12 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.4 2002/04/26 07:04:14 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/26 07:04:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.5 2002/04/26 19:05:12 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/26 19:05:12 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/04/26 07:04:14 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/26 19:05:12 $
*/
public class
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/WEB-INF/classes/org/apache/webapp/admin/service AddServiceAction.java
manveen 02/04/26 16:56:18
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
AddServiceAction.java
Log:
Fix for minor bug.
Revision ChangesPath
1.8 +6 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java
Index: AddServiceAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AddServiceAction.java 8 Mar 2002 00:12:30 - 1.7
+++ AddServiceAction.java 26 Apr 2002 23:56:18 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java,v
1.7 2002/03/08 00:12:30 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2002/03/08 00:12:30 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.java,v
1.8 2002/04/26 23:56:18 manveen Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/26 23:56:18 $
*
*
*
@@ -81,7 +81,7 @@
* The codeAction/code that sets up emAdd Service/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.7 $ $Date: 2002/03/08 00:12:30 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/26 23:56:18 $
*/
public class AddServiceAction extends Action {
@@ -131,7 +131,8 @@
serviceFm.setServiceName();
serviceFm.setEngineName();
serviceFm.setDebugLvl(0);
-serviceFm.setDefaultHost(localhost);
+serviceFm.setDefaultHost(localhost);
+serviceFm.setAdminServiceName();
serviceFm.setDebugLvlVals(Lists.getDebugLevels());
ArrayList hosts = new ArrayList();
hosts.add(new LabelValueBean
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/26 18:05:03
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
webapps/admin/connector connector.jsp
Log:
preliminary admin tool testing--some bug fixes
Revision ChangesPath
1.46 +3 -3
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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- ApplicationResources_en.properties26 Apr 2002 03:39:04 - 1.45
+++ ApplicationResources_en.properties27 Apr 2002 01:05:03 - 1.46
@@ -164,7 +164,7 @@
logger.filelogger.properties=Filelogger specific Properties
logger.verbositylevel=Verbosity Level
error.loggerName.bad=Invalid logger name {0}
-error.loggerName.exists=liLogger already exists/li
+error.loggerName.exists=liA Logger already exists./li
error.directory.required=liDirectory cannot be empty./li
error.prefix.required=liPrefix cannot be empty./li
error.suffix.required=liSuffix cannot be empty./li
@@ -189,8 +189,8 @@
error.serviceName.required=liService Name required/li
error.serviceName.exists=liService Name already exists/li
error.realmName.bad=Invalid realm name {0}
-error.realmName.required=liRealm Name required/li
-error.realmName.exists=liRealm already exists/li
+error.realmName.required=liRealm Name required./li
+error.realmName.exists=liA realm already exists./li
error.contextName.bad=Invalid context name {0}
error.adminContext.delete=liCannot delete admin context/li
error.loaderName.bad=Invalid loader name {0}
1.5 +7 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java
Index: EditServiceAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EditServiceAction.java26 Apr 2002 19:05:12 - 1.4
+++ EditServiceAction.java27 Apr 2002 01:05:03 - 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
1.4 2002/04/26 19:05:12 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/26 19:05:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
1.5 2002/04/27 01:05:03 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/27 01:05:03 $
*
*
*
@@ -91,7 +91,7 @@
* The codeAction/code that sets up emEdit Service/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/04/26 19:05:12 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/27 01:05:03 $
*/
public class EditServiceAction extends Action {
@@ -228,8 +228,9 @@
Iterator items = Lists.getHosts(mBServer, sname).iterator();
while (items.hasNext()) {
ObjectName hname = new ObjectName((String) items.next());
-String name = hname.getKeyProperty(name);
-hosts.add(new LabelValueBean(name, name));
+String name = hname.getKeyProperty(host);
+if (name!=null)
+hosts.add(new LabelValueBean(name, name));
}
serviceFm.setHostNameVals(hosts);
1.9 +2 -2 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp
Index: connector.jsp
===
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- connector.jsp 26 Apr 2002 19:05:12 - 1.8
+++ connector.jsp 27 Apr 2002 01:05:03 - 1.9
@@ -249,7 +249,7 @@
controls:row labelStyle=table-label-text dataStyle=table-normal-text
controls:labelbean:message
key=connector.keystore.filename/:/controls:label
controls:data
-html:text property=keyStoreFileName size=15/
+html:text property=keyStoreFileName size=30/
/controls:data
/controls:row
@@ -257,7 +257,7
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/25 16:24:31 Modified:webapps/admin/connector connector.jsp Log: Added support for SSL. Revision ChangesPath 1.5 +43 -6 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- connector.jsp 5 Apr 2002 00:02:19 - 1.4 +++ connector.jsp 25 Apr 2002 23:24:31 - 1.5 @@ -83,12 +83,15 @@ /controls:data /controls:row +%-- do not show scheme while creating a new connector --% +logic:notEqual name=connectorForm property=adminAction value=Create controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.scheme/:/controls:label controls:data bean:write name=connectorForm property=scheme scope=session/ /controls:data /controls:row + /logic:notEqual controls:row labelStyle=table-label-text dataStyle=table-normal-text controls:labelbean:message key=connector.accept.count/:/controls:label @@ -193,11 +196,7 @@ /controls:data /controls:row -%-- The following properties are supported only on Coyote Connector --% - logic:equal name=connectorForm property=connectorType scope=session - value=CoyoteConnector - br - +%-- The following properties are supported for both Coyote and JK2 Connectors --% controls:row header=true labelStyle=table-header-text dataStyle=table-header-text controls:labelProxy/controls:label controls:datanbsp;/controls:data @@ -216,8 +215,46 @@ html:text property=proxyPortText size=5/ /controls:data /controls:row + +%-- The following properties are supported only on HTTPS JK2 Connector --% + logic:equal name=connectorForm property=connectorType scope=session + value=HTTPS +br + +controls:row header=true labelStyle=table-header-text dataStyle=table-header-text +controls:labelFactory Properties:/controls:label +controls:datanbsp;/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.client.auth/:/controls:label +controls:data +html:select property=clientAuthentication + bean:define id=booleanVals name=connectorForm property=booleanVals/ + html:options collection=booleanVals property=value + labelProperty=label/ +/html:select +/controls:data +/controls:row + + %-- FIXME: Input only allowed on create transaction?? --% +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.keystore.filename/:/controls:label +controls:data +html:text property=keyStoreFileName size=15/ +/controls:data +/controls:row + +controls:row labelStyle=table-label-text dataStyle=table-normal-text +controls:labelbean:message key=connector.keystore.password/:/controls:label +controls:data +%-- should the password be of type html:password or is cleartext ok? --% +html:text property=keyStorePassword size=15/ +/controls:data +/controls:row + /logic:equal - /controls:table + /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/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java ConnectorForm.java EditConnectorAction.java SaveConnectorAction.java
manveen 02/04/25 16:28:00
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java ConnectorForm.java
EditConnectorAction.java SaveConnectorAction.java
Log:
Added support for SSL.
Revision ChangesPath
1.2 +27 -8
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddConnectorAction.java 3 Apr 2002 23:35:35 - 1.1
+++ AddConnectorAction.java 25 Apr 2002 23:27:59 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.1 2002/04/03 23:35:35 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/03 23:35:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.2 2002/04/25 23:27:59 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/25 23:27:59 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/04/03 23:35:35 $
+ * @version $Revision: 1.2 $ $Date: 2002/04/25 23:27:59 $
*/
public class AddConnectorAction extends Action {
@@ -135,7 +135,8 @@
connectorFm.setConnectorName();
String type = request.getParameter(type);
if (type == null)
-type = CoyoteConnector;// default type is CoyoteConnector
+//type = CoyoteConnector;// default type is CoyoteConnector
+type = HTTP;// default type is HTTP
connectorFm.setConnectorType(type);
connectorFm.setDebugLvl(0);
connectorFm.setServiceName(serviceName);
@@ -149,7 +150,10 @@
connectorFm.setRedirectPortText(-1);
connectorFm.setMinProcessorsText(5);
connectorFm.setMaxProcessorsText(20);
-
+connectorFm.setClientAuthentication(false);
+connectorFm.setKeyStoreFileName();
+connectorFm.setKeyStorePassword();
+
// should be set only for Coyote, not supported by all connector types
if (CoyoteConnector.equalsIgnoreCase(type)) {
connectorFm.setProxyName();
@@ -159,21 +163,36 @@
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
+/*
String connectorTypes[] = new String[2];
connectorTypes[0] = CoyoteConnector;
connectorTypes[1] = Ajp13Connector;
+*/
+String schemeTypes[]= new String[2];
+schemeTypes[0] = HTTP;
+schemeTypes[1] = HTTPS;
+
ArrayList types = new ArrayList();
// the first element in the select list should be the type selected
types.add(new LabelValueBean(type,
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + type));
-for (int i=0; i connectorTypes.length; i++) {
+ for (int i=0; i schemeTypes.length; i++) {
+if (!type.equalsIgnoreCase(schemeTypes[i])) {
+types.add(new LabelValueBean(schemeTypes[i],
+/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
++ type= + schemeTypes[i]));
+}
+/*
+ for (int i=0; i connectorTypes.length; i++) {
if (!type.equalsIgnoreCase(connectorTypes[i])) {
-types.add(new LabelValueBean(connectorTypes[i],
+types.add(new LabelValueBean(schemeTypes[i],
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + connectorTypes[i]));
}
+ */
+
}
connectorFm.setConnectorTypeVals(types);
1.7 +85 -10
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java
Index: ConnectorForm.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connector.jsp
manveen 02/04/25 19:11:28 Modified:webapps/admin/connector connector.jsp Log: Added check that one Should not be able to delete the connector on which the admin tool is running. Revision ChangesPath 1.6 +3 -0 jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp Index: connector.jsp === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/connector/connector.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- connector.jsp 25 Apr 2002 23:24:31 - 1.5 +++ connector.jsp 26 Apr 2002 02:11:28 - 1.6 @@ -45,10 +45,13 @@ controls:action selected=true bean:message key=actions.available.actions/ /controls:action controls:action - /controls:action logic:notEqual name=connectorForm property=adminAction value=Create +logic:notEqual name=connectorForm property=portText +value='%= Integer.toString(request.getServerPort()) %' controls:action url='%= /DeleteConnector.do?select= + URLEncoder.encode(thisObjectName) %' bean:message key=actions.connectors.delete/ /controls:action +/logic:notEqual /logic:notEqual /controls:actions /div -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector AddConnectorAction.java DeleteConnectorAction.java
manveen 02/04/25 19:13:48
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
AddConnectorAction.java DeleteConnectorAction.java
Log:
Do not display the connector on which the admin app runs in the list of connectors
that can be deleted.
This operation is prohibited from the admin tool.
Revision ChangesPath
1.3 +7 -25
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java
Index: AddConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AddConnectorAction.java 25 Apr 2002 23:27:59 - 1.2
+++ AddConnectorAction.java 26 Apr 2002 02:13:48 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.2 2002/04/25 23:27:59 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/25 23:27:59 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.java,v
1.3 2002/04/26 02:13:48 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/26 02:13:48 $
*
*
*
@@ -82,7 +82,7 @@
* The codeAction/code that sets up emAdd Connector/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/25 23:27:59 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/26 02:13:48 $
*/
public class AddConnectorAction extends Action {
@@ -135,7 +135,6 @@
connectorFm.setConnectorName();
String type = request.getParameter(type);
if (type == null)
-//type = CoyoteConnector;// default type is CoyoteConnector
type = HTTP;// default type is HTTP
connectorFm.setConnectorType(type);
connectorFm.setDebugLvl(0);
@@ -154,21 +153,13 @@
connectorFm.setKeyStoreFileName();
connectorFm.setKeyStorePassword();
-// should be set only for Coyote, not supported by all connector types
-if (CoyoteConnector.equalsIgnoreCase(type)) {
-connectorFm.setProxyName();
-connectorFm.setProxyPortText(0);
-}
+// supported by both JK2 and Coyote
+connectorFm.setProxyName();
+connectorFm.setProxyPortText(0);
connectorFm.setDebugLvlVals(Lists.getDebugLevels());
connectorFm.setBooleanVals(Lists.getBooleanValues());
-/*
-String connectorTypes[] = new String[2];
-connectorTypes[0] = CoyoteConnector;
-connectorTypes[1] = Ajp13Connector;
-*/
-
String schemeTypes[]= new String[2];
schemeTypes[0] = HTTP;
schemeTypes[1] = HTTPS;
@@ -184,15 +175,6 @@
/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
+ type= + schemeTypes[i]));
}
-/*
- for (int i=0; i connectorTypes.length; i++) {
-if (!type.equalsIgnoreCase(connectorTypes[i])) {
-types.add(new LabelValueBean(schemeTypes[i],
-/admin/AddConnector.do?serviceName= +
URLEncoder.encode(serviceName)
-+ type= + connectorTypes[i]));
-}
- */
-
}
connectorFm.setConnectorTypeVals(types);
1.2 +10 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java
Index: DeleteConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeleteConnectorAction.java4 Apr 2002 00:38:19 - 1.1
+++ DeleteConnectorAction.java26 Apr 2002 02:13:48 - 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
1.1 2002/04/04 00:38:19 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/04 00:38:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
1.2 2002/04/26 02:13:48 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/04/26 02:13:48
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties
manveen 02/04/25 20:39:04 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties Log: SSL related properties Revision ChangesPath 1.45 +4 -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.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- ApplicationResources_en.properties24 Apr 2002 06:05:55 - 1.44 +++ ApplicationResources_en.properties26 Apr 2002 03:39:04 - 1.45 @@ -119,6 +119,10 @@ connector.max=Maximum connector.proxy.name=Proxy Name connector.proxy.portnumber=Proxy Port Number +connector.client.auth=Client Authentication +connector.keystore.filename=Keystore Filename +connector.keystore.password=Keystore Password +connector.keyPass.warning=liPlease use keytool to generate certificate./li host.properties=Host Properties host.name=Name host.base=Application Base 1.40 +4 -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.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ApplicationResources_es.properties24 Apr 2002 06:05:55 - 1.39 +++ ApplicationResources_es.properties26 Apr 2002 03:39:04 - 1.40 @@ -120,6 +120,10 @@ connector.max=M\u00e1ximo connector.proxy.name=Nombre del Proxy connector.proxy.portnumber=N\u00fmero de Puerto del Proxy +connector.client.auth=Client Authentication +connector.keystore.filename=Keystore Filename +connector.keystore.password=Keystore Password +connector.keyPass.warning=liUtilice por favor el keytool para generar el certificado/li host.properties=Propiedades del ordenador principal host.name=Nombre host.base=Base De la Aplicacion -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/connector connectors.jsp
manveen 02/04/25 20:50:41 Modified:webapps/admin/connector connectors.jsp Log: Do not display a checkbox in front of the connector that the admin app runs on in order to prevent it from being deleted through the tool. Revision ChangesPath 1.2 +4 -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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- connectors.jsp4 Apr 2002 00:40:26 - 1.1 +++ connectors.jsp26 Apr 2002 03:50:41 - 1.2 @@ -64,8 +64,12 @@ logic:iterate name=connectorsList id=connector tr class=line-row tddiv align=left class=table-normal-textnbsp; +%-- the connector the admin app is running on cannot be deleted + through the tool --% +logic:notMatch name=connector value='%= Integer.toString(request.getServerPort()) %' html:multibox property=connectors value=%= connector.toString() %/ +/logic:notMatch /div/td tddiv align=left class=table-normal-textnbsp; html:link page='%= /EditConnector.do?select= + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector DeleteConnectorAction.java
manveen 02/04/25 20:51:59
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector
DeleteConnectorAction.java
Log:
DIsplay all connectors in the list but avoid deletion by the connector not being
selectable for deletion.
Revision ChangesPath
1.3 +5 -10
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java
Index: DeleteConnectorAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteConnectorAction.java26 Apr 2002 02:13:48 - 1.2
+++ DeleteConnectorAction.java26 Apr 2002 03:51:58 - 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
1.2 2002/04/26 02:13:48 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/26 02:13:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.java,v
1.3 2002/04/26 03:51:58 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/26 03:51:58 $
*
*
*
@@ -95,7 +95,7 @@
* The codeAction/code that sets up emDelete Connectors/em transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/04/26 02:13:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/26 03:51:58 $
*/
public class DeleteConnectorAction extends Action {
@@ -182,12 +182,7 @@
Iterator items =
mBServer.queryNames(new ObjectName(pattern), null).iterator();
while (items.hasNext()) {
-// do not display the connector that the admin tool runs on
-// as this should not be allowed to be deleted from the admin tool
-String adminPort = Integer.toString(request.getServerPort());
-ObjectName nextObj = (ObjectName) items.next();
-if (!(nextObj.getKeyProperty(port)).equalsIgnoreCase(adminPort))
-list.add(nextObj.toString());
+list.add(items.next().toString());
}
} catch (Exception e) {
getServlet().log
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/admin/context contexts.jsp
manveen 02/04/25 21:06:44 Modified:webapps/admin/context contexts.jsp Log: Admin context cannot be deleted from tool. Revision ChangesPath 1.3 +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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- contexts.jsp 24 Mar 2002 02:44:30 - 1.2 +++ contexts.jsp 26 Apr 2002 04:06:44 - 1.3 @@ -64,8 +64,11 @@ logic:iterate name=contextsList id=context tr class=line-row tddiv align=left class=table-normal-textnbsp; + %-- admin context cannot be deleted from the tool --% + logic:notMatch name=context value='%= request.getContextPath() %' html:multibox property=contexts value=%= context.toString() %/ + /logic:notMatch /div/td tddiv align=left class=table-normal-textnbsp; html:link page='%= /EditContext.do?select= + -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: [VOTE] Release Plan for Apache Tomcat 4.1
- Original Message - From: Remy Maucherat [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Wednesday, April 24, 2002 8:44 AM Subject: [VOTE] Release Plan for Apache Tomcat 4.1 I'd like to call for a vote on the Apache Tomcat 4.1 Release Plan. The vote will run until 04/26, and will be followed, if the Release Plan is accepted, by a vote for the release of Apache Tomcat 4.1 Beta 1. [X] +1 I approve this plan, and will help [ ] +0 I approve this plan, but can't help [ ] -0 I am not in favor of this plan [ ] -1 I am against this plan, because: -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
