Author: tolusha
Date: 2010-11-25 03:58:46 -0500 (Thu, 25 Nov 2010)
New Revision: 3550
Modified:
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java
Log:
EXOJCR-929: small fix
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-11-25 08:49:46 UTC (rev 3549)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-11-25 08:58:46 UTC (rev 3550)
@@ -175,7 +175,7 @@
<configuration>
<argLine>${env.MAVEN_OPTS}
-Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager
-Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine>
<includes>
- <include>**/actions/*Test.java</include>
+ <!--include>**/actions/*Test.java</include>
<include>**/metadata/*Test.java</include>
<include>**/owner/*Test.java</include>
<include>**/registry/*Test.java</include>
@@ -185,7 +185,8 @@
<include>**/replication/*.java</include>
<include>**/replication/external/*.java</include>
<include>**/replication/async/**/*.java</include>
- <include>**/**/TestBackupManager.java</include>
+ <include>**/**/TestBackupManager.java</include-->
+<include>**/**/TestRepositoryCreationService.java</include>
</includes>
<excludes>
<exclude>**/BaseStandaloneTest.java</exclude>
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java 2010-11-25
08:49:46 UTC (rev 3549)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationService.java 2010-11-25
08:58:46 UTC (rev 3550)
@@ -31,6 +31,7 @@
{
/**
* Reserves, validates and creates repository in a simplified form.
+ *
* @param rEntry - repository Entry - note that datasource must not exist.
* @param backupId - backup id
* @throws RepositoryConfigurationException
@@ -44,6 +45,7 @@
/**
* Reserve repository name to prevent repository creation with same name from other
place in same time
* via this service.
+ *
* @param repositoryName - repositoryName
* @return repository token. Anyone obtaining a token can later create a repository of
reserved name.
* @throws RepositoryCreationServiceException if can't reserve name
@@ -53,7 +55,8 @@
/**
* Creates repository, using token of already reserved repository name. Good for
cases, when repository creation should be delayed or
* made asynchronously in dedicated thread.
- * @param rEntry - repository entry - note, taht datasource must not exist
+ *
+ * @param rEntry - repository entry - note, that datasource must not exist
* @param backupId - backup id
* @param rToken - token
* @throws RepositoryConfigurationException
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 2010-11-25
08:49:46 UTC (rev 3549)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/repository/creation/RepositoryCreationServiceImpl.java 2010-11-25
08:58:46 UTC (rev 3550)
@@ -16,9 +16,7 @@
*/
package org.exoplatform.services.jcr.ext.repository.creation;
-import org.exoplatform.services.database.creator.DBConnectionInfo;
-import org.exoplatform.services.database.creator.DBCreator;
-import org.exoplatform.services.database.creator.DBCreatorException;
+import org.exoplatform.commons.utils.PrivilegedFileHelper;
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
@@ -110,6 +108,9 @@
private RemoteCommand startRepository;
+ /**
+ * Constructor RepositoryCreationServiceImpl.
+ */
public RepositoryCreationServiceImpl(RepositoryService repositoryService,
BackupManager backupManager,
DBCreator dbCreator, InitialContextInitializer initialContextInitializer, final
RPCService rpcService)
{
@@ -243,7 +244,7 @@
}
catch (RPCException e)
{
- Throwable cause = ((RPCException)e).getCause();
+ Throwable cause = (e).getCause();
if (cause instanceof RepositoryCreationException)
{
throw (RepositoryCreationException)cause;
@@ -335,7 +336,7 @@
}
catch (RPCException e)
{
- Throwable cause = ((RPCException)e).getCause();
+ Throwable cause = (e).getCause();
if (cause instanceof RepositoryCreationException)
{
throw (RepositoryCreationException)cause;
@@ -446,7 +447,7 @@
}
File backLog = new File(backupChain.getLogFilePath());
- if (backLog != null && backLog.exists())
+ if (backLog != null && PrivilegedFileHelper.exists(backLog))
{
try
{
@@ -468,7 +469,8 @@
else
{
throw new RepositoryCreationException("Backup log file by id " +
backupId
- + (backLog != null ? (" and file path=" +
backLog.getAbsolutePath()) : "") + " do not exists.");
+ + (backLog != null ? (" and file path=" +
PrivilegedFileHelper.getAbsolutePath(backLog)) : "")
+ + " do not exists.");
}
}
Show replies by date