cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java
amyroh 2004/04/29 17:44:51
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveDataSourceAction.java
Log:
Check for encoded JNDI name for adding DataSource.
Revision ChangesPath
1.10 +19 -4
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SaveDataSourceAction.java 27 Feb 2004 14:59:04 - 1.9
+++ SaveDataSourceAction.java 30 Apr 2004 00:44:50 - 1.10
@@ -18,7 +18,7 @@
package org.apache.webapp.admin.resources;
import java.io.IOException;
-import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
@@ -133,6 +133,8 @@
Object params[] = new Object[2];
params[0] = dataSourceForm.getJndiName();
params[1] = ResourceUtils.DATASOURCE_CLASS;
+String encodedJndiName = URLEncoder.encode(params[0].toString(),
+ "UTF-8");
String resourcetype = dataSourceForm.getResourcetype();
String path = dataSourceForm.getPath();
@@ -140,6 +142,7 @@
String domain = dataSourceForm.getDomain();
ObjectName oname = null;
+ObjectName encodedOName = null;
try {
@@ -148,15 +151,27 @@
ResourceUtils.GLOBAL_TYPE +
",class=" + params[1] +
",name=" + params[0]);
+encodedOName = new ObjectName( domain +
+ResourceUtils.RESOURCE_TYPE +
+ResourceUtils.GLOBAL_TYPE +
+",class=" + params[1] +
+",name=" + encodedJndiName);
} else if (resourcetype.equals("Context")) {
oname = new ObjectName( domain + ResourceUtils.RESOURCE_TYPE +
ResourceUtils.CONTEXT_TYPE +
",path=" + path + ",host=" + host +
",class=" + params[1] +
",name=" + params[0]);
+encodedOName = new ObjectName( domain +
+ResourceUtils.RESOURCE_TYPE +
+ResourceUtils.CONTEXT_TYPE +
+",path=" + path + ",host=" + host +
+",class=" + params[1] +
+",name=" + encodedJndiName);
}
-
-if (mserver.isRegistered(oname)) {
+
+if (mserver.isRegistered(oname) ||
+mserver.isRegistered(encodedOName)) {
ActionErrors errors = new ActionErrors();
errors.add("jndiName",
new ActionError("resources.invalid.name"));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java
amyroh 2002/12/23 11:34:32
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveDataSourceAction.java
Log:
Port change from tomcat 4.
Revision ChangesPath
1.5 +9 -7
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveDataSourceAction.java 20 Sep 2002 21:22:59 - 1.4
+++ SaveDataSourceAction.java 23 Dec 2002 19:34:32 - 1.5
@@ -265,9 +265,11 @@
(oname,
new Attribute(attribute, dataSourceForm.getWait()));
attribute = "validationQuery";
-mserver.setAttribute
-(oname,
- new Attribute(attribute, dataSourceForm.getQuery()));
+String validationQuery = dataSourceForm.getQuery();
+if ((validationQuery != null) && (validationQuery.length()>0)) {
+mserver.setAttribute(oname,
+new Attribute(attribute, validationQuery));
+}
} catch (Exception e) {
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources SaveDataSourceAction.java SetUpDataSourceAction.java
amyroh 2002/08/16 16:25:31
Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveDataSourceAction.java
SetUpDataSourceAction.java
Log:
Change to look for "username" attribute insted of "user" in JNDI datasource
since DBCP no longer supports the "user" attribute.
Fix for bugzilla 11775.
Revision ChangesPath
1.2 +17 -17
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveDataSourceAction.java 18 Jul 2002 16:48:27 - 1.1
+++ SaveDataSourceAction.java 16 Aug 2002 23:25:31 - 1.2
@@ -176,26 +176,26 @@
Object params[] = new Object[2];
params[0] = dataSourceForm.getJndiName();
-params[1] = ResourceUtils.DATASOURCE_CLASS;
-
+params[1] = ResourceUtils.DATASOURCE_CLASS;
+
String resourcetype = dataSourceForm.getResourcetype();
String path = dataSourceForm.getPath();
String host = dataSourceForm.getHost();
String service = dataSourceForm.getService();
-
+
ObjectName oname = null;
try {
if (resourcetype!=null) {
// Construct the MBean Name for the naming source
if (resourcetype.equals("Global")) {
-oname =
+oname =
new ObjectName(ResourceUtils.NAMINGRESOURCES_TYPE +
ResourceUtils.GLOBAL_TYPE);
-} else if (resourcetype.equals("Context")) {
-oname =
-new ObjectName (ResourceUtils.NAMINGRESOURCES_TYPE +
-ResourceUtils.CONTEXT_TYPE + ",path=" + path +
+} else if (resourcetype.equals("Context")) {
+oname =
+new ObjectName (ResourceUtils.NAMINGRESOURCES_TYPE +
+ResourceUtils.CONTEXT_TYPE + ",path=" + path +
",host=" + host + ",service=" + service);
} else if (resourcetype.equals("DefaultContext")) {
// add defaultcontext support later
@@ -205,7 +205,7 @@
// Create the new object and associated MBean
objectName = (String) mserver.invoke(oname, "addResource",
params, signature);
-
+
} catch (Exception e) {
getServlet().log
@@ -219,11 +219,11 @@
}
}
-
+
// Perform an "Update User database" transaction
String attribute = null;
try {
-
+
ObjectName oname = new ObjectName(objectName);
attribute = "url";
@@ -234,7 +234,7 @@
mserver.setAttribute
(oname,
new Attribute(attribute, dataSourceForm.getDriverClass()));
-attribute = "user";
+attribute = "username";
mserver.setAttribute
(oname,
new Attribute(attribute, dataSourceForm.getUsername()));
@@ -271,7 +271,7 @@
return (null);
}
-
+
// Proceed to the list entries screen
return (mapping.findForward("DataSources List Setup"));
1.2 +15 -15
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.java
Index: SetUpDataSourceAction.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/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.java18 Jul 2002 16:48:27 - 1.1
+++ SetUpDataSourceAction.java16 Aug 2002 23:25:31 - 1.2
@@ -115,7 +115,7 @@
* The MessageResources we will be retrieving messages from.
*/
private MessageResources resources = null;
-
+
// - Public Methods
@@ -156,8 +156,8 @@
String path = request.getParameter("path");
String host = reques
