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/03/27 04:08:05 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service EditServiceAction.java
amyroh 2003/03/26 19:08:05
Modified: webapps/admin/WEB-INF struts-config.xml
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationResources_en.properties Lists.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
SaveJDBCRealmAction.java SaveJNDIRealmAction.java
SaveUserDatabaseRealmAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
Log:
Add error pages for realm creation failures, etc.
Revision Changes Path
1.3 +4 -0 jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-config.xml 16 Sep 2002 04:46:18 -0000 1.2
+++ struts-config.xml 27 Mar 2003 03:08:05 -0000 1.3
@@ -199,6 +199,10 @@
<forward name="Save Successful"
path="/saved.jsp"
redirect="false"/>
+
+ <forward name="Save Unsuccessful"
+ path="/savefail.jsp"
+ redirect="false"/>
<forward name="Blank"
path="/blank.jsp"
1.10 +4 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ApplicationResources_en.properties 11 Feb 2003 03:34:43 -0000 1.9
+++ ApplicationResources_en.properties 27 Mar 2003 03:08:05 -0000 1.10
@@ -21,6 +21,7 @@
sample.someText.required=<li>"Some Text" cannot be empty</li>
sample.moreText.required=<li>"More Text" cannot be empty</li>
save.success=Save sucessful!
+save.fail=Save failed!
server.portnumber=Port Number
server.debuglevel=Debug Level
server.shutdown=Shutdown
@@ -201,6 +202,9 @@
error.serviceName.bad=Invalid service name {0}
error.serviceName.required=<li>Service Name required</li>
error.serviceName.exists=<li>Service Name already exists</li>
+error.jdbcrealm=Error occured during setting JDBCRealm.
+error.jndirealm=Error occured during setting JNDIRealm.
+error.userdbrealm=Error occured during setting UserdatabaseRealm.
error.realmName.bad=Invalid realm name {0}
error.realmName.required=<li>Realm Name required.</li>
error.realmName.exists=<li>A realm already exists.</li>
1.9 +6 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Lists.java 23 Mar 2003 02:10:26 -0000 1.8
+++ Lists.java 27 Mar 2003 03:08:05 -0000 1.9
@@ -470,6 +470,7 @@
StringBuffer sb = new StringBuffer(container.getDomain());
sb.append(":type=Valve");
String type = container.getKeyProperty("type");
+ String j2eeType = container.getKeyProperty("j2eeType");
sb.append(TomcatTreeBuilder.WILDCARD);
String host = "";
String path = "";
@@ -520,7 +521,7 @@
}
}
- if ("Context".equalsIgnoreCase(type)) {
+ if ("WebModule".equalsIgnoreCase(j2eeType)) {
if ((path.equalsIgnoreCase(vpath)) && (host.equalsIgnoreCase(vhost))) {
valves.add(valve.toString());
}
1.4 +9 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
Index: SaveJDBCRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveJDBCRealmAction.java 20 Mar 2003 05:40:10 -0000 1.3
+++ SaveJDBCRealmAction.java 27 Mar 2003 03:08:05 -0000 1.4
@@ -222,6 +222,11 @@
rObjectName = (String)
mBServer.invoke(fname, operation,
values, createStandardRealmTypes);
+
+ if (rObjectName==null) {
+ request.setAttribute("warning", "error.jdbcrealm");
+ return (mapping.findForward("Save Unsuccessful"));
+ }
// Add the new Realm to our tree control node
TreeControl control = (TreeControl)
1.7 +9 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
Index: SaveJNDIRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveJNDIRealmAction.java 20 Mar 2003 05:40:10 -0000 1.6
+++ SaveJNDIRealmAction.java 27 Mar 2003 03:08:05 -0000 1.7
@@ -224,6 +224,11 @@
mBServer.invoke(fname, operation,
values, createStandardRealmTypes);
+ if (rObjectName==null) {
+ request.setAttribute("warning", "error.jndirealm");
+ return (mapping.findForward("Save Unsuccessful"));
+ }
+
// Add the new Realm to our tree control node
TreeControl control = (TreeControl)
session.getAttribute("treeControlTest");
1.4 +8 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
Index: SaveUserDatabaseRealmAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SaveUserDatabaseRealmAction.java 20 Mar 2003 05:40:10 -0000 1.3
+++ SaveUserDatabaseRealmAction.java 27 Mar 2003 03:08:05 -0000 1.4
@@ -223,6 +223,10 @@
rObjectName = (String)
mBServer.invoke(fname, operation,
values, createUserDatabaseRealmTypes);
+ if (rObjectName==null) {
+ request.setAttribute("warning", "error.userdbrealm");
+ return (mapping.findForward("Save Unsuccessful"));
+ }
// Add the new Realm to our tree control node
TreeControl control = (TreeControl)
1.5 +5 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java
Index: EditServiceAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/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.java 21 Mar 2003 08:19:16 -0000 1.4
+++ EditServiceAction.java 27 Mar 2003 03:08:05 -0000 1.5
@@ -197,7 +197,7 @@
serviceFm.setObjectName(sname.toString());
serviceFm.setEngineObjectName(ename.toString());
sb = new StringBuffer("Service (");
- sb.append(sname.getDomain());
+ sb.append(sname.getKeyProperty("serviceName"));
sb.append(")");
serviceFm.setNodeLabel(sb.toString());
serviceFm.setAdminServiceName(adminService);
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org