April 2011 - gatein-commits - Jboss List Archives

gatein SVN: r6318 - portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-04-21 11:33:59 -0400 (Thu, 21 Apr 2011) New Revision: 6318 Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java Log: - If an exception occurs during the launch of WSRP, show an error but don't crash the portal. Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-04-21 12:37:40 UTC (rev 6317) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/WSRPServiceIntegration.java 2011-04-21 15:33:59 UTC (rev 6318) @@ -146,16 +146,23 @@ { if (!bypass) { - startProducer(); - startConsumers(); + try + { + startProducer(); + startConsumers(); - // listen for web app events so that we can inject services into WSRP admin UI "cleanly" - // todo: this service injection should really be done using CDI... :/ - ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); - ServletContainer servletContainer = factory.getServletContainer(); - servletContainer.addWebAppListener(this); + // listen for web app events so that we can inject services into WSRP admin UI "cleanly" + // todo: this service injection should really be done using CDI... :/ + ServletContainerFactory factory = DefaultServletContainerFactory.getInstance(); + ServletContainer servletContainer = factory.getServletContainer(); + servletContainer.addWebAppListener(this); - log.info("WSRP Service version '" + WSRPConstants.WSRP_SERVICE_VERSION + "' started"); + log.info("WSRP Service version '" + WSRPConstants.WSRP_SERVICE_VERSION + "' STARTED"); + } + catch (Exception e) + { + log.error("WSRP Service version '" + WSRPConstants.WSRP_SERVICE_VERSION + "' FAILED to start", e); + } } }

13 years, 5 months

1
0
0 / 0

gatein SVN: r6317 - epp/portal/branches/EPP_5_1_Branch.

by do-not-reply＠jboss.org

Author: hfnukal Date: 2011-04-21 08:37:40 -0400 (Thu, 21 Apr 2011) New Revision: 6317 Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml Log: JBEPP-897 Track component upgrades - EPP 5.1.1 Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-21 12:28:39 UTC (rev 6316) +++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-21 12:37:40 UTC (rev 6317) @@ -37,10 +37,10 @@ <name>GateIn - Portal</name> <properties> - <org.exoplatform.kernel.version>2.2.6-GA</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.6-GA</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.6-GA</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.12.6-GA</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.2.8-GA</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.8-GA</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.8-GA</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.12.8-CP01</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch04</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> @@ -48,7 +48,7 @@ <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version> <org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version> <org.picketlink.idm>1.1.8.GA</org.picketlink.idm> - <org.gatein.wsrp.version>2.0.1-Beta02</org.gatein.wsrp.version> + <org.gatein.wsrp.version>2.0.1-GA</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6316 - in components/wsrp/trunk/jcr-impl/src/test: resources and 1 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-04-21 08:28:39 -0400 (Thu, 21 Apr 2011) New Revision: 6316 Added: components/wsrp/trunk/jcr-impl/src/test/resources/ components/wsrp/trunk/jcr-impl/src/test/resources/conf/ components/wsrp/trunk/jcr-impl/src/test/resources/conf/configuration.xml Log: - GTNWSRP-196: Forgot to add configuration for tests. Added: components/wsrp/trunk/jcr-impl/src/test/resources/conf/configuration.xml =================================================================== --- components/wsrp/trunk/jcr-impl/src/test/resources/conf/configuration.xml (rev 0) +++ components/wsrp/trunk/jcr-impl/src/test/resources/conf/configuration.xml 2011-04-21 12:28:39 UTC (rev 6316) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<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.services.jcr.RepositoryService</target-component> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/> + <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/> + </properties-param> + </init-params> + </component-plugin> + <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/nodetypes/consumers-configuration-nodetypes.xml</value> + <value>jar:/conf/nodetypes/producer-configuration-nodetypes.xml</value> + <value>jar:/conf/nodetypes/producer-registrations-nodetypes.xml</value> + <value>jar:/conf/nodetypes/producer-pc-nodetypes.xml</value> + <value>jar:/conf/nodetypes/migration-nodetypes.xml</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> \ No newline at end of file

13 years, 5 months

1
0
0 / 0

gatein SVN: r6315 - epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-04-21 08:10:25 -0400 (Thu, 21 Apr 2011) New Revision: 6315 Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPPortalStructureAccess.java Log: - JBEPP-899: Save session instead of closing it. Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPPortalStructureAccess.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPPortalStructureAccess.java 2011-04-21 09:54:23 UTC (rev 6314) +++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPPortalStructureAccess.java 2011-04-21 12:10:25 UTC (rev 6315) @@ -91,7 +91,7 @@ session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName())); // save - session.close(true); + session.save(); } public Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage)

