Author: nfilotto Date: 2010-05-10 06:32:56 -0400 (Mon, 10 May 2010) New Revision: 2356 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java Log: EXOJCR-714: The methods initContainer, startContainer, stopContainer and destroyContainer are now deprecated since they must not be explicitly called because they are part of the container lifecycle. The method start(boolean init) has been added to allow to start and initialize if needed the container Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-05-06 17:32:20 UTC (rev 2355) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-05-10 10:32:56 UTC (rev 2356) @@ -407,23 +407,6 @@ } /** - * {@inheritDoc} - */ - @Override - public void stop() - { - try - { - stopContainer(); - } - catch (Exception e) - { - log.error(e.getLocalizedMessage(), e); - } - super.stop(); - } - - /** * Initialize worspaces (root node and jcr:system for system workspace). * <p> * Runs on container start. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-05-06 17:32:20 UTC (rev 2355) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-05-10 10:32:56 UTC (rev 2356) @@ -234,7 +234,6 @@ } repconfig.getWorkspaceEntries().clear(); RepositoryContainer repositoryContainer = repositoryContainers.get(name); - repositoryContainer.stopContainer(); repositoryContainer.stop(); repositoryContainers.remove(name); config.getRepositoryConfigurations().remove(repconfig); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java 2010-05-06 17:32:20 UTC (rev 2355) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/WorkspaceContainer.java 2010-05-10 10:32:56 UTC (rev 2356) @@ -83,22 +83,4 @@ return (WorkspaceInitializer)getComponentInstanceOfType(WorkspaceInitializer.class); } - /* - * (non-Javadoc) - * @see org.picocontainer.defaults.DefaultPicoContainer#stop() - */ - @Override - public void stop() - { - try - { - stopContainer(); - } - catch (Exception e) - { - log.error(e.getLocalizedMessage(), e); - } - super.stop(); - } - } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2010-05-06 17:32:20 UTC (rev 2355) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2010-05-10 10:32:56 UTC (rev 2356) @@ -422,7 +422,6 @@ workspaceContainer = repositoryContainer.getWorkspaceContainer(workspaceName); try { - workspaceContainer.stopContainer(); workspaceContainer.stop(); } catch (Exception e)