### Eclipse Workspace Patch 1.0 #P petals-platform-3.1.1-tmp Index: src/main/packaging/conf/server.properties =================================================================== --- src/main/packaging/conf/server.properties (revision 16565) +++ src/main/packaging/conf/server.properties (working copy) @@ -126,6 +126,12 @@ # If not specified, 1 hour is selected by default #petals.persistence.duration=3600000 +#To use MySQL as persistence DB +#petals.persistence.default.db.driver=com.mysql.jdbc.Driver +#petals.persistence.default.db.url=jdbc:mysql://localhost:3306/petalsRegistry +#petals.persistence.default.db.user=petals +#petals.persistence.default.db.password=petals + #Topology update period (in s) topology.update.period=101 #P petals-kernel-3.1.x-tmp Index: src/main/java/org/ow2/petals/kernel/configuration/ConfigurationService.java =================================================================== --- src/main/java/org/ow2/petals/kernel/configuration/ConfigurationService.java (revision 16565) +++ src/main/java/org/ow2/petals/kernel/configuration/ConfigurationService.java (working copy) @@ -105,22 +105,6 @@ static final String PROPERTY_USER_CONFIG_PREFIX = "user"; - static final String PROPERTY_REGISTRY_TRANSPORT_TIMEOUT = "registry.transport.timeout"; - - static final String PROPERTY_REGISTRY_SYNCHRO_PERIOD = "registry.synchro.period"; - - static final String PROPERTY_REGISTRY_REPOSITORY = "registry.repository"; - - static final String PROPERTY_REGISTRY_DB_DRIVER = "registry.db.driver"; - - static final String PROPERTY_REGISTRY_DB_URL = "registry.db.url"; - - static final String PROPERTY_REGISTRY_DB_USER = "registry.db.user"; - - static final String PROPERTY_REGISTRY_DB_PASSWORD = "registry.db.password"; - - static final String PROPERTY_REGISTRY_DB_DIALECT = "registry.db.dialect"; - static final String PROPERTY_REGISTRY_MODE = "registry.mode"; static final String STANDALONE = "standalone"; @@ -135,6 +119,14 @@ static final String PROPERTY_PERSISTENCE_DURATION = "petals.persistence.duration"; + static final String PROPERTY_PERSISTENCE_DB_DRIVER = "petals.persistence.default.db.driver"; + + static final String PROPERTY_PERSISTENCE_DB_URL = "petals.persistence.default.db.url"; + + static final String PROPERTY_PERSISTENCE_DB_USER = "petals.persistence.default.db.user"; + + static final String PROPERTY_PERSISTENCE_DB_PASSWORD = "petals.persistence.default.db.password"; + /** * Get the local container configuration. * Index: src/main/java/org/ow2/petals/kernel/configuration/ContainerConfiguration.java =================================================================== --- src/main/java/org/ow2/petals/kernel/configuration/ContainerConfiguration.java (revision 16565) +++ src/main/java/org/ow2/petals/kernel/configuration/ContainerConfiguration.java (working copy) @@ -290,44 +290,24 @@ private RegistryMode registryMode; /** - * The registry synchro period. - */ - private int registrySynchroPeriod; - - /** - * The registry transport timeout. - */ - private int registryTransportTimeout; - - /** - * The registry repository. - */ - private String registryRepository; - - /** - * The registry database driver. + * The persistence database driver. */ - private String registryDatabaseDriver = PersistenceService.HSQLDB_DRIVER; + private String persistenceDatabaseDriver = PersistenceService.HSQLDB_DRIVER; /** - * The registry database location. + * The persistence database location. */ - private String registryDatabaseUrl; + private String persistenceDatabaseUrl; /** - * The registry database user. + * The persistence database user. */ - private String registryDatabaseUser = PersistenceService.DEFAULT_USER; + private String persistenceDatabaseUser = PersistenceService.DEFAULT_USER; /** - * The registry database password. + * The persistence database password. */ - private String registryDatabasePassword = PersistenceService.DEFAULT_PASSWORD; - - /** - * The registry database dialect. - */ - private String registryDatabaseDialect; + private String persistenceDatabasePassword = PersistenceService.DEFAULT_PASSWORD; // ***** Persistence *****// @@ -409,25 +389,17 @@ this.getWebservicePrefix()) && (otherContainerConfiguration.getRegistryPort() == this.getRegistryPort()) && otherContainerConfiguration.getRegistryMode().equals(this.getRegistryMode()) - && (otherContainerConfiguration.getRegistrySynchroPeriod() == this - .getRegistrySynchroPeriod()) - && (otherContainerConfiguration.getRegistryTransportTimeout() == this - .getRegistryTransportTimeout()) - && otherContainerConfiguration.getRegistryRepository().equals( - this.getRegistryRepository()) - && otherContainerConfiguration.getRegistryDatabaseDriver().equals( - this.getRegistryDatabaseDriver()) - && otherContainerConfiguration.getRegistryDatabaseUrl().equals( - this.getRegistryDatabaseUrl()) - && otherContainerConfiguration.getRegistryDatabaseUser().equals( - this.getRegistryDatabaseUser()) - && otherContainerConfiguration.getRegistryDatabasePassword().equals( - this.getRegistryDatabasePassword()) - && otherContainerConfiguration.getRegistryDatabaseDialect().equals( - this.getRegistryDatabaseDialect()) && ((otherContainerConfiguration - .getUserConfiguration() == this.getUserConfiguration()) || ((otherContainerConfiguration - .getUserConfiguration() != null) && otherContainerConfiguration - .getUserConfiguration().equals(this.getUserConfiguration())))) + && otherContainerConfiguration.getPersistenceDatabaseDriver().equals( + this.getPersistenceDatabaseDriver()) + && otherContainerConfiguration.getPersistenceDatabaseUrl().equals( + this.getPersistenceDatabaseUrl()) + && otherContainerConfiguration.getPersistenceDatabaseUser().equals( + this.getPersistenceDatabaseUser()) + && otherContainerConfiguration.getPersistenceDatabasePassword().equals( + this.getPersistenceDatabasePassword()) + && ((otherContainerConfiguration.getUserConfiguration() == this.getUserConfiguration()) + || ((otherContainerConfiguration.getUserConfiguration() != null) + && otherContainerConfiguration.getUserConfiguration().equals(this.getUserConfiguration())))) && (otherContainerConfiguration.getTopologyUpdatePeriod() == this .getTopologyUpdatePeriod()) && (otherContainerConfiguration.getPersistenceDuration() == this @@ -480,38 +452,31 @@ } /** - * @return the registryDatabaseDialect + * @return the persistenceDatabaseDriver */ - public String getRegistryDatabaseDialect() { - return this.registryDatabaseDialect; + public String getPersistenceDatabaseDriver() { + return this.persistenceDatabaseDriver; } /** - * @return the registryDatabaseDriver + * @return the persistenceDatabasePassword */ - public String getRegistryDatabaseDriver() { - return this.registryDatabaseDriver; + public String getPersistenceDatabasePassword() { + return this.persistenceDatabasePassword; } /** - * @return the registryDatabasePassword + * @return the persistenceDatabaseUrl */ - public String getRegistryDatabasePassword() { - return this.registryDatabasePassword; + public String getPersistenceDatabaseUrl() { + return this.persistenceDatabaseUrl; } /** - * @return the registryDatabaseUrl + * @return the persistenceDatabaseUser */ - public String getRegistryDatabaseUrl() { - return this.registryDatabaseUrl; - } - - /** - * @return the registryDatabaseUser - */ - public String getRegistryDatabaseUser() { - return this.registryDatabaseUser; + public String getPersistenceDatabaseUser() { + return this.persistenceDatabaseUser; } /** @@ -529,27 +494,6 @@ } /** - * @return the registryRepository - */ - public String getRegistryRepository() { - return this.registryRepository; - } - - /** - * @return the registrySynchroPeriod - */ - public int getRegistrySynchroPeriod() { - return this.registrySynchroPeriod; - } - - /** - * @return the registryTransportTimeout - */ - public int getRegistryTransportTimeout() { - return this.registryTransportTimeout; - } - - /** * @return the repositoryDirectoryPath */ public String getRepositoryDirectoryPath() { @@ -804,32 +748,22 @@ result = prime * result + this.getRegistryPort(); result = prime * result + ((this.getRegistryMode() == null) ? 0 : this.getRegistryMode().hashCode()); - result = prime * result + this.getRegistrySynchroPeriod(); - result = prime * result + this.getRegistryTransportTimeout(); - result = prime - * result - + ((this.getRegistryRepository() == null) ? 0 : this.getRegistryRepository() - .hashCode()); result = prime * result - + ((this.getRegistryDatabaseDriver() == null) ? 0 : this - .getRegistryDatabaseDriver().hashCode()); + + ((this.getPersistenceDatabaseDriver() == null) ? 0 : this + .getPersistenceDatabaseDriver().hashCode()); result = prime * result - + ((this.getRegistryDatabaseUrl() == null) ? 0 : this.getRegistryDatabaseUrl() + + ((this.getPersistenceDatabaseUrl() == null) ? 0 : this.getPersistenceDatabaseUrl() .hashCode()); result = prime * result - + ((this.getRegistryDatabaseUser() == null) ? 0 : this.getRegistryDatabaseUser() + + ((this.getPersistenceDatabaseUser() == null) ? 0 : this.getPersistenceDatabaseUser() .hashCode()); result = prime * result - + ((this.getRegistryDatabasePassword() == null) ? 0 : this - .getRegistryDatabasePassword().hashCode()); - result = prime - * result - + ((this.getRegistryDatabaseDialect() == null) ? 0 : this - .getRegistryDatabaseDialect().hashCode()); + + ((this.getPersistenceDatabasePassword() == null) ? 0 : this + .getPersistenceDatabasePassword().hashCode()); result = prime * result + ((int) this.getTopologyUpdatePeriod()); result = prime * result + ((int) this.getPersistenceDuration()); @@ -847,7 +781,7 @@ + RepositoryService.DEFAULT_REPOSITORY_PATH; this.workDirectoryPath = this.getRootDirectoryPath() + File.separator + PetalsServer.WORK_DIRECTORY; - this.registryDatabaseUrl = PersistenceService.DEFAULT_URL_PREFIX + this.workDirectoryPath + this.persistenceDatabaseUrl = PersistenceService.DEFAULT_URL_PREFIX + this.workDirectoryPath + File.separator + PersistenceService.DEFAULT_URL_SUFFIX; } @@ -981,34 +915,25 @@ toStringBuilder.append("\n\t\t\t - State:").append(this.getState().name()); toStringBuilder.append("\n\t\t\t - RegistryPort:").append(this.getRegistryPort()); toStringBuilder.append("\n\t\t\t - RegistryMode:").append(this.getRegistryMode()); - toStringBuilder.append("\n\t\t\t - RegistrySynchroPeriod:").append( - this.getRegistrySynchroPeriod()); - toStringBuilder.append("\n\t\t\t - RegistryTransportTimeout:").append( - this.getRegistryTransportTimeout()); - toStringBuilder.append("\n\t\t\t - RegistryRepository:").append( - this.getRegistryRepository()); - toStringBuilder.append("\n\t\t\t - RegistryDatabaseDriver:").append( - this.getRegistryDatabaseDriver()); - toStringBuilder.append("\n\t\t\t - RegistryDatabaseUrl:").append( - this.getRegistryDatabaseUrl()); - toStringBuilder.append("\n\t\t\t - RegistryDatabaseUser:").append( - this.getRegistryDatabaseUser()); - if (this.getRegistryDatabasePassword() != null) { - StringBuffer hiddenPassword = new StringBuffer(this.getRegistryDatabasePassword() + toStringBuilder.append("\n\t\t\t - WebServicePort:").append(this.getWebservicePort()); + toStringBuilder.append("\n\t\t\t - WebServicePrefix:").append(this.getWebservicePrefix()); + toStringBuilder.append("\n\t\t\t - Topology update period:").append(this.getTopologyUpdatePeriod()); + toStringBuilder.append("\n\t\t\t - PersistenceDatabaseDriver:").append( + this.getPersistenceDatabaseDriver()); + toStringBuilder.append("\n\t\t\t - PersistenceDatabaseUrl:").append( + this.getPersistenceDatabaseUrl()); + toStringBuilder.append("\n\t\t\t - PersistenceDatabaseUser:").append( + this.getPersistenceDatabaseUser()); + if (this.getPersistenceDatabasePassword() != null) { + StringBuffer hiddenPassword = new StringBuffer(this.getPersistenceDatabasePassword() .length()); - while (hiddenPassword.length() < this.getRegistryDatabasePassword().length()) { + while (hiddenPassword.length() < this.getPersistenceDatabasePassword().length()) { hiddenPassword.append("*"); } - toStringBuilder.append("\n\t\t\t - RegistryDatabasePassword:").append(hiddenPassword); + toStringBuilder.append("\n\t\t\t - PersistenceDatabasePassword:").append(hiddenPassword); } else { - toStringBuilder.append("\n\t\t\t - RegistryDatabasePassword:none"); + toStringBuilder.append("\n\t\t\t - PersistenceDatabasePassword:none"); } - toStringBuilder.append("\n\t\t\t - RegistryDatabaseDialect:").append( - this.getRegistryDatabaseDialect()); - toStringBuilder.append("\n\t\t\t - WebServicePort:").append(this.getWebservicePort()); - toStringBuilder.append("\n\t\t\t - WebServicePrefix:").append(this.getWebservicePrefix()); - toStringBuilder.append("\n\t\t\t - Topology update period:").append( - this.getTopologyUpdatePeriod()); toStringBuilder.append("\n\t\t\t - Persistence duration:").append( this.getPersistenceDuration()); @@ -1099,43 +1024,35 @@ } /** - * @param registryDatabaseDialect - * the registryDatabaseDialect to set - */ - public void setRegistryDatabaseDialect(String registryDatabaseDialect) { - this.registryDatabaseDialect = registryDatabaseDialect; - } - - /** - * @param registryDatabaseDriver - * the registryDatabaseDriver to set + * @param persistenceDatabaseDriver + * the persistenceDatabaseDriver to set */ - public void setRegistryDatabaseDriver(String registryDatabaseDriver) { - this.registryDatabaseDriver = registryDatabaseDriver; + public void setPersistenceDatabaseDriver(String persistenceDatabaseDriver) { + this.persistenceDatabaseDriver = persistenceDatabaseDriver; } /** - * @param registryDatabasePassword - * the registryDatabasePassword to set + * @param persistenceDatabasePassword + * the persistenceDatabasePassword to set */ - public void setRegistryDatabasePassword(String registryDatabasePassword) { - this.registryDatabasePassword = registryDatabasePassword; + public void setPersistenceDatabasePassword(String persistenceDatabasePassword) { + this.persistenceDatabasePassword = persistenceDatabasePassword; } /** - * @param registryDatabaseUrl - * the registryDatabaseUrl to set + * @param persistenceDatabaseUrl + * the persistenceDatabaseUrl to set */ - public void setRegistryDatabaseUrl(String registryDatabaseUrl) { - this.registryDatabaseUrl = registryDatabaseUrl; + public void setPersistenceDatabaseUrl(String persistenceDatabaseUrl) { + this.persistenceDatabaseUrl = persistenceDatabaseUrl; } /** - * @param registryDatabaseUser - * the registryDatabaseUser to set + * @param persistenceDatabaseUser + * the persistenceDatabaseUser to set */ - public void setRegistryDatabaseUser(String registryDatabaseUser) { - this.registryDatabaseUser = registryDatabaseUser; + public void setPersistenceDatabaseUser(String persistenceDatabaseUser) { + this.persistenceDatabaseUser = persistenceDatabaseUser; } /** @@ -1155,30 +1072,6 @@ } /** - * @param registryRepository - * the registryRepository to set - */ - public void setRegistryRepository(String registryRepository) { - this.registryRepository = registryRepository; - } - - /** - * @param registrySynchroPeriod - * the registrySynchroPeriod to set - */ - public void setRegistrySynchroPeriod(int registrySynchroPeriod) { - this.registrySynchroPeriod = registrySynchroPeriod; - } - - /** - * @param registryTransportTimeout - * the registryTransportTimeout to set - */ - public void setRegistryTransportTimeout(int registryTransportTimeout) { - this.registryTransportTimeout = registryTransportTimeout; - } - - /** * @param repositoryDirectoryPath * the repositoryDirectoryPath to set */ Index: src/main/java/org/ow2/petals/kernel/configuration/ConfigurationServiceImpl.java =================================================================== --- src/main/java/org/ow2/petals/kernel/configuration/ConfigurationServiceImpl.java (revision 16565) +++ src/main/java/org/ow2/petals/kernel/configuration/ConfigurationServiceImpl.java (working copy) @@ -813,29 +813,17 @@ } else if (((String) key).equals(PROPERTY_SSL_TRUSTSTORE_PASSWORD)) { this.containerConfiguration.setSSLTruststorePassword(this.serverProperties .getProperty((String) key)); - } else if (((String) key).equals(PROPERTY_REGISTRY_TRANSPORT_TIMEOUT)) { - this.containerConfiguration.setRegistryTransportTimeout(Integer - .parseInt(this.serverProperties.getProperty((String) key))); - } else if (((String) key).equals(PROPERTY_REGISTRY_SYNCHRO_PERIOD)) { - this.containerConfiguration.setRegistrySynchroPeriod(Integer - .parseInt(this.serverProperties.getProperty((String) key))); - } else if (((String) key).equals(PROPERTY_REGISTRY_REPOSITORY)) { - this.containerConfiguration.setRegistryRepository(this.serverProperties - .getProperty((String) key)); - } else if (((String) key).equals(PROPERTY_REGISTRY_DB_DRIVER)) { - this.containerConfiguration.setRegistryDatabaseDriver(this.serverProperties + } else if (((String) key).equals(PROPERTY_PERSISTENCE_DB_DRIVER)) { + this.containerConfiguration.setPersistenceDatabaseDriver(this.serverProperties .getProperty((String) key)); - } else if (((String) key).equals(PROPERTY_REGISTRY_DB_URL)) { - this.containerConfiguration.setRegistryDatabaseUrl(this.serverProperties + } else if (((String) key).equals(PROPERTY_PERSISTENCE_DB_URL)) { + this.containerConfiguration.setPersistenceDatabaseUrl(this.serverProperties .getProperty((String) key)); - } else if (((String) key).equals(PROPERTY_REGISTRY_DB_USER)) { - this.containerConfiguration.setRegistryDatabaseUser(this.serverProperties + } else if (((String) key).equals(PROPERTY_PERSISTENCE_DB_USER)) { + this.containerConfiguration.setPersistenceDatabaseUser(this.serverProperties .getProperty((String) key)); - } else if (((String) key).equals(PROPERTY_REGISTRY_DB_PASSWORD)) { - this.containerConfiguration.setRegistryDatabasePassword(this.serverProperties - .getProperty((String) key)); - } else if (((String) key).equals(PROPERTY_REGISTRY_DB_DIALECT)) { - this.containerConfiguration.setRegistryDatabaseDialect(this.serverProperties + } else if (((String) key).equals(PROPERTY_PERSISTENCE_DB_PASSWORD)) { + this.containerConfiguration.setPersistenceDatabasePassword(this.serverProperties .getProperty((String) key)); } else if (((String) key).equals(PROPERTY_PERSISTENCE_DURATION)) { this.containerConfiguration.setPersistenceDuration(Long Index: src/main/java/org/ow2/petals/system/persistence/PersistenceServiceImpl.java =================================================================== --- src/main/java/org/ow2/petals/system/persistence/PersistenceServiceImpl.java (revision 16565) +++ src/main/java/org/ow2/petals/system/persistence/PersistenceServiceImpl.java (working copy) @@ -812,13 +812,13 @@ final ContainerConfiguration containerConfiguration = configurationService.getContainerConfiguration(); storageDuration = containerConfiguration.getPersistenceDuration(); - databaseDriver = containerConfiguration.getRegistryDatabaseDriver(); + databaseDriver = containerConfiguration.getPersistenceDatabaseDriver(); jdbcDataSource = new BasicDataSource(); - jdbcDataSource.setDriverClassName(containerConfiguration.getRegistryDatabaseDriver()); - jdbcDataSource.setUrl(containerConfiguration.getRegistryDatabaseUrl()); - jdbcDataSource.setUsername(containerConfiguration.getRegistryDatabaseUser()); - jdbcDataSource.setPassword(containerConfiguration.getRegistryDatabasePassword()); + jdbcDataSource.setDriverClassName(containerConfiguration.getPersistenceDatabaseDriver()); + jdbcDataSource.setUrl(containerConfiguration.getPersistenceDatabaseUrl()); + jdbcDataSource.setUsername(containerConfiguration.getPersistenceDatabaseUser()); + jdbcDataSource.setPassword(containerConfiguration.getPersistenceDatabasePassword()); try { checkPersistenceTables(jdbcDataSource);