Author: sergiykarpenko Date: 2011-01-24 08:20:31 -0500 (Mon, 24 Jan 2011) New Revision: 3834 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java Log: EXOJCR-1148: DBConnectionInfo returns only properties map Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2011-01-24 13:18:50 UTC (rev 3833) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2011-01-24 13:20:31 UTC (rev 3834) @@ -52,12 +52,10 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.io.Serializable; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import javax.jcr.RepositoryException; @@ -426,18 +424,11 @@ for (String dataSource : dataSourceNames) { // create related DB - Map<String, String> refAddr = new HashMap<String, String>(); + Map<String, String> refAddr = null; try { DBConnectionInfo dbConnectionInfo = dbCreator.createDatabase(rEntry.getName() + "_" + dataSource); - refAddr.put("driverClassName", dbConnectionInfo.getDriver()); - refAddr.put("url", dbConnectionInfo.getUrl()); - refAddr.put("username", dbConnectionInfo.getUsername()); - refAddr.put("password", dbConnectionInfo.getPassword()); - for (Entry<String, String> entry : dbConnectionInfo.getAdditionalProperties().entrySet()) - { - refAddr.put(entry.getKey(), entry.getValue()); - } + refAddr = dbConnectionInfo.getProperties(); } catch (DBCreatorException e) { @@ -519,19 +510,12 @@ for (String dataSource : dataSourceNames) { // get data base info - Map<String, String> refAddr = new HashMap<String, String>(); + Map<String, String> refAddr = null; try { DBConnectionInfo dbConnectionInfo = dbCreator.getDBConnectionInfo(repositoryEntry.getName() + "_" + dataSource); - refAddr.put("driverClassName", dbConnectionInfo.getDriver()); - refAddr.put("url", dbConnectionInfo.getUrl()); - refAddr.put("username", dbConnectionInfo.getUsername()); - refAddr.put("password", dbConnectionInfo.getPassword()); - for (Entry<String, String> entry : dbConnectionInfo.getAdditionalProperties().entrySet()) - { - refAddr.put(entry.getKey(), entry.getValue()); - } + refAddr = dbConnectionInfo.getProperties(); } catch (DBCreatorException e) {