You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2002/05/08 01:37:55 UTC
cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources DataSourceForm.java SaveUserDatabaseAction.java SetUpDataSourceAction.java SetUpUserDatabaseAction.java
manveen 02/05/07 16:37:55
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
DataSourceForm.java SaveUserDatabaseAction.java
SetUpDataSourceAction.java
SetUpUserDatabaseAction.java
Log:
Add a resourcetype entry to the datasource form bean
Revision Changes Path
1.2 +18 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataSourceForm.java 5 May 2002 22:44:21 -0000 1.1
+++ DataSourceForm.java 7 May 2002 23:37:55 -0000 1.2
@@ -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.1 2002/05/05 22:44:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/05 22:44:21 $
+ * $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 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Form bean for the individual data source page.
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/05 22:44:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/07 23:37:55 $
* @since 4.1
*/
@@ -195,6 +195,19 @@
public void setQuery(String query) {
this.query = query;
}
+
+ /**
+ * The type of the resource.
+ */
+ private String type = null;
+
+ public String getType() {
+ return (this.type);
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
// --------------------------------------------------------- Public Methods
@@ -211,6 +224,7 @@
driverClass = null;
username = null;
password = null;
+ type = null;
active = null;
idle = null;
1.2 +5 -7 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java
Index: SaveUserDatabaseAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveUserDatabaseAction.java 7 May 2002 21:13:27 -0000 1.1
+++ SaveUserDatabaseAction.java 7 May 2002 23:37:55 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v 1.1 2002/05/07 21:13:27 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/07 21:13:27 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.java,v 1.2 2002/05/07 23:37:55 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/07 23:37:55 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* updated User database entry.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/07 21:13:27 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/07 23:37:55 $
* @since 4.1
*/
@@ -116,8 +116,6 @@
*/
private MBeanServer mserver = null;
- public static String USERDB_RESOURCE_TYPE = "org.apache.catalina.UserDatabase";
-
/*
* Only one implementation of factory allowed to start with.
*/
@@ -183,7 +181,7 @@
Object params[] = new Object[2];
params[0] = userDatabaseForm.getName();
- params[1] = USERDB_RESOURCE_TYPE;
+ params[1] = ResourceUtils.USERDB_CLASS;
ObjectName oname = null;
1.2 +7 -7 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetUpDataSourceAction.java 5 May 2002 22:44:21 -0000 1.1
+++ SetUpDataSourceAction.java 7 May 2002 23:37:55 -0000 1.2
@@ -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.1 2002/05/05 22:44:21 manveen Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/05 22:44:21 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java,v 1.2 2002/05/07 23:37:55 manveen Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/05/07 23:37:55 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* being added, or a non-null value for an existing DataSource.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.1 $ $Date: 2002/05/05 22:44:21 $
+ * @version $Revision: 1.2 $ $Date: 2002/05/07 23:37:55 $
* @since 4.1
*/
@@ -115,8 +115,7 @@
* The MessageResources we will be retrieving messages from.
*/
private MessageResources resources = null;
-
-
+
// --------------------------------------------------------- Public Methods
@@ -155,6 +154,8 @@
String objectName = request.getParameter("objectName");
DataSourceForm dataSourceForm = new DataSourceForm();
+ dataSourceForm.setType(ResourceUtils.DATASOURCE_CLASS);
+
if (objectName == null) {
dataSourceForm.setNodeLabel
(resources.getMessage(locale, "resources.actions.datasrc.create"));
@@ -191,7 +192,6 @@
attribute = "validationQuery";
dataSourceForm.setQuery
((String) mserver.getAttribute(oname, attribute));
-
} catch (Exception e) {
getServlet().log
(resources.getMessage(locale,
1.3 +5 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java
Index: SetUpUserDatabaseAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetUpUserDatabaseAction.java 7 May 2002 21:13:27 -0000 1.2
+++ SetUpUserDatabaseAction.java 7 May 2002 23:37:55 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v 1.2 2002/05/07 21:13:27 manveen Exp $
- * $Revision: 1.2 $
- * $Date: 2002/05/07 21:13:27 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.java,v 1.3 2002/05/07 23:37:55 manveen Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/05/07 23:37:55 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* being added, or a non-null value for an existing UserDatabase.</p>
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/07 21:13:27 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/07 23:37:55 $
* @since 4.1
*/
@@ -158,7 +158,7 @@
userDatabaseForm.setFactory
(SaveUserDatabaseAction.USERDB_FACTORY);
userDatabaseForm.setType
- (SaveUserDatabaseAction.USERDB_RESOURCE_TYPE);
+ (ResourceUtils.USERDB_CLASS);
if (objectName == null) {
userDatabaseForm.setNodeLabel
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>