[gatein-commits] gatein SVN: r6323 - in portal/trunk: wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Apr 21 13:30:35 EDT 2011 

Author: chris.laprun at jboss.com
Date: 2011-04-21 13:30:35 -0400 (Thu, 21 Apr 2011)
New Revision: 6323

Removed:
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml
Modified:
   portal/trunk/pom.xml
   portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
Log:
- Updated to WSRP 2.1.0-Beta03. Adapted JCRPersister to changes.
- GTNWSRP-196: moved nodetype configuration files to WSRP module.

Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/pom.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -19,7 +19,8 @@
 
 -->
 
-<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/maven-v4_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/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
@@ -48,7 +49,7 @@
       <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.9.CR01</org.picketlink.idm>
-      <org.gatein.wsrp.version>2.1.0-Beta02</org.gatein.wsrp.version>
+      <org.gatein.wsrp.version>2.1.0-Beta03</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>
       <rhino.version>1.6R5</rhino.version>
@@ -125,29 +126,29 @@
             <version>${org.exoplatform.kernel.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
-           <version>${org.exoplatform.kernel.version}</version>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
+            <version>${org.exoplatform.kernel.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.mc-int</artifactId>
-           <version>${org.exoplatform.kernel.version}</version>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.mc-int</artifactId>
+            <version>${org.exoplatform.kernel.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.kernel</groupId>
-           <artifactId>exo.kernel.mc-kernel-extras</artifactId>
-           <version>${org.exoplatform.kernel.version}</version>
+            <groupId>org.exoplatform.kernel</groupId>
+            <artifactId>exo.kernel.mc-kernel-extras</artifactId>
+            <version>${org.exoplatform.kernel.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.core</groupId>
-           <artifactId>exo.core.component.organization.api</artifactId>
-           <version>${org.exoplatform.core.version}</version>
+            <groupId>org.exoplatform.core</groupId>
+            <artifactId>exo.core.component.organization.api</artifactId>
+            <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.core</groupId>
-           <artifactId>exo.core.component.xml-processing</artifactId>
-           <version>${org.exoplatform.core.version}</version>
+            <groupId>org.exoplatform.core</groupId>
+            <artifactId>exo.core.component.xml-processing</artifactId>
+            <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
             <groupId>org.exoplatform.core</groupId>
@@ -155,9 +156,9 @@
             <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.core</groupId>
-           <artifactId>exo.core.component.ldap</artifactId>
-           <version>${org.exoplatform.core.version}</version>
+            <groupId>org.exoplatform.core</groupId>
+            <artifactId>exo.core.component.ldap</artifactId>
+            <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
             <groupId>org.exoplatform.core</groupId>
@@ -165,29 +166,29 @@
             <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.core</groupId>
-           <artifactId>exo.core.component.organization.ldap</artifactId>
-           <version>${org.exoplatform.core.version}</version>
+            <groupId>org.exoplatform.core</groupId>
+            <artifactId>exo.core.component.organization.ldap</artifactId>
+            <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.core</groupId>
-           <artifactId>exo.core.component.security.core</artifactId>
-           <version>${org.exoplatform.core.version}</version>
+            <groupId>org.exoplatform.core</groupId>
+            <artifactId>exo.core.component.security.core</artifactId>
+            <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.core</groupId>
-           <artifactId>exo.core.component.document</artifactId>
-           <version>${org.exoplatform.core.version}</version>
+            <groupId>org.exoplatform.core</groupId>
+            <artifactId>exo.core.component.document</artifactId>
+            <version>${org.exoplatform.core.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.jcr</groupId>
-           <artifactId>exo.jcr.component.core</artifactId>
-           <version>${org.exoplatform.jcr.version}</version>
+            <groupId>org.exoplatform.jcr</groupId>
+            <artifactId>exo.jcr.component.core</artifactId>
+            <version>${org.exoplatform.jcr.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.jcr</groupId>
-           <artifactId>exo.jcr.framework.command</artifactId>
-           <version>${org.exoplatform.jcr.version}</version>
+            <groupId>org.exoplatform.jcr</groupId>
+            <artifactId>exo.jcr.framework.command</artifactId>
+            <version>${org.exoplatform.jcr.version}</version>
          </dependency>
          <dependency>
             <groupId>org.exoplatform.jcr</groupId>
@@ -195,44 +196,44 @@
             <version>${org.exoplatform.jcr.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.jcr</groupId>
-           <artifactId>exo.jcr.component.webdav</artifactId>
-           <version>${org.exoplatform.jcr.version}</version>
+            <groupId>org.exoplatform.jcr</groupId>
+            <artifactId>exo.jcr.component.webdav</artifactId>
+            <version>${org.exoplatform.jcr.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.jcr</groupId>
-           <artifactId>exo.jcr.framework.web</artifactId>
-           <version>${org.exoplatform.jcr.version}</version>
+            <groupId>org.exoplatform.jcr</groupId>
+            <artifactId>exo.jcr.framework.web</artifactId>
+            <version>${org.exoplatform.jcr.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.jcr</groupId>
-           <artifactId>exo.jcr.component.ftp</artifactId>
-           <version>${org.exoplatform.jcr.version}</version>
+            <groupId>org.exoplatform.jcr</groupId>
+            <artifactId>exo.jcr.component.ftp</artifactId>
+            <version>${org.exoplatform.jcr.version}</version>
          </dependency>
-        <dependency>
-           <groupId>org.exoplatform.ws</groupId>
-           <artifactId>exo.ws.commons</artifactId>
-           <version>${org.exoplatform.ws.version}</version>
+         <dependency>
+            <groupId>org.exoplatform.ws</groupId>
+            <artifactId>exo.ws.commons</artifactId>
+            <version>${org.exoplatform.ws.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.ws</groupId>
-           <artifactId>exo.ws.frameworks.servlet</artifactId>
-           <version>${org.exoplatform.ws.version}</version>
+            <groupId>org.exoplatform.ws</groupId>
+            <artifactId>exo.ws.frameworks.servlet</artifactId>
+            <version>${org.exoplatform.ws.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.ws</groupId>
-           <artifactId>exo.ws.rest.ext</artifactId>
-           <version>${org.exoplatform.ws.version}</version>
+            <groupId>org.exoplatform.ws</groupId>
+            <artifactId>exo.ws.rest.ext</artifactId>
+            <version>${org.exoplatform.ws.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.ws</groupId>
-           <artifactId>exo.ws.rest.core</artifactId>
-           <version>${org.exoplatform.ws.version}</version>
+            <groupId>org.exoplatform.ws</groupId>
+            <artifactId>exo.ws.rest.core</artifactId>
+            <version>${org.exoplatform.ws.version}</version>
          </dependency>
          <dependency>
-           <groupId>org.exoplatform.ws</groupId>
-           <artifactId>exo.ws.frameworks.json</artifactId>
-           <version>${org.exoplatform.ws.version}</version>
+            <groupId>org.exoplatform.ws</groupId>
+            <artifactId>exo.ws.frameworks.json</artifactId>
+            <version>${org.exoplatform.ws.version}</version>
          </dependency>
 
          <!-- GateIn components -->
@@ -377,210 +378,210 @@
             <version>${org.gatein.wsrp.version}</version>
          </dependency>
 
-        <!-- GateIn -->
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.common</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.web</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.web.controller</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.web.security</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.web.server</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.web.api</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.web.resources</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.portal</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.portal</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>test-jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.pc</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.identity</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.resources</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.application-registry</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.scripting</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.management</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.webui.framework</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.webui.portlet</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.webui.portal</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.webui.eXo</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.webui.core</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.webui.dashboard</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.gadgets-core</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.test.core</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.test.core</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>test-jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.test.jcr</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.test.jcr</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>test-jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.test.organization</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.component.test.organization</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>test-jar</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.server.jboss.plugin</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.web.portal</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.gadgets-server</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.eXoGadgets</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.portlet.web</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.web.rest</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.portlet.exoadmin</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.web.eXoResources</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.gatein.portal.examples.skins</groupId>
-          <artifactId>gatein-sample-skin</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
-        <dependency>
-          <groupId>org.exoplatform.portal</groupId>
-          <artifactId>exo.portal.portlet.dashboard</artifactId>
-          <version>3.2.0-Beta01-SNAPSHOT</version>
-          <type>war</type>
-        </dependency>
+         <!-- GateIn -->
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.common</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.web</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.web.controller</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.web.security</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.web.server</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.web.api</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.web.resources</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.portal</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.portal</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>test-jar</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.pc</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.identity</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.resources</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.application-registry</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.scripting</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.management</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.webui.framework</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.webui.portlet</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.webui.portal</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.webui.eXo</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.webui.core</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.webui.dashboard</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.gadgets-core</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.test.core</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.test.core</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>test-jar</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.test.jcr</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.test.jcr</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>test-jar</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.test.organization</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.component.test.organization</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>test-jar</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.server.jboss.plugin</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.web.portal</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.gadgets-server</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.eXoGadgets</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.portlet.web</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.web.rest</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.portlet.exoadmin</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.web.eXoResources</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.gatein.portal.examples.skins</groupId>
+            <artifactId>gatein-sample-skin</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
+         <dependency>
+            <groupId>org.exoplatform.portal</groupId>
+            <artifactId>exo.portal.portlet.dashboard</artifactId>
+            <version>3.2.0-Beta01-SNAPSHOT</version>
+            <type>war</type>
+         </dependency>
 
          <!-- Reflext -->
          <dependency>
@@ -658,14 +659,14 @@
             <artifactId>picketlink-idm-hibernate</artifactId>
             <version>${org.picketlink.idm}</version>
             <exclusions>
-              <exclusion>
-                 <groupId>org.slf4j</groupId>
-                 <artifactId>slf4j-log4j12</artifactId>
-              </exclusion>
-              <exclusion>
-                 <groupId>log4j</groupId>
-                 <artifactId>log4j</artifactId>
-              </exclusion>
+               <exclusion>
+                  <groupId>org.slf4j</groupId>
+                  <artifactId>slf4j-log4j12</artifactId>
+               </exclusion>
+               <exclusion>
+                  <groupId>log4j</groupId>
+                  <artifactId>log4j</artifactId>
+               </exclusion>
             </exclusions>
          </dependency>
          <dependency>
@@ -683,11 +684,11 @@
             <artifactId>picketlink-idm-cache</artifactId>
             <version>${org.picketlink.idm}</version>
          </dependency>
-        <dependency>
-           <groupId>org.picketlink.idm</groupId>
-           <artifactId>picketlink-idm-spi</artifactId>
-           <version>${org.picketlink.idm}</version>
-        </dependency>
+         <dependency>
+            <groupId>org.picketlink.idm</groupId>
+            <artifactId>picketlink-idm-spi</artifactId>
+            <version>${org.picketlink.idm}</version>
+         </dependency>
 
          <dependency>
             <groupId>javax.portlet</groupId>
@@ -711,40 +712,40 @@
             <version>${org.slf4j.version}</version>
          </dependency>
          <dependency>
-           <groupId>commons-beanutils</groupId>
-           <artifactId>commons-beanutils</artifactId>
-           <version>1.8.3</version>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.8.3</version>
          </dependency>
          <dependency>
-           <groupId>commons-chain</groupId>
-           <artifactId>commons-chain</artifactId>
-           <version>1.2</version>
+            <groupId>commons-chain</groupId>
+            <artifactId>commons-chain</artifactId>
+            <version>1.2</version>
          </dependency>
          <dependency>
-           <groupId>commons-codec</groupId>
-           <artifactId>commons-codec</artifactId>
-           <version>1.3</version>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
          </dependency>
          <dependency>
-           <groupId>commons-fileupload</groupId>
-           <artifactId>commons-fileupload</artifactId>
-           <version>1.2.1</version>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.2.1</version>
          </dependency>
          <dependency>
-           <groupId>commons-logging</groupId>
-           <artifactId>commons-logging</artifactId>
-           <version>1.1.1</version>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
          </dependency>
          <dependency>
-           <groupId>commons-pool</groupId>
-           <artifactId>commons-pool</artifactId>
-           <version>1.5.5</version>
-           <exclusions>
-              <exclusion>
-                 <groupId>xerces</groupId>
-                 <artifactId>xerces</artifactId>
-              </exclusion>
-           </exclusions>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <version>1.5.5</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>xerces</groupId>
+                  <artifactId>xerces</artifactId>
+               </exclusion>
+            </exclusions>
          </dependency>
          <dependency>
             <groupId>commons-dbcp</groupId>
@@ -845,9 +846,9 @@
             <version>2.0</version>
          </dependency>
          <dependency>
-           <groupId>com.google.inject.extensions</groupId>
-           <artifactId>guice-jmx</artifactId>
-           <version>2.0</version>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-jmx</artifactId>
+            <version>2.0</version>
          </dependency>
          <dependency>
             <groupId>rome</groupId>
@@ -879,11 +880,11 @@
             <artifactId>htmlparser</artifactId>
             <version>1.0.7</version>
          </dependency>
-        <dependency>
-           <groupId>log4j</groupId>
-           <artifactId>log4j</artifactId>
-           <version>1.2.16</version>
-        </dependency>
+         <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.16</version>
+         </dependency>
 
          <dependency>
             <groupId>org.gatein.shindig</groupId>
@@ -927,11 +928,11 @@
             <artifactId>simplecaptcha</artifactId>
             <version>${nl.captcha.simplecaptcha.version}</version>
          </dependency>
-         <!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) --> 
+         <!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) -->
          <dependency>
-         	<groupId>net.jcip</groupId>
-         	<artifactId>jcip-annotations</artifactId>
-         	<version>${jcip.version}</version>
+            <groupId>net.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+            <version>${jcip.version}</version>
          </dependency>
 
       </dependencies>
@@ -1010,13 +1011,13 @@
                  memory option properties. This should be removed when we can just set the compiler properties -->
             <!-- we need to specify this as building GateIn can cause memory problems with some JDKs (ie IBM) -->
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <configuration>
-                <fork>true</fork>
-                <meminitial>256m</meminitial>
-                <maxmem>1024m</maxmem>
-              </configuration>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-compiler-plugin</artifactId>
+               <configuration>
+                  <fork>true</fork>
+                  <meminitial>256m</meminitial>
+                  <maxmem>1024m</maxmem>
+               </configuration>
             </plugin>
          </plugins>
       </pluginManagement>
@@ -1030,11 +1031,12 @@
                   <phase>compile</phase>
                   <configuration>
                      <tasks>
-                        <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes">
+                        <copy failonerror="false"
+                              todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes">
                            <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes">
-                              <include name="**/*_en.properties" />
+                              <include name="**/*_en.properties"/>
                            </fileset>
-                           <globmapper from="*_en.properties" to="*.properties" />
+                           <globmapper from="*_en.properties" to="*.properties"/>
                         </copy>
                      </tasks>
                   </configuration>
@@ -1047,126 +1049,126 @@
       </plugins>
    </build>
 
-  <profiles>
-    <profile>
-      <id>hsqldb</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.hsqldb</groupId>
-          <artifactId>hsqldb</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-surefire-plugin</artifactId>
-             <configuration>
-                <systemProperties>
-                  <property>
-                     <name>java.util.logging.config.class</name>
-                     <value>org.exoplatform.component.test.logging.LogConfigurator</value>
-                  </property>
-                  <property>
-                    <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
-                    <value>${project.build.directory}</value>
-                  </property>
-                  <property>
-                    <name>gatein.test.datasource.driver</name>
-                    <value>org.hsqldb.jdbcDriver</value>
-                  </property>
-                  <property>
-                     <name>gatein.test.datasource.url</name>
-                     <value>jdbc:hsqldb:mem:gateindb</value>
-                  </property>
-                  <property>
-                     <name>gatein.test.datasource.username</name>
-                     <value>sa</value>
-                  </property>
-                  <property>
-                     <name>gatein.test.datasource.password</name>
-                     <value />
-                  </property>
-                </systemProperties>
-             </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>mysql5</id>
-      <dependencies>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-          <version>5.1.6</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-           <groupId>log4j</groupId>
-           <artifactId>log4j</artifactId>
-           <version>1.2.16</version>
-           <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-             <groupId>org.apache.maven.plugins</groupId>
-             <artifactId>maven-surefire-plugin</artifactId>
-             <configuration>
-                <systemProperties>
-                  <property>
-                     <name>java.util.logging.config.class</name>
-                     <value>org.exoplatform.component.test.logging.LogConfigurator</value>
-                  </property>
-                  <property>
-                    <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
-                    <value>${project.build.directory}</value>
-                  </property>
-                  <property>
-                    <name>gatein.test.datasource.driver</name>
-                    <value>com.mysql.jdbc.Driver</value>
-                  </property>
-                  <property>
-                     <name>gatein.test.datasource.url</name>
-                     <value>jdbc:mysql://10.37.129.4/gatein?createDatabaseIfNotExist=true&amp;useUnicode=true&amp;characterEncoding=utf-8</value>
-                  </property>
-                  <property>
-                     <name>gatein.test.datasource.username</name>
-                     <value>root</value>
-                  </property>
-                  <property>
-                     <name>gatein.test.datasource.password</name>
-                     <value>a</value>
-                  </property>
-                </systemProperties>
-             </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+   <profiles>
+      <profile>
+         <id>hsqldb</id>
+         <activation>
+            <activeByDefault>true</activeByDefault>
+         </activation>
+         <dependencies>
+            <dependency>
+               <groupId>org.hsqldb</groupId>
+               <artifactId>hsqldb</artifactId>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <systemProperties>
+                        <property>
+                           <name>java.util.logging.config.class</name>
+                           <value>org.exoplatform.component.test.logging.LogConfigurator</value>
+                        </property>
+                        <property>
+                           <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
+                           <value>${project.build.directory}</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.driver</name>
+                           <value>org.hsqldb.jdbcDriver</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.url</name>
+                           <value>jdbc:hsqldb:mem:gateindb</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.username</name>
+                           <value>sa</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.password</name>
+                           <value/>
+                        </property>
+                     </systemProperties>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+      <profile>
+         <id>mysql5</id>
+         <dependencies>
+            <dependency>
+               <groupId>mysql</groupId>
+               <artifactId>mysql-connector-java</artifactId>
+               <version>5.1.6</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>log4j</groupId>
+               <artifactId>log4j</artifactId>
+               <version>1.2.16</version>
+               <scope>test</scope>
+            </dependency>
+         </dependencies>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-surefire-plugin</artifactId>
+                  <configuration>
+                     <systemProperties>
+                        <property>
+                           <name>java.util.logging.config.class</name>
+                           <value>org.exoplatform.component.test.logging.LogConfigurator</value>
+                        </property>
+                        <property>
+                           <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
+                           <value>${project.build.directory}</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.driver</name>
+                           <value>com.mysql.jdbc.Driver</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.url</name>
+                           <value>jdbc:mysql://10.37.129.4/gatein?createDatabaseIfNotExist=true&amp;useUnicode=true&amp;characterEncoding=utf-8</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.username</name>
+                           <value>root</value>
+                        </property>
+                        <property>
+                           <name>gatein.test.datasource.password</name>
+                           <value>a</value>
+                        </property>
+                     </systemProperties>
+                  </configuration>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
 
    <!-- To be removed and replaced by settings in user config -->
    <repositories>
       <repository>
-        <id>jboss-public-repository-group</id>
-        <name>JBoss Public Maven Repository Group</name>
-        <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-        <layout>default</layout>
-        <releases>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-        </releases>
-        <snapshots>
-          <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-        </snapshots>
+         <id>jboss-public-repository-group</id>
+         <name>JBoss Public Maven Repository Group</name>
+         <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+         <layout>default</layout>
+         <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+         </releases>
+         <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+         </snapshots>
       </repository>
    </repositories>
    <pluginRepositories>
@@ -1176,13 +1178,13 @@
          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
          <layout>default</layout>
          <releases>
-           <enabled>true</enabled>
-           <updatePolicy>never</updatePolicy>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
          </releases>
          <snapshots>
-           <enabled>true</enabled>
-          <updatePolicy>never</updatePolicy>
-        </snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+         </snapshots>
       </pluginRepository>
    </pluginRepositories>
 </project>

Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java
===================================================================
--- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/jcr/JCRPersister.java	2011-04-21 17:30:35 UTC (rev 6323)
@@ -31,11 +31,12 @@
 import org.chromattic.spi.jcr.SessionLifeCycle;
 import org.exoplatform.container.ExoContainer;
 import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.container.component.ComponentRequestLifecycle;
 import org.exoplatform.services.jcr.RepositoryService;
 import org.exoplatform.services.jcr.core.ManageableRepository;
 import org.exoplatform.services.jcr.ext.common.SessionProvider;
 import org.gatein.common.util.ParameterValidation;
-import org.gatein.wsrp.jcr.ChromatticPersister;
+import org.gatein.wsrp.jcr.BaseChromatticPersister;
 import org.gatein.wsrp.jcr.mapping.BaseMapping;
 
 import javax.jcr.Credentials;
@@ -51,26 +52,16 @@
  * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  * @version $Revision$
  */
-public class JCRPersister implements ChromatticPersister
+public class JCRPersister extends BaseChromatticPersister
 {
-   private Chromattic chrome;
-   public static final String WSRP_WORKSPACE_NAME = "wsrp-system";
-   public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system";
-   private static final String REPOSITORY_NAME = "repository";
-   private String workspaceName;
-   private Map<Class, Class<? extends BaseMapping>> modelToMapping;
-
-   private ThreadLocal<ChromatticSession> sessionHolder = new ThreadLocal<ChromatticSession>();
-
    public JCRPersister(ExoContainer container, String workspaceName)
    {
-      this.workspaceName = workspaceName;
+      super(workspaceName);
    }
 
-   public void initializeBuilderFor(List<Class> mappingClasses) throws Exception
+   @Override
+   protected void setBuilderOptions(ChromatticBuilder builder)
    {
-      ChromatticBuilder builder = ChromatticBuilder.create();
-      builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME, "org.chromattic.apt.InstrumentorImpl");
       if (PORTLET_STATES_WORKSPACE_NAME.equals(workspaceName))
       {
          builder.setOptionValue(ChromatticBuilder.SESSION_LIFECYCLE_CLASSNAME, PortletStatesSessionLifeCycle.class.getName());
@@ -83,95 +74,8 @@
       {
          throw new IllegalArgumentException("Unknown workspace name: '" + workspaceName + "'");
       }
-
-      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();
    }
 
-   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;
-      }
-   }
-
    public static class WSRPSessionLifeCycle implements SessionLifeCycle
    {
       private ManageableRepository repository;

Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ JBoss, a division of Red Hat
-  ~ Copyright 2011, 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="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

Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ JBoss, a division of Red Hat
-  ~ Copyright 2011, 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="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

Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ JBoss, a division of Red Hat
-  ~ Copyright 2011, 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="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

Deleted: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-pc-nodetypes.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ JBoss, a division of Red Hat
-  ~ Copyright 2011, 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/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-  ~ JBoss, a division of Red Hat
-  ~ Copyright 2011, 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="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>
-      <!-- residual properties so that we can store an arbritrary number of registration properties -->
-      <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

Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml	2011-04-21 17:22:37 UTC (rev 6322)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml	2011-04-21 17:30:35 UTC (rev 6323)
@@ -66,11 +66,11 @@
             <values-param>
                <name>autoCreatedInNewRepository</name>
                <description>Node types configuration file</description>
-               <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-pc-nodetypes.xml</value>
-               <value>war:/conf/wsrp/migration-nodetypes.xml</value>
+               <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>
@@ -183,41 +183,4 @@
       </component-plugin>
    </external-component-plugins>
 
-
-   <!--<external-component-plugins>
-      <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
-      <component-plugin>
-         <name>chromattic</name>
-         <set-method>addLifeCycle</set-method>
-         <type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
-         <init-params>
-            <value-param>
-               <name>domain-name</name>
-               <value>wsrp</value>
-            </value-param>
-            <value-param>
-               <name>workspace-name</name>
-               <value>wsrp-system</value>
-            </value-param>
-            <values-param>
-               <name>entities</name>
-               <value>org.gatein.integration.wsrp.state.mapping.RegistrationPropertyDescriptionMapping</value>
-               <value>org.gatein.integration.wsrp.state.consumer.mapping.ProducerInfoMapping</value>
-               <value>org.gatein.integration.wsrp.state.consumer.mapping.ProducerInfosMapping</value>
-               <value>org.gatein.integration.wsrp.state.consumer.mapping.RegistrationInfoMapping</value>
-               <value>org.gatein.integration.wsrp.state.consumer.mapping.RegistrationPropertyMapping</value>
-               <value>org.gatein.integration.wsrp.state.consumer.mapping.EndpointInfoMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.configuration.mapping.ProducerConfigurationMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.configuration.mapping.RegistrationRequirementsMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumerCapabilitiesMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumerGroupMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumerMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.ConsumersAndGroupsMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.RegistrationMapping</value>
-               <value>org.gatein.integration.wsrp.state.producer.registrations.mapping.RegistrationPropertiesMapping</value>
-            </values-param>
-         </init-params>
-      </component-plugin>
-   </external-component-plugins>-->
-
 </configuration>

More information about the gatein-commits mailing list