manveen 02/05/09 14:27:27
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
DataSourceForm.java SaveDataSourceAction.java
SetUpDataSourceAction.java
webapps/admin/resources dataSource.jsp dataSources.jspf
Log:
* Added JNDI name to Data Source, used this attribute for the resource Name while
creating a new mBean for this Resource..
* Display list now displays JNDI name, JDBC class.
* Added a validation check that JNDI name is required while creating a new resource.
* JNDI Name can is editable only on create, while now URL can be edited any time.
Revision Changes Path
1.58 +1 -0
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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ApplicationResources_en.properties 9 May 2002 01:41:51 -0000 1.57
+++ ApplicationResources_en.properties 9 May 2002 21:27:27 -0000 1.58
@@ -298,6 +298,7 @@
resources.userdb.factory=Factory
resources.treeBuilder.databases=User Databases
resources.error.path.required=<li>Path is required</li>
+resources.error.jndiName.required=<li>JNDI Name is required</li>
# ---------- User Database Module ----------
users.actions.group.create=Create New Group
1.49 +2 -1
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
Index: ApplicationResources_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ApplicationResources_es.properties 8 May 2002 00:41:18 -0000 1.48
+++ ApplicationResources_es.properties 9 May 2002 21:27:27 -0000 1.49
@@ -297,7 +297,8 @@
resources.userdb.location=Location
resources.userdb.factory=Factory
resources.treeBuilder.userdbs=User Databases
-resources.error.path.required=<li>Path is required</li>
+resources.error.path.required=<li>Path requerido</li>
+resources.error.jndiName.required=<li>JNDI Nombre requerido</li>
# ---------- User Database Module ----------
users.actions.group.create=Cree Al Nuevo Grupo
1.3 +26 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
Index: DataSourceForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSourceForm.java 7 May 2002 23:37:55 -0000 1.2
+++ DataSourceForm.java 9 May 2002 21:27:27 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
1.2 2002/05/07 23:37:55 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/07 23:37:55 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
1.3 2002/05/09 21:27:27 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/09 21:27:27 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Form bean for the individual data source page.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/07 23:37:55 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/09 21:27:27 $
* @since 4.1
*/
@@ -101,6 +101,18 @@
this.url = url;
}
+ /**
+ * The JNDI name of the data source.
+ */
+ private String jndiName = null;
+
+ public String getJndiName() {
+ return (this.jndiName);
+ }
+
+ public void setJndiName(String jndiName) {
+ this.jndiName = jndiName;
+ }
/**
* The JDBC driver class of the data source.
@@ -220,12 +232,13 @@
public void reset(ActionMapping mapping, HttpServletRequest request) {
super.reset(mapping, request);
- url = null;
+ url = null;
+ jndiName = null;
driverClass = null;
username = null;
password = null;
type = null;
-
+
active = null;
idle = null;
wait = null;
@@ -254,10 +267,16 @@
if (submit != null) {
- // name is a required field
+ // url is a required field
if ((url == null) || (url.length() < 1)) {
errors.add("url",
new ActionError("resources.error.url.required"));
+ }
+
+ // jndiName is a required field
+ if (( jndiName == null) || (jndiName.length() < 1)) {
+ errors.add("jndiName",
+ new ActionError("resources.error.jndiName.required"));
}
// driverClass is a required field
1.3 +8 -5
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaveDataSourceAction.java 8 May 2002 03:39:56 -0000 1.2
+++ SaveDataSourceAction.java 9 May 2002 21:27:27 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
1.2 2002/05/08 03:39:56 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/08 03:39:56 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
1.3 2002/05/09 21:27:27 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/09 21:27:27 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* updated data source entry.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/08 03:39:56 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/09 21:27:27 $
* @since 4.1
*/
@@ -175,7 +175,7 @@
signature[1] = "java.lang.String";
Object params[] = new Object[2];
- params[0] = dataSourceForm.getUrl();
+ params[0] = dataSourceForm.getJndiName();
params[1] = ResourceUtils.DATASOURCE_CLASS;
ObjectName oname = null;
@@ -209,6 +209,9 @@
ObjectName oname = new ObjectName(objectName);
+ attribute = "name";
+ mserver.setAttribute
+ (oname, new Attribute(attribute,dataSourceForm.getJndiName()));
attribute = "url";
mserver.setAttribute
(oname,
1.5 +7 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetUpDataSourceAction.java 8 May 2002 17:27:48 -0000 1.4
+++ SetUpDataSourceAction.java 9 May 2002 21:27:27 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v
1.4 2002/05/08 17:27:48 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/08 17:27:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v
1.5 2002/05/09 21:27:27 manveen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/09 21:27:27 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* being added, or a non-null value for an existing DataSource.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/05/08 17:27:48 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/09 21:27:27 $
* @since 4.1
*/
@@ -172,6 +172,9 @@
String attribute = null;
try {
ObjectName oname = new ObjectName(objectName);
+ attribute = "name";
+ dataSourceForm.setJndiName
+ ((String) mserver.getAttribute(oname, attribute));
attribute = "url";
dataSourceForm.setUrl
((String) mserver.getAttribute(oname, attribute));
1.5 +14 -4 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dataSource.jsp 9 May 2002 01:41:51 -0000 1.4
+++ dataSource.jsp 9 May 2002 21:27:27 -0000 1.5
@@ -75,16 +75,26 @@
<controls:row labelStyle="table-label-text"
dataStyle="table-normal-text">
<controls:label>
- <bean:message key="resources.datasrc.url"/>:
+ <bean:message key="resources.datasrc.jndi"/>:
</controls:label>
<controls:data>
<logic:present name="dataSourceForm" property="objectName">
- <bean:write name="dataSourceForm" property="url"/>
- <html:hidden property="url"/>
+ <bean:write name="dataSourceForm" property="jndiName"/>
+ <html:hidden property="jndiName"/>
</logic:present>
<logic:notPresent name="dataSourceForm" property="objectName">
- <html:textarea property="url" cols="35" rows="2"/>
+ <html:text property="jndiName" size="35" maxlength="56"/>
</logic:notPresent>
+ </controls:data>
+ </controls:row>
+
+ <controls:row labelStyle="table-label-text"
+ dataStyle="table-normal-text">
+ <controls:label>
+ <bean:message key="resources.datasrc.url"/>:
+ </controls:label>
+ <controls:data>
+ <html:textarea property="url" cols="35" rows="2"/>
</controls:data>
</controls:row>
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dataSources.jspf 9 May 2002 20:17:54 -0000 1.6
+++ dataSources.jspf 9 May 2002 21:27:27 -0000 1.7
@@ -12,7 +12,7 @@
</td>
</logic:present>
<td width="20%"><div align="left" class="table-header-text">
- <bean:message key="service.name"/>
+ <bean:message key="resources.datasrc.jndi"/>
</div></td>
<td><div align="left" class="table-header-text">
<bean:message key="resources.datasrc.jdbcclass"/>
@@ -30,7 +30,7 @@
<td><div align="left" class="table-normal-text">
<html:link page='<%= "/resources/setUpDataSource.do?objectName=" +
URLEncoder.encode(dataSource) %>'>
- <controls:attribute name="dataSource" attribute="url"/>
+ <controls:attribute name="dataSource" attribute="name"/>
</html:link>
</div></td>
<td><div align="left" class="table-normal-text">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
