exo-jcr SVN: r2127 - in jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup: server and 1 other directory.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-03-25 09:46:47 -0400 (Thu, 25 Mar 2010)
New Revision: 2127
Added:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/RepositoryRestoreExeption.java
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java
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/RepositoryBackupChainLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2010-03-25 13:43:19 UTC (rev 2126)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2010-03-25 13:46:47 UTC (rev 2127)
@@ -211,7 +211,7 @@
protected static Log logger = ExoLogger.getLogger("ext.BackupChainLog");
- private static final String PREFIX = "repository-backup-";
+ public static final String PREFIX = "repository-backup-";
private static final String SUFFIX = ".xml";
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 13:43:19 UTC (rev 2126)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25 13:46:47 UTC (rev 2127)
@@ -626,21 +626,19 @@
try
{
- validateOneRestoreInstants(rEntry.getName());
+ validateOneRepositoryRestoreInstants(rEntry.getName());
- File backupLog = getBackupLogbyId(backupId);
+ File backupLog = getRepositoryBackupLogbyId(backupId);
// validate backup log file
if (backupLog == null)
{
- throw new BackupLogNotFoundException("The backup log file with id " + backupId + " not exists.");
+ throw new BackupLogNotFoundException("The repository backup log file with id " + backupId + " not exists.");
}
- validateRepositoryName(rEntry.getName());
-
if (isRepositoryExist(rEntry.getName()))
{
- throw new Exception("Repository " + rEntry.getName() + " already exist!");
+ throw new RepositoryRestoreExeption("Repository " + rEntry.getName() + " already exist!");
}
RepositoryBackupChainLog backupChainLog = new RepositoryBackupChainLog(backupLog);
@@ -651,28 +649,14 @@
Thread.sleep(100);
// search necessary restore
- List<JobRepositoryRestore> restoreJobs = backupManager.getRepositoryRestores();
- JobRepositoryRestore restore = null;
- for (JobRepositoryRestore curRestore : restoreJobs)
- {
- if (curRestore.getRepositoryName().equals(rEntry.getName()))
- {
- restore = curRestore;
- break;
- }
- }
+ JobRepositoryRestore restore = backupManager.getLastRepositoryRestore(rEntry.getName());
+ ShortInfo info =
+ new ShortInfo(ShortInfo.RESTORE, restore.getRepositoryBackupChainLog(), restore.getStartTime(),
+ restore.getEndTime(), restore.getStateRestore(), restore.getRepositoryName());
- if (restore != null)
- {
- ShortInfo info =
- new ShortInfo(ShortInfo.RESTORE, restore.getRepositoryBackupChainLog(), restore.getStartTime(), restore
- .getEndTime(), restore.getStateRestore(), restore.getRepositoryName());
- return Response.ok(info).cacheControl(noCache).build();
- }
-
- return Response.ok().cacheControl(noCache).build();
+ return Response.ok(info).cacheControl(noCache).build();
}
- catch (WorkspaceRestoreExeption e)
+ catch (RepositoryRestoreExeption e)
{
exception = e;
status = Response.Status.FORBIDDEN;
@@ -1294,7 +1278,15 @@
private boolean isRepositoryExist(String repositoryName) throws RepositoryException,
RepositoryConfigurationException
{
- return repositoryService.getRepository(repositoryName) != null;
+ try
+ {
+ return repositoryService.getRepository(repositoryName) != null;
+ }
+ catch (RepositoryException e)
+ {
+ return false;
+ }
+
}
/**
@@ -1339,6 +1331,26 @@
+ "' is already restoring.");
}
}
+
+ /**
+ * validateOneRepositoryRestoreInstants.
+ *
+ * @param repositoryName
+ * the repository name
+ * @throws WorkspaceRestoreExeption
+ * will be generated WorkspaceRestoreExeption
+ */
+ private void validateOneRepositoryRestoreInstants(String repositoryName) throws RepositoryRestoreExeption
+ {
+ for (JobRepositoryRestore job : backupManager.getRepositoryRestores())
+ {
+ if (repositoryName.equals(job.getRepositoryName())
+ && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
+ {
+ throw new RepositoryRestoreExeption("The repository '" + "/" + repositoryName + "' is already restoring.");
+ }
+ }
+ }
/**
* validateOneRestoreInstants.
@@ -1410,4 +1422,32 @@
return null;
}
+
+ /**
+ * getRepositoryBackupLogbyId.
+ *
+ * @param backupId
+ * String, the backup identifier
+ * @return File return backup log file
+ */
+ private File getRepositoryBackupLogbyId(String backupId)
+ {
+ FilenameFilter backupLogsFilter = new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return (name.endsWith(".xml") && name.startsWith(RepositoryBackupChainLog.PREFIX));
+ }
+ };
+
+ File[] files = backupManager.getBackupDirectory().listFiles(backupLogsFilter);
+
+ if (files.length != 0)
+ for (File f : files)
+ if (f.getName().replaceAll(".xml", "").replaceAll(RepositoryBackupChainLog.PREFIX, "").equals(backupId))
+ return f;
+
+ return null;
+ }
}
Added: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/RepositoryRestoreExeption.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/RepositoryRestoreExeption.java (rev 0)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/RepositoryRestoreExeption.java 2010-03-25 13:46:47 UTC (rev 2127)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.services.jcr.ext.backup.server;
+
+/**
+ * Created by The eXo Platform SAS.
+ *
+ * <br/>Date: 2010
+ *
+ * @author <a href="mailto:alex.reshetnyak@exoplatform.com.ua">Alex Reshetnyak</a>
+ * @version $Id$
+ */
+public class RepositoryRestoreExeption
+ extends Exception
+{
+ /**
+ * WorkspaceRestoreExeption constructor.
+ *
+ * @param message
+ * String, the exception message
+ * @param e
+ * the cause exception
+ */
+ public RepositoryRestoreExeption(String message)
+ {
+ super(message);
+ }
+}
Property changes on: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/RepositoryRestoreExeption.java
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2126 - in core/trunk: exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc and 19 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-25 09:43:19 -0400 (Thu, 25 Mar 2010)
New Revision: 2126
Modified:
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java
core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipUpdateListener.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java
core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ByGroupLdapUserListAccess.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptInstantiator.java
core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java
core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java
core/trunk/exo.core.component.security.core/src/test/java/org/exoplatform/services/security/TestRolesExtractor.java
core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java
core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java
core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java
core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java
core/trunk/exo.core.component.xml-processing/src/test/java/org/exoplatform/services/xml/BaseTest.java
Log:
EXOJCR-605 Logging category now consists of 'package name' + 'simple classname'
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/HibernateServiceImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -66,7 +66,7 @@
private ThreadLocal<Session> threadLocal_;
- private static Log log_ = ExoLogger.getLogger(HibernateServiceImpl.class);
+ private static Log log_ = ExoLogger.getLogger("exo.core.component.database.HibernateServiceImpl");
private HibernateConfigurationImpl conf_;
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/CreateDBSchemaPlugin.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -40,7 +40,7 @@
public class CreateDBSchemaPlugin extends BaseComponentPlugin
{
- protected static Log log = ExoLogger.getLogger("jcr.CreateDBSchemaPlugin");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.database.CreateDBSchemaPlugin");
private String dataSource;
Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java
===================================================================
--- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/jdbc/DBSchemaCreator.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -54,7 +54,7 @@
private final Pattern pattern;
- private static Log log = ExoLogger.getLogger("database.DBSchemaCreator");
+ private static Log log = ExoLogger.getLogger("exo.core.component.database.DBSchemaCreator");
private List<CreateDBSchemaPlugin> createDBSchemaPlugins = new ArrayList<CreateDBSchemaPlugin>();
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -56,7 +56,7 @@
public class PDFDocumentReader extends BaseDocumentReader
{
- protected static Log log = ExoLogger.getLogger("platform.PDFDocumentReader");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.document.PDFDocumentReader");
/**
* Get the application/pdf mime type.
Modified: core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -55,7 +55,7 @@
public class LDAPServiceImpl implements LDAPService, ComponentRequestLifecycle
{
- private static final Log LOG = ExoLogger.getLogger(LDAPServiceImpl.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.ldap.LDAPServiceImpl");
private Map<String, String> env = new HashMap<String, String>();
Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/OrganizationDatabaseInitializer.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -31,7 +31,7 @@
ComponentPlugin
{
- protected static Log log = ExoLogger.getLogger("organization:OrganizationDatabaseInitializer");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.api.OrganizationDatabaseInitializer");
private OrganizationConfig config_;
Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/auth/OrganizationAuthenticatorImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -51,7 +51,7 @@
{
protected static Log log =
- ExoLogger.getLogger("org.exoplatform.services.organization.auth.OrganizationUserRegistry");
+ ExoLogger.getLogger("exo.core.component.organization.api.OrganizationUserRegistry");
private final OrganizationService orgService;
Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipUpdateListener.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipUpdateListener.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/MembershipUpdateListener.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -38,7 +38,7 @@
{
/** Logger. */
- private static final Log LOG = ExoLogger.getLogger(MembershipUpdateListener.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.api.MembershipUpdateListener");
/** @see ConversationRegistry. */
private ConversationRegistry conversationRegistry;
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/GroupDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -46,7 +46,7 @@
public class GroupDAOImpl extends StandardSQLDAO<GroupImpl> implements GroupHandler
{
- protected static Log log = ExoLogger.getLogger("organization:GroupDAOImpl");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.GroupDAOImpl");
protected ListenerService listenerService_;
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -47,7 +47,7 @@
public class MembershipDAOImpl extends StandardSQLDAO<MembershipImpl> implements MembershipHandler
{
- protected static Log log = ExoLogger.getLogger("organization:MembershipDAOImpl");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.MembershipDAOImpl");
protected ListenerService listenerService_;
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -39,7 +39,7 @@
public class UserDAOImpl extends StandardSQLDAO<UserImpl> implements UserHandler
{
- protected static Log log = ExoLogger.getLogger("organization:UserDAOImpl");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.UserDAOImpl");
protected ListenerService listenerService_;
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/UserProfileDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -39,7 +39,7 @@
public class UserProfileDAOImpl extends StandardSQLDAO<UserProfileData> implements UserProfileHandler
{
- protected static Log log = ExoLogger.getLogger("organization:UserProfileDAOImpl");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.UserProfileDAOImpl");
protected ListenerService listenerService_;
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/CreateUserListener.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -40,7 +40,7 @@
{
private OrganizationService service_;
- protected static Log log = ExoLogger.getLogger("organisation:CreateUserListener");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.CreateUserListener");
public CreateUserListener(OrganizationService service)
{
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveGroupListener.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -36,7 +36,7 @@
public class RemoveGroupListener extends Listener<GroupDAOImpl, Group>
{
- protected static Log log = ExoLogger.getLogger("organisation:RemoveGroupListener");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveGroupListener");
private OrganizationService service_;
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveMembershipListener.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -42,7 +42,7 @@
{
private OrganizationService service_;
- protected static Log log = ExoLogger.getLogger("organization:RemoveMembershipListener");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveMembershipListener");
public RemoveMembershipListener(OrganizationService service)
{
Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/listeners/RemoveUserProfileListener.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -34,7 +34,7 @@
{
private OrganizationService service_;
- protected static Log log = ExoLogger.getLogger("organization:RemoveUserProfileListener");
+ protected static Log log = ExoLogger.getLogger("exo.core.component.organization.jdbc.RemoveUserProfileListener");
public RemoveUserProfileListener(OrganizationService service)
{
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -58,7 +58,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger("core.BaseAO");
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.BaseAO");
/**
* Mapping LDAP attributes to eXo organization service items (users, groups, etc).
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ByGroupLdapUserListAccess.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ByGroupLdapUserListAccess.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ByGroupLdapUserListAccess.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -40,7 +40,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(ByGroupLdapUserListAccess.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.ByGroupLdapUserListAccess");
/**
* List's size.
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -56,7 +56,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(GroupDAOImpl.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.GroupDAOImpl");
/**
* See {@link GroupEventListener}.
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/LDAPUserPageList.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -55,7 +55,7 @@
private LDAPAttributeMapping ldapAttrMapping;
- private static Log logger = ExoLogger.getLogger(LDAPUserPageList.class);
+ private static Log logger = ExoLogger.getLogger("exo.core.component.organization.ldap.LDAPUserPageList");
static boolean SEARCH_CONTROL = Control.NONCRITICAL;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -56,7 +56,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(MembershipDAOImpl.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.MembershipDAOImpl");
/**
* See {@link MembershipEventListener}.
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -50,7 +50,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(MembershipTypeDAOImpl.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.MembershipTypeDAOImpl");
/**
* @param ldapAttrMapping mapping LDAP attributes to eXo organization service
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/SimpleLdapUserListAccess.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -42,7 +42,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(SimpleLdapUserListAccess.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.SimpleLdapUserListAccess");
/**
* @param ldapAttrMapping LDAP attribute to organization service essences
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -57,7 +57,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(UserProfileDAOImpl.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.organization.ldap.UserProfileDAOImpl");
public UserProfileDAOImpl(LDAPAttributeMapping ldapAttrMapping, LDAPService ldapService) throws Exception
{
Modified: core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptInstantiator.java
===================================================================
--- core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptInstantiator.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptInstantiator.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -50,7 +50,7 @@
{
/** Our logger. */
- private static final Log LOG = ExoLogger.getLogger(GroovyScriptInstantiator.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.script.groovy.GroovyScriptInstantiator");
/**
* eXo Container.
Modified: core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java
===================================================================
--- core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.script.groovy/src/main/java/org/exoplatform/services/script/groovy/GroovyScriptJarJarPlugin.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -43,7 +43,7 @@
private final Map<String, String> mapping = new HashMap<String, String>();
/** Our logger. */
- private final Log log = ExoLogger.getLogger(GroovyScriptJarJarPlugin.class);
+ private final Log log = ExoLogger.getLogger("exo.core.component.script.groovy.GroovyScriptJarJarPlugin");
@SuppressWarnings("unchecked")
public GroovyScriptJarJarPlugin(InitParams params)
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/ConversationRegistry.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -45,7 +45,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(ConversationRegistry.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.ConversationRegistry");
/**
* Default concurrency level.
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/IdentityRegistry.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -42,7 +42,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(IdentityRegistry.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.IdentityRegistry");
/**
* Default concurrency level.
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/JbossLoginModule.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -47,7 +47,7 @@
public class JbossLoginModule extends DefaultLoginModule
{
/** . */
- private static Log log = ExoLogger.getLogger(JbossLoginModule.class);
+ private static Log log = ExoLogger.getLogger("exo.core.component.security.core.JbossLoginModule.class");
/**
* {@inheritDoc}
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereFilter.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -48,7 +48,7 @@
/**
* Exo logger.
*/
- private Log log = ExoLogger.getLogger(getClass().getName());
+ private Log log = ExoLogger.getLogger("exo.core.component.security.core.WebsphereFilter");
/**
* First ltpa cookie token name.
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/j2ee/websphere/WebsphereJAASLoginModule.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -47,7 +47,7 @@
/**
* Exo logger.
*/
- private Log log = ExoLogger.getLogger("core.ExoWebsphereJAASLoginModule");
+ private Log log = ExoLogger.getLogger("exo.core.component.security.core.ExoWebsphereJAASLoginModule");
/**
* Default constructor.
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/AbstractLoginModule.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -34,7 +34,7 @@
* Created by The eXo Platform SAS
* Author : Nicolas Filotto
* nicolas.filotto(a)exoplatform.com
- * 20 ao�t 2009
+ * 20 ao�t 2009
*/
public abstract class AbstractLoginModule implements LoginModule
{
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/DefaultLoginModule.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -45,7 +45,7 @@
/**
* Logger.
*/
- protected Log log = ExoLogger.getLogger("core.DefaultLoginModule");
+ protected Log log = ExoLogger.getLogger("exo.core.component.security.core.DefaultLoginModule");
/**
* encapsulates user's principals such as name, groups, etc .
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -46,7 +46,7 @@
/**
* Login.
*/
- protected Log log = ExoLogger.getLogger("core.IdentitySetLoginModule");
+ protected Log log = ExoLogger.getLogger("exo.core.component.security.core.IdentitySetLoginModule");
/**
* Is allowed for one user login again if he already login. If must set in LM
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/SharedStateLoginModule.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -38,7 +38,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(SharedStateLoginModule.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.core.component.security.core.SharedStateLoginModule");
/**
* {@inheritDoc}
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/ConversationStateListener.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -41,7 +41,7 @@
/**
* Logger.
*/
- protected Log log = ExoLogger.getLogger("core.security.ConversationStateListener");
+ protected Log log = ExoLogger.getLogger("exo.core.component.security.core.ConversationStateListener");
/**
* {@inheritDoc}
Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/web/SetCurrentIdentityFilter.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -52,7 +52,7 @@
/**
* Logger.
*/
- private static Log log = ExoLogger.getLogger("core.security.SetCurrentIdentityFilter");
+ private static Log log = ExoLogger.getLogger("exo.core.component.security.core.SetCurrentIdentityFilter");
/**
* Set current {@link ConversationState}, if it is not registered yet then
Modified: core/trunk/exo.core.component.security.core/src/test/java/org/exoplatform/services/security/TestRolesExtractor.java
===================================================================
--- core/trunk/exo.core.component.security.core/src/test/java/org/exoplatform/services/security/TestRolesExtractor.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.security.core/src/test/java/org/exoplatform/services/security/TestRolesExtractor.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -36,7 +36,7 @@
public class TestRolesExtractor extends TestCase
{
- // private static Log log = ExoLogger.getLogger("pc.TestRolesExtractor");
+ // private static Log log = ExoLogger.getLogger("exo.core.component.security.core.TestRolesExtractor");
protected RolesExtractor rolesExtractor;
Modified: core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/resolving/impl/XMLResolvingServiceImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -35,7 +35,7 @@
public class XMLResolvingServiceImpl implements XMLResolvingService
{
- private static final Log LOGGER = ExoLogger.getLogger("XMLResolvingServiceImpl");
+ private static final Log LOGGER = ExoLogger.getLogger("exo.core.component.xml-processing.XMLResolvingServiceImpl");
private Map<String, String> publicIDs_ = new HashMap<String, String>();
Modified: core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java
===================================================================
--- core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/EncodingMapImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -35,7 +35,7 @@
public class EncodingMapImpl implements EncodingMap
{
- private static Log log = ExoLogger.getLogger(EncodingMapImpl.class);
+ private static Log log = ExoLogger.getLogger("exo.core.component.xml-processing.EncodingMapImpl");
protected final static Hashtable<String, String> IANA2JavaMap = new Hashtable<String, String>();
Modified: core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java
===================================================================
--- core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/TransformerBase.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -51,7 +51,7 @@
{
private Result result = null;
- protected Log log = ExoLogger.getLogger(this.getClass());
+ protected Log log = ExoLogger.getLogger("exo.core.component.xml-processing.TransformerBase");
protected SAXTransformerFactory tSAXFactory;
Modified: core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.xml-processing/src/main/java/org/exoplatform/services/xml/transform/impl/trax/TRAXTemplatesServiceImpl.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -42,7 +42,7 @@
public class TRAXTemplatesServiceImpl implements TRAXTemplatesService, Startable
{
- private static final Log LOGGER = ExoLogger.getLogger("TRAXTemplatesServiceImpl");
+ private static final Log LOGGER = ExoLogger.getLogger("exo.core.component.xml-processing.TRAXTemplatesServiceImpl");
private Map<String, TRAXTemplates> templates_;
Modified: core/trunk/exo.core.component.xml-processing/src/test/java/org/exoplatform/services/xml/BaseTest.java
===================================================================
--- core/trunk/exo.core.component.xml-processing/src/test/java/org/exoplatform/services/xml/BaseTest.java 2010-03-25 13:09:01 UTC (rev 2125)
+++ core/trunk/exo.core.component.xml-processing/src/test/java/org/exoplatform/services/xml/BaseTest.java 2010-03-25 13:43:19 UTC (rev 2126)
@@ -43,7 +43,7 @@
private DateFormat dateFormat;
- protected Log log = ExoLogger.getLogger("org.exoplatform.services.xml");
+ protected Log log = ExoLogger.getLogger("exo.core.component.xml-processing.BaseTest");
protected String getTimeStamp()
{
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2125 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-03-25 09:09:01 -0400 (Thu, 25 Mar 2010)
New Revision: 2125
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-549: fix bug
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 13:02:20 UTC (rev 2124)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25 13:09:01 UTC (rev 2125)
@@ -351,7 +351,7 @@
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
- @Path("/start/{repo}}")
+ @Path("/start/{repo}")
public Response start(BackupConfigBean bConfigBeen, @PathParam("repo") String repository)
{
String failMessage;
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2124 - in kernel/trunk: exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl and 13 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-25 09:02:20 -0400 (Thu, 25 Mar 2010)
New Revision: 2124
Modified:
kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java
kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java
kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java
kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java
kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java
kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java
Log:
EXOJCR-605 Logging category now consists of 'package name' + 'simple classname'
Modified: kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java
===================================================================
--- kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.cache/src/main/java/org/exoplatform/services/cache/impl/LoggingCacheListener.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -34,7 +34,7 @@
public class LoggingCacheListener implements CacheListener
{
- Log log = ExoLogger.getLogger("kernel.cache.log");
+ Log log = ExoLogger.getLogger("exo.kernel.component.cache.LoggingCacheListener");
public void onClearCache(CacheListenerContext context) throws Exception
{
Modified: kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java
===================================================================
--- kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.command/src/main/java/org/exoplatform/services/command/impl/CommonsXMLConfigurationPlugin.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -43,7 +43,7 @@
// protected Catalog defaultCatalog;
- private static Log log = ExoLogger.getLogger(CommonsXMLConfigurationPlugin.class);
+ private static Log log = ExoLogger.getLogger("exo.kernel.component.cache.CommonsXMLConfigurationPlugin");
public CommonsXMLConfigurationPlugin(InitParams params, ConfigurationManager configurationManager) throws Exception
{
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/listener/ListenerService.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -35,8 +35,8 @@
private Map<String, List<Listener>> listeners_;
- private static Log log = ExoLogger.getLogger("kernel.ListenerService");
-
+ private static Log log = ExoLogger.getLogger("exo.kernel.component.common.ListenerService");
+
/**
* Construct a listener service.
*/
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -26,22 +26,18 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
-import java.io.File;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NameAlreadyBoundException;
import javax.naming.NamingException;
import javax.naming.Reference;
-import javax.naming.StringRefAddr;
import javax.xml.stream.XMLStreamException;
/**
@@ -58,7 +54,7 @@
final public static String PROPERTIES_MANDATORY = "mandatory-properties";
- private static Log log = ExoLogger.getLogger("naming.InitialContextInitializer");
+ private static Log log = ExoLogger.getLogger("exo.kernel.component.common.InitialContextInitializer");
private List<BindReferencePlugin> bindReferencesPlugins;
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/transaction/impl/jotm/TransactionServiceJotmImpl.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -51,7 +51,7 @@
public class TransactionServiceJotmImpl implements TransactionService
{
- protected static Log log = ExoLogger.getLogger("transaction.TransactionServiceJotmImpl");
+ protected static Log log = ExoLogger.getLogger("exo.kernel.component.common.TransactionServiceJotmImpl");
public static final String TRACK_WITHOT_TRANSACTION_PARAM = "track-without-transaction";
Modified: kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/TransactionTest.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -40,7 +40,7 @@
public class TransactionTest extends TestCase
{
- private static Log log = ExoLogger.getLogger("tx.TransactionTest");
+ private static Log log = ExoLogger.getLogger("exo.kernel.component.common.TransactionTest");
private StandaloneContainer container;
Modified: kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.common/src/test/java/org/exoplatform/services/transaction/XAResourceTestImpl.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -39,7 +39,7 @@
public class XAResourceTestImpl implements ExoResource, XAResource
{
- private static Log log = ExoLogger.getLogger("tx.TestXAResource");
+ private static Log log = ExoLogger.getLogger("exo.kernel.component.common.XAResourceTestImpl");
private int timeout = 5;
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCache.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -59,7 +59,7 @@
/**
* Logger.
*/
- private static final Log LOG = ExoLogger.getLogger(AbstractExoCache.class);
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.ext.cache.impl.jboss.v3.AbstractExoCache");
private final AtomicInteger hits = new AtomicInteger(0);
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -55,7 +55,7 @@
/**
* The logger
*/
- private static final Log LOG = ExoLogger.getLogger(ExoCacheFactoryImpl.class);
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.ext.cache.impl.jboss.v3.ExoCacheFactoryImpl");
/**
* The initial parameter key that defines the full path of the configuration template
Modified: kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/CommunicationServiceImpl.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -62,7 +62,7 @@
private CommunicationChannelListener channelListener_ = new CommunicationChannelListener();
- private Log LOG = ExoLogger.getLogger(CommunicationServiceImpl.class.getName());
+ private Log LOG = ExoLogger.getLogger("exo.kernel.component.remote.CommunicationServiceImpl");
public CommunicationServiceImpl(InitParams confParams) throws Exception
{
Modified: kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.component.remote/src/main/java/org/exoplatform/services/remote/group/impl/RequestHandlerImpl.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -40,7 +40,7 @@
{
private Map messageHandlers_ = new HashMap();
- private static final Log LOG = ExoLogger.getLogger(RequestHandlerImpl.class.getName());
+ private static final Log LOG = ExoLogger.getLogger("exo.kernel.component.remote.RequestHandlerImpl");
public RequestHandlerImpl()
{
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainer.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -71,7 +71,7 @@
return Collections.unmodifiableSet(profiles);
}
- Log log = ExoLogger.getLogger(ExoContainer.class);
+ Log log = ExoLogger.getLogger("exo.kernel.container.ExoContainer");
private Map<String, ComponentLifecyclePlugin> componentLifecylePlugin_ =
new HashMap<String, ComponentLifecyclePlugin>();
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/ExoContainerContext.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -43,7 +43,7 @@
private String name;
- private static final Log log = ExoLogger.getLogger(ExoContainerContext.class);
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.ExoContainerContext");
public ExoContainerContext(ExoContainer container)
{
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -64,7 +64,7 @@
private PortalContainerConfig config_;
- private static final Log log = ExoLogger.getLogger(RootContainer.class);
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.RootContainer");
private static volatile boolean booting = false;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -52,7 +52,7 @@
final static public boolean LOG_DEBUG = System.getProperty(LOG_DEBUG_PROPERTY) != null;
- private static final Log log = ExoLogger.getLogger(ConfigurationManagerImpl.class);
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationManagerImpl");
protected Configuration configurations_;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationUnmarshaller.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -60,7 +60,7 @@
public class ConfigurationUnmarshaller
{
- private static final Log log = ExoLogger.getLogger(ConfigurationUnmarshaller.class);
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationUnmarshaller");
private class Reporter implements ErrorHandler
{
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -52,14 +52,14 @@
* Created by The eXo Platform SAS
* Author : Nicolas Filotto
* nicolas.filotto(a)exoplatform.com
- * 26 ao�t 2009
+ * 26 ao�t 2009
*/
public class PortalContainerConfig implements Startable
{
/**
* The logger
*/
- private static final Log log = ExoLogger.getLogger(PortalContainerConfig.class);
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.PortalContainerConfig");
/**
* The name of the setting corresponding to the portal container name
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/jmx/MX4JComponentAdapter.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -46,7 +46,7 @@
{
private Object instance_;
- private Log log = ExoLogger.getLogger(MX4JComponentAdapter.class);
+ private Log log = ExoLogger.getLogger("exo.kernel.container.MX4JComponentAdapter");
public MX4JComponentAdapter(Object key, Class implementation)
{
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableComponentAdapter.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -35,7 +35,7 @@
{
/** . */
- private Log log = ExoLogger.getLogger(ManageableComponentAdapter.class);
+ private Log log = ExoLogger.getLogger("exo.kernel.container.ManageableComponentAdapter");
/** . */
private ComponentAdapter delegate;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationContainer.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -38,7 +38,7 @@
/**
* Logger
*/
- private static Log log = ExoLogger.getLogger(MCIntegrationContainer.class);
+ private static Log log = ExoLogger.getLogger("exo.kernel.container.MCIntegrationContainer");
/**
* Constructor that exposes super constructor.
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/mc/MCIntegrationInvoker.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -43,7 +43,7 @@
/**
* Logger
*/
- private static Log log = ExoLogger.getLogger(MCIntegrationInvoker.class);
+ private static Log log = ExoLogger.getLogger("exo.kernel.container.MCIntegrationInvoker");
/**
* Reference to actual implementation of mc-integration - the one with hard dependencies on JBoss MC Kernel.
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java 2010-03-25 12:56:10 UTC (rev 2123)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/AddJVMComponentsToRootContainer.java 2010-03-25 13:02:20 UTC (rev 2124)
@@ -34,7 +34,7 @@
public class AddJVMComponentsToRootContainer extends BaseContainerLifecyclePlugin
{
- private static final Log log = ExoLogger.getLogger(AddJVMComponentsToRootContainer.class);
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.AddJVMComponentsToRootContainer");
public void initContainer(ExoContainer container)
{
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2123 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-03-25 08:56:10 -0400 (Thu, 25 Mar 2010)
New Revision: 2123
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-549: fix singature
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:51:01 UTC (rev 2122)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25 12:56:10 UTC (rev 2123)
@@ -703,8 +703,8 @@
failMessage = e.getMessage();
}
- log.error("Can not start restore the repository '" + "/" + rEntry.getName() + "' from backup log with id '" + backupId
- + "'", exception);
+ 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 '" + "/" + rEntry.getName() + "' from backup log with id '" + backupId
@@ -1013,7 +1013,7 @@
@GET
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
- @Path("/info/backup/{repo}")
+ @Path("/info/backup/repository/{repo}")
public Response infoBackupByRepository(@PathParam("repo") String repository)
{
try
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2122 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
by do-not-reply＠jboss.org
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();
}
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2121 - in jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup: impl and 1 other directories.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-03-25 08:47:11 -0400 (Thu, 25 Mar 2010)
New Revision: 2121
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java
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/RepositoryBackupChainLog.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2010-03-25 12:07:57 UTC (rev 2120)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryBackupChainLog.java 2010-03-25 12:47:11 UTC (rev 2121)
@@ -366,11 +366,14 @@
* Finalize log.
*
*/
- public void endLog()
+ public synchronized void endLog()
{
- finishedTime = Calendar.getInstance();
- finalized = true;
- logWriter.writeEndLog();
+ if (!finalized)
+ {
+ finishedTime = Calendar.getInstance();
+ finalized = true;
+ logWriter.writeEndLog();
+ }
}
/**
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-03-25 12:07:57 UTC (rev 2120)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-03-25 12:47:11 UTC (rev 2121)
@@ -1399,8 +1399,7 @@
}
JobRepositoryRestore jobRepositoryRestore =
- new JobRepositoryRestore(repoService, this, repositoryEntry, workspacesMapping, new RepositoryBackupChainLog(
- new File(rblog.getLogFilePath()))); // TODO
+ new JobRepositoryRestore(repoService, this, repositoryEntry, workspacesMapping, rblog);
if (asynchronous)
{
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java 2010-03-25 12:07:57 UTC (rev 2120)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java 2010-03-25 12:47:11 UTC (rev 2121)
@@ -36,11 +36,9 @@
import org.exoplatform.services.jcr.ext.backup.BackupChainLog;
import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChainLog;
import org.exoplatform.services.jcr.ext.backup.RepositoryRestoreExeption;
-import org.exoplatform.services.jcr.ext.backup.server.WorkspaceRestoreExeption;
import org.exoplatform.services.jcr.impl.core.BackupWorkspaceInitializer;
import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
-import org.exoplatform.services.jcr.impl.core.SysViewWorkspaceInitializer;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -182,18 +180,16 @@
// save configuration to persistence (file or persister)
repositoryService.getConfig().retain();
- backupManager.restore(repositoryBackupChainLog, repositoryEntry, false);
- // TODO
- // for (WorkspaceEntry wsEntry : originalWorkspaceEntrys)
- // {
- // if (!(wsEntry.getName().equals(repositoryEntry.getSystemWorkspaceName())))
- // {
- // currennWorkspaceName = wsEntry.getName();
- // backupManager.restore(workspacesMapping.get(wsEntry.getName()), repositoryEntry.getName(), wsEntry,
- // false);
- // }
- // }
+ for (WorkspaceEntry wsEntry : originalWorkspaceEntrys)
+ {
+ if (!(wsEntry.getName().equals(repositoryEntry.getSystemWorkspaceName())))
+ {
+ currennWorkspaceName = wsEntry.getName();
+ backupManager.restore(workspacesMapping.get(wsEntry.getName()), repositoryEntry.getName(), wsEntry,
+ false);
+ }
+ }
}
catch (InvalidItemStateException e)
{
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:07:57 UTC (rev 2120)
+++ 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)
@@ -489,75 +489,6 @@
}
/**
- * Drops repository.
- *
- * @param repository
- * String, the repository name
- * @param forceSessionClose
- * Boolean, flag to force session close
- * @return Response return the response
- */
- @GET
- @RolesAllowed("administrators")
- @Path("/drop-repository/{repo}/{force-session-close}")
- public Response dropRepository(@PathParam("repo") String repository,
- @PathParam("force-session-close") Boolean forceSessionClose)
- {
-
- String failMessage;
- Response.Status status;
- Throwable exception;
-
- try
- {
- validateRepositoryName(repository);
-
- RepositoryImpl repositoryImpl = (RepositoryImpl)repositoryService.getRepository(repository);
-
- if (forceSessionClose)
- {
- for (String workspace : repositoryImpl.getWorkspaceNames())
- {
- forceCloseSession(repository, workspace);
- }
- }
-
- for (String workspace : repositoryImpl.getWorkspaceNames())
- {
- repositoryImpl.removeWorkspace(workspace);
- }
- repositoryService.getConfig().retain(); // save configuration to persistence (file or persister)
-
- return Response.ok().cacheControl(noCache).build();
-
- }
- catch (RepositoryException e)
- {
- exception = e;
- status = Response.Status.INTERNAL_SERVER_ERROR;
- failMessage = e.getMessage();
- }
- catch (RepositoryConfigurationException e)
- {
- exception = e;
- status = Response.Status.INTERNAL_SERVER_ERROR;
- failMessage = e.getMessage();
- }
- catch (Throwable e)
- {
- exception = e;
- status = Response.Status.INTERNAL_SERVER_ERROR;
- failMessage = e.getMessage();
- }
-
- log.error("Can not drop the repository '" + "/" + repository, exception);
-
- return Response.status(status).entity("Can not drop the repository '" + "/" + repository + "' : " + failMessage)
- .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
-
- }
-
- /**
* Restore the workspace.
*
* @param wEntry
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2120 - jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-03-25 08:07:57 -0400 (Thu, 25 Mar 2010)
New Revision: 2120
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java
Log:
EXOJCR-549: HttpBackUpAgent impl
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 11:52:37 UTC (rev 2119)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25 12:07:57 UTC (rev 2120)
@@ -489,6 +489,75 @@
}
/**
+ * Drops repository.
+ *
+ * @param repository
+ * String, the repository name
+ * @param forceSessionClose
+ * Boolean, flag to force session close
+ * @return Response return the response
+ */
+ @GET
+ @RolesAllowed("administrators")
+ @Path("/drop-repository/{repo}/{force-session-close}")
+ public Response dropRepository(@PathParam("repo") String repository,
+ @PathParam("force-session-close") Boolean forceSessionClose)
+ {
+
+ String failMessage;
+ Response.Status status;
+ Throwable exception;
+
+ try
+ {
+ validateRepositoryName(repository);
+
+ RepositoryImpl repositoryImpl = (RepositoryImpl)repositoryService.getRepository(repository);
+
+ if (forceSessionClose)
+ {
+ for (String workspace : repositoryImpl.getWorkspaceNames())
+ {
+ forceCloseSession(repository, workspace);
+ }
+ }
+
+ for (String workspace : repositoryImpl.getWorkspaceNames())
+ {
+ repositoryImpl.removeWorkspace(workspace);
+ }
+ repositoryService.getConfig().retain(); // save configuration to persistence (file or persister)
+
+ return Response.ok().cacheControl(noCache).build();
+
+ }
+ catch (RepositoryException e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+ catch (RepositoryConfigurationException e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+ catch (Throwable e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+
+ log.error("Can not drop the repository '" + "/" + repository, exception);
+
+ return Response.status(status).entity("Can not drop the repository '" + "/" + repository + "' : " + failMessage)
+ .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+
+ }
+
+ /**
* Restore the workspace.
*
* @param wEntry
@@ -1004,6 +1073,55 @@
}
/**
+ * Will be returned the list short info of current and completed backups.
+ *
+ * @param repository
+ * String, the repository name
+ *
+ * @return Response return the response
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @RolesAllowed("administrators")
+ @Path("/info/backup/{repo}")
+ public Response infoBackupByRepository(@PathParam("repo") String repository)
+ {
+ try
+ {
+ List<ShortInfo> list = new ArrayList<ShortInfo>();
+
+ for (BackupChain chain : backupManager.getCurrentBackups())
+ {
+ if (repository.equals(chain.getBackupConfig().getRepository()))
+ {
+ list.add(new ShortInfo(ShortInfo.CURRENT, chain));
+ }
+ }
+
+ for (BackupChainLog chainLog : backupManager.getBackupsLogs())
+ {
+ if (backupManager.findBackup(chainLog.getBackupId()) == null
+ && repository.equals(chainLog.getBackupConfig().getRepository()))
+ {
+ list.add(new ShortInfo(ShortInfo.COMPLETED, chainLog));
+ }
+ }
+
+ ShortInfoList shortInfoList = new ShortInfoList(list);
+
+ return Response.ok(shortInfoList).cacheControl(noCache).build();
+ }
+ catch (Throwable e)
+ {
+ log.error("Can not get information about current or completed backups", e);
+
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
+ "Can not get information about current or completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
+ }
+ }
+
+ /**
* Will be returned the detailed information about last restore for specific workspace.
*
* @param repository
@@ -1066,7 +1184,7 @@
@GET
@Produces(MediaType.APPLICATION_JSON)
@RolesAllowed("administrators")
- @Path("/info/restore/{repo}/{ws}")
+ @Path("/info/restore/{repo}")
public Response infoRestore(@PathParam("repo") String repository)
{
try
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2119 - in jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup: server and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-03-25 07:52:37 -0400 (Thu, 25 Mar 2010)
New Revision: 2119
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java
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/bean/BackupConfigBean.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfo.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfoEx.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/ShortInfo.java
Log:
EXOJCR-549: HTTPBackupAgent impl
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-03-25 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -98,8 +98,7 @@
* @version $Id: $
*/
-public class BackupManagerImpl
- implements BackupManager, Startable
+public class BackupManagerImpl implements BackupManager, Startable
{
protected static Log log = ExoLogger.getLogger("ext.BackupManagerImpl");
@@ -131,14 +130,14 @@
private String incrementalBackupType;
private final Set<BackupChain> currentBackups;
-
+
private final Set<RepositoryBackupChain> currentRepositoryBackups;
/**
* The list of workspace restore job.
*/
private List<JobWorkspaceRestore> restoreJobs;
-
+
/**
* The list of repository restore job.
*/
@@ -161,11 +160,10 @@
private final MessagesListener messagesListener;
private final WorkspaceBackupAutoStopper workspaceBackupStopper;
-
+
private final RepositoryBackupAutoStopper repositoryBackupStopper;
- class MessagesListener
- implements BackupJobListener
+ class MessagesListener implements BackupJobListener
{
public void onError(BackupJob job, String message, Throwable error)
@@ -248,8 +246,7 @@
}
}
- class LogsFilter
- implements FileFilter
+ class LogsFilter implements FileFilter
{
public boolean accept(File pathname)
@@ -258,8 +255,7 @@
}
}
- class TaskFilter
- implements FileFilter
+ class TaskFilter implements FileFilter
{
public boolean accept(File pathname)
@@ -268,8 +264,7 @@
}
}
- class WorkspaceBackupAutoStopper
- extends Thread
+ class WorkspaceBackupAutoStopper extends Thread
{
/**
@@ -315,50 +310,49 @@
}
}
}
-
- class RepositoryBackupAutoStopper
- extends Thread
-{
- /**
- * {@inheritDoc}
- */
- public void run()
+ class RepositoryBackupAutoStopper extends Thread
{
- while (true)
+
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
{
- try
+ while (true)
{
- Thread.sleep(AUTO_STOPPER_TIMEOUT);
+ try
+ {
+ Thread.sleep(AUTO_STOPPER_TIMEOUT);
- Iterator<RepositoryBackupChain> it = currentRepositoryBackups.iterator();
- List<RepositoryBackupChain> stopedList = new ArrayList<RepositoryBackupChain>();
+ Iterator<RepositoryBackupChain> it = currentRepositoryBackups.iterator();
+ List<RepositoryBackupChain> stopedList = new ArrayList<RepositoryBackupChain>();
- while (it.hasNext())
- {
- RepositoryBackupChain chain = it.next();
+ while (it.hasNext())
+ {
+ RepositoryBackupChain chain = it.next();
- if (chain.isFinished())
- {
- stopedList.add(chain);
+ if (chain.isFinished())
+ {
+ stopedList.add(chain);
+ }
}
+
+ // STOP backups
+ for (RepositoryBackupChain chain : stopedList)
+ stopBackup(chain);
}
-
- // STOP backups
- for (RepositoryBackupChain chain : stopedList)
- stopBackup(chain);
+ catch (InterruptedException e)
+ {
+ log.error("The interapted this thread.", e);
+ }
+ catch (Throwable e)
+ {
+ log.error("The unknown error", e);
+ }
}
- catch (InterruptedException e)
- {
- log.error("The interapted this thread.", e);
- }
- catch (Throwable e)
- {
- log.error("The unknown error", e);
- }
}
}
-}
/**
* BackupManagerImpl constructor.
@@ -391,7 +385,7 @@
this.initParams = initParams;
currentBackups = Collections.synchronizedSet(new HashSet<BackupChain>());
-
+
currentRepositoryBackups = Collections.synchronizedSet(new HashSet<RepositoryBackupChain>());
fileCleaner = new FileCleaner(10000);
@@ -402,10 +396,10 @@
this.restoreJobs = new ArrayList<JobWorkspaceRestore>();
this.restoreRepositoryJobs = new ArrayList<JobRepositoryRestore>();
-
+
this.workspaceBackupStopper = new WorkspaceBackupAutoStopper();
this.workspaceBackupStopper.start();
-
+
this.repositoryBackupStopper = new RepositoryBackupAutoStopper();
this.repositoryBackupStopper.start();
}
@@ -473,8 +467,8 @@
*/
@Deprecated
public void restore(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry)
- throws BackupOperationException, RepositoryException, RepositoryConfigurationException,
- BackupConfigurationException
+ throws BackupOperationException, RepositoryException, RepositoryConfigurationException,
+ BackupConfigurationException
{
List<JobEntryInfo> list = log.getJobEntryInfos();
BackupConfig config = log.getBackupConfig();
@@ -531,8 +525,8 @@
}
protected void restoreOverInitializer(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry)
- throws BackupOperationException, RepositoryException, RepositoryConfigurationException,
- BackupConfigurationException
+ throws BackupOperationException, RepositoryException, RepositoryConfigurationException,
+ BackupConfigurationException
{
List<JobEntryInfo> list = log.getJobEntryInfos();
@@ -561,7 +555,7 @@
{
throw new BackupOperationException("Restore of full backup file I/O error " + e, e);
}
-
+
repoService.getConfig().retain(); // save configuration to persistence (file or persister)
}
else
@@ -592,7 +586,7 @@
}
private boolean workspaceAlreadyExist(String repository, String workspace) throws RepositoryException,
- RepositoryConfigurationException
+ RepositoryConfigurationException
{
String[] ws = repoService.getRepository(repository).getWorkspaceNames();
@@ -606,7 +600,7 @@
* {@inheritDoc}
*/
public BackupChain startBackup(BackupConfig config) throws BackupOperationException, BackupConfigurationException,
- RepositoryException, RepositoryConfigurationException
+ RepositoryException, RepositoryConfigurationException
{
return startBackup(config, null);
@@ -624,14 +618,14 @@
* @throws RepositoryConfigurationException
*/
BackupChain startBackup(BackupConfig config, BackupJobListener jobListener) throws BackupOperationException,
- BackupConfigurationException, RepositoryException, RepositoryConfigurationException
+ BackupConfigurationException, RepositoryException, RepositoryConfigurationException
{
validateBackupConfig(config);
BackupChain bchain =
- new BackupChainImpl(config, logsDirectory, repoService.getRepository(config.getRepository()),
- fullBackupType, incrementalBackupType, IdGenerator.generate());
-
+ new BackupChainImpl(config, logsDirectory, repoService.getRepository(config.getRepository()), fullBackupType,
+ incrementalBackupType, IdGenerator.generate());
+
bchain.addListener(messagesListener);
bchain.addListener(jobListener);
@@ -640,7 +634,7 @@
return bchain;
}
-
+
/**
* Initialize backup chain to workspace backup.
*
@@ -756,22 +750,22 @@
@Deprecated
private void fullRestore(String pathBackupFile, String repositoryName, String workspaceName,
- WorkspaceEntry workspaceEntry) throws FileNotFoundException, IOException, RepositoryException,
- RepositoryConfigurationException
+ WorkspaceEntry workspaceEntry) throws FileNotFoundException, IOException, RepositoryException,
+ RepositoryConfigurationException
{
- RepositoryImpl defRep = (RepositoryImpl) repoService.getRepository(repositoryName);
+ RepositoryImpl defRep = (RepositoryImpl)repoService.getRepository(repositoryName);
defRep.importWorkspace(workspaceEntry.getName(), new FileInputStream(pathBackupFile));
}
private void fullRestoreOverInitializer(String pathBackupFile, String repositoryName, WorkspaceEntry workspaceEntry)
- throws FileNotFoundException, IOException, RepositoryException, RepositoryConfigurationException
+ throws FileNotFoundException, IOException, RepositoryException, RepositoryConfigurationException
{
WorkspaceInitializerEntry wieOriginal = workspaceEntry.getInitializer();
-
- RepositoryImpl defRep = (RepositoryImpl) repoService.getRepository(repositoryName);
+ RepositoryImpl defRep = (RepositoryImpl)repoService.getRepository(repositoryName);
+
// set the initializer SysViewWorkspaceInitializer
WorkspaceInitializerEntry wiEntry = new WorkspaceInitializerEntry();
wiEntry.setType(SysViewWorkspaceInitializer.class.getCanonicalName());
@@ -786,21 +780,21 @@
//restore
defRep.configWorkspace(workspaceEntry);
defRep.createWorkspace(workspaceEntry.getName());
-
+
//set original workspace initializer
WorkspaceContainerFacade wcf = defRep.getWorkspaceContainer(workspaceEntry.getName());
- WorkspaceEntry createdWorkspaceEntry = (WorkspaceEntry) wcf.getComponent(WorkspaceEntry.class);
+ WorkspaceEntry createdWorkspaceEntry = (WorkspaceEntry)wcf.getComponent(WorkspaceEntry.class);
createdWorkspaceEntry.setInitializer(wieOriginal);
}
private void incrementalRestore(String pathBackupFile, String repositoryName, String workspaceName)
- throws RepositoryException, RepositoryConfigurationException, BackupOperationException,
- FileNotFoundException, IOException, ClassNotFoundException
+ throws RepositoryException, RepositoryConfigurationException, BackupOperationException, FileNotFoundException,
+ IOException, ClassNotFoundException
{
- SessionImpl sesion = (SessionImpl) repoService.getRepository(repositoryName).getSystemSession(workspaceName);
+ SessionImpl sesion = (SessionImpl)repoService.getRepository(repositoryName).getSystemSession(workspaceName);
WorkspacePersistentDataManager dataManager =
- (WorkspacePersistentDataManager) sesion.getContainer().getComponentInstanceOfType(
- WorkspacePersistentDataManager.class);
+ (WorkspacePersistentDataManager)sesion.getContainer().getComponentInstanceOfType(
+ WorkspacePersistentDataManager.class);
ObjectInputStream ois = null;
File backupFile = null;
@@ -835,7 +829,7 @@
}
private void saveChangesLog(WorkspacePersistentDataManager dataManager, TransactionChangesLog changesLog)
- throws RepositoryException, BackupOperationException
+ throws RepositoryException, BackupOperationException
{
try
{
@@ -844,24 +838,24 @@
catch (JCRInvalidItemStateException e)
{
TransactionChangesLog normalizeChangesLog =
- getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog);
+ getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog);
if (normalizeChangesLog != null)
saveChangesLog(dataManager, normalizeChangesLog);
else
throw new BackupOperationException(
- "Collisions found during save of restore changes log, but caused item is not found by ID "
- + e.getIdentifier() + ". " + e, e);
+ "Collisions found during save of restore changes log, but caused item is not found by ID "
+ + e.getIdentifier() + ". " + e, e);
}
catch (JCRItemExistsException e)
{
TransactionChangesLog normalizeChangesLog =
- getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog);
+ getNormalizedChangesLog(e.getIdentifier(), e.getState(), changesLog);
if (normalizeChangesLog != null)
saveChangesLog(dataManager, normalizeChangesLog);
else
throw new RepositoryException(
- "Collisions found during save of restore changes log, but caused item is not found by ID "
- + e.getIdentifier() + ". " + e, e);
+ "Collisions found during save of restore changes log, but caused item is not found by ID "
+ + e.getIdentifier() + ". " + e, e);
}
}
@@ -891,7 +885,7 @@
{
// Node... by ID and desc path
if (!item.getIdentifier().equals(collisionID)
- && !item.getQPath().isDescendantOf(citem.getData().getQPath()))
+ && !item.getQPath().isDescendantOf(citem.getData().getQPath()))
normalized.add(change);
}
else if (!item.getIdentifier().equals(collisionID))
@@ -925,7 +919,7 @@
{
// read ChangesLog
- transactionChangesLog = (TransactionChangesLog) in.readObject();
+ transactionChangesLog = (TransactionChangesLog)in.readObject();
// read FixupStream count
int iFixupStream = in.readInt();
@@ -956,7 +950,7 @@
}
PendingChangesLog pendingChangesLog =
- new PendingChangesLog(transactionChangesLog, listFixupStreams, listFiles, fileCleaner);
+ new PendingChangesLog(transactionChangesLog, listFixupStreams, listFiles, fileCleaner);
pendingChangesLog.restore();
@@ -965,7 +959,7 @@
}
else if (changesLogType == PendingChangesLog.Type.CHANGESLOG_WITHOUT_STREAM)
{
- transactionChangesLog = (TransactionChangesLog) in.readObject();
+ transactionChangesLog = (TransactionChangesLog)in.readObject();
}
return transactionChangesLog;
@@ -990,8 +984,8 @@
}
else if (readBytes < bufferSize)
{
- ois.readFully(buf, 0, (int) readBytes);
- fos.write(buf, 0, (int) readBytes);
+ ois.readFully(buf, 0, (int)readBytes);
+ fos.write(buf, 0, (int)readBytes);
}
readBytes -= bufferSize;
}
@@ -1013,7 +1007,7 @@
* @throws RepositoryException
*/
private void writeParamsToRegistryService(SessionProvider sessionProvider) throws IOException, SAXException,
- ParserConfigurationException, RepositoryException
+ ParserConfigurationException, RepositoryException
{
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
Element root = doc.createElement(SERVICE_NAME);
@@ -1039,7 +1033,7 @@
* @throws PathNotFoundException
*/
private void readParamsFromRegistryService(SessionProvider sessionProvider) throws PathNotFoundException,
- RepositoryException
+ RepositoryException
{
String entryPath = RegistryService.EXO_SERVICES + "/" + SERVICE_NAME + "/" + BACKUP_PROPERTIES;
RegistryEntry registryEntry = registryService.getEntry(sessionProvider, entryPath);
@@ -1151,7 +1145,7 @@
{
BackupChain chain = it.next();
if (repository.equals(chain.getBackupConfig().getRepository())
- && workspace.equals(chain.getBackupConfig().getWorkspace()))
+ && workspace.equals(chain.getBackupConfig().getWorkspace()))
return chain;
}
return null;
@@ -1249,13 +1243,13 @@
return null;
}
-
+
/**
* {@inheritDoc}
*/
public JobRepositoryRestore getLastRepositoryRestore(String repositoryName)
{
-
+
for (int i = restoreRepositoryJobs.size() - 1; i >= 0; i--)
{
JobRepositoryRestore job = restoreRepositoryJobs.get(i);
@@ -1279,13 +1273,13 @@
* {@inheritDoc}
*/
public void restore(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry, boolean asynchronous)
- throws BackupOperationException, BackupConfigurationException, RepositoryException,
- RepositoryConfigurationException
+ throws BackupOperationException, BackupConfigurationException, RepositoryException,
+ RepositoryConfigurationException
{
if (asynchronous)
{
JobWorkspaceRestore jobRestore =
- new JobWorkspaceRestore(repoService, this, repositoryName, log, workspaceEntry);
+ new JobWorkspaceRestore(repoService, this, repositoryName, log, workspaceEntry);
restoreJobs.add(jobRestore);
jobRestore.start();
}
@@ -1294,51 +1288,56 @@
this.restoreOverInitializer(log, repositoryName, workspaceEntry);
}
}
-
+
/**
* {@inheritDoc}
*/
public void restore(RepositoryBackupChainLog log, RepositoryEntry repositoryEntry, boolean asynchronous)
- throws BackupOperationException, BackupConfigurationException, RepositoryException,
- RepositoryConfigurationException
+ throws BackupOperationException, BackupConfigurationException, RepositoryException,
+ RepositoryConfigurationException
{
this.restore(log, repositoryEntry, null, asynchronous);
}
-
+
/**
* {@inheritDoc}
*/
public void restore(RepositoryBackupChainLog rblog, RepositoryEntry repositoryEntry,
- Map<String, String> workspaceNamesCorrespondMap, boolean asynchronous) throws BackupOperationException,
- BackupConfigurationException, RepositoryException, RepositoryConfigurationException
+ Map<String, String> workspaceNamesCorrespondMap, boolean asynchronous) throws BackupOperationException,
+ BackupConfigurationException, RepositoryException, RepositoryConfigurationException
{
Map<String, BackupChainLog> workspacesMapping = new HashedMap();
Map<String, BackupChainLog> backups = new HashedMap();
-
- if (workspaceNamesCorrespondMap == null)
+
+ if (workspaceNamesCorrespondMap == null)
{
for (String path : rblog.getWorkspaceBackupsInfo())
{
BackupChainLog bLog = new BackupChainLog(new File(path));
backups.put(bLog.getBackupConfig().getWorkspace(), bLog);
}
-
- if (!rblog.getSystemWorkspace().equals(repositoryEntry.getSystemWorkspaceName()))
+
+ if (!rblog.getSystemWorkspace().equals(repositoryEntry.getSystemWorkspaceName()))
{
- throw new BackupConfigurationException("The backup to system workspace is not system workspace in repository entry: " + rblog.getSystemWorkspace() + " is not equal " + repositoryEntry.getSystemWorkspaceName());
+ throw new BackupConfigurationException(
+ "The backup to system workspace is not system workspace in repository entry: "
+ + rblog.getSystemWorkspace() + " is not equal " + repositoryEntry.getSystemWorkspaceName());
}
-
- if (backups.size() != repositoryEntry.getWorkspaceEntries().size())
+
+ if (backups.size() != repositoryEntry.getWorkspaceEntries().size())
{
- throw new BackupConfigurationException("The repository entry is contains more or less workspace entry than backups of workspace in " + rblog.getLogFilePath());
+ throw new BackupConfigurationException(
+ "The repository entry is contains more or less workspace entry than backups of workspace in "
+ + rblog.getLogFilePath());
}
-
+
for (WorkspaceEntry wsEntry : repositoryEntry.getWorkspaceEntries())
{
- if (!backups.containsKey(wsEntry.getName()))
+ if (!backups.containsKey(wsEntry.getName()))
{
- throw new BackupConfigurationException("The workspace '" + wsEntry.getName() + "' is not found in backup " + rblog.getLogFilePath());
+ throw new BackupConfigurationException("The workspace '" + wsEntry.getName()
+ + "' is not found in backup " + rblog.getLogFilePath());
}
else
{
@@ -1348,41 +1347,49 @@
}
else
{
- // Crate map [new_ws_name : backupLog to that workspace].
+ // Create map [new_ws_name : backupLog to that workspace].
for (String path : rblog.getWorkspaceBackupsInfo())
{
BackupChainLog bLog = new BackupChainLog(new File(path));
-
- if (!workspaceNamesCorrespondMap.containsKey(bLog.getBackupConfig().getWorkspace()))
+
+ if (!workspaceNamesCorrespondMap.containsKey(bLog.getBackupConfig().getWorkspace()))
{
- throw new BackupConfigurationException("Can not found coresptonding workspace name to workspace '"
- + bLog.getBackupConfig().getWorkspace() + "' in " + workspaceNamesCorrespondMap .keySet());
+ throw new BackupConfigurationException("Can not found coresptonding workspace name to workspace '"
+ + bLog.getBackupConfig().getWorkspace() + "' in " + workspaceNamesCorrespondMap.keySet());
}
-
+
backups.put(workspaceNamesCorrespondMap.get(bLog.getBackupConfig().getWorkspace()), bLog);
}
-
+
// Checking system workspace.
- if (!repositoryEntry.getSystemWorkspaceName().equals(workspaceNamesCorrespondMap.get(rblog.getSystemWorkspace())))
+ if (!repositoryEntry.getSystemWorkspaceName().equals(
+ workspaceNamesCorrespondMap.get(rblog.getSystemWorkspace())))
{
- throw new BackupConfigurationException("The backup to system workspace is not system workspace in repository entry: " + repositoryEntry.getSystemWorkspaceName() + " is not equal " + workspaceNamesCorrespondMap.get(rblog.getSystemWorkspace()));
+ throw new BackupConfigurationException(
+ "The backup to system workspace is not system workspace in repository entry: "
+ + repositoryEntry.getSystemWorkspaceName() + " is not equal "
+ + workspaceNamesCorrespondMap.get(rblog.getSystemWorkspace()));
}
-
+
// Checking count of corresponding workspaces.
- if (workspaceNamesCorrespondMap.size() != repositoryEntry.getWorkspaceEntries().size())
+ if (workspaceNamesCorrespondMap.size() != repositoryEntry.getWorkspaceEntries().size())
{
- throw new BackupConfigurationException("The repository entry is contains more or less workspace entry than backups of workspace in " + rblog.getLogFilePath());
+ throw new BackupConfigurationException(
+ "The repository entry is contains more or less workspace entry than backups of workspace in "
+ + rblog.getLogFilePath());
}
-
+
for (WorkspaceEntry wsEntry : repositoryEntry.getWorkspaceEntries())
{
- if (!workspaceNamesCorrespondMap.containsValue(wsEntry.getName()))
+ if (!workspaceNamesCorrespondMap.containsValue(wsEntry.getName()))
{
- throw new BackupConfigurationException("The workspace '" + wsEntry.getName() + "' is not found workspaceNamesCorrespondMap : " + workspaceNamesCorrespondMap.values());
+ throw new BackupConfigurationException("The workspace '" + wsEntry.getName()
+ + "' is not found workspaceNamesCorrespondMap : " + workspaceNamesCorrespondMap.values());
}
else if (!backups.containsKey(wsEntry.getName()))
{
- throw new BackupConfigurationException("The workspace '" + wsEntry.getName() + "' is not found in backup " + rblog.getLogFilePath());
+ throw new BackupConfigurationException("The workspace '" + wsEntry.getName()
+ + "' is not found in backup " + rblog.getLogFilePath());
}
else
{
@@ -1390,10 +1397,11 @@
}
}
}
-
+
JobRepositoryRestore jobRepositoryRestore =
- new JobRepositoryRestore(repoService, this, repositoryEntry, workspacesMapping);
-
+ new JobRepositoryRestore(repoService, this, repositoryEntry, workspacesMapping, new RepositoryBackupChainLog(
+ new File(rblog.getLogFilePath()))); // TODO
+
if (asynchronous)
{
restoreRepositoryJobs.add(jobRepositoryRestore);
@@ -1409,24 +1417,24 @@
* {@inheritDoc}
*/
public RepositoryBackupChain startBackup(RepositoryBackupConfig config) throws BackupOperationException,
- BackupConfigurationException, RepositoryException, RepositoryConfigurationException
+ BackupConfigurationException, RepositoryException, RepositoryConfigurationException
{
validateBackupConfig(config);
ManageableRepository repository = repoService.getRepository(config.getRepository());
File dir =
- new File(config.getBackupDir() + File.separator + "repository_" + config.getRepository() + "_backup_"
- + System.currentTimeMillis());
+ new File(config.getBackupDir() + File.separator + "repository_" + config.getRepository() + "_backup_"
+ + System.currentTimeMillis());
dir.mkdir();
config.setBackupDir(dir);
RepositoryBackupChain repositoryBackupChain =
- new RepositoryBackupChainImpl(config, logsDirectory, repository, fullBackupType, incrementalBackupType,
- IdGenerator.generate());
-
+ new RepositoryBackupChainImpl(config, logsDirectory, repository, fullBackupType, incrementalBackupType,
+ IdGenerator.generate());
+
repositoryBackupChain.startBackup();
-
+
currentRepositoryBackups.add(repositoryBackupChain);
return repositoryBackupChain;
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java 2010-03-25 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobRepositoryRestore.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -34,6 +34,7 @@
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
import org.exoplatform.services.jcr.ext.backup.BackupChainLog;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChainLog;
import org.exoplatform.services.jcr.ext.backup.RepositoryRestoreExeption;
import org.exoplatform.services.jcr.ext.backup.server.WorkspaceRestoreExeption;
import org.exoplatform.services.jcr.impl.core.BackupWorkspaceInitializer;
@@ -57,7 +58,7 @@
* The apache logger.
*/
private static Log log = ExoLogger.getLogger("ext.JobRepositoryRestore");
-
+
/**
* REPOSITORY_RESTORE_STARTED. The state of start restore.
*/
@@ -82,7 +83,7 @@
* The state of restore.
*/
private int stateRestore;
-
+
/**
* The start time of restore.
*/
@@ -92,27 +93,31 @@
* The end time of restore.
*/
private Calendar endTime;
-
+
/**
* The exception on restore.
*/
private Throwable restoreException = null;
-
+
private RepositoryService repositoryService;
-
+
private BackupManagerImpl backupManager;
-
+
private RepositoryEntry repositoryEntry;
-
+
private Map<String, BackupChainLog> workspacesMapping;
+ private RepositoryBackupChainLog repositoryBackupChainLog;
+
public JobRepositoryRestore(RepositoryService repoService, BackupManagerImpl backupManagerImpl,
- RepositoryEntry repositoryEntry, Map<String, BackupChainLog> workspacesMapping)
+ RepositoryEntry repositoryEntry, Map<String, BackupChainLog> workspacesMapping,
+ RepositoryBackupChainLog backupChainLog)
{
this.repositoryService = repoService;
this.backupManager = backupManagerImpl;
this.repositoryEntry = repositoryEntry;
this.workspacesMapping = workspacesMapping;
+ this.repositoryBackupChainLog = backupChainLog;
}
/**
@@ -122,82 +127,86 @@
* @throws Throwable
* will be generated the Throwable
*/
- protected void restore() throws RepositoryRestoreExeption
+ protected void restore() throws RepositoryRestoreExeption
{
List<WorkspaceEntry> originalWorkspaceEntrys = repositoryEntry.getWorkspaceEntries();
-
+
//Getting system workspace entry
WorkspaceEntry systemWorkspaceEntry = null;
-
+
for (WorkspaceEntry wsEntry : originalWorkspaceEntrys)
{
- if (wsEntry.getName().equals(repositoryEntry.getSystemWorkspaceName()))
+ if (wsEntry.getName().equals(repositoryEntry.getSystemWorkspaceName()))
{
systemWorkspaceEntry = wsEntry;
break;
}
}
-
+
WorkspaceInitializerEntry wieOriginal = systemWorkspaceEntry.getInitializer();
-
- //getting backup cahil log to system workspace.
+
+ //getting backup chail log to system workspace.
BackupChainLog systemBackupChainLog = workspacesMapping.get(systemWorkspaceEntry.getName());
File fullBackupFile = new File(systemBackupChainLog.getJobEntryInfos().get(0).getURL().getPath());
-
+
// set the initializer SysViewWorkspaceInitializer
WorkspaceInitializerEntry wiEntry = new WorkspaceInitializerEntry();
wiEntry.setType(BackupWorkspaceInitializer.class.getCanonicalName());
List<SimpleParameterEntry> wieParams = new ArrayList<SimpleParameterEntry>();
- wieParams.add(new SimpleParameterEntry(BackupWorkspaceInitializer.RESTORE_PATH_PARAMETER, fullBackupFile.getParent()));
+ wieParams.add(new SimpleParameterEntry(BackupWorkspaceInitializer.RESTORE_PATH_PARAMETER, fullBackupFile
+ .getParent()));
wiEntry.setParameters(wieParams);
// set initializer
systemWorkspaceEntry.setInitializer(wiEntry);
-
+
ArrayList<WorkspaceEntry> newEntries = new ArrayList<WorkspaceEntry>();
newEntries.add(systemWorkspaceEntry);
-
+
repositoryEntry.setWorkspaceEntries(newEntries);
-
+
String currennWorkspaceName = repositoryEntry.getSystemWorkspaceName();
-
+
boolean restored = true;
try
{
repositoryService.createRepository(repositoryEntry);
-
+
//set original initializer to created workspace.
- RepositoryImpl defRep = (RepositoryImpl) repositoryService.getRepository(repositoryEntry.getName());
+ RepositoryImpl defRep = (RepositoryImpl)repositoryService.getRepository(repositoryEntry.getName());
WorkspaceContainerFacade wcf = defRep.getWorkspaceContainer(systemWorkspaceEntry.getName());
- WorkspaceEntry createdWorkspaceEntry = (WorkspaceEntry) wcf.getComponent(WorkspaceEntry.class);
+ WorkspaceEntry createdWorkspaceEntry = (WorkspaceEntry)wcf.getComponent(WorkspaceEntry.class);
createdWorkspaceEntry.setInitializer(wieOriginal);
-
+
// save configuration to persistence (file or persister)
- repositoryService.getConfig().retain();
-
- for (WorkspaceEntry wsEntry : originalWorkspaceEntrys)
- {
- if (!(wsEntry.getName().equals(repositoryEntry.getSystemWorkspaceName())))
- {
- currennWorkspaceName = wsEntry.getName();
- backupManager.restore(workspacesMapping.get(wsEntry.getName()), repositoryEntry.getName(), wsEntry, false);
- }
- }
+ repositoryService.getConfig().retain();
+ backupManager.restore(repositoryBackupChainLog, repositoryEntry, false);
+
+ // TODO
+ // for (WorkspaceEntry wsEntry : originalWorkspaceEntrys)
+ // {
+ // if (!(wsEntry.getName().equals(repositoryEntry.getSystemWorkspaceName())))
+ // {
+ // currennWorkspaceName = wsEntry.getName();
+ // backupManager.restore(workspacesMapping.get(wsEntry.getName()), repositoryEntry.getName(), wsEntry,
+ // false);
+ // }
+ // }
}
catch (InvalidItemStateException e)
{
restored = false;
- throw new RepositoryRestoreExeption("Workspace '" + "/" + repositoryEntry.getName() + "/" + currennWorkspaceName
- + "' can not be restored! There was database error!", e);
+ throw new RepositoryRestoreExeption("Workspace '" + "/" + repositoryEntry.getName() + "/"
+ + currennWorkspaceName + "' can not be restored! There was database error!", e);
}
catch (Throwable t)
{
restored = false;
- throw new RepositoryRestoreExeption("Workspace '" + "/" + repositoryEntry.getName() + "/" + currennWorkspaceName
- + "' can not be restored!", t);
+ throw new RepositoryRestoreExeption("Workspace '" + "/" + repositoryEntry.getName() + "/"
+ + currennWorkspaceName + "' can not be restored!", t);
}
finally
@@ -207,16 +216,16 @@
try
{
ManageableRepository mr = null;
-
- try
+
+ try
{
mr = repositoryService.getRepository(repositoryEntry.getName());
- }
+ }
catch (RepositoryException e)
{
// The repository not exist.
}
-
+
if (mr != null)
{
closeAllSession(mr);
@@ -226,13 +235,13 @@
}
catch (Throwable thr)
{
- throw new RepositoryRestoreExeption("Reprository '" + "/" + repositoryEntry.getName() +
- "' can not be restored!", thr);
+ throw new RepositoryRestoreExeption("Reprository '" + "/" + repositoryEntry.getName()
+ + "' can not be restored!", thr);
}
}
}
}
-
+
/**
* Close all open session in repository
*
@@ -247,7 +256,7 @@
if (!mr.canRemoveWorkspace(wsName))
{
WorkspaceContainerFacade wc = mr.getWorkspaceContainer(wsName);
- SessionRegistry sessionRegistry = (SessionRegistry) wc.getComponent(SessionRegistry.class);
+ SessionRegistry sessionRegistry = (SessionRegistry)wc.getComponent(SessionRegistry.class);
sessionRegistry.closeSessions(wsName);
}
}
@@ -258,7 +267,7 @@
*/
public void run()
{
-
+
try
{
stateRestore = REPOSITORY_RESTORE_STARTED;
@@ -287,7 +296,7 @@
{
return restoreException;
}
-
+
/**
* getStateRestore.
*
@@ -317,7 +326,7 @@
{
return endTime;
}
-
+
/**
* getRepositoryName.
*
@@ -328,4 +337,25 @@
{
return repositoryEntry.getName();
}
+
+ /**
+ * GetRepositoryBackupChainLog.
+ *
+ * @return repositoryBackupChainLog
+ */
+ public RepositoryBackupChainLog getRepositoryBackupChainLog()
+ {
+ return repositoryBackupChainLog;
+ }
+
+ /**
+ * getRepositoryEntry.
+ *
+ * @return repositoryBackupChainLog
+ */
+ public RepositoryEntry getRepositoryEntry()
+ {
+ return repositoryEntry;
+ }
+
}
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 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgent.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -40,6 +40,7 @@
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
+import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
@@ -50,6 +51,10 @@
import org.exoplatform.services.jcr.ext.backup.BackupConfigurationException;
import org.exoplatform.services.jcr.ext.backup.BackupManager;
import org.exoplatform.services.jcr.ext.backup.BackupOperationException;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChain;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChainLog;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupConfig;
+import org.exoplatform.services.jcr.ext.backup.impl.JobRepositoryRestore;
import org.exoplatform.services.jcr.ext.backup.impl.JobWorkspaceRestore;
import org.exoplatform.services.jcr.ext.backup.server.bean.BackupConfigBean;
import org.exoplatform.services.jcr.ext.backup.server.bean.response.BackupServiceInfoBean;
@@ -74,8 +79,7 @@
*/
@Path("/jcr-backup/")
-public class HTTPBackupAgent
- implements ResourceContainer
+public class HTTPBackupAgent implements ResourceContainer
{
/**
@@ -223,7 +227,7 @@
* the ThreadLocalSessionProviderService
*/
public HTTPBackupAgent(RepositoryService repoService, BackupManager backupManager,
- ThreadLocalSessionProviderService sessionProviderService)
+ ThreadLocalSessionProviderService sessionProviderService)
{
this.repositoryService = repoService;
this.backupManager = backupManager;
@@ -249,7 +253,7 @@
@RolesAllowed("administrators")
@Path("/start/{repo}/{ws}")
public Response start(BackupConfigBean bConfigBeen, @PathParam("repo") String repository,
- @PathParam("ws") String workspace)
+ @PathParam("ws") String workspace)
{
String failMessage;
Response.Status status;
@@ -331,10 +335,96 @@
log.error("Can not start backup", exception);
return Response.status(status).entity("Can not start backup : " + failMessage).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ .cacheControl(noCache).build();
}
/**
+ * The start repository backup.
+ *
+ * @param bConfigBeen
+ * BackupConfigBeen, the been with backup configuration.
+ * @param repository
+ * String, the repository name
+ * @return Response return the response
+ */
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @RolesAllowed("administrators")
+ @Path("/start/{repo}}")
+ public Response start(BackupConfigBean bConfigBeen, @PathParam("repo") String repository)
+ {
+ String failMessage;
+ Response.Status status;
+ Throwable exception;
+
+ try
+ {
+ File backupDir = new File(bConfigBeen.getBackupDir());
+ if (!backupDir.exists())
+ {
+ throw new BackupDirNotFoundException("The backup folder not exists : " + backupDir.getAbsolutePath());
+ }
+
+ RepositoryBackupConfig config = new RepositoryBackupConfig();
+ config.setBackupType(bConfigBeen.getBackupType());
+ config.setRepository(repository);
+ config.setBackupDir(backupDir);
+ config.setIncrementalJobPeriod(bConfigBeen.getIncrementalJobPeriod());
+ config.setIncrementalJobNumber(bConfigBeen.getIncrementalRepetitionNumber());
+
+ validateRepositoryName(repository);
+
+ RepositoryBackupChain chain = backupManager.startBackup(config);
+
+ ShortInfo shortInfo = new ShortInfo(ShortInfo.CURRENT, chain);
+
+ return Response.ok(shortInfo).cacheControl(noCache).build();
+ }
+ catch (LoginException e)
+ {
+ exception = e;
+ status = Response.Status.UNAUTHORIZED;
+ failMessage = e.getMessage();
+ }
+ catch (RepositoryException e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+ catch (RepositoryConfigurationException e)
+ {
+ exception = e;
+ status = Response.Status.NOT_FOUND;
+ failMessage = e.getMessage();
+ }
+ catch (BackupOperationException e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+ catch (BackupConfigurationException e)
+ {
+ exception = e;
+ status = Response.Status.NOT_FOUND;
+ failMessage = e.getMessage();
+ }
+ catch (Throwable e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+
+ log.error("Can not start backup", exception);
+
+ return Response.status(status).entity("Can not start backup : " + failMessage).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
+ }
+
+ /**
* The delete workspace.
*
* @param repository
@@ -349,7 +439,7 @@
@RolesAllowed("administrators")
@Path("/drop-workspace/{repo}/{ws}/{force-session-close}")
public Response dropWorkspace(@PathParam("repo") String repository, @PathParam("ws") String workspace,
- @PathParam("force-session-close") Boolean forceSessionClose)
+ @PathParam("force-session-close") Boolean forceSessionClose)
{
String failMessage;
@@ -364,7 +454,7 @@
if (forceSessionClose)
forceCloseSession(repository, workspace);
- RepositoryImpl repositoryImpl = (RepositoryImpl) repositoryService.getRepository(repository);
+ RepositoryImpl repositoryImpl = (RepositoryImpl)repositoryService.getRepository(repository);
repositoryImpl.removeWorkspace(workspace);
repositoryService.getConfig().retain(); // save configuration to persistence (file or persister)
@@ -393,8 +483,8 @@
log.error("Can not drop the workspace '" + "/" + repository + "/" + workspace + "'", exception);
return Response.status(status).entity(
- "Can not drop the workspace '" + "/" + repository + "/" + workspace + "' : " + failMessage).type(
- MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ "Can not drop the workspace '" + "/" + repository + "/" + workspace + "' : " + failMessage).type(
+ MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}
@@ -443,31 +533,34 @@
* Sleeping
* Restore must be initialized by job thread
*/
-
+
Thread.sleep(100);
-
+
/*
* search necessary restore
*/
List<JobWorkspaceRestore> restoreJobs = backupManager.getRestores();
JobWorkspaceRestore restore = null;
- for (JobWorkspaceRestore curRestore : restoreJobs) {
- if (curRestore.getRepositoryName().equals(repository) &&
- curRestore.getWorkspaceName().equals(wEntry.getName())) {
+ for (JobWorkspaceRestore curRestore : restoreJobs)
+ {
+ if (curRestore.getRepositoryName().equals(repository)
+ && curRestore.getWorkspaceName().equals(wEntry.getName()))
+ {
restore = curRestore;
break;
}
}
-
- if (restore != null) {
+
+ if (restore != null)
+ {
ShortInfo info =
- new ShortInfo(ShortInfo.RESTORE, restore.getBackupChainLog(), restore.getStartTime(), restore.getEndTime(),
- restore.getStateRestore(), restore.getRepositoryName(), restore.getWorkspaceName());
+ new ShortInfo(ShortInfo.RESTORE, restore.getBackupChainLog(), restore.getStartTime(), restore
+ .getEndTime(), restore.getStateRestore(), restore.getRepositoryName(), restore.getWorkspaceName());
return Response.ok(info).cacheControl(noCache).build();
}
-
- return Response.ok().cacheControl(noCache).build();
+
+ return Response.ok().cacheControl(noCache).build();
}
catch (WorkspaceRestoreExeption e)
{
@@ -501,15 +594,125 @@
}
log.error("Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
- + "' from backup log with id '" + backupId + "'", exception);
+ + "' from backup log with id '" + backupId + "'", exception);
return Response.status(status).entity(
- "Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
- + "' from backup log with id '" + backupId + "' : " + failMessage).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ "Can not start restore the workspace '" + "/" + repository + "/" + wEntry.getName()
+ + "' from backup log with id '" + backupId + "' : " + failMessage).type(MediaType.TEXT_PLAIN).cacheControl(
+ noCache).build();
}
/**
+ * Restore the repository.
+ *
+ * @param rEntry
+ * RepositoryEntry, the configuration to restored repository
+ * @param repository
+ * String, the repository name
+ * @param backupId
+ * String, the identifier of backup
+ * @return Response return the response
+ */
+ @POST
+ @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)
+ {
+ String failMessage;
+ Response.Status status;
+ Throwable exception;
+
+ try
+ {
+ validateOneRestoreInstants(repository);
+
+ File backupLog = getBackupLogbyId(backupId);
+
+ // validate backup log file
+ if (backupLog == null)
+ {
+ throw new BackupLogNotFoundException("The backup log file with id " + backupId + " not exists.");
+ }
+
+ validateRepositoryName(repository);
+
+ if (isRepositoryExist(repository))
+ {
+ throw new Exception("Repository " + rEntry.getName() + " already exist!");
+ }
+
+ RepositoryBackupChainLog backupChainLog = new RepositoryBackupChainLog(backupLog);
+
+ backupManager.restore(backupChainLog, rEntry, true);
+
+ // Sleeping. Restore should be initialized by job thread
+ Thread.sleep(100);
+
+ // search necessary restore
+ List<JobRepositoryRestore> restoreJobs = backupManager.getRepositoryRestores();
+ JobRepositoryRestore restore = null;
+ for (JobRepositoryRestore curRestore : restoreJobs)
+ {
+ if (curRestore.getRepositoryName().equals(repository))
+ {
+ restore = curRestore;
+ break;
+ }
+ }
+
+ if (restore != null)
+ {
+ ShortInfo info =
+ new ShortInfo(ShortInfo.RESTORE, restore.getRepositoryBackupChainLog(), restore.getStartTime(), restore
+ .getEndTime(), restore.getStateRestore(), restore.getRepositoryName());
+ return Response.ok(info).cacheControl(noCache).build();
+ }
+
+ return Response.ok().cacheControl(noCache).build();
+ }
+ catch (WorkspaceRestoreExeption e)
+ {
+ exception = e;
+ status = Response.Status.FORBIDDEN;
+ failMessage = e.getMessage();
+ }
+ catch (RepositoryException e)
+ {
+ exception = e;
+ status = Response.Status.NOT_FOUND;
+ failMessage = e.getMessage();
+ }
+ catch (RepositoryConfigurationException e)
+ {
+ exception = e;
+ status = Response.Status.NOT_FOUND;
+ failMessage = e.getMessage();
+ }
+ catch (BackupLogNotFoundException e)
+ {
+ exception = e;
+ status = Response.Status.NOT_FOUND;
+ failMessage = e.getMessage();
+ }
+ catch (Throwable e)
+ {
+ exception = e;
+ status = Response.Status.INTERNAL_SERVER_ERROR;
+ failMessage = e.getMessage();
+ }
+
+ log.error("Can not start restore the repository '" + "/" + repository + "' 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
+ + "' : " + failMessage).type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ }
+
+ /**
* The backup stop by 'id'.
*
* @param backupId
@@ -565,7 +768,7 @@
log.error("Can not stop backup", exception);
return Response.status(status).entity("Can not stop backup : " + failMessage).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ .cacheControl(noCache).build();
}
/**
@@ -582,9 +785,8 @@
try
{
BackupServiceInfoBean infoBeen =
- new BackupServiceInfoBean(backupManager.getFullBackupType(),
- backupManager.getIncrementalBackupType(), backupManager.getBackupDirectory()
- .getAbsolutePath(), backupManager.getDefaultIncrementalJobPeriod());
+ new BackupServiceInfoBean(backupManager.getFullBackupType(), backupManager.getIncrementalBackupType(),
+ backupManager.getBackupDirectory().getAbsolutePath(), backupManager.getDefaultIncrementalJobPeriod());
return Response.ok(infoBeen).cacheControl(noCache).build();
}
@@ -593,8 +795,8 @@
log.error("Can not get information about backup service", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about backup service : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ "Can not get information about backup service : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
}
}
@@ -629,8 +831,8 @@
log.error("Can not get information about current or completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about current or completed backups" + e.getMessage()).type(
- MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ "Can not get information about current or completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
}
}
@@ -670,15 +872,15 @@
}
return Response.status(Response.Status.NOT_FOUND).entity("No current or completed backup with 'id' " + id)
- .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}
catch (Throwable e)
{
log.error("Can not get information about current or completed backup with 'id' " + id, e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about current or completed backup with 'id' " + id + " : " + e.getMessage())
- .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ "Can not get information about current or completed backup with 'id' " + id + " : " + e.getMessage()).type(
+ MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}
}
@@ -709,8 +911,8 @@
log.error("Can not get information about current backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about current backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ "Can not get information about current backups" + e.getMessage()).type(MediaType.TEXT_PLAIN).cacheControl(
+ noCache).build();
}
}
@@ -742,8 +944,8 @@
log.error("Can not get information about completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ "Can not get information about completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
}
}
@@ -771,7 +973,7 @@
for (BackupChain chain : backupManager.getCurrentBackups())
{
if (repository.equals(chain.getBackupConfig().getRepository())
- && workspace.equals(chain.getBackupConfig().getWorkspace()))
+ && workspace.equals(chain.getBackupConfig().getWorkspace()))
{
list.add(new ShortInfo(ShortInfo.CURRENT, chain));
}
@@ -780,8 +982,8 @@
for (BackupChainLog chainLog : backupManager.getBackupsLogs())
{
if (backupManager.findBackup(chainLog.getBackupId()) == null
- && repository.equals(chainLog.getBackupConfig().getRepository())
- && workspace.equals(chainLog.getBackupConfig().getWorkspace()))
+ && repository.equals(chainLog.getBackupConfig().getRepository())
+ && workspace.equals(chainLog.getBackupConfig().getWorkspace()))
{
list.add(new ShortInfo(ShortInfo.COMPLETED, chainLog));
}
@@ -796,8 +998,8 @@
log.error("Can not get information about current or completed backups", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about current or completed backups" + e.getMessage()).type(
- MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ "Can not get information about current or completed backups" + e.getMessage()).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
}
}
@@ -824,37 +1026,84 @@
if (restoreJob != null)
{
DetailedInfoEx info =
- new DetailedInfoEx(DetailedInfo.RESTORE, restoreJob.getBackupChainLog(),
- restoreJob.getStartTime(), restoreJob.getEndTime(), restoreJob.getStateRestore(),
- restoreJob.getRepositoryName(), restoreJob.getWorkspaceName(),
+ new DetailedInfoEx(DetailedInfo.RESTORE, restoreJob.getBackupChainLog(), restoreJob.getStartTime(),
+ restoreJob.getEndTime(), restoreJob.getStateRestore(), restoreJob.getRepositoryName(), restoreJob
+ .getWorkspaceName(),
- restoreJob.getWorkspaceEntry(), restoreJob.getRestoreException() == null ? ""
- : restoreJob.getRestoreException().getMessage());
+ restoreJob.getWorkspaceEntry(), restoreJob.getRestoreException() == null ? "" : restoreJob
+ .getRestoreException().getMessage());
return Response.ok(info).cacheControl(noCache).build();
}
else
{
return Response.status(Response.Status.NOT_FOUND).entity(
- "No resrore for workspace /" + repository + "/" + workspace + "'").type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ "No resrore for workspace /" + repository + "/" + workspace + "'").type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
}
}
catch (Throwable e)
{
log.error(
- "Can not get information about current restore for workspace /" + repository + "/" + workspace + "'",
- e);
+ "Can not get information about current restore for workspace /" + repository + "/" + workspace + "'", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about current restore for workspace /" + repository + "/" + workspace
- + "' : " + e.getMessage()).type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ "Can not get information about current restore for workspace /" + repository + "/" + workspace + "' : "
+ + e.getMessage()).type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}
}
/**
+ * Will be returned the detailed information about last restore for specific repository.
+ *
+ * @param repository
+ * String, the repository name
+ *
+ * @return Response return the response
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ @RolesAllowed("administrators")
+ @Path("/info/restore/{repo}/{ws}")
+ public Response infoRestore(@PathParam("repo") String repository)
+ {
+ try
+ {
+ JobRepositoryRestore restoreJob = backupManager.getLastRepositoryRestore(repository);
+
+ if (restoreJob != null)
+ {
+ DetailedInfoEx info =
+ new DetailedInfoEx(DetailedInfo.RESTORE, restoreJob.getRepositoryBackupChainLog(), restoreJob
+ .getStartTime(), restoreJob.getEndTime(), restoreJob.getStateRestore(), restoreJob
+ .getRepositoryName(),
+
+ restoreJob.getRepositoryEntry(), restoreJob.getRestoreException() == null ? "" : restoreJob
+ .getRestoreException().getMessage());
+
+ return Response.ok(info).cacheControl(noCache).build();
+ }
+ else
+ {
+ return Response.status(Response.Status.NOT_FOUND).entity("No restore for repository /" + repository + "'")
+ .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ }
+
+ }
+ catch (Throwable e)
+ {
+ log.error("Can not get information about current restore for repository /" + repository + "'", e);
+
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
+ "Can not get information about current restore for repository /" + repository + "' : " + e.getMessage())
+ .type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ }
+
+ }
+
+ /**
* Will be returned the detailed information about last restores.
*
* @return Response return the response
@@ -878,7 +1127,7 @@
for (JobWorkspaceRestore unJob : jobs)
{
if (unJob.getRepositoryName().equals(job.getRepositoryName())
- && unJob.getWorkspaceName().equals(job.getWorkspaceName()))
+ && unJob.getWorkspaceName().equals(job.getWorkspaceName()))
isUnique = false;
}
@@ -891,8 +1140,8 @@
for (JobWorkspaceRestore job : jobs)
{
ShortInfo info =
- new ShortInfo(ShortInfo.RESTORE, job.getBackupChainLog(), job.getStartTime(), job.getEndTime(),
- job.getStateRestore(), job.getRepositoryName(), job.getWorkspaceName());
+ new ShortInfo(ShortInfo.RESTORE, job.getBackupChainLog(), job.getStartTime(), job.getEndTime(), job
+ .getStateRestore(), job.getRepositoryName(), job.getWorkspaceName());
list.add(info);
}
@@ -904,8 +1153,8 @@
log.error("Can not get information about current restores.", e);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get information about current restores : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
- .cacheControl(noCache).build();
+ "Can not get information about current restores : " + e.getMessage()).type(MediaType.TEXT_PLAIN)
+ .cacheControl(noCache).build();
}
}
@@ -923,20 +1172,19 @@
try
{
String defaultWorkspaceName =
- repositoryService.getDefaultRepository().getConfiguration().getDefaultWorkspaceName();
+ repositoryService.getDefaultRepository().getConfiguration().getDefaultWorkspaceName();
for (WorkspaceEntry wEntry : repositoryService.getDefaultRepository().getConfiguration().getWorkspaceEntries())
if (defaultWorkspaceName.equals(wEntry.getName()))
return Response.ok(wEntry).cacheControl(noCache).build();
return Response.status(Response.Status.NOT_FOUND).entity("Can not get default workspace configuration.").type(
- MediaType.TEXT_PLAIN).cacheControl(noCache).build();
+ MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}
catch (Throwable e)
{
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
- "Can not get default workspace configuration.").type(MediaType.TEXT_PLAIN).cacheControl(noCache)
- .build();
+ "Can not get default workspace configuration.").type(MediaType.TEXT_PLAIN).cacheControl(noCache).build();
}
}
@@ -951,7 +1199,7 @@
* will be generated the exception RepositoryException
*/
private void validateRepositoryName(String repositoryName) throws RepositoryException,
- RepositoryConfigurationException
+ RepositoryConfigurationException
{
repositoryService.getRepository(repositoryName);
}
@@ -973,16 +1221,16 @@
* will be generated the exception LoginException
*/
private void validateWorkspaceName(String repositoryName, String workspaceName) throws LoginException,
- NoSuchWorkspaceException, RepositoryException, RepositoryConfigurationException
+ NoSuchWorkspaceException, RepositoryException, RepositoryConfigurationException
{
Session ses =
- sessionProviderService.getSessionProvider(null).getSession(workspaceName,
- repositoryService.getRepository(repositoryName));
+ sessionProviderService.getSessionProvider(null).getSession(workspaceName,
+ repositoryService.getRepository(repositoryName));
ses.logout();
}
private boolean isWorkspaceExist(String repositoryName, String workspaceName) throws RepositoryException,
- RepositoryConfigurationException
+ RepositoryConfigurationException
{
for (String workspace : repositoryService.getRepository(repositoryName).getWorkspaceNames())
{
@@ -995,6 +1243,12 @@
return false;
}
+ private boolean isRepositoryExist(String repositoryName) throws RepositoryException,
+ RepositoryConfigurationException
+ {
+ return repositoryService.getRepository(repositoryName) != null;
+ }
+
/**
* validateOneBackupInstants.
*
@@ -1012,7 +1266,7 @@
if (bch != null)
throw new WorkspaceRestoreExeption("The backup is already working on workspace '" + "/" + repositoryName + "/"
- + workspaceName + "'");
+ + workspaceName + "'");
}
/**
@@ -1030,15 +1284,34 @@
for (JobWorkspaceRestore job : backupManager.getRestores())
if (repositoryName.equals(job.getRepositoryName())
- && workspaceName.endsWith(job.getWorkspaceName())
- && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
+ && workspaceName.endsWith(job.getWorkspaceName())
+ && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
{
throw new WorkspaceRestoreExeption("The workspace '" + "/" + repositoryName + "/" + workspaceName
- + "' is already restoring.");
+ + "' is already restoring.");
}
}
/**
+ * validateOneRestoreInstants.
+ *
+ * @param repositoryName
+ * the repository name
+ * @throws WorkspaceRestoreExeption
+ * will be generated WorkspaceRestoreExeption
+ */
+ private void validateOneRestoreInstants(String repositoryName) throws WorkspaceRestoreExeption
+ {
+
+ for (JobWorkspaceRestore job : backupManager.getRestores())
+ if (repositoryName.equals(job.getRepositoryName())
+ && (job.getStateRestore() == JobWorkspaceRestore.RESTORE_INITIALIZED || job.getStateRestore() == JobWorkspaceRestore.RESTORE_STARTED))
+ {
+ throw new WorkspaceRestoreExeption("The workspace '" + "/" + repositoryName + "' is already restoring.");
+ }
+ }
+
+ /**
* forceCloseSession. Close sessions on specific workspace.
*
* @param repositoryName
@@ -1052,12 +1325,12 @@
* will be generate RepositoryException
*/
private int forceCloseSession(String repositoryName, String workspaceName) throws RepositoryException,
- RepositoryConfigurationException
+ RepositoryConfigurationException
{
ManageableRepository mr = repositoryService.getRepository(repositoryName);
WorkspaceContainerFacade wc = mr.getWorkspaceContainer(workspaceName);
- SessionRegistry sessionRegistry = (SessionRegistry) wc.getComponent(SessionRegistry.class);
+ SessionRegistry sessionRegistry = (SessionRegistry)wc.getComponent(SessionRegistry.class);
return sessionRegistry.closeSessions(workspaceName);
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/BackupConfigBean.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/BackupConfigBean.java 2010-03-25 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/BackupConfigBean.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -19,6 +19,7 @@
package org.exoplatform.services.jcr.ext.backup.server.bean;
import org.exoplatform.services.jcr.ext.backup.BackupConfig;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupConfig;
import org.exoplatform.services.jcr.ext.backup.server.bean.response.BackupJobConfig;
/**
@@ -135,6 +136,18 @@
}
/**
+ * BackupConfigBeen constructor.
+ *
+ * @param config
+ * the backup config
+ */
+ public BackupConfigBean(RepositoryBackupConfig config)
+ {
+ this(config.getBackupType(), config.getBackupDir().getAbsolutePath(), config.getIncrementalJobPeriod());
+ this.incrementalRepetitionNumber = config.getIncrementalJobNumber();
+ }
+
+ /**
* getIncrementalJobPeriod.
*
* @return Long return the incremental job period
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfo.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfo.java 2010-03-25 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfo.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -20,6 +20,7 @@
import org.exoplatform.services.jcr.ext.backup.BackupChain;
import org.exoplatform.services.jcr.ext.backup.BackupChainLog;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChainLog;
import org.exoplatform.services.jcr.ext.backup.server.bean.BackupConfigBean;
import java.util.Calendar;
@@ -127,6 +128,33 @@
}
/**
+ * DetailedInfo constructor.
+ *
+ * For restore.
+ *
+ * @param type
+ * int, the type of DetailedInfo
+ * @param chainLog
+ * RepositoryBackupChainLog, chain log for restore
+ * @param startedTime
+ * Calendar, the started time of restore
+ * @param finishedTime
+ * Calendar, the finished time of restore
+ * @param state
+ * int, the state of restore
+ * @param repositroryName
+ * String, the repository name
+ * @param workspaceName
+ * String, the workspace name
+ */
+ public DetailedInfo(int type, RepositoryBackupChainLog chainLog, Calendar startedTime, Calendar finishedTime,
+ int state, String repositroryName)
+ {
+ super(type, chainLog, startedTime, finishedTime, state, repositroryName);
+ this.backupConfig = new BackupConfigBean(chainLog.getBackupConfig());
+ }
+
+ /**
* getBackupConfig.
*
* @return BackupConfigBean return the bean to backup config
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfoEx.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfoEx.java 2010-03-25 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/DetailedInfoEx.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -18,8 +18,10 @@
*/
package org.exoplatform.services.jcr.ext.backup.server.bean.response;
+import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.ext.backup.BackupChainLog;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChainLog;
import java.util.Calendar;
@@ -35,6 +37,8 @@
protected WorkspaceEntry workspaceEntry;
+ protected RepositoryEntry repositoryEntry;
+
protected String failMessage;
public DetailedInfoEx(int type, BackupChainLog chainLog, Calendar startedTime, Calendar finishedTime, int state,
@@ -46,6 +50,15 @@
this.failMessage = failMessage;
}
+ public DetailedInfoEx(int type, RepositoryBackupChainLog chainLog, Calendar startedTime, Calendar finishedTime,
+ int state, String repositroryName, RepositoryEntry repositoryEntry, String failMessage)
+ {
+ super(type, chainLog, startedTime, finishedTime, state, repositroryName);
+
+ this.repositoryEntry = repositoryEntry;
+ this.failMessage = failMessage;
+ }
+
public String getFailMessage()
{
return failMessage;
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/ShortInfo.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/ShortInfo.java 2010-03-25 11:28:12 UTC (rev 2118)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/server/bean/response/ShortInfo.java 2010-03-25 11:52:37 UTC (rev 2119)
@@ -20,6 +20,8 @@
import org.exoplatform.services.jcr.ext.backup.BackupChain;
import org.exoplatform.services.jcr.ext.backup.BackupChainLog;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChain;
+import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChainLog;
import org.exoplatform.services.jcr.ext.backup.server.HTTPBackupAgent;
import java.text.DateFormat;
@@ -132,6 +134,30 @@
*
* @param type
* int, the tupe of short info
+ * @param chain
+ * RepositoryBackupChain, the backup chain for current backup.
+ */
+ public ShortInfo(int type, RepositoryBackupChain chain)
+ {
+ this.type = type;
+ this.backupType = chain.getBackupConfig().getBackupType();
+ this.backupId = chain.getBackupId();
+ this.repositoryName = chain.getBackupConfig().getRepository();
+ this.state = chain.getState();
+
+ DateFormat df = new SimpleDateFormat(HTTPBackupAgent.Constants.DATE_FORMAT_RFC_1123);
+ this.startedTime = df.format(chain.getStartedTime().getTime());
+
+ // no applicable
+ this.finishedTime = "";
+ this.workspaceName = "";
+ }
+
+ /**
+ * ShortInfo constructor.
+ *
+ * @param type
+ * int, the tupe of short info
* @param chainLog
* BackupChainLog, the backup chain log for completed backup.
*/
@@ -190,6 +216,40 @@
* ShortInfo constructor.
*
* For restore.
+ *
+ * @param type
+ * int, the type of short info
+ * @param chainLog
+ * RepositoryBackupChainLog, the backup chain log for completed backup.
+ * @param startedTime
+ * Calendar, the stated time
+ * @param finishedTime
+ * Calendar, the finished time
+ * @param state
+ * int, the state of restore
+ */
+ public ShortInfo(int type, RepositoryBackupChainLog chainLog, Calendar startedTime, Calendar finishedTime, int state)
+ {
+ this.type = type;
+ this.backupType = chainLog.getBackupConfig().getBackupType();
+ this.backupId = chainLog.getBackupId();
+ this.repositoryName = chainLog.getBackupConfig().getRepository();
+
+ this.state = state;
+
+ DateFormat df = new SimpleDateFormat(HTTPBackupAgent.Constants.DATE_FORMAT_RFC_1123);
+ this.startedTime = df.format(startedTime.getTime());
+
+ if (finishedTime != null)
+ this.finishedTime = df.format(finishedTime.getTime());
+ else
+ this.finishedTime = "";
+ }
+
+ /**
+ * ShortInfo constructor.
+ *
+ * For restore.
*
* @param type
* int, the tupe of short info
@@ -215,6 +275,34 @@
}
/**
+ * ShortInfo constructor.
+ *
+ * For restore.
+ *
+ * @param type
+ * int, the tupe of short info
+ * @param chainLog
+ * BackupChainLog, the backup chain log for completed backup.
+ * @param startedTime
+ * Calendar, the stated time
+ * @param finishedTime
+ * Calendar, the finished time
+ * @param state
+ * int, the state of restore
+ * @param repositroryName
+ * String, the repository name
+ */
+ public ShortInfo(int type, RepositoryBackupChainLog chainLog, Calendar startedTime, Calendar finishedTime,
+ int state, String repositroryName)
+ {
+ this(type, chainLog, startedTime, finishedTime, state);
+ this.repositoryName = repositroryName;
+
+ // no applicable
+ this.workspaceName = "";
+ }
+
+ /**
* getState.
*
* @return Integer the state of backup or restore
16 years, 1 month
- 1
- 0
exo-jcr SVN: r2118 - jcr/trunk.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-03-25 07:28:12 -0400 (Thu, 25 Mar 2010)
New Revision: 2118
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-523 deps on jbosscache 3.2.3.CR1
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-03-25 11:12:26 UTC (rev 2117)
+++ jcr/trunk/pom.xml 2010-03-25 11:28:12 UTC (rev 2118)
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.0.GA</version>
+ <version>3.2.3.CR1</version>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
16 years, 1 month
- 1
- 0