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 2002/06/18 05:20:53 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/resources dataSource.jsp dataSources.jspf deleteResourceLinks.jsp envEntries.jspf envEntry.jsp listDataSources.jspf listResourceLinks.jspf resourceLink.jsp
amyroh 2002/06/17 20:20:53
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
ListResourceLinksAction.java
SaveResourceLinkAction.java
SetUpDataSourceAction.java
SetUpResourceLinkAction.java
webapps/admin/resources dataSource.jsp dataSources.jspf
deleteResourceLinks.jsp envEntries.jspf
envEntry.jsp listDataSources.jspf
listResourceLinks.jspf resourceLink.jsp
Log:
Minor fixes to properly set up JDBC data sources.
Revision Changes Path
1.3 +6 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java
Index: ListResourceLinksAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ListResourceLinksAction.java 14 Jun 2002 13:29:29 -0000 1.2
+++ ListResourceLinksAction.java 18 Jun 2002 03:20:53 -0000 1.3
@@ -162,11 +162,12 @@
if (service != null) {
service = URLDecoder.decode(service);
}
+
// Create a form bean containing the requested MBean Names
ResourceLinksForm resourceLinksForm = null;
try {
resourceLinksForm =
- ResourceUtils.getResourceLinksForm(mserver, resourcetype,
+ ResourceUtils.getResourceLinksForm(mserver, resourcetype,
path, host, service);
} catch (Exception e) {
getServlet().log(resources.getMessage
1.3 +9 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java
Index: SaveResourceLinkAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveResourceLinkAction.java 14 Jun 2002 13:29:29 -0000 1.2
+++ SaveResourceLinkAction.java 18 Jun 2002 03:20:53 -0000 1.3
@@ -170,13 +170,15 @@
// Perform an "Add ResourceLink" transaction
if (objectName == null) {
- String signature[] = new String[2];
+ String signature[] = new String[3];
signature[0] = "java.lang.String";
signature[1] = "java.lang.String";
+ signature[2] = "java.lang.String";
- Object params[] = new Object[2];
+ Object params[] = new Object[3];
params[0] = resourceLinkForm.getName();
params[1] = resourceLinkForm.getType();
+ params[2] = resourceLinkForm.getGlobal();
String resourcetype = resourceLinkForm.getResourcetype();
String path = resourceLinkForm.getPath();
@@ -225,7 +227,7 @@
try {
ObjectName oname = new ObjectName(objectName);
- getServlet().log(objectName);
+
attribute = "name";
mserver.setAttribute
(oname,
1.8 +35 -16 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SetUpDataSourceAction.java 14 Jun 2002 13:29:29 -0000 1.7
+++ SetUpDataSourceAction.java 18 Jun 2002 03:20:53 -0000 1.8
@@ -195,18 +195,37 @@
attribute = "password";
dataSourceForm.setPassword
((String) mserver.getAttribute(oname, attribute));
- attribute = "maxActive";
- dataSourceForm.setActive
- ((String) mserver.getAttribute(oname, attribute));
- attribute = "maxIdle";
- dataSourceForm.setIdle
- ((String) mserver.getAttribute(oname, attribute));
- attribute = "maxWait";
- dataSourceForm.setWait
- ((String) mserver.getAttribute(oname, attribute));
- attribute = "validationQuery";
- dataSourceForm.setQuery
- ((String) mserver.getAttribute(oname, attribute));
+ try {
+ attribute = "maxActive";
+ dataSourceForm.setActive
+ ((String) mserver.getAttribute(oname, attribute));
+ } catch (Exception e) {
+ // if maxActive not defined, display default value
+ dataSourceForm.setActive("4");
+ }
+ try {
+ attribute = "maxIdle";
+ dataSourceForm.setIdle
+ ((String) mserver.getAttribute(oname, attribute));
+ } catch (Exception e) {
+ // if maxIdle not defined, display default value
+ dataSourceForm.setIdle("2");
+ }
+ try {
+ attribute = "maxWait";
+ dataSourceForm.setWait
+ ((String) mserver.getAttribute(oname, attribute));
+ } catch (Exception e) {
+ // if maxWait not defined, display default value
+ dataSourceForm.setWait("5000");
+ }
+ try {
+ attribute = "validationQuery";
+ dataSourceForm.setQuery
+ ((String) mserver.getAttribute(oname, attribute));
+ } catch (Exception e) {
+ // don't display anything
+ }
} catch (Exception e) {
getServlet().log
(resources.getMessage(locale,
1.3 +6 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java
Index: SetUpResourceLinkAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetUpResourceLinkAction.java 14 Jun 2002 13:29:29 -0000 1.2
+++ SetUpResourceLinkAction.java 18 Jun 2002 03:20:53 -0000 1.3
@@ -149,7 +149,7 @@
}
HttpSession session = request.getSession();
Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
-
+
// Set up the form bean based on the creating or editing state
String objectName = request.getParameter("objectName");
String resourcetype = request.getParameter("resourcetype");
@@ -162,6 +162,7 @@
resourceLinkForm.setPath(path);
resourceLinkForm.setHost(host);
resourceLinkForm.setService(service);
+
if (objectName == null) {
resourceLinkForm.setNodeLabel
(resources.getMessage(locale, "resources.actions.resourcelk.create"));
1.9 +1 -6 jakarta-tomcat-4.0/webapps/admin/resources/dataSource.jsp
Index: dataSource.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/dataSource.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dataSource.jsp 14 Jun 2002 20:05:02 -0000 1.8
+++ dataSource.jsp 18 Jun 2002 03:20:53 -0000 1.9
@@ -20,7 +20,6 @@
<html:form method="POST" action="/resources/saveDataSource">
<html:hidden property="objectName"/>
- <html:hidden property="type"/>
<html:hidden property="resourcetype"/>
<html:hidden property="path"/>
<html:hidden property="host"/>
@@ -46,11 +45,7 @@
<controls:action url="/resources/setUpDataSource.do">
<bean:message key="resources.actions.datasrc.create"/>
</controls:action>
- <controls:action url='<%= "/resources/listDataSources.do?&resourcetype=" +
- URLEncoder.encode(resourcetypeInfo) + "&path="+
- URLEncoder.encode(pathInfo) + "&host="+
- URLEncoder.encode(hostInfo) + "&service="+
- URLEncoder.encode(serviceInfo) %> "&forward=" +
+ <controls:action url='<%= "/resources/listDataSources.do?forward=" +
URLEncoder.encode("DataSources Delete List") %>'>
<bean:message key="resources.actions.datasrc.delete"/>
</controls:action>
1.9 +2 -0 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dataSources.jspf 14 Jun 2002 13:29:29 -0000 1.8
+++ dataSources.jspf 18 Jun 2002 03:20:53 -0000 1.9
@@ -18,6 +18,7 @@
<bean:message key="resources.datasrc.jdbcclass"/>
</div></td>
</tr>
+
<logic:iterate name="dataSourcesForm" property="dataSources"
id="dataSource" type="java.lang.String">
<tr class="line-row">
@@ -42,6 +43,7 @@
</div></td>
</tr>
</logic:iterate>
+
</table>
</td></tr></table>
1.2 +1 -0 jakarta-tomcat-4.0/webapps/admin/resources/deleteResourceLinks.jsp
Index: deleteResourceLinks.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/deleteResourceLinks.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deleteResourceLinks.jsp 13 Jun 2002 18:34:45 -0000 1.1
+++ deleteResourceLinks.jsp 18 Jun 2002 03:20:53 -0000 1.2
@@ -38,6 +38,7 @@
<br>
<bean:define id="checkboxes" scope="page" value="true"/>
<html:form action="/resources/deleteResourceLinks">
+
<%@ include file="../buttons.jsp" %>
<br>
<%@ include file="resourceLinks.jspf" %>
1.9 +2 -0 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- envEntries.jspf 14 Jun 2002 13:29:29 -0000 1.8
+++ envEntries.jspf 18 Jun 2002 03:20:53 -0000 1.9
@@ -21,6 +21,7 @@
<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">
@@ -48,6 +49,7 @@
</div></td>
</tr>
</logic:iterate>
+
</table>
</td></tr></table>
1.8 +1 -5 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- envEntry.jsp 14 Jun 2002 20:05:02 -0000 1.7
+++ envEntry.jsp 18 Jun 2002 03:20:53 -0000 1.8
@@ -45,11 +45,7 @@
<controls:action url="/resources/setUpEnvEntry.do">
<bean:message key="resources.actions.env.create"/>
</controls:action>
- <controls:action url='<%= "/resources/listEnvEntries.do?resourcetype=" +
- URLEncoder.encode(resourcetypeInfo) + "&path="+
- URLEncoder.encode(pathInfo) + "&host="+
- URLEncoder.encode(hostInfo) + "&service="+
- URLEncoder.encode(serviceInfo) + "&forward=" +
+ <controls:action url='<%= "/resources/listEnvEntries.do?forward=" +
URLEncoder.encode("EnvEntries Delete List") %>'>
<bean:message key="resources.actions.env.delete"/>
</controls:action>
1.5 +1 -5 jakarta-tomcat-4.0/webapps/admin/resources/listDataSources.jspf
Index: listDataSources.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listDataSources.jspf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- listDataSources.jspf 14 Jun 2002 20:05:02 -0000 1.4
+++ listDataSources.jspf 18 Jun 2002 03:20:53 -0000 1.5
@@ -16,11 +16,7 @@
<bean:message key="resources.actions.datasrc.create"/>
</controls:action>
- <controls:action url='<%= "/resources/listDataSources.do?resourcetype=" +
- URLEncoder.encode(resourcetypeInfo) + "&path="+
- URLEncoder.encode(pathInfo) + "&host="+
- URLEncoder.encode(hostInfo) + "&service="+
- URLEncoder.encode(serviceInfo) +"&forward=" +
+ <controls:action url='<%= "/resources/listDataSources.do?forward=" +
URLEncoder.encode("DataSources Delete List") %>'>
<bean:message key="resources.actions.datasrc.delete"/>
</controls:action>
1.3 +6 -2 jakarta-tomcat-4.0/webapps/admin/resources/listResourceLinks.jspf
Index: listResourceLinks.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listResourceLinks.jspf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- listResourceLinks.jspf 14 Jun 2002 13:29:30 -0000 1.2
+++ listResourceLinks.jspf 18 Jun 2002 03:20:53 -0000 1.3
@@ -16,8 +16,12 @@
<bean:message key="resources.actions.resourcelk.create"/>
</controls:action>
- <controls:action url='<%= "/resources/listResourceLinks.do?forward="
- + URLEncoder.encode("ResourceLinks Delete List") %>'>
+ <controls:action url='<%= "/resources/listResourceLinks.do?resourcetype=" +
+ URLEncoder.encode(resourcetypeInfo) + "&path="+
+ URLEncoder.encode(pathInfo) + "&host="+
+ URLEncoder.encode(hostInfo) + "&service="+
+ URLEncoder.encode(serviceInfo) +"&forward=" +
+ URLEncoder.encode("ResourceLinks Delete List") %>'>
<bean:message key="resources.actions.resourcelk.delete"/>
</controls:action>
1.3 +3 -3 jakarta-tomcat-4.0/webapps/admin/resources/resourceLink.jsp
Index: resourceLink.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/resourceLink.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resourceLink.jsp 14 Jun 2002 13:29:30 -0000 1.2
+++ resourceLink.jsp 18 Jun 2002 03:20:53 -0000 1.3
@@ -45,8 +45,8 @@
<controls:action url="/resources/setUpResourceLink.do">
<bean:message key="resources.actions.resourcelk.create"/>
</controls:action>
- <controls:action url='<%= "/resources/listResourceLinks.do?forward="
- + URLEncoder.encode("ResourceLinks Delete List") %>'>
+ <controls:action url='<%= "/resources/listResourceLinks.do?forward=" +
+ URLEncoder.encode("ResourceLinks Delete List") %>'>
<bean:message key="resources.actions.resourcelk.delete"/>
</controls:action>
</controls:actions>
@@ -111,7 +111,7 @@
</controls:data>
</controls:row>
- </controls:table>
+ </controls:table>
</td>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>