Author: andrew.plotnikov Date: 2012-01-18 08:30:06 -0500 (Wed, 18 Jan 2012) New Revision: 5480 Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBBackup.java jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/name/TestPath.java jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupManager.java jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java jcr/branches/1.15.x/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/DisplayJCRContentServlet.java Log: EXOJCR-1723: Removed deprecated methods and classes Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -76,7 +76,6 @@ * * @param workspaceName - name of workspace * @param listener Item persistence listener - * @deprecated */ void addItemPersistenceListener(String workspaceName, ItemsPersistenceListener listener); Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/datamodel/QPath.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -400,33 +400,6 @@ } /** - * Makes child path from existed path and child name. Assumed that parent path belongs to node so - * it should have some index. If not sets index=1 automatically. - * - * @param parent - * path - * @param name - * child name - * @return new InternalQPath - */ - @Deprecated - public static QPath makeChildPath(QPath parent, String name) throws IllegalPathException - { - - QPathEntry[] parentEntries = parent.getEntries(); - QPathEntry[] names = new QPathEntry[parentEntries.length + 1]; - int index = 0; - for (QPathEntry pname : parentEntries) - { - names[index++] = pname; - } - - names[index] = parseEntry(name); - QPath path = new QPath(names); - return path; - } - - /** * Make child path using JCR internal QName and index 1. <br/> * * @param parent Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBBackup.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBBackup.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/backup/rdbms/DBBackup.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -55,13 +55,11 @@ /** * Suffix for content file. */ - @Deprecated public static final String CONTENT_FILE_SUFFIX = ".dump"; /** * Suffix for content length file. */ - @Deprecated public static final String CONTENT_LEN_FILE_SUFFIX = ".len"; /** Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -16,17 +16,17 @@ */ package org.exoplatform.services.jcr.impl.core.query; -import java.util.Date; - -import javax.jcr.RepositoryException; - import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.Constants; +import java.util.Date; +import javax.jcr.RepositoryException; + + /** * Implements a query node that defines property value relation. */ @@ -152,6 +152,7 @@ { return relPath == null ? null : relPath.getName(); } + /** * Sets a new property name for this relation query node. * Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/name/TestPath.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/name/TestPath.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/name/TestPath.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -90,11 +90,10 @@ public void testMakeQPath() throws Exception { QPath root = QPath.parse(Constants.ROOT_URI); - QPath path = QPath.makeChildPath(root, "[http://www.exoplatform.com/jcr/exo/1.0]test"); + QPath path = QPath.makeChildPath(root, InternalQName.parse("[http://www.exoplatform.com/jcr/exo/1.0]test&qu...); assertEquals(1, path.getIndex()); assertEquals("test", path.getName().getName()); assertTrue(path.isDescendantOf(root, true)); assertEquals(root, path.makeParentPath()); } - } Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupManager.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupManager.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupManager.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -181,29 +181,6 @@ * String, repository name * @param workspaceEntry * WorkspaceEntry, the workspace entry - * @throws BackupOperationException - * will be generate the exception BackupOperationException - * @throws BackupConfigurationException - * will be generate the exception BackupConfigurationException - * @throws RepositoryException - * will be generate the exception RepositoryException - * @throws RepositoryConfigurationException - * will be generate the exception RepositoryConfigurationException - */ - @Deprecated - void restore(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry) - throws BackupOperationException, BackupConfigurationException, RepositoryException, - RepositoryConfigurationException; - - /** - * Restore from backup. - * - * @param log - * BackupChainLog, the backup log - * @param repositoryName - * String, repository name - * @param workspaceEntry - * WorkspaceEntry, the workspace entry * @param asynchronous * boolean, in 'true' then asynchronous restore. * @throws BackupOperationException Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -19,10 +19,10 @@ package org.exoplatform.services.jcr.ext.backup.impl; import org.apache.commons.collections.map.HashedMap; +import org.exoplatform.commons.utils.ClassLoading; import org.exoplatform.commons.utils.PrivilegedFileHelper; import org.exoplatform.commons.utils.PrivilegedSystemHelper; import org.exoplatform.commons.utils.SecurityHelper; -import org.exoplatform.commons.utils.ClassLoading; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.PropertiesParam; @@ -643,68 +643,6 @@ return false; } - /** - * {@inheritDoc} - */ - @Deprecated - public void restore(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry) - throws BackupOperationException, RepositoryException, RepositoryConfigurationException, - BackupConfigurationException - { - List<JobEntryInfo> list = log.getJobEntryInfos(); - BackupConfig config = log.getBackupConfig(); - - String reposytoryName = (repositoryName == null ? config.getRepository() : repositoryName); - String workspaceName = workspaceEntry.getName(); - - // ws should be registered not created - if (!workspaceAlreadyExist(reposytoryName, workspaceName)) - { - - for (int i = 0; i < list.size(); i++) - { - if (i == 0) - { - try - { - fullRestore(list.get(i).getURL().getPath(), reposytoryName, workspaceName, workspaceEntry); - } - catch (FileNotFoundException e) - { - throw new BackupOperationException("Restore of full backup file error " + e, e); - } - catch (IOException e) - { - throw new BackupOperationException("Restore of full backup file I/O error " + e, e); - } - } - else - { - try - { - incrementalRestore(list.get(i).getURL().getPath(), reposytoryName, workspaceName); - } - catch (FileNotFoundException e) - { - throw new BackupOperationException("Restore of incremental backup file error " + e, e); - } - catch (IOException e) - { - throw new BackupOperationException("Restore of incremental backup file I/O error " + e, e); - } - catch (ClassNotFoundException e) - { - throw new BackupOperationException("Restore of incremental backup error " + e, e); - } - } - } - } - else - { - throw new BackupConfigurationException("Workspace should exists " + workspaceName); - } - } - protected void restoreOverInitializer(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry) throws BackupOperationException, RepositoryException, RepositoryConfigurationException, BackupConfigurationException Modified: jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.framework.command/src/main/java/org/exoplatform/frameworks/jcr/cli/CliAppContext.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -23,7 +23,6 @@ import java.util.List; -import javax.jcr.Credentials; import javax.jcr.Item; import javax.naming.NamingException; @@ -49,13 +48,6 @@ this.parametersKey = parametersKey; } - @Deprecated - public CliAppContext(ManageableRepository rep, String parametersKey, Credentials cred) throws NamingException - { - super(rep); - this.parametersKey = parametersKey; - } - public String getUserName() { try Modified: jcr/branches/1.15.x/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/DisplayJCRContentServlet.java =================================================================== --- jcr/branches/1.15.x/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/DisplayJCRContentServlet.java 2012-01-18 12:16:35 UTC (rev 5479) +++ jcr/branches/1.15.x/exo.jcr.framework.web/src/main/java/org/exoplatform/frameworks/jcr/web/DisplayJCRContentServlet.java 2012-01-18 13:30:06 UTC (rev 5480) @@ -43,7 +43,6 @@ * @author <a href="mailto:gennady.azarenkov@exoplatform.com">Gennady Azarenkov</a> * @version $Id: DisplayJCRContentServlet.java 14756 2008-05-26 14:47:15Z pnedonosko $ */ -@Deprecated public class DisplayJCRContentServlet extends HttpServlet {