[exo-jcr-commits] exo-jcr SVN: r2122 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
Author: areshetnyak
Date: 2010-03-25 08:51:01 -0400 (Thu, 25 Mar 2010)
New Revision: 2122
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-549 : The implementation backup/restore whole repository in HTTPBackupAgent.
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
===================================================================
---
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25
12:47:11 UTC (rev 2121)
+++
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25
12:51:01 UTC (rev 2122)
@@ -617,9 +617,8 @@
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
- @Path("/restore/{repo}/{id}")
- public Response restore(RepositoryEntry rEntry, @PathParam("repo") String
repository,
- @PathParam("id") String backupId)
+ @Path("/restore-repository/{id}")
+ public Response restore(RepositoryEntry rEntry, @PathParam("id") String
backupId)
{
String failMessage;
Response.Status status;
@@ -627,7 +626,7 @@
try
{
- validateOneRestoreInstants(repository);
+ validateOneRestoreInstants(rEntry.getName());
File backupLog = getBackupLogbyId(backupId);
@@ -637,9 +636,9 @@
throw new BackupLogNotFoundException("The backup log file with id "
+ backupId + " not exists.");
}
- validateRepositoryName(repository);
+ validateRepositoryName(rEntry.getName());
- if (isRepositoryExist(repository))
+ if (isRepositoryExist(rEntry.getName()))
{
throw new Exception("Repository " + rEntry.getName() + "
already exist!");
}
@@ -656,7 +655,7 @@
JobRepositoryRestore restore = null;
for (JobRepositoryRestore curRestore : restoreJobs)
{
- if (curRestore.getRepositoryName().equals(repository))
+ if (curRestore.getRepositoryName().equals(rEntry.getName()))
{
restore = curRestore;
break;
@@ -704,11 +703,11 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" +
repository + "' from backup log with id '" + backupId
+ log.error("Can not start restore the repository '" + "/" +
rEntry.getName() + "' from backup log with id '" + backupId
+ "'", exception);
return Response.status(status).entity(
- "Can not start restore the repository '" + "/" +
repository + "' from backup log with id '" + backupId
+ "Can not start restore the repository '" + "/" +
rEntry.getName() + "' from backup log with id '" + backupId
+ "' : " +
failMessage).type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}