You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/02/24 03:48:20 UTC
svn commit: r1074026 -
/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Author: rwonly
Date: Thu Feb 24 02:48:20 2011
New Revision: 1074026
URL: http://svn.apache.org/viewvc?rev=1074026&view=rev
Log:
GERONIMO-5823 Database Pools of Derby Can't Be Created (Thanks Fang Sheng Hao for the patch!)
Modified:
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=1074026&r1=1074025&r2=1074026&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Thu Feb 24 02:48:20 2011
@@ -561,8 +561,8 @@ public class DatabasePoolPortlet extends
private ResourceAdapterParams loadConfigPropertiesByPath(PortletRequest request, String rarPath) {
DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
try {
- URI uri = getRAR(request, rarPath).toURI();
- ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request, uri.toString()));
+ //URI uri = getRAR(request, rarPath).toURI();
+ ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request, rarPath));
final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
String adapterName = null, adapterDesc = null;
String[] test = ddBeanRoot.getText("connector/display-name");
@@ -984,9 +984,10 @@ public class DatabasePoolPortlet extends
data.name = data.name.replaceAll("\\s", "");
DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
try {
- File rarFile = getRAR(request, data.getRarPath());
- URI uri = getRAR(request, data.getRarPath()).toURI();
- ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request, uri.toString()));
+ String rarPath = data.getRarPath();
+ File rarFile = getRAR(request, rarPath);
+ //URI uri = getRAR(request, data.getRarPath()).toURI();
+ ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request, rarPath));
DeploymentConfiguration config = mgr.createConfiguration(deployable);
final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);