[gatein-commits] gatein SVN: r905 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/registry/mop and 17 other directories.

Author: julien_viet Date: 2009-12-02 06:42:19 -0500 (Wed, 02 Dec 2009) New Revision: 905 Added: portal/trunk/component/common/src/main/java/conf/ portal/trunk/component/common/src/main/java/conf/portal/ portal/trunk/component/common/src/main/java/conf/portal/configuration.xml portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/GlobalContext.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LifeCycleContext.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/PortalSessionLifeCycle.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SessionContext.java portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java portal/trunk/component/common/src/test/resources/conf/ portal/trunk/component/common/src/test/resources/conf/portal/ portal/trunk/component/common/src/test/resources/conf/portal/jcr-configuration.xml portal/trunk/component/common/src/test/resources/conf/portal/repository-configuration.xml portal/trunk/component/common/src/test/resources/conf/portal/test-configuration.xml portal/trunk/component/common/src/test/resources/conf/portal/test-nodetypes.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java Removed: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalSessionLifeCycle.java Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java portal/trunk/component/common/pom.xml portal/trunk/component/portal/pom.xml portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalMOPService.java portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/MOPSessionLifeCycle.java Log: GTNPORTAL-336 : Chromattic session manager Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/mop/MOPApplicationRegistryService.java 2009-12-02 11:42:19 UTC (rev 905) @@ -657,7 +657,7 @@ { if (plugins != null) { - pomMGr.openSession(); + POMSession session = pomMGr.openSession(); boolean save = false; try { @@ -674,7 +674,7 @@ } finally { - pomMGr.closeSession(save); + session.close(save); } } } Modified: portal/trunk/component/common/pom.xml =================================================================== --- portal/trunk/component/common/pom.xml 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/common/pom.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -41,10 +41,42 @@ <version>${org.exoplatform.core.version}</version> </dependency> <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${version.chromattic}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>test</scope> + </dependency> </dependencies> </project> Added: portal/trunk/component/common/src/main/java/conf/portal/configuration.xml =================================================================== --- portal/trunk/component/common/src/main/java/conf/portal/configuration.xml (rev 0) +++ portal/trunk/component/common/src/main/java/conf/portal/configuration.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.commons.chromattic.ChromatticManager</key> + <type>org.exoplatform.commons.chromattic.ChromatticManager</type> + </component> +</configuration> Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.chromattic.api.ChromatticSession; + +import java.util.HashMap; +import java.util.Map; + +/** + * An abstract implementation of the {@link org.exoplatform.commons.chromattic.SessionContext} interface. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class AbstractContext implements SessionContext +{ + + /** . */ + ChromatticSession session; + + /** . */ + private Map<String, Object> attributes; + + /** The related configurator. */ + private final ChromatticLifeCycle configurator; + + public AbstractContext(ChromatticLifeCycle configurator) + { + this.configurator = configurator; + this.session = null; + } + + public final ChromatticSession getSession() + { + if (session == null) + { + session = configurator.realChromattic.openSession(); + } + return session; + } + + public final Object getAttachment(String name) + { + if (attributes != null) + { + return attributes.get(name); + } + return null; + } + + public final void setAttachment(String name, Object attribute) + { + if (attribute != null) + { + if (attributes == null) + { + attributes = new HashMap<String, Object>(); + } + attributes.put(name, attribute); + } + else if (attributes != null) + { + attributes.remove(name); + } + } + + public void close(boolean save) + { + if (session != null) + { + if (save) + { + session.save(); + } + + // + session.close(); + } + + // + configurator.currentContext.set(null); + + // + configurator.onCloseSession(this); + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.chromattic.api.Chromattic; +import org.chromattic.api.ChromatticSession; +import org.chromattic.api.SessionTask; + +import javax.jcr.Credentials; + +/** + * <p>A specific implementation of the {@link org.chromattic.api.Chromattic} interface that delegates + * the obtention of a session to the managed system.</p> + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ChromatticImpl implements Chromattic +{ + + /** . */ + private final ChromatticLifeCycle configurator; + + public ChromatticImpl(ChromatticLifeCycle configurator) + { + this.configurator = configurator; + } + + public ChromatticSession openSession() + { + SessionContext sessionContext = configurator.getSessionContext(); + + // + if (sessionContext == null) + { + sessionContext = configurator.openGlobalContext(); + } + + // + return sessionContext.getSession(); + } + + public ChromatticSession openSession(String workspace) + { + throw new UnsupportedOperationException(); + } + + public ChromatticSession openSession(Credentials credentials, String workspace) + { + throw new UnsupportedOperationException(); + } + + public ChromatticSession openSession(Credentials credentials) + { + throw new UnsupportedOperationException(); + } + + public void execute(SessionTask task) throws Throwable + { + throw new UnsupportedOperationException(); + } + + public void stop() + { + throw new UnsupportedOperationException(); + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.chromattic.api.Chromattic; +import org.chromattic.api.ChromatticBuilder; +import org.exoplatform.container.component.BaseComponentPlugin; +import org.exoplatform.container.xml.InitParams; + +import java.util.List; + +/** + * <p>The chromattic life cycle objets is a plugin that allow to bootstrap a chromattic builder and make + * it managed either locally or globally.</p> + * + * <p>It is allowed to create subclasses of this class to override the methods {@link #onOpenSession(SessionContext)} + * or {@link #onCloseSession(SessionContext)} to perform additional treatment on the session context at a precise + * phase of its life cycle.</p> + * + * <p>The life cycle name uniquely identifies the chromattic domain among all domain registered against the + * {@link org.exoplatform.commons.chromattic.ChromatticManager} manager.</p> + * + * <p>The plugin takes an instance of {@link org.exoplatform.container.xml.InitParams} as parameter that contains + * the following entries: + * + * <ul> + * <li>The <code>name</code> string that is the life cycle name</li> + * <li>The <code>workspace-name</code> string that is the repository workspace name associated with this life cycle</li> + * <li>The <code>entities</code> list value that contains the list of chromattic entities that will be registered + * against the builder chromattic builder</li> + * </ul> + * </p> + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ChromatticLifeCycle extends BaseComponentPlugin +{ + + /** . */ + private final String name; + + /** . */ + private final String workspaceName; + + /** . */ + Chromattic realChromattic; + + /** . */ + private ChromatticImpl chromattic; + + /** . */ + ChromatticManager manager; + + /** . */ + private final List<String> entityClassNames; + + /** . */ + final ThreadLocal<LocalContext> currentContext = new ThreadLocal<LocalContext>(); + + public ChromatticLifeCycle(InitParams params) + { + this.name = params.getValueParam("name").getValue(); + this.workspaceName = params.getValueParam("workspace-name").getValue(); + this.entityClassNames = params.getValuesParam("entities").getValues(); + } + + public final String getName() + { + return name; + } + + public final String getWorkspaceName() + { + return workspaceName; + } + + public final Chromattic getChromattic() + { + return chromattic; + } + + public final ChromatticManager getManager() + { + return manager; + } + + public final SessionContext getSessionContext() + { + Synchronization sync = manager.getSynchronization(); + + // + if (sync != null) + { + return sync.getContext(name); + } + + // + return currentContext.get(); + } + + LoginContext getLoginContext() + { + Synchronization sync = manager.getSynchronization(); + + // + if (sync != null) + { + return sync; + } + + // + return currentContext.get(); + } + + final SessionContext openGlobalContext() + { + AbstractContext context = (AbstractContext)getSessionContext(); + + // + if (context != null) + { + throw new IllegalStateException("A session is already opened."); + } + + // + Synchronization sync = manager.getSynchronization(); + + // + if (sync == null) + { + throw new IllegalStateException("Need global synchronization"); + } + + // + return sync.openContext(this); + } + + /** + * Opens a context and returns it. If there is a global ongoing synchronization then the context will be + * scoped to that synchronization, otherwise it will be a local context. + * + * @return the session context + */ + public final SessionContext openContext() + { + AbstractContext context = (AbstractContext)getSessionContext(); + + // + if (context != null) + { + throw new IllegalStateException("A session is already opened."); + } + + // + Synchronization sync = manager.getSynchronization(); + + // + if (sync != null) + { + context = sync.openContext(this); + } + else + { + LocalContext localContext = new LocalContext(this); + currentContext.set(localContext); + onOpenSession(localContext); + context = localContext; + } + + // + return context; + } + + public final void closeContext(SessionContext context, boolean save) + { + AbstractContext abstractContext = (AbstractContext)context; + + // + ((AbstractContext)context).close(save); + } + + protected void onOpenSession(SessionContext context) + { + } + + protected void onCloseSession(SessionContext context) + { + } + + public final void start() throws Exception + { + ChromatticBuilder builder = ChromatticBuilder.create(); + + // + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + for (String className : entityClassNames) + { + Class<?> entityClass = cl.loadClass(className); + builder.add(entityClass); + } + + // Set up boot context + LifeCycleContext.bootContext.set(new LifeCycleContext(this, manager, workspaceName)); + + // + try + { + // Set it now, so we are sure that it will be the correct life cycle + builder.setOption(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortalSessionLifeCycle.class.getName()); + + // + realChromattic = builder.build(); + chromattic = new ChromatticImpl(this); + } + catch (Exception e) + { + e.printStackTrace(); + } + finally + { + LifeCycleContext.bootContext.set(null); + } + } + + public final void stop() + { + // Nothing to do for now + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticManager.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.exoplatform.container.component.ComponentPlugin; +import org.exoplatform.services.jcr.RepositoryService; + +import java.util.HashMap; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ChromatticManager +{ + + /** . */ + final RepositoryService repositoryService; + + /** . */ + Map<String, String> lifeCycleToWorkspaceMap; + + /** . */ + Map<String, ChromatticLifeCycle> lifeCycles = new HashMap<String, ChromatticLifeCycle>(); + + /** . */ + private static final ThreadLocal<Synchronization> currentSynchronization = new ThreadLocal<Synchronization>(); + + public ChromatticManager(RepositoryService repositoryService) throws Exception { + this.repositoryService = repositoryService; + this.lifeCycleToWorkspaceMap = new HashMap<String, String>(); + } + + static Synchronization getCurrentSynchronization() { + return currentSynchronization.get(); + } + + public ChromatticLifeCycle getConfigurator(String configuratorKey) + { + return lifeCycles.get(configuratorKey); + } + + public void addLifeCycle(ComponentPlugin plugin) + { + ChromatticLifeCycle lifeCycle = (ChromatticLifeCycle)plugin; + try + { + lifeCycle.manager = this; + lifeCycle.start(); + lifeCycles.put(lifeCycle.getName(), lifeCycle); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + public Synchronization getSynchronization() + { + return currentSynchronization.get(); + } + + /** + * Begins the demarcation of a request and associates the current thread of execution with + * a context that will provides access to the correct persistence context. + * + * @throws IllegalStateException if a request is already associated with this thread + */ + public void beginRequest() throws IllegalStateException + { + if (currentSynchronization.get() != null) + { + throw new IllegalStateException("Request already started"); + } + + // + Synchronization sync = new Synchronization(); + + // + currentSynchronization.set(sync); + } + + /** + * Ends the demarcation of a request. + * + * @param save if state must be saved + * @throws IllegalStateException if no request was started previously + */ + public void endRequest(boolean save) throws IllegalStateException + { + Synchronization sync = currentSynchronization.get(); + + // We set null now so it will be properly closed in the PortalSessionLifeCycle logout method + currentSynchronization.set(null); + + // + if (sync == null) + { + throw new IllegalStateException("Request not started"); + } + + // Properly close everything + sync.close(save); + + // + currentSynchronization.set(null); + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/GlobalContext.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/GlobalContext.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/GlobalContext.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +/** + * The global context is associated with a {@link org.exoplatform.commons.chromattic.Synchronization} object. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class GlobalContext extends AbstractContext +{ + + /** The related global synchronization when it is not null. */ + final Synchronization synchronization; + + public GlobalContext(ChromatticLifeCycle configurator, Synchronization synchronization) + { + super(configurator); + + // + this.synchronization = synchronization; + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LifeCycleContext.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LifeCycleContext.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LifeCycleContext.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.exoplatform.services.jcr.core.ManageableRepository; + +import javax.jcr.RepositoryException; +import javax.jcr.Session; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class LifeCycleContext +{ + + /** . */ + static final ThreadLocal<LifeCycleContext> bootContext = new ThreadLocal<LifeCycleContext>(); + + /** . */ + private final String workspaceName; + + /** . */ + private final ChromatticManager manager; + + /** . */ + private final ChromatticLifeCycle configurator; + + public LifeCycleContext(ChromatticLifeCycle configurator, ChromatticManager manager, String repositoryName) + { + this.configurator = configurator; + this.manager = manager; + this.workspaceName = repositoryName; + } + + public Session doLogin() throws RepositoryException + { + LoginContext loginContext = configurator.getLoginContext(); + + // + if (loginContext == null) + { + throw new IllegalStateException(); + } + + // + ManageableRepository repo = manager.repositoryService.getCurrentRepository(); + + // + Session session = repo.getSystemSession(workspaceName); + + // + loginContext.loggedIn(session); + + // + return session; + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import javax.jcr.Session; + +/** + * A local context that is managed by a thread local owned by a chromattic life cycle instance. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class LocalContext extends AbstractContext implements LoginContext +{ + + /** The related JCR session. */ + Session jcrSession; + + public LocalContext(ChromatticLifeCycle configurator) + { + super(configurator); + } + + public void loggedIn(Session session) + { + this.jcrSession = session; + } + + @Override + public void close(boolean save) + { + try + { + super.close(save); + } + finally + { + jcrSession.logout(); + } + } +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import javax.jcr.Session; + +/** + * Allows the implementor to be aware of external session life cycle management. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface LoginContext +{ + + void loggedIn(Session session); + + void close(boolean save); + +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/PortalSessionLifeCycle.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/PortalSessionLifeCycle.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/PortalSessionLifeCycle.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.commons.chromattic; + +import org.chromattic.spi.jcr.SessionLifeCycle; + +import javax.jcr.Credentials; +import javax.jcr.RepositoryException; +import javax.jcr.Session; + +/** + * The implementation of the {@link org.chromattic.spi.jcr.SessionLifeCycle} chromattic interface that + * delegates all the job to a {@link org.exoplatform.commons.chromattic.LifeCycleContext} interface + * that is obtained at build time. The life cycle context is obtained by invoking the <code>get</code> method + * on the {@link org.exoplatform.commons.chromattic.LifeCycleContext#bootContext} thread local. That + * thread local is setup by the {@link org.exoplatform.commons.chromattic.ChromatticLifeCycle} object + * around the invocation of the {@link org.chromattic.api.ChromatticBuilder#build()} method. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class PortalSessionLifeCycle implements SessionLifeCycle +{ + /** . */ + LifeCycleContext context = LifeCycleContext.bootContext.get(); + + public final Session login() throws RepositoryException + { + return context.doLogin(); + } + + public void save(Session session) throws RepositoryException + { + session.save(); + } + + public void close(Session session) + { + } + + public final Session login(Credentials credentials) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public final Session login(String workspace) throws RepositoryException + { + throw new UnsupportedOperationException(); + } + + public final Session login(Credentials credentials, String workspace) throws RepositoryException + { + throw new UnsupportedOperationException(); + } +} \ No newline at end of file Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SessionContext.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SessionContext.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SessionContext.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.chromattic.api.ChromatticSession; + +/** + * The contract for integration between client of a chromattic session and the session management system. + * Attachments are useful to associated an arbitrary payload with the session context. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public interface SessionContext +{ + + /** + * Returns the managed chromattic session. + * + * @return the session + */ + ChromatticSession getSession(); + + /** + * Returns an attachment of this context. + * + * @param name the attachment name + * @return the attached object + */ + Object getAttachment(String name); + + /** + * Sets an attachment on this context. + * + * @param name the attachment name + * @param payload the attachment payload + */ + void setAttachment(String name, Object payload); +} Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java (rev 0) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import javax.jcr.Session; +import java.util.HashMap; +import java.util.Map; + +/** + * A global notion of synchronization for all chromattic sessions and all JCR sessions. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +class Synchronization implements LoginContext +{ + + /** The sessions mapped by workspace name. */ + private final Map<String, Session> repositorySessions = new HashMap<String, Session>(); + + /** . */ + private final Map<String, GlobalContext> contexts = new HashMap<String, GlobalContext>(); + + /** + * Returns a specified global context by its name. + * + * @param name the global context name + * @return the global context or null if no such context exists + */ + public GlobalContext getContext(String name) + { + if (name == null) + { + throw new NullPointerException(); + } + return contexts.get(name); + } + + /** + * Opens a global context related to this synchronization object. + * + * @param lifeCycle the life cycle for the session + * @return the global context related to life cycle + * @throws IllegalStateException if a context is already created for the specified life cycle + */ + public GlobalContext openContext(ChromatticLifeCycle lifeCycle) throws IllegalStateException + { + if (lifeCycle == null) + { + throw new NullPointerException(); + } + String name = lifeCycle.getName(); + GlobalContext context = contexts.get(name); + if (context != null) + { + throw new IllegalStateException(); + } + context = new GlobalContext(lifeCycle, this); + contexts.put(name, context); + lifeCycle.onOpenSession(context); + return context; + } + + public void loggedIn(Session session) + { + repositorySessions.put(session.getWorkspace().getName(), session); + } + + public void close(boolean save) + { + // First close all sessions + for (AbstractContext context : contexts.values()) + { + context.close(save); + } + + // Now close all JCR sessions + for (Session session : repositorySessions.values()) + { + session.logout(); + } + } +} Added: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java =================================================================== --- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java (rev 0) +++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import junit.framework.TestCase; +import org.chromattic.api.Chromattic; +import org.chromattic.api.ChromatticSession; +import org.exoplatform.container.PortalContainer; + +import javax.jcr.Session; +import javax.jcr.Workspace; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class ChromatticIntegrationTestCase extends TestCase +{ + + /** . */ + private ChromatticLifeCycle configurator; + + /** . */ + private ChromatticManager chromatticManager; + + @Override + protected void setUp() throws Exception + { + PortalContainer container = PortalContainer.getInstance(); + chromatticManager = (ChromatticManager)container.getComponent(ChromatticManager.class); + configurator = chromatticManager.getConfigurator("test"); + } + + @Override + protected void tearDown() throws Exception + { + + } + + public void testConfiguratorInitialized() throws Exception + { + assertNotNull(configurator); + assertEquals("test", configurator.getWorkspaceName()); + assertNotNull(configurator.getChromattic()); + assertSame(chromatticManager, configurator.getManager()); + } + + public void testCannotInitiateMoreThanOneRequest() + { + chromatticManager.beginRequest(); + + // + try + { + chromatticManager.beginRequest(); + fail(); + } + catch (IllegalStateException e) + { + } + + // + chromatticManager.endRequest(false); + } + + public void testCannotEndNonExistingRequest() + { + try + { + chromatticManager.endRequest(false); + fail(); + } + catch (IllegalStateException e) + { + } + } + + + public void testWrapperFailsWhenNoGlobalRequest() throws Exception + { + try + { + configurator.getChromattic().openSession(); + fail(); + } + catch (IllegalStateException e) + { + } + } + + public void testLocalRequest() throws Exception + { + Session jcrSession; + + // + SessionContext context = configurator.openContext(); + try + { + ChromatticSession session = configurator.getChromattic().openSession(); + FooEntity foo = session.create(FooEntity.class); + assertEquals("test", foo.getWorkspace()); + jcrSession = session.getJCRSession(); + assertTrue(jcrSession.isLive()); + Workspace workspace = jcrSession.getWorkspace(); + assertEquals("test", workspace.getName()); + + session.close(); + assertTrue(jcrSession.isLive()); + } + finally + { + configurator.closeContext(context, false); + } + + // Assert JCR session was properly closed + assertFalse(jcrSession.isLive()); + } + + public void testGlobalRequest() throws Exception + { + Session jcrSession; + + // + chromatticManager.beginRequest(); + try + { + Chromattic chromattic = configurator.getChromattic(); + + // Opens a session with the provided Chromattic + ChromatticSession session = chromattic.openSession(); + + // Check how chromattic see the session + FooEntity foo = session.create(FooEntity.class); + assertEquals("test", foo.getWorkspace()); + + // Check related JCR session + jcrSession = session.getJCRSession(); + assertTrue(jcrSession.isLive()); + Workspace workspace = jcrSession.getWorkspace(); + assertEquals("test", workspace.getName()); + + // Closing chromattic session should not close the underlying JCR session + session.close(); + assertTrue(jcrSession.isLive()); + } + finally + { + chromatticManager.endRequest(false); + } + + // Assert JCR session was properly closed + assertFalse(jcrSession.isLive()); + } +} Added: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java =================================================================== --- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java (rev 0) +++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/FooEntity.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2003-2007 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.commons.chromattic; + +import org.chromattic.api.annotations.NodeMapping; +import org.chromattic.api.annotations.WorkspaceName; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +@NodeMapping(name = "foo") +public abstract class FooEntity +{ + + @WorkspaceName + public abstract String getWorkspace(); + +} Added: portal/trunk/component/common/src/test/resources/conf/portal/jcr-configuration.xml =================================================================== --- portal/trunk/component/common/src/test/resources/conf/portal/jcr-configuration.xml (rev 0) +++ portal/trunk/component/common/src/test/resources/conf/portal/jcr-configuration.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + ~ Copyright (C) 2003-2009 eXo Platform SAS. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software 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 + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + <init-params> + <properties-param> + <name>default-properties</name> + <description>Default initial context properties</description> + </properties-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>jar:/conf/portal/repository-configuration.xml</value> + </value-param> + </init-params> + </component> + + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>testds</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/testds"/> + <property name="username" value="sa"/> + <property name="password" value=""/> + </properties-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/portal/test-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + +</configuration> Added: portal/trunk/component/common/src/test/resources/conf/portal/repository-configuration.xml =================================================================== --- portal/trunk/component/common/src/test/resources/conf/portal/repository-configuration.xml (rev 0) +++ portal/trunk/component/common/src/test/resources/conf/portal/repository-configuration.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,126 @@ +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<repository-service default-repository="repository"> +<repositories> +<repository name="repository" system-workspace="system" default-workspace="portal-system"> +<security-domain>gatein-domain</security-domain> +<access-control>optional</access-control> +<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> +<workspaces> +<workspace name="system"> +<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> +<properties> +<property name="source-name" value="testds"/> +<property name="dialect" value="hsqldb"/> +<property name="multi-db" value="false"/> +<property name="update-storage" value="true"/> +<property name="max-buffer-size" value="204800"/> +<property name="swap-directory" value="target/temp/swap/system"/> +</properties> +<value-storages> +<value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> +<properties> +<property name="path" value="target/temp/values/system"/> +</properties> +<filters> +<filter property-type="Binary"/> +</filters> +</value-storage> +</value-storages> +</container> +<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> +<properties> +<property name="root-nodetype" value="nt:unstructured"/> +<property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> +</properties> +</initializer> +<cache enabled="true"> +<properties> +<property name="max-size" value="20000"/> +<property name="live-time" value="30000"/> +</properties> +</cache> +<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> +<properties> +<property name="index-dir" value="target/temp/jcrlucenedb/system"/> +</properties> +</query-handler> +<lock-manager> +<time-out>15m</time-out><!-- 15min --> +<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> +<properties> +<property name="path" value="target/temp/lock/system"/> +</properties> +</persister> +</lock-manager> +</workspace> +<workspace name="test"> +<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> +<properties> +<property name="source-name" value="testds"/> +<property name="dialect" value="hsqldb"/> +<property name="multi-db" value="false"/> +<property name="update-storage" value="true"/> +<property name="max-buffer-size" value="204800"/> +<property name="swap-directory" value="target/temp/swap/test"/> +</properties> +<value-storages> +<value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> +<properties> +<property name="path" value="target/temp/values/test"/> +</properties> +<filters> +<filter property-type="Binary"/> +</filters> +</value-storage> +</value-storages> +</container> +<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> +<properties> +<property name="root-nodetype" value="nt:unstructured"/> +<property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/> +</properties> +</initializer> +<cache enabled="true"> +<properties> +<property name="max-size" value="20000"/> +<property name="live-time" value="30000"/> +</properties> +</cache> +<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> +<properties> +<property name="index-dir" value="target/temp/jcrlucenedb/test"/> +</properties> +</query-handler> +<lock-manager> +<time-out>15m</time-out><!-- 15min --> +<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> +<properties> +<property name="path" value="target/temp/lock/test"/> +</properties> +</persister> +</lock-manager> +</workspace> +</workspaces> +</repository> +</repositories> +</repository-service> Added: portal/trunk/component/common/src/test/resources/conf/portal/test-configuration.xml =================================================================== --- portal/trunk/component/common/src/test/resources/conf/portal/test-configuration.xml (rev 0) +++ portal/trunk/component/common/src/test/resources/conf/portal/test-configuration.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> + +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type> + <init-params> + <value-param> + <name>name</name> + <value>test</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>test</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.exoplatform.commons.chromattic.FooEntity</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + <import>jar:/conf/portal/jcr-configuration.xml</import> +</configuration> Added: portal/trunk/component/common/src/test/resources/conf/portal/test-nodetypes.xml =================================================================== --- portal/trunk/component/common/src/test/resources/conf/portal/test-nodetypes.xml (rev 0) +++ portal/trunk/component/common/src/test/resources/conf/portal/test-nodetypes.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,29 @@ +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="foo" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + </supertypes> + </nodeType> + +</nodeTypes> Modified: portal/trunk/component/portal/pom.xml =================================================================== --- portal/trunk/component/portal/pom.xml 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/pom.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -47,6 +47,12 @@ <dependency> <groupId>org.exoplatform.portal</groupId> + <artifactId>exo.portal.component.common</artifactId> + <version>3.0.0-Beta04-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> <version>3.0.0-Beta04-SNAPSHOT</version> </dependency> Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java (rev 0) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/MOPChromatticLifeCycle.java 2009-12-02 11:42:19 UTC (rev 905) @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2003-2007 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.portal.pom.config; + +import org.exoplatform.commons.chromattic.ChromatticLifeCycle; +import org.exoplatform.commons.chromattic.SessionContext; +import org.exoplatform.container.xml.InitParams; + +/** + * Extends the chromattic life cycle to associate the mop session as an attachment of the chromattic session. + * + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class MOPChromatticLifeCycle extends ChromatticLifeCycle +{ + + /** . */ + POMSessionManager manager; + + public MOPChromatticLifeCycle(InitParams params) + { + super(params); + } + + @Override + protected void onOpenSession(SessionContext context) + { + POMSession session = new POMSession(manager, this, context); + context.setAttachment("mopsession", session); + context.getSession().addEventListener(new Injector(session)); + } + + @Override + protected void onCloseSession(SessionContext context) + { + } +} Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMDataStorage.java 2009-12-02 11:42:19 UTC (rev 905) @@ -19,6 +19,7 @@ package org.exoplatform.portal.pom.config; +import org.exoplatform.commons.chromattic.ChromatticManager; import org.exoplatform.commons.utils.IOUtil; import org.exoplatform.commons.utils.LazyPageList; import org.exoplatform.container.configuration.ConfigurationManager; @@ -31,7 +32,6 @@ import org.exoplatform.portal.config.model.ModelObject; import org.exoplatform.portal.config.model.PersistentApplicationState; import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.pom.config.cache.DataCache; import org.exoplatform.portal.pom.config.tasks.DashboardTask; import org.exoplatform.portal.pom.config.tasks.PageNavigationTask; import org.exoplatform.portal.pom.config.tasks.PageTask; @@ -76,13 +76,13 @@ private final Log log = ExoLogger.getLogger(getClass()); /** . */ - private final TaskExecutionDecorator executor; + private final ChromatticManager manager; - public POMDataStorage(POMSessionManager pomMgr, ConfigurationManager confManager) + public POMDataStorage(POMSessionManager pomMgr, ConfigurationManager confManager, ChromatticManager manager) { this.pomMgr = pomMgr; this.confManager_ = confManager; - this.executor = new DataCache(new ExecutorDispatcher()); + this.manager = manager; } public POMSessionManager getPOMSessionManager() @@ -90,110 +90,74 @@ return pomMgr; } - public <E extends TaskExecutionDecorator> E getDecorator(Class<E> decoratorClass) - { - return executor.getDecorator(decoratorClass); - } - - /** - * <p>Execute the task with a session. The method attempts first to get a current session and if no such session - * is found then a session will be created for the scope of the method.</p> - * - * @param task the task to execute - * @throws Exception any exception thrown by the task - */ - private <T extends POMTask> T execute(T task) throws Exception - { - POMSession session = POMSessionManager.getSession(); - if (session == null) - { - session = pomMgr.openSession(); - try - { - executor.execute(session, task); - } - finally - { - pomMgr.closeSession(true); - } - } - else - { - executor.execute(session, task); - } - - // - return task; - } - public PortalData getPortalConfig(PortalKey key) throws Exception { - return execute(new PortalConfigTask.Load(key)).getConfig(); + return pomMgr.execute(new PortalConfigTask.Load(key)).getConfig(); } public void create(PortalData config) throws Exception { - execute(new PortalConfigTask.Save(config, false)); + pomMgr.execute(new PortalConfigTask.Save(config, false)); } public void save(PortalData config) throws Exception { - execute(new PortalConfigTask.Save(config, true)); + pomMgr.execute(new PortalConfigTask.Save(config, true)); } public void remove(PortalData config) throws Exception { - execute(new PortalConfigTask.Remove(config.getKey())); + pomMgr.execute(new PortalConfigTask.Remove(config.getKey())); } public PageData getPage(PageKey key) throws Exception { - return execute(new PageTask.Load(key)).getPage(); + return pomMgr.execute(new PageTask.Load(key)).getPage(); } public PageData clonePage(PageKey key, PageKey cloneKey) throws Exception { - return execute(new PageTask.Clone(key, cloneKey, true)).getPage(); + return pomMgr.execute(new PageTask.Clone(key, cloneKey, true)).getPage(); } public void remove(PageData page) throws Exception { - execute(new PageTask.Remove(page)); + pomMgr.execute(new PageTask.Remove(page)); } public void create(PageData page) throws Exception { - execute(new PageTask.Save(page)); + pomMgr.execute(new PageTask.Save(page)); } public List<ModelChange> save(PageData page) throws Exception { - return execute(new PageTask.Save(page)).getChanges(); + return pomMgr.execute(new PageTask.Save(page)).getChanges(); } public NavigationData getPageNavigation(NavigationKey key) throws Exception { - return execute(new PageNavigationTask.Load(key)).getPageNavigation(); + return pomMgr.execute(new PageNavigationTask.Load(key)).getPageNavigation(); } public void save(NavigationData navigation) throws Exception { - execute(new PageNavigationTask.Save(navigation, true)); + pomMgr.execute(new PageNavigationTask.Save(navigation, true)); } public void create(NavigationData navigation) throws Exception { - execute(new PageNavigationTask.Save(navigation, false)); + pomMgr.execute(new PageNavigationTask.Save(navigation, false)); } public void remove(NavigationData navigation) throws Exception { - execute(new PageNavigationTask.Remove(navigation)); + pomMgr.execute(new PageNavigationTask.Remove(navigation)); } public void save(PortletPreferences portletPreferences) throws Exception { - execute(new PortletPreferencesTask.Save(portletPreferences)); + pomMgr.execute(new PortletPreferencesTask.Save(portletPreferences)); } public <S> String getId(ApplicationState<S> state) throws Exception @@ -207,12 +171,12 @@ else if (state instanceof PersistentApplicationState) { PersistentApplicationState pstate = (PersistentApplicationState)state; - contentId = execute(new PreferencesTask.GetContentId<S>(pstate.getStorageId())).getContentId(); + contentId = pomMgr.execute(new PreferencesTask.GetContentId<S>(pstate.getStorageId())).getContentId(); } else if (state instanceof CloneApplicationState) { CloneApplicationState cstate = (CloneApplicationState)state; - contentId = execute(new PreferencesTask.GetContentId<S>(cstate.getStorageId())).getContentId(); + contentId = pomMgr.execute(new PreferencesTask.GetContentId<S>(cstate.getStorageId())).getContentId(); } else { @@ -234,14 +198,14 @@ else if (state instanceof CloneApplicationState) { PreferencesTask.Load<S> load = new PreferencesTask.Load<S>(((CloneApplicationState<S>)state).getStorageId()); - execute(load); + pomMgr.execute(load); return load.getState(); } else { PreferencesTask.Load<S> load = new PreferencesTask.Load<S>(((PersistentApplicationState<S>)state).getStorageId()); - execute(load); + pomMgr.execute(load); return load.getState(); } } @@ -258,13 +222,13 @@ { PreferencesTask.Save<S> save = new PreferencesTask.Save<S>(((PersistentApplicationState<S>)state).getStorageId(), preferences); - execute(save); + pomMgr.execute(save); } else { PreferencesTask.Save<S> save = new PreferencesTask.Save<S>(((CloneApplicationState<S>)state).getStorageId(), preferences); - execute(save); + pomMgr.execute(save); } return state; } @@ -272,7 +236,7 @@ public PortletPreferences getPortletPreferences(String windowID) throws Exception { - return execute(new PortletPreferencesTask.Load(windowID)).getPreferences(); + return pomMgr.execute(new PortletPreferencesTask.Load(windowID)).getPreferences(); } public <T> LazyPageList<T> find(Query<T> q) throws Exception @@ -285,24 +249,24 @@ Class<T> type = q.getClassType(); if (PageData.class.equals(type)) { - return (LazyPageList<T>)execute(new SearchTask.FindPage((Query<PageData>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindPage((Query<PageData>)q)).getResult(); } else if (NavigationData.class.equals(type)) { - return (LazyPageList<T>)execute(new SearchTask.FindNavigation((Query<NavigationData>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindNavigation((Query<NavigationData>)q)).getResult(); } else if (PortletPreferences.class.equals(type)) { - return (LazyPageList<T>)execute(new SearchTask.FindPortletPreferences((Query<PortletPreferences>)q)) + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindPortletPreferences((Query<PortletPreferences>)q)) .getResult(); } else if (PortalData.class.equals(type)) { - return (LazyPageList<T>)execute(new SearchTask.FindSite((Query<PortalData>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindSite((Query<PortalData>)q)).getResult(); } else if (PortalKey.class.equals(type) && "portal".equals(q.getOwnerType())) { - return (LazyPageList<T>)execute(new SearchTask.FindSiteKey((Query<PortalKey>)q)).getResult(); + return (LazyPageList<T>)pomMgr.execute(new SearchTask.FindSiteKey((Query<PortalKey>)q)).getResult(); } else { @@ -331,12 +295,12 @@ public DashboardData loadDashboard(String dashboardId) throws Exception { - return execute(new DashboardTask.Load(dashboardId)).getDashboard(); + return pomMgr.execute(new DashboardTask.Load(dashboardId)).getDashboard(); } public void saveDashboard(DashboardData dashboard) throws Exception { - execute(new DashboardTask.Save(dashboard)); + pomMgr.execute(new DashboardTask.Save(dashboard)); } public Container getSharedLayout() throws Exception @@ -353,11 +317,11 @@ public void begin() { - getPOMSessionManager().openSession(); + manager.beginRequest(); } public void end(boolean save) { - getPOMSessionManager().closeSession(save); + manager.endRequest(true); } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2009-12-02 11:42:19 UTC (rev 905) @@ -21,6 +21,7 @@ import org.chromattic.api.ChromatticSession; import org.chromattic.api.UndeclaredRepositoryException; +import org.exoplatform.commons.chromattic.SessionContext; import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.pom.data.Mapper; import org.exoplatform.portal.pom.registry.ContentRegistry; @@ -74,12 +75,20 @@ /** . */ private boolean modified; - public POMSession(POMSessionManager mgr) + /** . */ + private SessionContext context; + + /** . */ + private MOPChromatticLifeCycle configurator; + + public POMSession(POMSessionManager mgr, MOPChromatticLifeCycle configurator, SessionContext context) { this.mgr = mgr; this.isInTask = false; this.markedForRollback = false; this.staleKeys = null; + this.configurator = configurator; + this.context = context; } public Object getFromCache(Serializable key) @@ -141,17 +150,7 @@ protected ChromatticSession getSession() { - try - { - Model model = getModel(); - Field f = model.getClass().getDeclaredField("session"); - f.setAccessible(true); - return (ChromatticSession)f.get(model); - } - catch (Exception e) - { - throw new Error(e); - } + return context.getSession(); } /** @@ -395,14 +394,38 @@ } } - void close() + /** + * <p>Closes the current session and discard the changes done during the session.</p> + * + * @see #close(boolean) + */ + public void close() { + close(false); + } + + /** + * <p>Closes the current session and optionally saves its content. If no session is associated then this method has + * no effects and returns false.</p> + * + * @param save if the session must be saved + */ + public void close(boolean save) + { + if (save) + { + save(); + } + if (model != null) { model.close(); } // + configurator.closeContext(context, save & markedForRollback); + + // if (staleKeys != null) { for (Serializable key : staleKeys) Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2009-12-02 11:42:19 UTC (rev 905) @@ -19,34 +19,26 @@ package org.exoplatform.portal.pom.config; -import org.chromattic.api.ChromatticSession; +import org.exoplatform.commons.chromattic.ChromatticLifeCycle; +import org.exoplatform.commons.chromattic.ChromatticManager; +import org.exoplatform.commons.chromattic.SessionContext; +import org.exoplatform.portal.pom.config.cache.DataCache; import org.exoplatform.services.cache.CacheService; import org.exoplatform.services.cache.ExoCache; -import org.exoplatform.services.jcr.RepositoryService; -import org.exoplatform.services.jcr.core.ManageableRepository; -import org.exoplatform.services.jcr.ext.registry.RegistryService; import org.gatein.mop.core.api.MOPService; +import org.picocontainer.Startable; -import javax.jcr.Credentials; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; import java.io.Serializable; +import java.lang.reflect.UndeclaredThrowableException; /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ -public class POMSessionManager +public class POMSessionManager implements Startable { /** . */ - private static final ThreadLocal<POMSession> current = new ThreadLocal<POMSession>(); - - /** . */ - final RepositoryService repositoryService; - - /** . */ private MOPService pomService; /** . */ @@ -58,68 +50,62 @@ /** . */ final ExoCache<Serializable, Object> cache; - public POMSessionManager(CacheService cacheService, RegistryService service) throws Exception - { - RepositoryService repositoryService = service.getRepositoryService(); + /** . */ + final ChromatticManager manager; + /** . */ + private ChromatticLifeCycle configurator; + + /** . */ + private final TaskExecutionDecorator executor; + + public POMSessionManager(ChromatticManager manager, CacheService cacheService) + { // + this.manager = manager; this.cache = cacheService.getCacheInstance(POMSessionManager.class.getSimpleName()); - this.repositoryService = repositoryService; this.pomService = null; + this.executor = new DataCache(new ExecutorDispatcher()); } - - public void clearCache() - { - cache.clearCache(); - } - public Session login() throws RepositoryException + public void start() { - ManageableRepository repo = repositoryService.getCurrentRepository(); - return repo.login(); + try + { + MOPChromatticLifeCycle configurator = (MOPChromatticLifeCycle)manager.getConfigurator("mop"); + configurator.manager = this; + + // + PortalMOPService pomService = new PortalMOPService(configurator.getChromattic()); + pomService.start(); + + // + this.pomService = pomService; + this.configurator = configurator; + } + catch (Exception e) + { + throw new UndeclaredThrowableException(e); + } } - public Session login(String workspace) throws RepositoryException + public void stop() { - Repository repo = repositoryService.getCurrentRepository(); - return repo.login(workspace); } - public Session login(Credentials credentials, String workspace) throws RepositoryException + public void clearCache() { - Repository repo = repositoryService.getCurrentRepository(); - return repo.login(credentials, workspace); + cache.clearCache(); } - public Session login(Credentials credentials) throws RepositoryException + public MOPService getPOMService() { - Repository repo = repositoryService.getCurrentRepository(); - return repo.login(credentials); + return pomService; } - /* - * todo : use better than the synchronized block - */ - public synchronized MOPService getPOMService() + public <E extends TaskExecutionDecorator> E getDecorator(Class<E> decoratorClass) { - if (pomService == null) - { - PortalMOPService mopService = new PortalMOPService(); - - // - try - { - mopService.start(); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - - // - this.pomService = mopService; - } - return pomService; + return executor.getDecorator(decoratorClass); } /** @@ -127,9 +113,10 @@ * * @return the current session */ - public static POMSession getSession() + public POMSession getSession() { - return current.get(); + SessionContext context = configurator.getSessionContext(); + return context != null ? (POMSession)context.getAttachment("mopsession") : null; } /** @@ -140,76 +127,18 @@ */ public POMSession openSession() { - POMSession session = current.get(); - if (session == null) - { - session = new POMSession(this); - current.set(session); - - // - // A bit ugly but we will improve that later - ChromatticSession csession = session.getSession(); - csession.addEventListener(new Injector(session)); - } - else - { - throw new IllegalStateException("A session is already opened."); - } - return session; + SessionContext context = configurator.openContext(); + return (POMSession)context.getAttachment("mopsession"); } /** - * <p>Closes the current session and discard the changes done during the session.</p> + * <p>Execute the task with a session. The method attempts first to get a current session and if no such session + * is found then a session will be created for the scope of the method.</p> * - * @return a boolean indicating if the session was closed - * @see #closeSession(boolean) - */ - public boolean closeSession() - { - return closeSession(false); - } - - /** - * <p>Closes the current session and optionally saves its content. If no session is associated then this method has - * no effects and returns false.</p> - * - * @param save if the session must be saved - * @return a boolean indicating if the session was closed - */ - public boolean closeSession(boolean save) - { - POMSession session = current.get(); - if (session == null) - { - // Should warn - return false; - } - else - { - current.set(null); - try - { - if (save) - { - session.save(); - } - } - finally - { - session.close(); - } - return true; - } - } - - /** - * <p>Execute the task with a session. The method attempts first to get a current session and if no such session is - * found then a session will be created for the scope of the method.</p> - * * @param task the task to execute * @throws Exception any exception thrown by the task */ - public void execute(POMTask task) throws Exception + public <T extends POMTask> T execute(T task) throws Exception { POMSession session = getSession(); if (session == null) @@ -217,16 +146,20 @@ session = openSession(); try { - session.execute(task); + executor.execute(session, task); } finally { - closeSession(true); + session.close(true); } } else { - session.execute(task); + executor.execute(session, task); } + + // + return task; } + } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalMOPService.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalMOPService.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalMOPService.java 2009-12-02 11:42:19 UTC (rev 905) @@ -16,21 +16,13 @@ */ package org.exoplatform.portal.pom.config; -import org.chromattic.api.ChromatticBuilder; -import org.chromattic.apt.InstrumentorImpl; -import org.exoplatform.portal.pom.registry.CategoryDefinition; -import org.exoplatform.portal.pom.registry.ContentDefinition; -import org.exoplatform.portal.pom.registry.ContentRegistry; +import org.chromattic.api.Chromattic; import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.gadget.GadgetContentProvider; -import org.exoplatform.portal.pom.spi.gadget.GadgetState; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletContentProvider; -import org.exoplatform.portal.pom.spi.portlet.PortletState; -import org.exoplatform.portal.pom.spi.portlet.PreferenceState; import org.exoplatform.portal.pom.spi.wsrp.WSRP; import org.exoplatform.portal.pom.spi.wsrp.WSRPContentProvider; -import org.exoplatform.portal.pom.spi.wsrp.WSRPState; import org.gatein.mop.core.api.MOPService; import org.gatein.mop.core.api.content.ContentManagerRegistry; @@ -41,22 +33,18 @@ public class PortalMOPService extends MOPService { - @Override - protected void configure(ChromatticBuilder builder) + /** . */ + private final Chromattic chromattic; + + public PortalMOPService(Chromattic chromattic) { - builder.setOption(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortalSessionLifeCycle.class.getName()); - builder.setOption(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, InstrumentorImpl.class.getName()); + this.chromattic = chromattic; + } - // - builder.add(PortletState.class); - builder.add(PreferenceState.class); - builder.add(GadgetState.class); - builder.add(WSRPState.class); - - // - builder.add(ContentRegistry.class); - builder.add(CategoryDefinition.class); - builder.add(ContentDefinition.class); + @Override + protected Chromattic getChromattic() + { + return chromattic; } @Override Deleted: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalSessionLifeCycle.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalSessionLifeCycle.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/PortalSessionLifeCycle.java 2009-12-02 11:42:19 UTC (rev 905) @@ -1,132 +0,0 @@ -/** - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.portal.pom.config; - -import org.chromattic.spi.jcr.SessionLifeCycle; -import org.exoplatform.services.jcr.RepositoryService; -import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import org.exoplatform.services.jcr.core.ManageableRepository; -import org.exoplatform.services.jcr.ext.common.SessionProvider; - -import javax.jcr.Credentials; -import javax.jcr.RepositoryException; -import javax.jcr.Session; - -/** - * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> - * @version $Revision$ - */ -public class PortalSessionLifeCycle implements SessionLifeCycle -{ - - private static class Entry - { - - /** . */ - private final SessionProvider provider; - - /** . */ - private final ManageableRepository repo; - - /** . */ - private int count; - - /** . */ - private final String workspaceName; - - private Entry(POMSession session) throws RepositoryException - { - ManageableRepository repo; - POMSessionManager mgr = session.mgr; - try - { - RepositoryService repoService = mgr.repositoryService; - repo = repoService.getRepository(mgr.repositoryName); - } - catch (RepositoryConfigurationException e) - { - throw new RepositoryException(e); - } - - // - this.provider = SessionProvider.createSystemProvider(); - this.count = 0; - this.repo = repo; - this.workspaceName = mgr.workspaceName; - } - - Session openSession() throws RepositoryException - { - Session session = provider.getSession(workspaceName, repo); - count++; - return session; - } - } - - /** . */ - private ThreadLocal<Entry> current = new ThreadLocal<Entry>(); - - public Session login() throws RepositoryException - { - POMSession session = POMSessionManager.getSession(); - - // - Entry entry = current.get(); - if (entry == null) - { - entry = new Entry(session); - current.set(entry); - } - - // - return entry.openSession(); - } - - public Session login(String workspace) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public Session login(Credentials credentials, String workspace) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public Session login(Credentials credentials) throws RepositoryException - { - throw new UnsupportedOperationException(); - } - - public void save(Session session) throws RepositoryException - { - session.save(); - } - - public void close(Session session) - { - session.logout(); - Entry entry = current.get(); - if (--entry.count == 0) - { - current.remove(); - entry.provider.close(); - } - } -} Modified: portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml =================================================================== --- portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/conf/portal/test-configuration.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -23,18 +23,23 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> <key>org.exoplatform.portal.pom.config.POMSessionManager</key> <type>org.exoplatform.portal.pom.config.POMSessionManager</type> </component> + <component> <key>org.exoplatform.portal.pom.data.ModelDataStorage</key> <type>org.exoplatform.portal.pom.config.POMDataStorage</type> </component> + <component> <key>org.exoplatform.portal.config.DataStorage</key> <type>org.exoplatform.portal.config.DataStorageImpl</type> </component> + <component> <key>org.exoplatform.portal.config.UserACL</key> <type>org.exoplatform.portal.config.UserACL</type> @@ -187,7 +192,59 @@ <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key> <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type> </component> + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-system</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> + <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> + <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> + <value>org.exoplatform.portal.pom.registry.ContentRegistry</value> + <value>org.exoplatform.portal.pom.registry.CategoryDefinition</value> + <value>org.exoplatform.portal.pom.registry.ContentDefinition</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> <target-component>org.exoplatform.services.jcr.RepositoryService</target-component> <component-plugin> <name>bind.datasource</name> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2009-12-02 11:42:19 UTC (rev 905) @@ -18,6 +18,7 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.test.BasicTestCase; @@ -36,6 +37,9 @@ /** . */ private POMSessionManager mgr; + /** . */ + private POMSession session; + public void setUp() throws Exception { super.setUp(); @@ -44,12 +48,12 @@ PortalContainer container = PortalContainer.getInstance(); storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + session = mgr.openSession(); } protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(); } public void testDirtyWrite() throws Exception @@ -65,7 +69,9 @@ // final AtomicBoolean go = new AtomicBoolean(false); - // Force a cache update + // Force a cache update with the entry that will be modified + // when the main session is closed + new Thread() { @Override @@ -75,7 +81,7 @@ { mgr.openSession(); storage_.getPage("portal::test::test4"); - mgr.closeSession(false); + session.close(); } catch (Exception e) { @@ -95,7 +101,7 @@ } // Reopen session with no modifications that use the cache - mgr.closeSession(true); + session.close(true); mgr.openSession(); // Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestContentRegistry.java 2009-12-02 11:42:19 UTC (rev 905) @@ -39,6 +39,9 @@ /** . */ private POMSessionManager mgr; + /** . */ + private POMSession session; + public void setUp() throws Exception { super.setUp(); @@ -47,25 +50,26 @@ PortalContainer container = PortalContainer.getInstance(); storage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + session = mgr.openSession(); } protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(false); + session = null; storage = null; } public void testGetContentRegistry() { - POMSession session = POMSessionManager.getSession(); + POMSession session = mgr.getSession(); ContentRegistry registry = session.getContentRegistry(); assertNotNull(registry); } public void testCreateCategory() { - POMSession session = POMSessionManager.getSession(); + POMSession session = mgr.getSession(); ContentRegistry registry = session.getContentRegistry(); CategoryDefinition category = registry.createCategory("foo"); assertNotNull(category); @@ -74,7 +78,7 @@ public void testCreateContent() { - POMSession session = POMSessionManager.getSession(); + POMSession session = mgr.getSession(); ContentRegistry registry = session.getContentRegistry(); CategoryDefinition category = registry.createCategory("foo"); ContentDefinition content = category.createContent("bar", Portlet.CONTENT_TYPE, "myportlet"); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-12-02 11:42:19 UTC (rev 905) @@ -30,6 +30,7 @@ import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Dashboard; import org.exoplatform.portal.config.model.PageNode; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.data.ModelChange; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; @@ -62,6 +63,9 @@ private POMSessionManager mgr; + /** . */ + private POMSession session; + public TestDataStorage(String name) { super(name); @@ -75,12 +79,12 @@ PortalContainer container = PortalContainer.getInstance(); storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + session = mgr.openSession(); } protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(); } public void testCreatePortal() throws Exception Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-12-02 11:42:19 UTC (rev 905) @@ -57,7 +57,7 @@ protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(); } public void testBilto() throws Exception Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2009-12-02 11:42:19 UTC (rev 905) @@ -28,6 +28,7 @@ import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.test.BasicTestCase; @@ -54,6 +55,9 @@ /** . */ private POMSessionManager mgr; + /** . */ + private POMSession session; + public TestLoadedPOM(String name) { super(name); @@ -69,12 +73,13 @@ (UserPortalConfigService)container.getComponentInstanceOfType(UserPortalConfigService.class); storage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + session = mgr.openSession(); } protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(false); + session = null; storage = null; } Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortalConfig.java 2009-12-02 11:42:19 UTC (rev 905) @@ -22,6 +22,7 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.container.component.ComponentRequestLifecycle; import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.GroupHandler; @@ -42,6 +43,9 @@ private OrganizationService org; + /** . */ + private POMSession session; + public TestPortalConfig(String name) { super(name); @@ -55,13 +59,13 @@ org = (OrganizationService)container.getComponentInstanceOfType(OrganizationService.class); storage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + session = mgr.openSession(); ((ComponentRequestLifecycle)org).startRequest(container); } protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(); storage = null; PortalContainer container = PortalContainer.getInstance(); ((ComponentRequestLifecycle)org).endRequest(container); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-12-02 11:42:19 UTC (rev 905) @@ -23,6 +23,7 @@ import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PersistentApplicationState; +import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.portlet.Portlet; import org.exoplatform.portal.pom.spi.portlet.PortletBuilder; @@ -46,6 +47,9 @@ /** . */ private POMSessionManager mgr; + /** . */ + private POMSession session; + public void setUp() throws Exception { super.setUp(); @@ -54,12 +58,13 @@ PortalContainer container = PortalContainer.getInstance(); storage_ = (DataStorage)container.getComponentInstanceOfType(DataStorage.class); mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + session = mgr.openSession(); } protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(false); + session = null; } public void testSiteScopedPreferences() throws Exception Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2009-12-02 11:42:19 UTC (rev 905) @@ -78,7 +78,7 @@ protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(); storage = null; } @@ -151,9 +151,6 @@ Page layout = portal.getRootNavigation().getTemplate(); assertNotNull(layout); assertSame(portal.getRootPage().getChild("templates").getChild("default"), layout); - - // - mgr.closeSession(); } public void testPageWithoutPageId() throws Exception @@ -224,8 +221,5 @@ assertEquals("application/portlet", customization.getType().getMimeType()); assertEquals("web/BannerPortlet", customization.getContentId()); // assertEquals("banner", customization.getName()); - - // - mgr.closeSession(); } } \ No newline at end of file Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-12-02 11:42:19 UTC (rev 905) @@ -722,7 +722,7 @@ { public void execute() throws Exception { -// mgr.clearCache(); + mgr.clearCache(); PortalConfig cfg = storage_.getPortalConfig(PortalConfig.USER_TYPE, "overwritelayout"); assertNotNull(cfg); @@ -735,8 +735,6 @@ assertTrue(((Application)container.getChildren().get(1)).getType() == ApplicationType.PORTLET); Application<Portlet> pa = (Application<Portlet>)container.getChildren().get(1); ApplicationState<Portlet> state = pa.getState(); - - assertEquals("overwrite_application_ref/overwrite_portlet_ref", storage_.getId(state)); } }.execute(null); @@ -782,7 +780,7 @@ public void execute() throws Exception { mgr.clearCache(); - DataCache cache = mopStorage.getDecorator(DataCache.class); + DataCache cache = mgr.getDecorator(DataCache.class); long readCount0 = cache.getReadCount(); userPortalConfigSer_.getUserPortalConfig("classic", null); long readCount1 = cache.getReadCount(); @@ -801,7 +799,7 @@ public void execute() throws Exception { mgr.clearCache(); - DataCache cache = mopStorage.getDecorator(DataCache.class); + DataCache cache = mgr.getDecorator(DataCache.class); long readCount0 = cache.getReadCount(); userPortalConfigSer_.getPage("portal::test::test1"); long readCount1 = cache.getReadCount(); @@ -820,7 +818,7 @@ public void execute() throws Exception { mgr.clearCache(); - DataCache cache = mopStorage.getDecorator(DataCache.class); + DataCache cache = mgr.getDecorator(DataCache.class); long readCount0 = cache.getReadCount(); userPortalConfigSer_.getPageNavigation("portal", "test"); long readCount1 = cache.getReadCount(); @@ -891,8 +889,8 @@ finally { ConversationState.setCurrent(null); + mopSession.close(); mopSession = null; - mgr.closeSession(); try { session.close(); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestWSRP.java 2009-12-02 11:42:19 UTC (rev 905) @@ -59,7 +59,8 @@ protected void tearDown() throws Exception { - mgr.closeSession(false); + session.close(false); + session = null; } public void testBilto() throws Exception Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/pom.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -48,7 +48,7 @@ <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> <org.picketlink.idm>1.0.0.CR1</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta01</org.gatein.wsrp.version> - <org.gatein.mop.version>1.0.0-Beta10</org.gatein.mop.version> + <org.gatein.mop.version>1.0.0-Beta11</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2009-12-02 11:42:19 UTC (rev 905) @@ -173,4 +173,56 @@ </component-plugin> </component-plugins> </component> + + <external-component-plugins> + <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component> + <component-plugin> + <name>chromattic</name> + <set-method>addLifeCycle</set-method> + <type>org.exoplatform.portal.pom.config.MOPChromatticLifeCycle</type> + <init-params> + <value-param> + <name>name</name> + <value>mop</value> + </value-param> + <value-param> + <name>workspace-name</name> + <value>portal-system</value> + </value-param> + <values-param> + <name>entities</name> + <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value> + <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value> + <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value> + <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value> + <value>org.gatein.mop.core.api.workspace.PageImpl</value> + <value>org.gatein.mop.core.api.workspace.PageContainer</value> + <value>org.gatein.mop.core.api.workspace.NavigationImpl</value> + <value>org.gatein.mop.core.api.workspace.NavigationContainer</value> + <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value> + <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.PortalSite</value> + <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.GroupSite</value> + <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value> + <value>org.gatein.mop.core.api.workspace.UserSite</value> + <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value> + <value>org.gatein.mop.core.api.workspace.content.ContextType</value> + <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value> + <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value> + <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value> + <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> + <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> + <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> + <value>org.exoplatform.portal.pom.registry.ContentRegistry</value> + <value>org.exoplatform.portal.pom.registry.CategoryDefinition</value> + <value>org.exoplatform.portal.pom.registry.ContentDefinition</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> + </configuration> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/MOPSessionLifeCycle.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/MOPSessionLifeCycle.java 2009-12-02 10:14:37 UTC (rev 904) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/MOPSessionLifeCycle.java 2009-12-02 11:42:19 UTC (rev 905) @@ -19,8 +19,8 @@ package org.exoplatform.portal.application; +import org.exoplatform.commons.chromattic.ChromatticManager; import org.exoplatform.container.ExoContainer; -import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.web.application.Application; import org.exoplatform.web.application.ApplicationLifecycle; import org.exoplatform.webui.application.WebuiRequestContext; @@ -33,7 +33,7 @@ { /** . */ - private final ThreadLocal<POMSessionManager> currentMgr = new ThreadLocal<POMSessionManager>(); + private final ThreadLocal<ChromatticManager> currentMgr = new ThreadLocal<ChromatticManager>(); public void onInit(Application app) throws Exception { @@ -42,18 +42,18 @@ public void onStartRequest(Application app, WebuiRequestContext context) throws Exception { ExoContainer container = context.getApplication().getApplicationServiceContainer(); - POMSessionManager mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class); - mgr.openSession(); + ChromatticManager mgr = (ChromatticManager)container.getComponentInstanceOfType(ChromatticManager.class); + mgr.beginRequest(); currentMgr.set(mgr); } public void onEndRequest(Application app, WebuiRequestContext context) throws Exception { - POMSessionManager mgr = currentMgr.get(); + ChromatticManager mgr = currentMgr.get(); currentMgr.remove(); // Need to see if saving untouched session has an impact or not on performances - mgr.closeSession(true); + mgr.endRequest(true); } public void onDestroy(Application app) throws Exception