amyroh 2003/03/26 00:05:22 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources ListUserDatabasesAction.java ResourceUtils.java SaveUserDatabaseAction.java SetUpUserDatabaseAction.java UserDatabaseForm.java UserDatabasesForm.java webapps/admin/resources deleteUserDatabases.jsp listUserDatabases.jsp listUserDatabases.jspf userDatabase.jsp userDatabases.jspf Log: Fix UserDatabase. Revision Changes Path 1.2 +11 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java Index: ListUserDatabasesAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ListUserDatabasesAction.java 18 Jul 2002 16:48:27 -0000 1.1 +++ ListUserDatabasesAction.java 26 Mar 2003 08:05:19 -0000 1.2 @@ -147,10 +147,16 @@ HttpSession session = request.getSession(); Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY); + String domain = request.getParameter("domain"); + if (domain != null) { + domain = URLDecoder.decode(domain); + } // Create a form bean containing the requested MBean Names UserDatabasesForm userDatabasesForm = null; try { - userDatabasesForm = ResourceUtils.getUserDatabasesForm(mserver); + userDatabasesForm = + ResourceUtils.getUserDatabasesForm(mserver, domain); + userDatabasesForm.setDomain(domain); } catch (Exception e) { getServlet().log(resources.getMessage (locale, 1.7 +6 -6 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java Index: ResourceUtils.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/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.java 23 Mar 2003 02:10:27 -0000 1.6 +++ ResourceUtils.java 26 Mar 2003 08:05:19 -0000 1.7 @@ -426,10 +426,10 @@ * * @exception Exception if an error occurs */ - public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver) + public static UserDatabasesForm getUserDatabasesForm(MBeanServer mserver,String domain) throws Exception { - ObjectName rname = new ObjectName( RESOURCE_TYPE + GLOBAL_TYPE + + ObjectName rname = new ObjectName( domain + RESOURCE_TYPE + GLOBAL_TYPE + ",class=" + USERDB_CLASS + ",*"); Iterator iterator = (mserver.queryMBeans(rname, null).iterator()); 1.3 +5 -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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SaveUserDatabaseAction.java 18 Mar 2003 10:48:24 -0000 1.2 +++ SaveUserDatabaseAction.java 26 Mar 2003 08:05:19 -0000 1.3 @@ -186,7 +186,7 @@ ObjectName oname = null; try { - String domain = (new ObjectName(objectName)).getDomain(); + String domain = userDatabaseForm.getDomain(); // Construct the MBean Name for the naming source oname = new ObjectName(domain + ResourceUtils.NAMINGRESOURCES_TYPE + 1.2 +7 -5 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java Index: SetUpUserDatabaseAction.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SetUpUserDatabaseAction.java 18 Jul 2002 16:48:27 -0000 1.1 +++ SetUpUserDatabaseAction.java 26 Mar 2003 08:05:19 -0000 1.2 @@ -153,12 +153,14 @@ // Set up the form bean based on the creating or editing state String objectName = request.getParameter("objectName"); + String domain = request.getParameter("domain"); UserDatabaseForm userDatabaseForm = new UserDatabaseForm(); userDatabaseForm.setFactory (SaveUserDatabaseAction.USERDB_FACTORY); userDatabaseForm.setType - (ResourceUtils.USERDB_CLASS); + (ResourceUtils.USERDB_CLASS); + userDatabaseForm.setDomain(domain); if (objectName == null) { userDatabaseForm.setNodeLabel 1.3 +22 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java Index: UserDatabaseForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- UserDatabaseForm.java 25 Mar 2003 08:29:05 -0000 1.2 +++ UserDatabaseForm.java 26 Mar 2003 08:05:19 -0000 1.3 @@ -89,6 +89,24 @@ // ------------------------------------------------------------- Properties + /** + * The domain of this data source. + */ + private String domain = null; + + /** + * Return the domain of the data source this bean refers to. + */ + public String getDomain() { + return this.domain; + } + + /** + * Set the domain of the data source this bean refers to. + */ + public void setDomain(String domain) { + this.domain = domain; + } /** * The name of the associated entry. 1.2 +22 -4 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java Index: UserDatabasesForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- UserDatabasesForm.java 18 Jul 2002 16:48:27 -0000 1.1 +++ UserDatabasesForm.java 26 Mar 2003 08:05:19 -0000 1.2 @@ -99,7 +99,25 @@ this.userDatabases = userDatabases; } + /** + * The domain of this userdatabase. + */ + private String domain = null; + + /** + * Return the domain of the userdatabase this bean refers to. + */ + public String getDomain() { + return this.domain; + } + /** + * Set the domain of the userdatabase this bean refers to. + */ + public void setDomain(String domain) { + this.domain = domain; + } + // --------------------------------------------------------- Public Methods 1.3 +11 -0 jakarta-tomcat-catalina/webapps/admin/resources/deleteUserDatabases.jsp Index: deleteUserDatabases.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/deleteUserDatabases.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- deleteUserDatabases.jsp 24 Jul 2002 20:57:27 -0000 1.2 +++ deleteUserDatabases.jsp 26 Mar 2003 08:05:20 -0000 1.3 @@ -18,6 +18,10 @@ <html:form action="/resources/listUserDatabases"> + <bean:define id="domainInfo" type="java.lang.String" + name="userDatabasesForm" property="domain"/> + <html:hidden property="domain"/> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> <td width="81%"> @@ -36,8 +40,15 @@ </html:form> <br> + <bean:define id="checkboxes" scope="page" value="true"/> + <html:form action="/resources/deleteUserDatabases"> + + <bean:define id="domainInfo" type="java.lang.String" + name="userDatabasesForm" property="domain"/> + <html:hidden property="domain"/> + <%@ include file="../buttons.jsp" %> <br> <%@ include file="userDatabases.jspf" %> 1.3 +6 -2 jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jsp Index: listUserDatabases.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- listUserDatabases.jsp 24 Jul 2002 20:57:27 -0000 1.2 +++ listUserDatabases.jsp 26 Mar 2003 08:05:20 -0000 1.3 @@ -18,6 +18,10 @@ <html:form action="/resources/listUserDatabases"> + <bean:define id="domainInfo" type="java.lang.String" + name="userDatabasesForm" property="domain"/> + <html:hidden property="domain"/> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr bgcolor="7171A5"> <td width="81%"> @@ -33,11 +37,11 @@ </tr> </table> -</html:form> - <br> <%@ include file="userDatabases.jspf" %> + +</html:form> <br> 1.3 +5 -3 jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jspf Index: listUserDatabases.jspf =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/listUserDatabases.jspf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- listUserDatabases.jspf 23 Jan 2003 00:07:09 -0000 1.2 +++ listUserDatabases.jspf 26 Mar 2003 08:05:20 -0000 1.3 @@ -10,12 +10,14 @@ --------------------------------- </controls:action> - <controls:action url="/resources/setUpUserDatabase.do"> + <controls:action url='<%= "/resources/setUpUserDatabase.do?domain=" + + URLEncoder.encode(domainInfo) %>'> <bean:message key="resources.actions.userdb.create"/> </controls:action> - <controls:action url='<%= "/resources/listUserDatabases.do?forward=" - + URLEncoder.encode("UserDatabases Delete List") %>'> + <controls:action url='<%= "/resources/listUserDatabases.do?domain=" + + URLEncoder.encode(domainInfo) + "&forward=" + + URLEncoder.encode("UserDatabases Delete List") %>'> <bean:message key="resources.actions.userdb.delete"/> </controls:action> 1.4 +9 -4 jakarta-tomcat-catalina/webapps/admin/resources/userDatabase.jsp Index: userDatabase.jsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/resources/userDatabase.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- userDatabase.jsp 23 Jan 2003 00:07:09 -0000 1.3 +++ userDatabase.jsp 26 Mar 2003 08:05:20 -0000 1.4 @@ -19,6 +19,9 @@ <html:form method="POST" action="/resources/saveUserDatabase"> + <bean:define id="domainInfo" type="java.lang.String" + name="userDatabaseForm" property="domain"/> + <html:hidden property="domain"/> <html:hidden property="objectName"/> <html:hidden property="type"/> <html:hidden property="factory"/> @@ -39,12 +42,14 @@ <controls:action> --------------------------------- </controls:action> - - <controls:action url="/resources/setUpUserDatabase.do"> + + <controls:action url='<%= "/resources/setUpUserDatabase.do?domain=" + + URLEncoder.encode(domainInfo) %>'> <bean:message key="resources.actions.userdb.create"/> </controls:action> - <controls:action url='<%= "/resources/listUserDatabases.do?forward=" - + URLEncoder.encode("UserDatabases Delete List") %>'> + <controls:action url='<%= "/resources/listUserDatabases.do?domain=" + + URLEncoder.encode(domainInfo) + "&forward=" + + URLEncoder.encode("UserDatabases Delete List") %>'> <bean:message key="resources.actions.userdb.delete"/> </controls:action> </controls:actions> 1.3 +2 -1 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- userDatabases.jspf 23 Jan 2003 00:07:09 -0000 1.2 +++ userDatabases.jspf 26 Mar 2003 08:05:20 -0000 1.3 @@ -35,7 +35,8 @@ </logic:present> <td><div align="left" class="table-normal-text"> <html:link page='<%= "/resources/setUpUserDatabase.do?objectName=" + - URLEncoder.encode(userDatabase) %>'> + URLEncoder.encode(userDatabase) + "&domain=" + + URLEncoder.encode(domainInfo) %>'> <controls:attribute name="userDatabase" attribute="name"/> </html:link> </div></td>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]