You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2003/04/10 07:13:49 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/resources userDatabases.jspf
amyroh 2003/04/09 22:13:49
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
SaveDataSourceAction.java SaveEnvEntryAction.java
SaveMailSessionAction.java
SaveResourceLinkAction.java
SaveUserDatabaseAction.java
webapps/admin/resources userDatabases.jspf
Log:
Disallow deletion of UserDatabase for tomcat-users.xml. Also check for already defined resources with the same name to avoid errors.
Revision Changes Path
1.12 +2 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
Index: ApplicationResources_en.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApplicationResources_en.properties 9 Apr 2003 23:27:25 -0000 1.11
+++ ApplicationResources_en.properties 10 Apr 2003 05:13:48 -0000 1.12
@@ -352,6 +352,8 @@
resources.treeBuilder.databases=User Databases
resources.error.path.required=<li>Path is required</li>
resources.error.jndiName.required=<li>JNDI Name is required</li>
+resources.invalid.name=<li>Invalid resource name - Name already exists.</li>
+resources.invalid.env=<li>Invalid environment name - Name already exists.</li>
# ---------- User Database Module ----------
users.actions.group.create=Create New Group
1.11 +2 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplicationResources_es.properties 9 Apr 2003 23:27:25 -0000 1.10
+++ ApplicationResources_es.properties 10 Apr 2003 05:13:48 -0000 1.11
@@ -347,6 +347,8 @@
resources.treeBuilder.userdbs=Bases de datos Del Usuario
resources.error.path.required=<li>Path requerido</li>
resources.error.jndiName.required=<li>JNDI Nombre requerido</li>
+resources.invalid.name=<li>Nombre inv�lido del recurso - el nombre existe ya.</li>
+resources.invalid.env=<li>Nombre inv�lido del ambiente - el nombre existe ya.</li>
# ---------- User Database Module ----------
users.actions.group.create=Cree Al Nuevo Grupo
1.8 +29 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveDataSourceAction.java 23 Mar 2003 02:10:27 -0000 1.7
+++ SaveDataSourceAction.java 10 Apr 2003 05:13:48 -0000 1.8
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -186,8 +187,31 @@
ObjectName oname = null;
try {
+
+ if (resourcetype.equals("Global")) {
+ oname = new ObjectName( domain + ResourceUtils.RESOURCE_TYPE +
+ ResourceUtils.GLOBAL_TYPE +
+ ",class=" + params[1] +
+ ",name=" + params[0]);
+ } else if (resourcetype.equals("Context")) {
+ oname = new ObjectName( domain + ResourceUtils.RESOURCE_TYPE +
+ ResourceUtils.CONTEXT_TYPE +
+ ",path=" + path + ",host=" + host +
+ ",class=" + params[1] +
+ ",name=" + params[0]);
+ }
+
+ if (mserver.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("jndiName",
+ new ActionError("resources.invalid.name"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+
oname = ResourceUtils.getNamingResourceObjectName(domain,
- resourcetype, path, host);
+ resourcetype, path, host);
+
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addResource",
params, signature);
1.6 +28 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java
Index: SaveEnvEntryAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveEnvEntryAction.java 23 Mar 2003 02:10:27 -0000 1.5
+++ SaveEnvEntryAction.java 10 Apr 2003 05:13:48 -0000 1.6
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -189,8 +190,31 @@
ObjectName oname = null;
try {
+
+ if (resourcetype.equals("Global")) {
+ oname = new ObjectName( domain +
+ ResourceUtils.ENVIRONMENT_TYPE +
+ ResourceUtils.GLOBAL_TYPE +
+ ",name=" + params[0]);
+ } else if (resourcetype.equals("Context")) {
+ oname = new ObjectName( domain +
+ ResourceUtils.ENVIRONMENT_TYPE +
+ ResourceUtils.CONTEXT_TYPE +
+ ",path=" + path + ",host=" + host +
+ ",name=" + params[0]);
+ }
+
+ if (mserver.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("name",
+ new ActionError("resources.invalid.env"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+
oname = ResourceUtils.getNamingResourceObjectName(domain,
resourcetype, path, host);
+
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addEnvironment",
params, signature);
1.6 +28 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java
Index: SaveMailSessionAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveMailSessionAction.java 23 Mar 2003 02:10:27 -0000 1.5
+++ SaveMailSessionAction.java 10 Apr 2003 05:13:48 -0000 1.6
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -186,9 +187,31 @@
ObjectName oname = null;
try {
+
+ if (resourcetype.equals("Global")) {
+ oname = new ObjectName( domain + ResourceUtils.RESOURCE_TYPE +
+ ResourceUtils.GLOBAL_TYPE +
+ ",class=" + params[1] +
+ ",name=" + params[0]);
+ } else if (resourcetype.equals("Context")) {
+ oname = new ObjectName( domain + ResourceUtils.RESOURCE_TYPE +
+ ResourceUtils.CONTEXT_TYPE +
+ ",path=" + path + ",host=" + host +
+ ",class=" + params[1] +
+ ",name=" + params[0]);
+ }
+
+ if (mserver.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("name",
+ new ActionError("resources.invalid.name"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+
oname = ResourceUtils.getNamingResourceObjectName(domain,
resourcetype, path, host);
-
+
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addResource",
params, signature);
1.8 +28 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java
Index: SaveResourceLinkAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveResourceLinkAction.java 23 Mar 2003 02:10:27 -0000 1.7
+++ SaveResourceLinkAction.java 10 Apr 2003 05:13:48 -0000 1.8
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -186,8 +187,31 @@
ObjectName oname = null;
try {
+
+ if (resourcetype.equals("Global")) {
+ oname = new ObjectName( domain +
+ ResourceUtils.RESOURCELINK_TYPE +
+ ResourceUtils.GLOBAL_TYPE +
+ ",name=" + params[0]);
+ } else if (resourcetype.equals("Context")) {
+ oname = new ObjectName( domain +
+ ResourceUtils.RESOURCELINK_TYPE +
+ ResourceUtils.CONTEXT_TYPE +
+ ",path=" + path + ",host=" + host +
+ ",name=" + params[0]);
+ }
+
+ if (mserver.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("name",
+ new ActionError("resources.invalid.name"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+
oname = ResourceUtils.getNamingResourceObjectName(domain,
resourcetype, path, host);
+
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addResourceLink",
params, signature);
1.4 +20 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
Index: SaveUserDatabaseAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveUserDatabaseAction.java 26 Mar 2003 08:05:19 -0000 1.3
+++ SaveUserDatabaseAction.java 10 Apr 2003 05:13:48 -0000 1.4
@@ -72,6 +72,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -187,11 +188,25 @@
try {
String domain = userDatabaseForm.getDomain();
+ oname = new ObjectName( domain +
+ ResourceUtils.RESOURCE_TYPE +
+ ResourceUtils.GLOBAL_TYPE +
+ ",class=" + ResourceUtils.USERDB_CLASS +
+ ",name=" + params[0]);
+
+ if (mserver.isRegistered(oname)) {
+ ActionErrors errors = new ActionErrors();
+ errors.add("name",
+ new ActionError("resources.invalid.name"));
+ saveErrors(request, errors);
+ return (new ActionForward(mapping.getInput()));
+ }
+
// Construct the MBean Name for the naming source
oname = new ObjectName(domain +
ResourceUtils.NAMINGRESOURCES_TYPE +
ResourceUtils.GLOBAL_TYPE);
-
+
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addResource",
params, signature);
1.5 +13 -3 jakarta-tomcat-catalina/webapps/admin/resources/userDatabases.jspf
Index: userDatabases.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/userDatabases.jspf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- userDatabases.jspf 28 Mar 2003 02:51:07 -0000 1.4
+++ userDatabases.jspf 10 Apr 2003 05:13:49 -0000 1.5
@@ -28,9 +28,19 @@
<tr class="line-row">
<logic:present name="checkboxes">
<td scope="row"><div align="center" class="table-normal-text">
- <label for="userDatabases"></label>
- <input type="checkbox" name="userDatabases"
- value="<%= userDatabase %>" styleId="userDatabases">
+ <logic:match name="userDatabase"
+ value="name=UserDatabase">
+ <font color='red'>*</font>
+ </logic:match>
+ <logic:notMatch name="userDatabase"
+ value="name=UserDatabase">
+ <label for="userDatabases"></label>
+ <html:multibox property="userDatabases"
+ value="userDatabase" styleId="userDatabases"/>
+ </logic:notMatch>
+
+ <!--input type="checkbox" name="userDatabases"
+ value="<%= userDatabase %>" styleId="userDatabases"-->
</td>
</logic:present>
<td scope="row"><div align="left" class="table-normal-text">
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org