tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties
Date Sun, 10 Feb 2002 03:14:11 GMT
craigmcc    02/02/09 19:14:11

  Modified:    webapps/admin/WEB-INF struts-config.xml web.xml
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_en.properties
  Removed:     webapps/admin listGroups.jsp listUsers.jsp user.jsp
  Log:
  Update struts-config.xml, web.xml, and the message resources for the move
  of user database administration stuff to "users" subdirectories, and remove
  the JSP pages that have been migrated.  Subsequent commits will catch up on
  the new pages and classes.
  
  Revision  Changes    Path
  1.25      +107 -46   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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- struts-config.xml	8 Feb 2002 21:30:34 -0000	1.24
  +++ struts-config.xml	10 Feb 2002 03:14:11 -0000	1.25
  @@ -51,18 +51,6 @@
       <form-bean      name="setLocaleForm"
                       type="org.apache.webapp.admin.SetLocaleForm"/>
   
  -    <!-- List Groups form bean -->
  -    <form-bean      name="listGroupsForm"
  -                    type="org.apache.webapp.admin.ListGroupsForm"/>
  -
  -    <!-- List Users form bean -->
  -    <form-bean      name="listUsersForm"
  -                    type="org.apache.webapp.admin.ListUsersForm"/>
  -
  -    <!-- User form bean -->
  -    <form-bean      name="userForm"
  -                    type="org.apache.webapp.admin.UserForm"/>
  -
       <!-- JDBC Realm form bean -->
       <form-bean      name="jdbcRealmForm"
                       type="org.apache.webapp.admin.realm.JDBCRealmForm"/>
  @@ -71,10 +59,28 @@
       <form-bean      name="memoryRealmForm"
                       type="org.apache.webapp.admin.realm.MemoryRealmForm"/>
   
  -   <!-- UserDB Realm form bean -->
  +    <!-- UserDB Realm form bean -->
       <form-bean      name="userdbRealmForm"
                       type="org.apache.webapp.admin.realm.UserDBRealmForm"/>
   
  +    <!-- ========== User Database Module ========== -->
  +
  +    <form-bean      name="databaseForm"
  +                    type="org.apache.webapp.admin.users.BaseForm"/>
  +
  +    <form-bean      name="groupForm"
  +                    type="org.apache.webapp.admin.users.GroupForm"/>
  +
  +    <form-bean      name="roleForm"
  +                    type="org.apache.webapp.admin.users.RoleForm"/>
  +
  +    <form-bean      name="userForm"
  +                    type="org.apache.webapp.admin.users.UserForm"/>
  +
  +
  +    <!-- ========== ==================== ========== -->
  +
  +
     </form-beans>
   
   
  @@ -134,18 +140,6 @@
                       path="/blank.jsp"
                   redirect="false"/>
   
  -    <forward        name="Groups List"
  -                    path="/listGroups.jsp"
  -                redirect="false"/>
  -
  -    <forward        name="Users List"
  -                    path="/listUsers.jsp"
  -                redirect="false"/>
  -
  -    <forward        name="Users List Setup"
  -                    path="/listUsers.do"
  -                redirect="false"/>
  -
       <forward        name="Logger"
                       path="/logger.jsp"
                   redirect="false"/>
  @@ -166,6 +160,46 @@
                       path="/userDBRealm.jsp"
                   redirect="false"/>
   
  +    <!-- ========== User Database Module ========== -->
  +
  +    <forward        name="Group"
  +                    path="/users/group.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Groups List"
  +                    path="/users/listGroups.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Groups List Setup"
  +                    path="/users/listGroups.do"
  +                redirect="false"/>
  +
  +    <forward        name="Role"
  +                    path="/users/role.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Roles List"
  +                    path="/users/listRoles.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Roles List Setup"
  +                    path="/users/listRoles.do"
  +                redirect="false"/>
  +
  +    <forward        name="User"
  +                    path="/users/user.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Users List"
  +                    path="/users/listUsers.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Users List Setup"
  +                    path="/users/listUsers.do"
  +                redirect="false"/>
  +
  +    <!-- ========== ==================== ========== -->
  +
     </global-forwards>
   
   
  @@ -355,27 +389,6 @@
       <action    path="/treeControlTest"
                  type="org.apache.webapp.admin.TreeControlTestAction"/>
   
  -    <!-- Set up groups list action -->
  -    <action    path="/listGroups"
  -               name="listGroupsForm"
  -               type="org.apache.webapp.admin.ListGroupsAction"/>
  -
  -    <!-- Set up users list action -->
  -    <action    path="/listUsers"
  -               name="listUsersForm"
  -               type="org.apache.webapp.admin.ListUsersAction"/>
  -
  -    <!-- Set up user action -->
  -    <action    path="/setUpUser"
  -               type="org.apache.webapp.admin.SetUpUserAction"/>
  -
  -    <!-- Save user action -->
  -    <action    path="/saveUser"
  -              input="/user.jsp"
  -               name="userForm"
  -              scope="request"
  -               type="org.apache.webapp.admin.SaveUserAction"/>
  -
       <!-- Delete service action -->
       <action    path="/deleteService"
                 input="/deleteService.jsp"
  @@ -410,6 +423,54 @@
                  name="userdbRealmForm"
                  scope="session"
                  input="/userDBRealm.jsp"/>
  +
  +
  +    <!-- ========== User Database Module ========== -->
  +
  +    <action    path="/users/listGroups"
  +               name="databaseForm"
  +              scope="request"
  +               type="org.apache.webapp.admin.users.ListGroupsAction"/>
  +
  +    <action    path="/users/listRoles"
  +               name="databaseForm"
  +              scope="request"
  +               type="org.apache.webapp.admin.users.ListRolesAction"/>
  +
  +    <action    path="/users/listUsers"
  +               name="databaseForm"
  +              scope="request"
  +               type="org.apache.webapp.admin.users.ListUsersAction"/>
  +
  +    <action    path="/users/saveGroup"
  +              input="/users/group.jsp"
  +               name="groupForm"
  +              scope="session"
  +               type="org.apache.webapp.admin.users.SaveGroupAction"/>
  +
  +    <action    path="/users/saveRole"
  +              input="/users/role.jsp"
  +               name="roleForm"
  +              scope="session"
  +               type="org.apache.webapp.admin.users.SaveRoleAction"/>
  +
  +    <action    path="/users/saveUser"
  +              input="/users/user.jsp"
  +               name="userForm"
  +              scope="session"
  +               type="org.apache.webapp.admin.users.SaveUserAction"/>
  +
  +    <action    path="/users/setUpGroup"
  +               type="org.apache.webapp.admin.users.SetUpGroupAction"/>
  +
  +    <action    path="/users/setUpRole"
  +               type="org.apache.webapp.admin.users.SetUpRoleAction"/>
  +
  +    <action    path="/users/setUpUser"
  +               type="org.apache.webapp.admin.users.SetUpUserAction"/>
  +
  +    <!-- ========== ==================== ========== -->
  +
   
     </action-mappings>  
       
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- web.xml	23 Jan 2002 23:06:53 -0000	1.8
  +++ web.xml	10 Feb 2002 03:14:11 -0000	1.9
  @@ -51,7 +51,7 @@
         <param-name>treebuilders</param-name>
         <param-value>
           org.apache.webapp.admin.TomcatTreeBuilder,
  -        org.apache.webapp.admin.UsersTreeBuilder
  +        org.apache.webapp.admin.users.UsersTreeBuilder
       </param-value>
       </init-param>
       <load-on-startup>2</load-on-startup>
  
  
  
  1.24      +45 -9     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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ApplicationResources_en.properties	8 Feb 2002 21:55:15 -0000	1.23
  +++ ApplicationResources_en.properties	10 Feb 2002 03:14:11 -0000	1.24
  @@ -135,15 +135,6 @@
   error.mgrMaxSessions.required=<li>Maximum sessions cannot be empty</li>
   error.mgrMaxSessions.format=<li>Maximum sessions not a valid integer!</li>
   error.mgrMaxSessions.range=<li>Maximum sessions seems out of range. Valid range is
