You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2008/08/22 04:04:06 UTC

svn commit: r687927 - /geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Author: linsun
Date: Thu Aug 21 19:04:06 2008
New Revision: 687927

URL: http://svn.apache.org/viewvc?rev=687927&view=rev
Log:
GERONIMO-3469 - From console: database pool doesn't work well if the name contains a / like jdbc/EmployeeDataSource

Modified:
    geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=687927&r1=687926&r2=687927&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Thu Aug 21 19:04:06 2008
@@ -972,7 +972,8 @@
                 String artifactId = data.name;
                 if (artifactId.indexOf('/') != -1) {
                     // slash in artifact-id results in invalid configuration-id and leads to deployment errors
-                    artifactId = artifactId.replaceAll("/", "%2F");
+                    // use the after / portion as the artifactId
+                    artifactId = artifactId.substring(artifactId.indexOf('/') + 1);
                 }
                 configId.setArtifactId(artifactId);
                 configId.setVersion("1.0");