[gatein-commits] gatein SVN: r2151 - in portal/trunk: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Mar 11 04:50:40 EST 2010
Author: julien_viet
Date: 2010-03-11 04:50:40 -0500 (Thu, 11 Mar 2010)
New Revision: 2151
Added:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-portlet-states-nodetypes.xml
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextsMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateMapping.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Log:
renaming portlet-states-system -> pc-system / portlet: namespace to pc:
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-03-11 09:50:40 UTC (rev 2151)
@@ -47,7 +47,7 @@
{
private Chromattic chrome;
public static final String WSRP_WORKSPACE_NAME = "wsrp-system";
- public static final String PORTLET_STATES_WORKSPACE_NAME = "portlet-states-system";
+ public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system";
private static final String REPOSITORY_NAME = "repository";
private String workspaceName;
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java 2010-03-11 09:50:40 UTC (rev 2151)
@@ -38,7 +38,7 @@
@PrimaryType(name = PortletStateContextMapping.NODE_NAME)
public abstract class PortletStateContextMapping
{
- public static final String NODE_NAME = "portlet:statecontext";
+ public static final String NODE_NAME = "pc:statecontext";
@Id
public abstract String getPersistentKey();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextsMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextsMapping.java 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextsMapping.java 2010-03-11 09:50:40 UTC (rev 2151)
@@ -40,7 +40,7 @@
@FormattedBy(JCRPersister.PortletNameFormatter.class)
public abstract class PortletStateContextsMapping
{
- public static final String NODE_NAME = "portlet:producerstates";
+ public static final String NODE_NAME = "pc:producerstates";
@OneToMany
public abstract Collection<PortletStateContextMapping> getPortletStateContexts();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateMapping.java 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateMapping.java 2010-03-11 09:50:40 UTC (rev 2151)
@@ -46,10 +46,10 @@
@PrimaryType(name = PortletStateMapping.NODE_NAME)
public abstract class PortletStateMapping
{
- public static final String NODE_NAME = "portlet:state";
+ public static final String NODE_NAME = "pc:state";
- private static final String PORTLET_ID = "portlet:portletid";
- private static final String TERMINATION_TIME = "portlet:terminationtime";
+ private static final String PORTLET_ID = "pc:portletid";
+ private static final String TERMINATION_TIME = "pc:terminationtime";
private static final ObjectToStringListConverter VALUE_CONVERTER = new ObjectToStringListConverter();
private static final MappedMap<String, List<String>> mappedMap =
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-03-11 09:50:40 UTC (rev 2151)
@@ -100,7 +100,7 @@
<property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
<property name="lgn" value="http://www.gatein.org/jcr/autologin/1.0/"/>
<property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
- <property name="portlet" value="http://www.gatein.org/jcr/portlet/1.0/"/>
+ <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/>
</properties-param>
</init-params>
</component-plugin>
@@ -122,7 +122,7 @@
<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
- <value>war:/conf/wsrp/producer-portlet-states-nodetypes.xml</value>
+ <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-03-11 09:50:40 UTC (rev 2151)
@@ -293,7 +293,7 @@
</workspace>
<!-- Producer portlet states -->
- <workspace name="portlet-states-system">
+ <workspace name="pc-system">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
@@ -301,13 +301,12 @@
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
- <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portlet-states${container.name.suffix}"/>
+ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/pc${container.name.suffix}"/>
</properties>
<value-storages>
- <value-storage id="gadgets"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <value-storage id="gadgets" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="${gatein.jcr.storage.data.dir}/portlet-states${container.name.suffix}"/>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/pc${container.name.suffix}"/>
</properties>
<filters>
<filter property-type="Binary"/>
@@ -318,40 +317,36 @@
<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
<properties>
<property name="root-nodetype" value="nt:unstructured"/>
- <property name="root-permissions"
- value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
</properties>
</initializer>
<cache enabled="true"
class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration"
- value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml"/>
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml"/>
<property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/>
<property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portlet-states-system"/>
+ <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/>
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="${gatein.jcr.index.data.dir}/portlet-states-system${container.name.suffix}"/>
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/pc-system${container.name.suffix}"/>
<property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/>
<property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml"/>
<property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/>
<property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portlet-states-system"/>
+ <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/>
<property name="max-volatile-time" value="60"/>
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
<properties>
<property name="time-out" value="15m"/>
- <property name="jbosscache-configuration"
- value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml"/>
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml"/>
<property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml"/>
<property name="jgroups-multiplexer-stack" value="true"/>
- <property name="jbosscache-cluster-namejbosscache-cluster-name"
- value="jcrlock-${container.name.suffix}-system"/>
+ <property name="jbosscache-cluster-namejbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system"/>
<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/>
<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/>
<property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/>
@@ -359,8 +354,7 @@
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/>
<property name="jbosscache-cl-cache.jdbc.node.column" value="node"/>
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/>
- <property name="jbosscache-cl-cache.jdbc.datasource"
- value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
</properties>
</lock-manager>
</workspace>
Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml (from rev 2145, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-portlet-states-nodetypes.xml)
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml 2010-03-11 09:50:40 UTC (rev 2151)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<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>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-portlet-states-nodetypes.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-portlet-states-nodetypes.xml 2010-03-11 09:41:13 UTC (rev 2150)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-portlet-states-nodetypes.xml 2010-03-11 09:50:40 UTC (rev 2151)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<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="portlet: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>portlet:statecontext</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="portlet: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="portlet:state" autoCreated="true" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>portlet:state</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="portlet:state" isMixin="false" hasOrderableChildNodes="false">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="portlet:portletid" requiredType="String" autoCreated="false" mandatory="false"
- onParentVersion="COPY" protected="false" multiple="false">
- <valueConstraints/>
- </propertyDefinition>
- <propertyDefinition name="portlet: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>
More information about the gatein-commits
mailing list