-1 to 100. </li>
  -usersTreeBuilder.groupsNode=Group Administration
  -usersTreeBuilder.subtreeNode=User and Group Administration
  -usersTreeBuilder.usersNode=User Administration
  -listGroups.title=Groups List
  -listGroups.groupname=Group Name
  -listGroups.description=Description
  -listUsers.title=Users List
  -listUsers.username=Username
  -listUsers.fullName=Full Name
   logger.directory=Directory
   logger.prefix=Prefix
   logger.suffix=Suffix
  @@ -182,3 +173,48 @@
   error.resource.required=<li>Resource Name is required.</li>
   error.resource.javaprefix=<li>Resource must have "java:" prefix.</li>
   error.pathName.required=<li>Path Name is required.</li>
  +
  +# ---------- User Database Module ----------
  +users.actions.group.create=Create New Group
  +users.actions.group.delete=Delete Existing Groups
  +users.actions.role.create=Create New Role
  +users.actions.role.delete=Delete Existing Roles
  +users.actions.user.create=Create New User
  +users.actions.user.delete=Delete Existing Users
  +users.error.attribute.get=Error retrieving attribute {0}
  +users.error.attribute.set=Error modifying attribute {0}
  +users.error.invoke=Error invoking operation {0}
  +users.error.groupname.required=Group Name is required
  +users.error.password.required=Password is required
  +users.error.quotes=Double quote characters are not allowed in field values
  +users.error.rolename.required=Role Name is required
  +users.error.token=Transaction submitted out of order
  +users.error.username.required=User Name is required
  +users.group.newGroup=Create New Group Properties
  +users.group.oldGroup=Edit Existing Group Properties
  +users.group.properties=Group Properties
  +users.list.description=Description
  +users.list.fullName=Full Name
  +users.list.groupname=Group Name
  +users.list.rolename=Role Name
  +users.list.username=User Name
  +users.listGroups.title=Groups List
  +users.listRoles.title=Roles List
  +users.listUsers.title=Users List
  +users.prompt.description=Description:
  +users.prompt.fullName=Full Name:
  +users.prompt.groupname=Group Name:
  +users.prompt.password=Password:
  +users.prompt.rolename=Role Name:
  +users.prompt.username=User Name:
  +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.user.newUser=Create New User Properties
  +users.user.oldUser=Edit Existing User Properties
  +users.user.properties=User Properties
  +# ---------- -------------------- ----------
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message