13 years, 5 months

1
0
0 / 0

gatein SVN: r6314 - portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-04-21 05:54:23 -0400 (Thu, 21 Apr 2011) New Revision: 6314 Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java Log: - GTNPORTAL-1868: Save the session instead of closing it. Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java 2011-04-21 08:37:10 UTC (rev 6313) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/structure/MOPPortalStructureAccess.java 2011-04-21 09:54:23 UTC (rev 6314) @@ -91,7 +91,7 @@ session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName())); // save - session.close(true); + session.save(); } public Page getPageFrom(org.exoplatform.portal.config.model.Page portalPage)

13 years, 5 months

1
0
0 / 0

gatein SVN: r6313 - in components/wsrp/trunk: consumer/src/test/java/org/gatein/wsrp/consumer/registry and 10 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-04-21 04:37:10 -0400 (Thu, 21 Apr 2011) New Revision: 6313 Added: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/BaseChromatticPersister.java components/wsrp/trunk/jcr-impl/src/main/resources/ components/wsrp/trunk/jcr-impl/src/main/resources/conf/ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/consumers-configuration-nodetypes.xml components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/migration-nodetypes.xml components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-configuration-nodetypes.xml components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-pc-nodetypes.xml components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-registrations-nodetypes.xml components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/consumer/ components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/ components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java components/wsrp/trunk/pom.xml Log: - GTNWSRP-196: Moved nodetype definitions to WSRP module from GateIn. Need to be removed from GateIn once a new WSRP release is available. - Added BaseChromatticPersister based on GateIn's implementation of ChromatticPersister, JCRPersister. JCRPersister will need to be adapted to this change once a new WSRP is available. - Added JCRConsumerRegistryTestCase. Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2011-04-21 08:06:47 UTC (rev 6312) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2011-04-21 08:37:10 UTC (rev 6313) @@ -41,7 +41,7 @@ */ public class ConsumerRegistryTestCase extends TestCase { - private ConsumerRegistry registry; + protected ConsumerRegistry registry; @Override protected void setUp() throws Exception Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-04-21 08:06:47 UTC (rev 6312) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -22,7 +22,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> @@ -74,6 +75,51 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.exo</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${org.mockito.version}</version> + <scope>test</scope> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name> + <value>${project.build.directory}</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-04-21 08:06:47 UTC (rev 6312) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-04-21 08:37:10 UTC (rev 6313) @@ -50,6 +50,7 @@ public class JCRConsumerRegistry extends AbstractConsumerRegistry implements StoresByPathManager<ProducerInfo> { private ChromatticPersister persister; + private boolean loadFromXMLIfNeeded; private static final String PRODUCER_INFOS_PATH = ProducerInfosMapping.NODE_NAME; public static final List<Class> mappingClasses = new ArrayList<Class>(6); @@ -63,7 +64,13 @@ public JCRConsumerRegistry(ChromatticPersister persister) throws Exception { + this(persister, true); + } + + protected JCRConsumerRegistry(ChromatticPersister persister, boolean loadFromXMLIfNeeded) + { this.persister = persister; + this.loadFromXMLIfNeeded = loadFromXMLIfNeeded; } @Override @@ -163,25 +170,27 @@ { producerInfosMapping = session.insert(ProducerInfosMapping.class, ProducerInfosMapping.NODE_NAME); - List<ProducerInfoMapping> infos = producerInfosMapping.getProducerInfos(); + if (loadFromXMLIfNeeded) + { + // Load from XML + XMLConsumerRegistry fromXML = new XMLConsumerRegistry(); + fromXML.reloadConsumers(); - // Load from XML - XMLConsumerRegistry fromXML = new XMLConsumerRegistry(); - fromXML.reloadConsumers(); + // Save to JCR + List<ProducerInfoMapping> infos = producerInfosMapping.getProducerInfos(); + List<WSRPConsumer> consumers = fromXML.getConfiguredConsumers(); + for (WSRPConsumer consumer : consumers) + { + ProducerInfo info = consumer.getProducerInfo(); - // Save to JCR - List<WSRPConsumer> consumers = fromXML.getConfiguredConsumers(); - for (WSRPConsumer consumer : consumers) - { - ProducerInfo info = consumer.getProducerInfo(); + ProducerInfoMapping pim = producerInfosMapping.createProducerInfo(info.getId()); - ProducerInfoMapping pim = producerInfosMapping.createProducerInfo(info.getId()); + // need to add to parent first to attach newly created ProducerInfoMapping + infos.add(pim); - // need to add to parent first to attach newly created ProducerInfoMapping - infos.add(pim); - - // init it from ProducerInfo - pim.initFrom(info); + // init it from ProducerInfo + pim.initFrom(info); + } } } Added: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/BaseChromatticPersister.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/BaseChromatticPersister.java (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/BaseChromatticPersister.java 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,153 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* 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.gatein.wsrp.jcr; + +import org.chromattic.api.Chromattic; +import org.chromattic.api.ChromatticBuilder; +import org.chromattic.api.ChromatticSession; +import org.gatein.common.util.ParameterValidation; +import org.gatein.wsrp.jcr.mapping.BaseMapping; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public abstract class BaseChromatticPersister implements ChromatticPersister +{ + private Chromattic chrome; + public static final String WSRP_WORKSPACE_NAME = "wsrp-system"; + public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system"; + protected static final String REPOSITORY_NAME = "repository"; + protected String workspaceName; + private Map<Class, Class<? extends BaseMapping>> modelToMapping; + + private ThreadLocal<ChromatticSession> sessionHolder = new ThreadLocal<ChromatticSession>(); + + public BaseChromatticPersister(String workspaceName) + { + this.workspaceName = workspaceName; + } + + public void initializeBuilderFor(List<Class> mappingClasses) throws Exception + { + ChromatticBuilder builder = ChromatticBuilder.create(); + builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl"); + + setBuilderOptions(builder); + + modelToMapping = new HashMap<Class, Class<? extends BaseMapping>>(mappingClasses.size()); + for (Class mappingClass : mappingClasses) + { + if (BaseMapping.class.isAssignableFrom(mappingClass)) + { + Type[] interfaces = mappingClass.getGenericInterfaces(); + if (ParameterValidation.existsAndIsNotEmpty(interfaces)) + { + Class type = (Class)((ParameterizedType)interfaces[0]).getActualTypeArguments()[0]; + modelToMapping.put(type, mappingClass); + } + } + builder.add(mappingClass); + } + + chrome = builder.build(); + } + + protected abstract void setBuilderOptions(ChromatticBuilder builder); + + public ChromatticSession getSession() + { + ChromatticSession chromatticSession = sessionHolder.get(); + if (chromatticSession == null) + { + ChromatticSession session = chrome.openSession(); + sessionHolder.set(session); + return session; + } + else + { + return chromatticSession; + } + } + + public void closeSession(boolean save) + { + ChromatticSession session = getOpenedSessionOrFail(); + if (save) + { + synchronized (this) + { + session.save(); + } + } + session.close(); + sessionHolder.set(null); + } + + private ChromatticSession getOpenedSessionOrFail() + { + ChromatticSession session = sessionHolder.get(); + if (session == null) + { + throw new IllegalStateException("Cannot close the session as it hasn't been opened first!"); + } + return session; + } + + public synchronized void save() + { + getOpenedSessionOrFail().save(); + } + + public <T> boolean delete(T toDelete, org.gatein.wsrp.jcr.StoresByPathManager<T> manager) + { + Class<? extends Object> modelClass = toDelete.getClass(); + Class<? extends BaseMapping> baseMappingClass = modelToMapping.get(modelClass); + if (baseMappingClass == null) + { + throw new IllegalArgumentException("Cannot find a mapping class for " + modelClass.getName()); + } + + ChromatticSession session = getSession(); + + Object old = session.findByPath(baseMappingClass, manager.getChildPath(toDelete)); + + if (old != null) + { + session.remove(old); + closeSession(true); + return true; + } + else + { + closeSession(false); + return false; + } + } +} Added: components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/consumers-configuration-nodetypes.xml =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/consumers-configuration-nodetypes.xml (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/consumers-configuration-nodetypes.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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="wsrp:producerinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:producerinfo" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:producerinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:producerinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="producerid" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="cache" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="active" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="endpoint" defaultPrimaryType="wsrp:endpointinfo" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:endpointinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="registration" defaultPrimaryType="wsrp:registrationinfo" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:endpointinfo" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="wsdlurl" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="timeout" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="enablewss" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="consumername" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationproperty" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationproperty</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="Integer" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" + primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Added: components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/migration-nodetypes.xml =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/migration-nodetypes.xml (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/migration-nodetypes.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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="wsrp:exportinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportinfo" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exportinfo</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:exportinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="exporttime" requiredType="Long" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="expirationtime" requiredType="Long" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="exportcontext" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportedstate" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exportedstate</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:exporterror" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:exporterror</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:exportedstate" isMixin="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:exporterror" isMixin="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="errorcode" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="handles" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> +</nodeTypes> \ No newline at end of file Added: components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-configuration-nodetypes.xml =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-configuration-nodetypes.xml (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-configuration-nodetypes.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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="wsrp:producerconfiguration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="strictmode" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="registrationrequirements" defaultPrimaryType="wsrp:registrationrequirements" + autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationrequirements</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationrequirements" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="registrationrequired" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="registrationrequiredforfulldescription" requiredType="boolean" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="policyclassname" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="validatorclassname" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registrationpropertydescription" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperty" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="description" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationpropertydescription</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationpropertydescription" isMixin="false" hasOrderableChildNodes="true" + primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="type" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="description" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="hint" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="label" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Added: components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-pc-nodetypes.xml =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-pc-nodetypes.xml (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-pc-nodetypes.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<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="pc:producerstates" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions/> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>pc:statecontext</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="pc:statecontext" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="id" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="state" defaultPrimaryType="pc:state" autoCreated="true" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>pc:state</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="pc:state" isMixin="false" hasOrderableChildNodes="false"> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="pc:portletid" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="pc:terminationtime" requiredType="Date" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions/> + </nodeType> + +</nodeTypes> Added: components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-registrations-nodetypes.xml =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-registrations-nodetypes.xml (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/resources/conf/nodetypes/producer-registrations-nodetypes.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,218 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<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="wsrp:consumersandgroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" + autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumergroup" + autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" + sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumergroup</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:consumer" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="id" requiredType="String" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="consumeragent" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" + autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="group" requiredType="Path" autoCreated="false" mandatory="false" + onParentVersion="COPY" + protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:registration" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registration</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="capabilities" defaultPrimaryType="wsrp:consumercapabilities" autoCreated="true" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumercapabilities</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:registration" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="status" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="registrationhandle" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="properties" defaultPrimaryType="wsrp:registrationproperties" autoCreated="false" + mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:registrationproperties</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:portletcontext" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:portletcontext</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:portletcontext" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="id" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:registrationproperties" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> +  + <propertyDefinitions> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + + <nodeType name="wsrp:consumergroup" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="status" requiredType="String" + autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + <childNodeDefinitions> + <childNodeDefinition name="*" defaultPrimaryType="wsrp:consumer" autoCreated="false" + mandatory="false" + onParentVersion="COPY" protected="false" sameNameSiblings="false"> + <requiredPrimaryTypes> + <requiredPrimaryType>wsrp:consumer</requiredPrimaryType> + </requiredPrimaryTypes> + </childNodeDefinition> + </childNodeDefinitions> + </nodeType> + + <nodeType name="wsrp:consumercapabilities" isMixin="false" hasOrderableChildNodes="true" primaryItemName=""> + <supertypes> + <supertype>nt:base</supertype> + <supertype>mix:referenceable</supertype> + </supertypes> + <propertyDefinitions> + <propertyDefinition name="modes" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="windowstates" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="userscopes" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="userprofiledata" requiredType="String" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="supportsgetmethod" requiredType="boolean" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes> \ No newline at end of file Added: components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java (rev 0) +++ components/wsrp/trunk/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java 2011-04-21 08:37:10 UTC (rev 6313) @@ -0,0 +1,70 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * 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.gatein.wsrp.consumer.registry; + +import org.chromattic.api.ChromatticBuilder; +import org.gatein.pc.federation.impl.FederatingPortletInvokerService; +import org.gatein.wsrp.jcr.BaseChromatticPersister; + +/** + * This is essentially the same class as org.gatein.wsrp.state.consumer.ConsumerRegistryTestCase in WSRP consumer + * module + * tests. + * + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public class JCRConsumerRegistryTestCase extends ConsumerRegistryTestCase +{ + /** + * Incremented for each test so that we can append it to the workspace name and work with a "clean" DB for each + * test. + */ + + @Override + protected void setUp() throws Exception + { + String workspaceName = "/wsrp-jcr-test" + Math.round(Math.abs(100000 * Math.random())); + BaseChromatticPersister persister = new BaseChromatticPersister(workspaceName) + { + @Override + protected void setBuilderOptions(ChromatticBuilder builder) + { + builder.setOptionValue(ChromatticBuilder.ROOT_NODE_PATH, workspaceName); + builder.setOptionValue(ChromatticBuilder.ROOT_NODE_TYPE, "nt:unstructured"); + builder.setOptionValue(ChromatticBuilder.CREATE_ROOT_NODE, true); + } + }; + persister.initializeBuilderFor(JCRConsumerRegistry.mappingClasses); + registry = new JCRConsumerRegistry(persister, false); + registry.setFederatingPortletInvoker(new FederatingPortletInvokerService()); + } + + @Override + public void testStoppingShouldntStartConsumers() throws Exception + { + // override to bypass this test as I couldn't find a way to make it work properly (i.e. how to inject a Mock + // into the registry to check that start is only called once) + } +} Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-04-21 08:06:47 UTC (rev 6312) +++ components/wsrp/trunk/pom.xml 2011-04-21 08:37:10 UTC (rev 6313) @@ -87,6 +87,12 @@ </dependency> <dependency> <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <type>test-jar</type> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-producer-lib</artifactId> <version>${project.version}</version> </dependency> @@ -195,6 +201,20 @@ <scope>compile</scope> </dependency> +  + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${org.chromattic.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.exo</artifactId> + <version>${org.chromattic.version}</version> + <scope>test</scope> + </dependency> + <!-- TODO: Need to investigate this plugin to speed up tests <dependency>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6312 - in portal/branches/global-portlet-metadata: portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui and 28 other directories.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2011-04-21 04:06:47 -0400 (Thu, 21 Apr 2011) New Revision: 6312 Removed: portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml Log: Remove legacy portlet monitoring Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ActionProcessingPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -21,6 +21,7 @@ import java.io.IOException; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.filter.ActionFilter; import javax.portlet.filter.FilterChain; @@ -39,6 +40,24 @@ public void doFilter(ActionRequest request, ActionResponse response, FilterChain chain) throws IOException, PortletException { + long startTime = System.currentTimeMillis(); + + chain.doFilter(request, response); + + String portletName = ""; + + PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); + if(portletConfig != null) + { + portletName = portletConfig.getPortletName(); + } + + String portletWindowID = portletName + "-" + request.getWindowID(); + + long endTime = System.currentTimeMillis(); + + System.out.println("Processing action on portlet " + portletWindowID + " takes " + (endTime - startTime) + " ms"); + } public void destroy() Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/EventHandlingPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -21,6 +21,7 @@ import java.io.IOException; import javax.portlet.EventRequest; import javax.portlet.EventResponse; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.filter.EventFilter; import javax.portlet.filter.FilterChain; @@ -39,6 +40,25 @@ public void doFilter(EventRequest request, EventResponse response, FilterChain chain) throws IOException, PortletException { + long startTime = System.currentTimeMillis(); + + chain.doFilter(request, response); + + String portletName = ""; + + PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); + if(portletConfig != null) + { + portletName = portletConfig.getPortletName(); + } + + String portletWindowID = portletName + "-" + request.getWindowID(); + + String eventName = request.getEvent().getName(); + + long endTime = System.currentTimeMillis(); + + System.out.println("Handling the event " + eventName + " on portlet window " + portletWindowID + " takes " + (endTime - startTime) + " ms"); } public void destroy() Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/RenderPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -46,6 +46,8 @@ { long startTime = System.currentTimeMillis(); + chain.doFilter(request, response); + String portletName = ""; PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); @@ -56,11 +58,9 @@ String portletWindowID = portletName + "-" + request.getWindowID(); - chain.doFilter(request, response); - long endTime = System.currentTimeMillis(); - System.out.println("RENDERING PORTLET " + portletWindowID + " TAKES " + (endTime - startTime) + " MILLISECONDS"); + System.out.println("Rendering portlet window " + portletWindowID + " takes " + (endTime - startTime) + " ms"); } Modified: portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java =================================================================== --- portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/ResourceServingPerformanceFilter.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -19,6 +19,7 @@ package org.exoplatform.portal.pc.filter; import java.io.IOException; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; @@ -38,6 +39,24 @@ public void doFilter(ResourceRequest request, ResourceResponse response, FilterChain chain) throws IOException, PortletException { + long startTime = System.currentTimeMillis(); + + chain.doFilter(request, response); + + String portletName = ""; + + PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config"); + if(portletConfig != null) + { + portletName = portletConfig.getPortletName(); + } + + String portletWindowID = portletName + "-" + request.getWindowID(); + + long endTime = System.currentTimeMillis(); + + System.out.println("Serving resource request to resource " + request.getResourceID() + " on portlet window " + portletWindowID + " takes " + + (endTime - startTime) + " ms"); } public void destroy() Modified: portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/DashboardPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.dashboard.webui.component.UIDashboardPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/dashboard/TabbedDashboardPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.dashboard.webui.component.UITabbedDashboardPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/dashboard/src/main/webapp/WEB-INF/conf/portlet/gadget/GadgetPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.gadget.webui.component.UIGadgetPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AccountPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.account.webui.component.UIAccountPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/AdminToolbarPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIAdminToolbarPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> \ No newline at end of file Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/ApplicationRegistryPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.applicationregistry.webui.component.UIApplicationRegistryPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/GroupNavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.navigation.webui.component.UIGroupNavigationPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/OrganizationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.organization.webui.component.UIOrganizationPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PageManagementPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.navigation.webui.component.UIPageManagementPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.navigation.webui.component.UIPortalNavigationPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.account.webui.component.UIRegisterPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/StarToolbarPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIStarToolbarPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> \ No newline at end of file Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserInfoPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIUserInfoPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarDashboardPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarDashboardPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarGroupPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarGroupPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/UserToolbarSitePortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.toolbar.webui.component.UIUserToolBarSitePortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BannerPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -30,7 +30,6 @@ <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> - </application-lifecycle-listeners> + </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/BreadcumbsPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.component.UIBreadcumbsPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FCKEditorPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.fck.webui.component.UIFCKEditorPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> \ No newline at end of file Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/FooterPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -29,7 +29,6 @@ <ui-component-root>org.exoplatform.portal.webui.application.UIGroovyPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> \ No newline at end of file Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/HomePagePortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.application.UIGroovyPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/IFramePortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.component.UIIFramePortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LoginPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -27,7 +27,6 @@ <ui-component-root>org.exoplatform.groovy.webui.component.UILoginPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/LogoPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.component.UILogoPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/NavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.component.UINavigationPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/PortalNavigationPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.component.UIPortalNavigationPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Modified: portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml =================================================================== --- portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/portlet/web/src/main/webapp/WEB-INF/conf/portlet/web/SitemapPortlet/webui/configuration.xml 2011-04-21 08:06:47 UTC (rev 6312) @@ -24,7 +24,6 @@ <ui-component-root>org.exoplatform.portal.webui.component.UISitemapPortlet</ui-component-root> <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager> <application-lifecycle-listeners> - <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener> </application-lifecycle-listeners> </application> </webui-configuration> Deleted: portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java =================================================================== --- portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-04-21 06:12:37 UTC (rev 6311) +++ portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/PortletStatisticLifecycle.java 2011-04-21 08:06:47 UTC (rev 6312) @@ -1,67 +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.application; - -import org.exoplatform.web.application.Application; -import org.exoplatform.web.application.ApplicationLifecycle; -import org.exoplatform.web.application.RequestFailure; -import org.exoplatform.webui.application.WebuiRequestContext; - -public class PortletStatisticLifecycle implements ApplicationLifecycle<WebuiRequestContext> -{ - - private static final String ATTRIBUTE_NAME = "AppStatistic"; - - @SuppressWarnings("unused") - public void onInit(Application app) - { - - } - - @SuppressWarnings("unused") - public void onStartRequest(Application app, WebuiRequestContext context) throws Exception - { - app.setAttribute(ATTRIBUTE_NAME, System.currentTimeMillis()); - } - - @SuppressWarnings("unused") - public void onFailRequest(Application app, WebuiRequestContext context, RequestFailure failureType) throws Exception - { - - } - - @SuppressWarnings("unused") - public void onEndRequest(Application app, WebuiRequestContext context) throws Exception - { - ApplicationStatisticService service = - (ApplicationStatisticService)app.getApplicationServiceContainer().getComponentInstanceOfType( - ApplicationStatisticService.class); - ApplicationStatistic appStatistic = service.getApplicationStatistic(app.getApplicationId()); - long startTime = Long.valueOf(app.getAttribute(ATTRIBUTE_NAME).toString()); - appStatistic.logTime(System.currentTimeMillis() - startTime); - } - - @SuppressWarnings("unused") - public void onDestroy(Application app) - { - - } - -} \ No newline at end of file

13 years, 5 months

1
0
0 / 0

gatein SVN: r6311 - portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-04-21 02:12:37 -0400 (Thu, 21 Apr 2011) New Revision: 6311 Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java Log: GTNPORTAL-1866 - Issue with picketlink cache - cached items are never evicted Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-04-20 23:04:32 UTC (rev 6310) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-04-21 06:12:37 UTC (rev 6311) @@ -141,7 +141,9 @@ int expiration = -1; - if (cacheExpirationParam.getValue() != null && cacheExpirationParam.getValue().length() > 0) + if (cacheExpirationParam != null && + cacheExpirationParam.getValue() != null && + cacheExpirationParam.getValue().length() > 0) { expiration = Integer.decode(cacheExpirationParam.getValue()); }

13 years, 5 months

1
0
0 / 0

gatein SVN: r6310 - in portal/trunk: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directories.

by do-not-reply＠jboss.org

Author: bdaw Date: 2011-04-20 19:04:32 -0400 (Wed, 20 Apr 2011) New Revision: 6310 Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml Log: GTNPORTAL-1866 - Issue with picketlink cache - cached items are never evicted Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java 2011-04-20 20:36:51 UTC (rev 6309) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java 2011-04-20 23:04:32 UTC (rev 6310) @@ -6,6 +6,9 @@ import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.Fqn; import org.jboss.cache.Node; +import org.jboss.cache.eviction.ExpirationAlgorithmConfig; +import org.jboss.cache.eviction.ExpirationConfiguration; + import org.picketlink.idm.api.Group; import org.picketlink.idm.api.User; @@ -55,6 +58,8 @@ public static final String NODE_OBJECT_KEY = "object"; + private int expiration = -1; + private Fqn getRootNode() { return Fqn.fromString("/" + MAIN_ROOT); @@ -152,6 +157,7 @@ if (ioNode != null) { ioNode.put(NODE_OBJECT_KEY, id); + setExpiration(ioNode); if (log.isLoggable(Level.FINER)) { @@ -205,6 +211,7 @@ if (ioNode != null) { + setExpiration(ioNode); ioNode.put(NODE_OBJECT_KEY, rootGroup); if (log.isLoggable(Level.FINER)) @@ -242,4 +249,22 @@ } + public void setExpiration(Node node) + { + if (expiration != -1 && expiration > 0) + { + Long future = new Long(System.currentTimeMillis() + expiration); + node.put(ExpirationAlgorithmConfig.EXPIRATION_KEY, future); + } + } + + public int getExpiration() + { + return expiration; + } + + public void setExpiration(int expiration) + { + this.expiration = expiration; + } } Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-04-20 20:36:51 UTC (rev 6309) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-04-20 23:04:32 UTC (rev 6310) @@ -76,6 +76,8 @@ public static final String JGROUPS_MUX_ENABLED = "jgroups-multiplexer-stack"; + public static final String CACHE_EXPIRATION = "cacheExpiration"; + private IdentitySessionFactory identitySessionFactory; private String config; @@ -106,6 +108,7 @@ ValueParam storeCacheConfig = initParams.getValueParam(CACHE_CONFIG_STORE_OPTION); ValueParam jgroupsStack = initParams.getValueParam(JGROUPS_MUX_ENABLED); ValueParam jgroupsConfig = initParams.getValueParam(JGROUPS_CONFIG); + ValueParam cacheExpirationParam = initParams.getValueParam(CACHE_EXPIRATION); if (config == null && jndiName == null) { @@ -136,6 +139,13 @@ identityConfiguration.getIdentityConfigurationRegistry().register(hibernateService.getSessionFactory(), "hibernateSessionFactory"); + int expiration = -1; + + if (cacheExpirationParam.getValue() != null && cacheExpirationParam.getValue().length() > 0) + { + expiration = Integer.decode(cacheExpirationParam.getValue()); + } + if (apiCacheConfig != null) { @@ -159,12 +169,14 @@ // PLIDM API cache JBossCacheAPICacheProviderImpl apiCacheProvider = new JBossCacheAPICacheProviderImpl(); + apiCacheProvider.setExpiration(expiration); apiCacheProvider.initialize(cache); picketLinkIDMCache.register(apiCacheProvider); identityConfiguration.getIdentityConfigurationRegistry().register(apiCacheProvider, "apiCacheProvider"); //Integration cache integrationCache = new IntegrationCache(); + integrationCache.setExpiration(expiration); integrationCache.initialize(cache); picketLinkIDMCache.register(apiCacheProvider); @@ -192,6 +204,7 @@ configStream.close(); JBossCacheIdentityStoreCacheProviderImpl storeCacheProvider = new JBossCacheIdentityStoreCacheProviderImpl(); + storeCacheProvider.setExpiration(expiration); storeCacheProvider.initialize(cache); picketLinkIDMCache.register(storeCacheProvider); identityConfiguration.getIdentityConfigurationRegistry().register(storeCacheProvider, "storeCacheProvider"); Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-04-20 20:36:51 UTC (rev 6309) +++ portal/trunk/pom.xml 2011-04-20 23:04:32 UTC (rev 6310) @@ -47,7 +47,7 @@ <org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Beta02</org.gatein.wci.version> <org.gatein.pc.version>2.3.0-Beta02</org.gatein.pc.version> - <org.picketlink.idm>1.1.8.GA</org.picketlink.idm> + <org.picketlink.idm>1.1.9.CR01</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta02</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta01</org.gatein.mop.version> <org.slf4j.version>1.5.8</org.slf4j.version> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-04-20 20:36:51 UTC (rev 6309) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-04-20 23:04:32 UTC (rev 6310) @@ -119,6 +119,12 @@ <value>true</value> </value-param> + <value-param> + <name>cacheExpiration</name> + <value>2000</value> + </value-param> + + </init-params> </component>

13 years, 5 months

1
0
0 / 0

gatein SVN: r6309 - components/pc/trunk/api/src/main/java/org/gatein/pc/api.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-04-20 16:36:51 -0400 (Wed, 20 Apr 2011) New Revision: 6309 Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletContext.java Log: - Reformat javadoc so that it's more legible. Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletContext.java =================================================================== --- components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletContext.java 2011-04-20 17:01:38 UTC (rev 6308) +++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletContext.java 2011-04-20 20:36:51 UTC (rev 6309) @@ -85,12 +85,15 @@ * <p>Interprets the specified identifier and splits it into Components that can then be used to create a * PortletContext.</p> * <p/> - * <ul>Currently supported formats: <li>portletContext := invokerId + {@link #INVOKER_SEPARATOR} + {@link #PREFIX} + - * applicationName + {@link #SEPARATOR} + portletName</li> <li>portletContext := invokerId + {@link - * #INVOKER_SEPARATOR} + arbitraryPortletName</li> <li>portletContext := {@link #PRODUCER_CLONE_ID_PREFIX} + - * portletName</li> <li>portletContext := {@link #CONSUMER_CLONE_ID_PREFIX} + portletName</li> <li>invokerId := - * space* + (digit | letter)+ + (digit | letter | space)*</li> <li>applicationName := space* + (digit | letter)+ + - * (digit | letter | space)*</li> <li>portletName := space* + (digit | letter)+ + (digit | letter | space)*</li> + * <ul>Currently supported formats: + * <li>portletContext := invokerId + {@link #INVOKER_SEPARATOR} + {@link #PREFIX} + applicationName + {@link + * #SEPARATOR} + portletName</li> + * <li>portletContext := invokerId + {@link #INVOKER_SEPARATOR} + arbitraryPortletName</li> + * <li>portletContext := {@link #PRODUCER_CLONE_ID_PREFIX} + portletName</li> + * <li>portletContext := {@link #CONSUMER_CLONE_ID_PREFIX} + portletName</li> + * <li>invokerId := space* + (digit | letter)+ + (digit | letter | space)*</li> + * <li>applicationName := space* + (digit | letter)+ + (digit | letter | space)*</li> + * <li>portletName := space* + (digit | letter)+ + (digit | letter | space)*</li> * <li>arbitraryPortletName := ({@link #PREFIX} | {@link #PRODUCER_CLONE_ID_PREFIX} | {@link * #CONSUMER_CLONE_ID_PREFIX})? + portletName</li> </ul> *

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits April 2011