[gatein-commits] gatein SVN: r3972 - in portal/branches/branched-r3845: component/application-registry/src/test and 32 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Aug 31 02:45:17 EDT 2010


Author: kien_nguyen
Date: 2010-08-31 02:45:13 -0400 (Tue, 31 Aug 2010)
New Revision: 3972

Added:
   portal/branches/branched-r3845/component/application-registry/src/test/resources/
   portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/
   portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml
   portal/branches/branched-r3845/component/identity/src/test/resources/
   portal/branches/branched-r3845/component/identity/src/test/resources/conf/
   portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/
   portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml
   portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml
   portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml
   portal/branches/branched-r3845/component/portal/src/test/resources/conf/
   portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml
   portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/
   portal/branches/branched-r3845/component/resources/src/test/resources/conf/
   portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties
   portal/branches/branched-r3845/component/resources/src/test/resources/resources/
   portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml
   portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml
   portal/branches/branched-r3845/webui/core/src/test/resources/conf/
   portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/
   portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml
Removed:
   portal/branches/branched-r3845/component/portal/src/test/java/conf/
Modified:
   portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
   portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml
   portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml
   portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml
   portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml
   portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties
   portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties
   portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml
   portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml
   portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml
   portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml
   portal/branches/branched-r3845/pom.xml
   portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml
Log:
GTNPORTAL-113 resources have to be in src/[main|test]/resources and not in src/[main|test]/java

Modified: portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/application-registry/src/test/java/conf/exo.portal.component.application-registry-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-  xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
-  <component>
-    <key>org.exoplatform.application.registry.ApplicationRegistryService</key>
-    <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type>
-    <!--
-  	<component-plugins>
-	    <component-plugin>
-	      <name>new.portal.portlets.registry</name>
-	      <set-method>initListener</set-method>
-	      <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type>
-	      <description>this listener init the portlets are registered in PortletRegister</description>
-	      <init-params>
-	      	<object-param>
-	          <name>administration</name>
-	          <description>description</description>
-	          <object type="org.exoplatform.application.registry.ApplicationCategory">
-	            <field  name="name"><string>administration</string></field>
-	            <field  name="displayName"><string>Administration</string></field>
-	            <field  name="description"><string>application for administration</string></field>
-		          <field name="accessPermissions">
-				        <collection type="java.util.ArrayList" item-type="java.lang.String">
-				        	<value><string>*:/platform/administrators</string></value>
-				        	<value><string>*:/organization/management/executive-board</string></value>
-				        </collection>
-		          </field>
-	            <field  name="applications">
-		            <collection type="java.util.ArrayList">
-									<value>
-	                  <object type="org.exoplatform.application.registry.Application">
-									    <field name="applicationName"><string>ApplicationRegistryPortlet</string></field>
-	                    <field  name="categoryName"><string>administration</string></field>
-						          <field name="displayName"><string>Application Registry</string></field>
-						          <field name="description"><string>Application Registry</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>exoadmin</string></field>
-						          <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-								        	<value><string>*:/platform/administrators</string></value>
-								        	<value><string>*:/organization/management/executive-board</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-					        <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field name="applicationName"><string>OrganizationPortlet</string></field>
-		                  <field  name="categoryName"><string>administration</string></field>
-	                    <field name="displayName"><string>Organization Management</string></field>
-	                    <field name="description"><string>Organization Management</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>exoadmin</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/administrators</string></value>
-													<value><string>*:/organization/management/executive-board</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-					        <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field name="applicationName"><string>AccountPortlet</string></field>
-		                  <field  name="categoryName"><string>administration</string></field>
-						          <field name="displayName"><string>New Account</string></field>
-						          <field name="description"><string>New Account</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>exoadmin</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/administrators</string></value>
-													<value><string>*:/organization/management/executive-board</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-		            </collection>
-	            </field>
-	          </object>
-	        </object-param>
-
-			    <object-param>
-	          <name>web</name>
-	          <description>description</description>
-	          <object type="org.exoplatform.application.registry.ApplicationCategory">
-	            <field  name="name"><string>web</string></field>
-	            <field  name="displayName"><string>web</string></field>
-	            <field  name="description"><string>BasicPortlets</string></field>
-              <field name="accessPermissions">
-				        <collection type="java.util.ArrayList" item-type="java.lang.String">
-									<value><string>*:/platform/users</string></value>
-				        </collection>
-		          </field>
-	            <field  name="applications">
-		            <collection type="java.util.ArrayList">
-	                <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field  name="categoryName"><string>web</string></field>
-		                  <field name="applicationName"><string>IFramePortlet</string></field>
-						          <field name="displayName"><string>IFrame</string></field>
-						          <field name="description"><string>IFrame</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>web</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/users</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-					        <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field  name="categoryName"><string>web</string></field>
-		                  <field name="applicationName"><string>SiteMapPortlet</string></field>
-						          <field name="displayName"><string>SiteMap</string></field>
-						          <field name="description"><string>SiteMap</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>web</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/users</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-	                <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field  name="categoryName"><string>web</string></field>
-		                  <field name="applicationName"><string>BrowserPortlet</string></field>
-						          <field name="displayName"><string>Web Explorer</string></field>
-						          <field name="description"><string>Web Explorer</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>web</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/users</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-		            </collection>
-	            </field>
-	          </object>
-	        </object-param>
-
-	        <object-param>
-	          <name>dashboard</name>
-	          <description>description</description>
-	          <object type="org.exoplatform.application.registry.ApplicationCategory">
-	            <field name="name"><string>dashboard</string></field>
-	            <field name="displayName"><string>Dashboard</string></field>
-	            <field name="description"><string>Dashboard</string></field>
-              <field name="accessPermissions">
-				        <collection type="java.util.ArrayList" item-type="java.lang.String">
-									<value><string>*:/platform/users</string></value>
-				        </collection>
-		          </field>
-	            <field  name="applications">
-		            <collection type="java.util.ArrayList">
-	                <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field name="categoryName"><string>dashboard</string></field>
-		                  <field name="applicationName"><string>DashboardPortlet</string></field>
-						          <field name="displayName"><string>Dashboard Portlet</string></field>
-						          <field name="description"><string>Dashboard Portlet</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>dashboard</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/users</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-	                <value>
-		                <object type="org.exoplatform.application.registry.Application">
-		                  <field name="categoryName"><string>dashboard</string></field>
-		                  <field name="applicationName"><string>GadgetPortlet</string></field>
-						          <field name="displayName"><string>Gadget Wrapper Portlet</string></field>
-						          <field name="description"><string>Gadget Wrapper Portlet</string></field>
-		                  <field name="applicationType"><string>portlet</string></field>
-		                  <field name="applicationGroup"><string>dashboard</string></field>
-		                  <field name="accessPermissions">
-								        <collection type="java.util.ArrayList" item-type="java.lang.String">
-													<value><string>*:/platform/users</string></value>
-								        </collection>
-						          </field>
-		                </object>
-	                </value>
-		            </collection>
-	            </field>
-	          </object>
-	        </object-param>
-	      </init-params>
-	    </component-plugin>
-	  </component-plugins>
--->
-  </component>
-  
-  <external-component-plugins>
-    <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
-    <component-plugin>
-      <name>chromattic</name>
-      <set-method>addLifeCycle</set-method>
-      <type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type>
-      <init-params>
-        <value-param>
-          <name>domain-name</name>
-          <value>app</value>
-        </value-param>
-        <value-param>
-          <name>workspace-name</name>
-          <value>portal-test</value>
-        </value-param>
-        <values-param>
-          <name>entities</name>
-          <value>org.exoplatform.application.registry.impl.ContentRegistry</value>
-          <value>org.exoplatform.application.registry.impl.CategoryDefinition</value>
-          <value>org.exoplatform.application.registry.impl.ContentDefinition</value>
-          <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value>
-          <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value>
-          <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value>
-          <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value>
-          <value>org.chromattic.ext.ntdef.NTFile</value>
-          <value>org.chromattic.ext.ntdef.NTFolder</value>
-          <value>org.chromattic.ext.ntdef.NTResource</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-
-  <external-component-plugins>
- 		<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
- 		<component-plugin>
- 		  <name>add.namespaces</name>
- 		  <set-method>addPlugin</set-method>
- 		  <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
- 		  <init-params>
- 		    <properties-param>
- 		      <name>namespaces</name>
-          <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/>
- 		      <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
- 		      </properties-param>
- 		  </init-params>
- 		</component-plugin>
- 		<component-plugin>
- 		  <name>add.nodeType</name>
- 		  <set-method>addPlugin</set-method>
- 		  <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
- 		  <init-params>
- 		    <values-param>
- 		      <name>autoCreatedInNewRepository</name>
- 		      <description>Node types configuration file</description>
- 		      <value>jar:/conf/application-nodetypes.xml</value>
- 		    </values-param>
- 		  </init-params>
- 		</component-plugin>
-  </external-component-plugins>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
-    <component-plugin>
-      <name>new.portal.config.user.listener</name>
-      <set-method>initListener</set-method>
-      <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
-      <description>this listener init the portal configuration</description>
-      <init-params>
-        <value-param>
-          <name>default.portal</name>
-          <description>The default portal for checking db is empty or not</description>
-          <value>classic</value>
-        </value-param>
-        <value-param>
-          <name>initializing.failure.ignore</name>
-          <description>In the run method, use try catch or not (value is true/false)</description>
-          <value>true</value>
-        </value-param>
-        <value-param>
-          <name>page.templates.location</name>
-          <description>the path to the location that contains Page templates</description>
-          <value>classpath:/portal/template/pages</value>
-        </value-param>
-				<object-param>
-          <name>site.templates.location</name>
-          <description>description</description>
-          <object type="org.exoplatform.portal.config.SiteConfigTemplates">
-						<field name="location">
-              <string>classpath:/portal</string>
-            </field>
-            <field name="portalTemplates">
-              <collection type="java.util.HashSet">
-								<value>
-                  <string>classic</string>
-                </value>
-                <value>
-                  <string>test</string>
-                </value>
-							</collection>
-            </field>
-            <field name="groupTemplates">
-              <collection type="java.util.HashSet">
-								<value>
-                  <string>group</string>
-                </value>
-							</collection>
-            </field>
-            <field name="userTemplates">
-              <collection type="java.util.HashSet">
-                <value>
-                  <string>user</string>
-                </value>
-							</collection>
-            </field>
-          </object>
-        </object-param>
-        <object-param>
-          <name>portal.configuration</name>
-          <description>description</description>
-          <object type="org.exoplatform.portal.config.NewPortalConfig">
-            <field name="predefinedOwner">
-              <collection type="java.util.HashSet">
-                <value>
-                  <string>classic</string>
-                </value>
-                <value>
-                  <string>test</string>
-                </value>
-              </collection>
-            </field>
-            <field name="ownerType">
-              <string>portal</string>
-            </field>
-            <field name="templateLocation">
-              <string>classpath:/portal</string>
-            </field>
-          </object>
-        </object-param>
-        <object-param>
-          <name>group.configuration</name>
-          <description>description</description>
-          <object type="org.exoplatform.portal.config.NewPortalConfig">
-            <field name="predefinedOwner">
-              <collection type="java.util.HashSet">
-                <value>
-                  <string>platform/administrators</string>
-                </value>
-                <value>
-                  <string>platform/users</string>
-                </value>
-                <value>
-                  <string>platform/guests</string>
-                </value>
-                <value>
-                  <string>platform/test/legacy</string>
-                </value>
-                <value>
-                  <string>platform/test/normalized</string>
-                </value>
-                <value>
-                  <string>organization/management/executive-board</string>
-                </value>
-              </collection>
-            </field>
-            <field name="ownerType">
-              <string>group</string>
-            </field>
-            <field name="templateLocation">
-              <string>classpath:/portal</string>
-            </field>
-          </object>
-        </object-param>
-        <object-param>
-          <name>user.configuration</name>
-          <description>description</description>
-          <object type="org.exoplatform.portal.config.NewPortalConfig">
-            <field name="predefinedOwner">
-              <collection type="java.util.HashSet">
-                <value>
-                  <string>root</string>
-                </value>
-                <value>
-                  <string>john</string>
-                </value>
-                <value>
-                  <string>mary</string>
-                </value>
-                <value>
-                  <string>demo</string>
-                </value>
-                <value>
-                  <string>overwritelayout</string>
-                </value>
-              </collection>
-            </field>
-            <field name="ownerType">
-              <string>user</string>
-            </field>
-            <field name="templateLocation">
-              <string>classpath:/portal</string>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.organization.OrganizationService</target-component>
-    <component-plugin>
-      <name>init.service.listener</name>
-      <set-method>addListenerPlugin</set-method>
-      <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
-      <description>this listener populate organization data for the first launch</description>
-      <init-params>
-        <value-param>
-          <name>checkDatabaseAlgorithm</name>
-          <description>check database</description>
-          <value>entry</value>
-        </value-param>
-        <value-param>
-          <name>printInformation</name>
-          <description>Print information init database</description>
-          <value>true</value>
-        </value-param>
-        <object-param>
-          <name>configuration</name>
-          <description>description</description>
-          <object type="org.exoplatform.services.organization.OrganizationConfig">
-            <field  name="membershipType">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
-                    <field  name="type"><string>member</string></field>
-                    <field  name="description"><string>member membership type</string></field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
-                    <field  name="type"><string>MembershipType_1</string></field>
-                    <field  name="description"><string>MembershipType_1 membership type</string></field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
-                    <field  name="type"><string>MembershipType_2</string></field>
-                    <field  name="description"><string>MembershipType_2 membership type</string></field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-
-            <field  name="group">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
-                    <field  name="name"><string>platform</string></field>
-                    <field  name="parentId"><string></string></field>
-                    <field  name="description"><string>the /platform group</string></field>
-                    <field  name="label"><string>Platform</string></field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
-                    <field  name="name"><string>users</string></field>
-                    <field  name="parentId"><string>/platform</string></field>
-                    <field  name="description"><string>the /platform/users group</string></field>
-                    <field  name="label"><string>Users</string></field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
-                    <field  name="name"><string>Group1</string></field>
-                    <field  name="parentId"><string>/platform/users</string></field>
-                    <field  name="description"><string>the /platform/users/Group1 group</string></field>
-                    <field  name="label"><string>Group1</string></field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
-                    <field  name="name"><string>Group2</string></field>
-                    <field  name="parentId"><string>/platform/users</string></field>
-                    <field  name="description"><string>the /platform/users/Group2 group</string></field>
-                    <field  name="label"><string>Group2</string></field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-
-            <field  name="user">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>demo</string></field>
-                    <field  name="password"><string>gtn</string></field>
-                    <field  name="firstName"><string>Demo</string></field>
-                    <field  name="lastName"><string>gtn</string></field>
-                    <field  name="email"><string>demo at localhost</string></field>
-                    <field  name="groups">
-                      <string>member:/platform/users</string>
-                    </field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>userName_1</string></field>
-                    <field  name="password"><string>default</string></field>
-                    <field  name="firstName"><string>default</string></field>
-                    <field  name="lastName"><string>default</string></field>
-                    <field  name="email"><string>exo at exoportal.org</string></field>
-                    <field  name="groups">
-                      <string>member:/platform/users</string>
-                    </field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>userName_2</string></field>
-                    <field  name="password"><string>default</string></field>
-                    <field  name="firstName"><string>default</string></field>
-                    <field  name="lastName"><string>default</string></field>
-                    <field  name="email"><string>exo at exoportal.org</string></field>
-                    <field  name="groups">
-                      <string>member:/platform/users</string>
-                    </field>
-                  </object>
-                </value>
-
-                <!--
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>root</string></field>
-                    <field  name="password"><string>gtn</string></field>
-                    <field  name="firstName"><string>Root</string></field>
-                    <field  name="lastName"><string>Root</string></field>
-                    <field  name="email"><string>root at localhost</string></field>
-                    <field  name="groups">
-                      <string>
-                      	manager:/platform/administrators,member:/platform/users,
-                      	member:/organization/management/executive-board
-                      </string>
-                    </field>
-                  </object>
-                </value>
-
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>john</string></field>
-                    <field  name="password"><string>gtn</string></field>
-                    <field  name="firstName"><string>John</string></field>
-                    <field  name="lastName"><string>Anthony</string></field>
-                    <field  name="email"><string>john at localhost</string></field>
-                    <field  name="groups">
-                      <string>
-                      	member:/platform/administrators,member:/platform/users,
-                      	manager:/organization/management/executive-board
-                      </string>
-                    </field>
-                  </object>
-                </value>
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>mary</string></field>
-                    <field  name="password"><string>gtn</string></field>
-                    <field  name="firstName"><string>Mary</string></field>
-                    <field  name="lastName"><string>Kelly</string></field>
-                    <field  name="email"><string>mary at localhost</string></field>
-                    <field  name="groups">
-                      <string>member:/platform/users</string>
-                    </field>
-                  </object>
-                </value>
-
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field name="userName"><string>overwritelayout</string></field>
-                    <field name="password"><string>whatever</string></field>
-                    <field name="firstName"><string>whatever</string></field>
-                    <field name="lastName"><string>whatever</string></field>
-                    <field name="email"><string>whatever at localhost</string></field>
-                    <field name="groups">
-                      <string>member:/platform/guests</string>
-                    </field>
-                  </object>
-                </value>
--->
-
-              </collection>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-
-  </external-component-plugins>
-
-</configuration>

Added: portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/application-registry/src/test/resources/conf/exo.portal.component.application-registry-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,620 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+  xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+  <component>
+    <key>org.exoplatform.application.registry.ApplicationRegistryService</key>
+    <type>org.exoplatform.application.registry.impl.ApplicationRegistryServiceImpl</type>
+    <!--
+  	<component-plugins>
+	    <component-plugin>
+	      <name>new.portal.portlets.registry</name>
+	      <set-method>initListener</set-method>
+	      <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type>
+	      <description>this listener init the portlets are registered in PortletRegister</description>
+	      <init-params>
+	      	<object-param>
+	          <name>administration</name>
+	          <description>description</description>
+	          <object type="org.exoplatform.application.registry.ApplicationCategory">
+	            <field  name="name"><string>administration</string></field>
+	            <field  name="displayName"><string>Administration</string></field>
+	            <field  name="description"><string>application for administration</string></field>
+		          <field name="accessPermissions">
+				        <collection type="java.util.ArrayList" item-type="java.lang.String">
+				        	<value><string>*:/platform/administrators</string></value>
+				        	<value><string>*:/organization/management/executive-board</string></value>
+				        </collection>
+		          </field>
+	            <field  name="applications">
+		            <collection type="java.util.ArrayList">
+									<value>
+	                  <object type="org.exoplatform.application.registry.Application">
+									    <field name="applicationName"><string>ApplicationRegistryPortlet</string></field>
+	                    <field  name="categoryName"><string>administration</string></field>
+						          <field name="displayName"><string>Application Registry</string></field>
+						          <field name="description"><string>Application Registry</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>exoadmin</string></field>
+						          <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+								        	<value><string>*:/platform/administrators</string></value>
+								        	<value><string>*:/organization/management/executive-board</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+					        <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field name="applicationName"><string>OrganizationPortlet</string></field>
+		                  <field  name="categoryName"><string>administration</string></field>
+	                    <field name="displayName"><string>Organization Management</string></field>
+	                    <field name="description"><string>Organization Management</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>exoadmin</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/administrators</string></value>
+													<value><string>*:/organization/management/executive-board</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+					        <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field name="applicationName"><string>AccountPortlet</string></field>
+		                  <field  name="categoryName"><string>administration</string></field>
+						          <field name="displayName"><string>New Account</string></field>
+						          <field name="description"><string>New Account</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>exoadmin</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/administrators</string></value>
+													<value><string>*:/organization/management/executive-board</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+		            </collection>
+	            </field>
+	          </object>
+	        </object-param>
+
+			    <object-param>
+	          <name>web</name>
+	          <description>description</description>
+	          <object type="org.exoplatform.application.registry.ApplicationCategory">
+	            <field  name="name"><string>web</string></field>
+	            <field  name="displayName"><string>web</string></field>
+	            <field  name="description"><string>BasicPortlets</string></field>
+              <field name="accessPermissions">
+				        <collection type="java.util.ArrayList" item-type="java.lang.String">
+									<value><string>*:/platform/users</string></value>
+				        </collection>
+		          </field>
+	            <field  name="applications">
+		            <collection type="java.util.ArrayList">
+	                <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field  name="categoryName"><string>web</string></field>
+		                  <field name="applicationName"><string>IFramePortlet</string></field>
+						          <field name="displayName"><string>IFrame</string></field>
+						          <field name="description"><string>IFrame</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>web</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/users</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+					        <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field  name="categoryName"><string>web</string></field>
+		                  <field name="applicationName"><string>SiteMapPortlet</string></field>
+						          <field name="displayName"><string>SiteMap</string></field>
+						          <field name="description"><string>SiteMap</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>web</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/users</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+	                <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field  name="categoryName"><string>web</string></field>
+		                  <field name="applicationName"><string>BrowserPortlet</string></field>
+						          <field name="displayName"><string>Web Explorer</string></field>
+						          <field name="description"><string>Web Explorer</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>web</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/users</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+		            </collection>
+	            </field>
+	          </object>
+	        </object-param>
+
+	        <object-param>
+	          <name>dashboard</name>
+	          <description>description</description>
+	          <object type="org.exoplatform.application.registry.ApplicationCategory">
+	            <field name="name"><string>dashboard</string></field>
+	            <field name="displayName"><string>Dashboard</string></field>
+	            <field name="description"><string>Dashboard</string></field>
+              <field name="accessPermissions">
+				        <collection type="java.util.ArrayList" item-type="java.lang.String">
+									<value><string>*:/platform/users</string></value>
+				        </collection>
+		          </field>
+	            <field  name="applications">
+		            <collection type="java.util.ArrayList">
+	                <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field name="categoryName"><string>dashboard</string></field>
+		                  <field name="applicationName"><string>DashboardPortlet</string></field>
+						          <field name="displayName"><string>Dashboard Portlet</string></field>
+						          <field name="description"><string>Dashboard Portlet</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>dashboard</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/users</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+	                <value>
+		                <object type="org.exoplatform.application.registry.Application">
+		                  <field name="categoryName"><string>dashboard</string></field>
+		                  <field name="applicationName"><string>GadgetPortlet</string></field>
+						          <field name="displayName"><string>Gadget Wrapper Portlet</string></field>
+						          <field name="description"><string>Gadget Wrapper Portlet</string></field>
+		                  <field name="applicationType"><string>portlet</string></field>
+		                  <field name="applicationGroup"><string>dashboard</string></field>
+		                  <field name="accessPermissions">
+								        <collection type="java.util.ArrayList" item-type="java.lang.String">
+													<value><string>*:/platform/users</string></value>
+								        </collection>
+						          </field>
+		                </object>
+	                </value>
+		            </collection>
+	            </field>
+	          </object>
+	        </object-param>
+	      </init-params>
+	    </component-plugin>
+	  </component-plugins>
+-->
+  </component>
+  
+  <external-component-plugins>
+    <target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
+    <component-plugin>
+      <name>chromattic</name>
+      <set-method>addLifeCycle</set-method>
+      <type>org.exoplatform.application.registry.impl.ApplicationRegistryChromatticLifeCycle</type>
+      <init-params>
+        <value-param>
+          <name>domain-name</name>
+          <value>app</value>
+        </value-param>
+        <value-param>
+          <name>workspace-name</name>
+          <value>portal-test</value>
+        </value-param>
+        <values-param>
+          <name>entities</name>
+          <value>org.exoplatform.application.registry.impl.ContentRegistry</value>
+          <value>org.exoplatform.application.registry.impl.CategoryDefinition</value>
+          <value>org.exoplatform.application.registry.impl.ContentDefinition</value>
+          <value>org.exoplatform.application.gadget.impl.GadgetRegistry</value>
+          <value>org.exoplatform.application.gadget.impl.GadgetDefinition</value>
+          <value>org.exoplatform.application.gadget.impl.LocalGadgetData</value>
+          <value>org.exoplatform.application.gadget.impl.RemoteGadgetData</value>
+          <value>org.chromattic.ext.ntdef.NTFile</value>
+          <value>org.chromattic.ext.ntdef.NTFolder</value>
+          <value>org.chromattic.ext.ntdef.NTResource</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+
+  <external-component-plugins>
+ 		<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
+ 		<component-plugin>
+ 		  <name>add.namespaces</name>
+ 		  <set-method>addPlugin</set-method>
+ 		  <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ 		  <init-params>
+ 		    <properties-param>
+ 		      <name>namespaces</name>
+          <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/>
+ 		      <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
+ 		      </properties-param>
+ 		  </init-params>
+ 		</component-plugin>
+ 		<component-plugin>
+ 		  <name>add.nodeType</name>
+ 		  <set-method>addPlugin</set-method>
+ 		  <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ 		  <init-params>
+ 		    <values-param>
+ 		      <name>autoCreatedInNewRepository</name>
+ 		      <description>Node types configuration file</description>
+ 		      <value>jar:/conf/application-nodetypes.xml</value>
+ 		    </values-param>
+ 		  </init-params>
+ 		</component-plugin>
+  </external-component-plugins>
+
+  <external-component-plugins>
+    <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
+    <component-plugin>
+      <name>new.portal.config.user.listener</name>
+      <set-method>initListener</set-method>
+      <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
+      <description>this listener init the portal configuration</description>
+      <init-params>
+        <value-param>
+          <name>default.portal</name>
+          <description>The default portal for checking db is empty or not</description>
+          <value>classic</value>
+        </value-param>
+        <value-param>
+          <name>initializing.failure.ignore</name>
+          <description>In the run method, use try catch or not (value is true/false)</description>
+          <value>true</value>
+        </value-param>
+        <value-param>
+          <name>page.templates.location</name>
+          <description>the path to the location that contains Page templates</description>
+          <value>classpath:/portal/template/pages</value>
+        </value-param>
+				<object-param>
+          <name>site.templates.location</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.SiteConfigTemplates">
+						<field name="location">
+              <string>classpath:/portal</string>
+            </field>
+            <field name="portalTemplates">
+              <collection type="java.util.HashSet">
+								<value>
+                  <string>classic</string>
+                </value>
+                <value>
+                  <string>test</string>
+                </value>
+							</collection>
+            </field>
+            <field name="groupTemplates">
+              <collection type="java.util.HashSet">
+								<value>
+                  <string>group</string>
+                </value>
+							</collection>
+            </field>
+            <field name="userTemplates">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>user</string>
+                </value>
+							</collection>
+            </field>
+          </object>
+        </object-param>
+        <object-param>
+          <name>portal.configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.NewPortalConfig">
+            <field name="predefinedOwner">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>classic</string>
+                </value>
+                <value>
+                  <string>test</string>
+                </value>
+              </collection>
+            </field>
+            <field name="ownerType">
+              <string>portal</string>
+            </field>
+            <field name="templateLocation">
+              <string>classpath:/portal</string>
+            </field>
+          </object>
+        </object-param>
+        <object-param>
+          <name>group.configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.NewPortalConfig">
+            <field name="predefinedOwner">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>platform/administrators</string>
+                </value>
+                <value>
+                  <string>platform/users</string>
+                </value>
+                <value>
+                  <string>platform/guests</string>
+                </value>
+                <value>
+                  <string>platform/test/legacy</string>
+                </value>
+                <value>
+                  <string>platform/test/normalized</string>
+                </value>
+                <value>
+                  <string>organization/management/executive-board</string>
+                </value>
+              </collection>
+            </field>
+            <field name="ownerType">
+              <string>group</string>
+            </field>
+            <field name="templateLocation">
+              <string>classpath:/portal</string>
+            </field>
+          </object>
+        </object-param>
+        <object-param>
+          <name>user.configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.NewPortalConfig">
+            <field name="predefinedOwner">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>root</string>
+                </value>
+                <value>
+                  <string>john</string>
+                </value>
+                <value>
+                  <string>mary</string>
+                </value>
+                <value>
+                  <string>demo</string>
+                </value>
+                <value>
+                  <string>overwritelayout</string>
+                </value>
+              </collection>
+            </field>
+            <field name="ownerType">
+              <string>user</string>
+            </field>
+            <field name="templateLocation">
+              <string>classpath:/portal</string>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+
+  <external-component-plugins>
+    <target-component>org.exoplatform.services.organization.OrganizationService</target-component>
+    <component-plugin>
+      <name>init.service.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
+      <description>this listener populate organization data for the first launch</description>
+      <init-params>
+        <value-param>
+          <name>checkDatabaseAlgorithm</name>
+          <description>check database</description>
+          <value>entry</value>
+        </value-param>
+        <value-param>
+          <name>printInformation</name>
+          <description>Print information init database</description>
+          <value>true</value>
+        </value-param>
+        <object-param>
+          <name>configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.services.organization.OrganizationConfig">
+            <field  name="membershipType">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>member</string></field>
+                    <field  name="description"><string>member membership type</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>MembershipType_1</string></field>
+                    <field  name="description"><string>MembershipType_1 membership type</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>MembershipType_2</string></field>
+                    <field  name="description"><string>MembershipType_2 membership type</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+
+            <field  name="group">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>platform</string></field>
+                    <field  name="parentId"><string></string></field>
+                    <field  name="description"><string>the /platform group</string></field>
+                    <field  name="label"><string>Platform</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>users</string></field>
+                    <field  name="parentId"><string>/platform</string></field>
+                    <field  name="description"><string>the /platform/users group</string></field>
+                    <field  name="label"><string>Users</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>Group1</string></field>
+                    <field  name="parentId"><string>/platform/users</string></field>
+                    <field  name="description"><string>the /platform/users/Group1 group</string></field>
+                    <field  name="label"><string>Group1</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>Group2</string></field>
+                    <field  name="parentId"><string>/platform/users</string></field>
+                    <field  name="description"><string>the /platform/users/Group2 group</string></field>
+                    <field  name="label"><string>Group2</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+
+            <field  name="user">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>demo</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>Demo</string></field>
+                    <field  name="lastName"><string>gtn</string></field>
+                    <field  name="email"><string>demo at localhost</string></field>
+                    <field  name="groups">
+                      <string>member:/platform/users</string>
+                    </field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>userName_1</string></field>
+                    <field  name="password"><string>default</string></field>
+                    <field  name="firstName"><string>default</string></field>
+                    <field  name="lastName"><string>default</string></field>
+                    <field  name="email"><string>exo at exoportal.org</string></field>
+                    <field  name="groups">
+                      <string>member:/platform/users</string>
+                    </field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>userName_2</string></field>
+                    <field  name="password"><string>default</string></field>
+                    <field  name="firstName"><string>default</string></field>
+                    <field  name="lastName"><string>default</string></field>
+                    <field  name="email"><string>exo at exoportal.org</string></field>
+                    <field  name="groups">
+                      <string>member:/platform/users</string>
+                    </field>
+                  </object>
+                </value>
+
+                <!--
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>root</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>Root</string></field>
+                    <field  name="lastName"><string>Root</string></field>
+                    <field  name="email"><string>root at localhost</string></field>
+                    <field  name="groups">
+                      <string>
+                      	manager:/platform/administrators,member:/platform/users,
+                      	member:/organization/management/executive-board
+                      </string>
+                    </field>
+                  </object>
+                </value>
+
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>john</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>John</string></field>
+                    <field  name="lastName"><string>Anthony</string></field>
+                    <field  name="email"><string>john at localhost</string></field>
+                    <field  name="groups">
+                      <string>
+                      	member:/platform/administrators,member:/platform/users,
+                      	manager:/organization/management/executive-board
+                      </string>
+                    </field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>mary</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>Mary</string></field>
+                    <field  name="lastName"><string>Kelly</string></field>
+                    <field  name="email"><string>mary at localhost</string></field>
+                    <field  name="groups">
+                      <string>member:/platform/users</string>
+                    </field>
+                  </object>
+                </value>
+
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field name="userName"><string>overwritelayout</string></field>
+                    <field name="password"><string>whatever</string></field>
+                    <field name="firstName"><string>whatever</string></field>
+                    <field name="lastName"><string>whatever</string></field>
+                    <field name="email"><string>whatever at localhost</string></field>
+                    <field name="groups">
+                      <string>member:/platform/guests</string>
+                    </field>
+                  </object>
+                </value>
+-->
+
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+
+  </external-component-plugins>
+
+</configuration>

Modified: portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/idm-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-               xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
-  <component>
-    <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key>
-    <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type>
-  </component> 
-
-  <component>
-    <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
-    <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type>
-    <init-params>
-      <value-param>
-        <name>config</name>
-        <value>jar:/conf/portal/idm-config.xml</value>
-      </value-param>
-    </init-params>
-  </component>
-
-  <component>
-    <key>org.exoplatform.services.organization.OrganizationService</key>
-    <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type>
-    <init-params>
-      <object-param>
-        <name>configuration</name>
-        <object type="org.exoplatform.services.organization.idm.Config">
-          <field name="useParentIdAsGroupType">
-            <boolean>true</boolean>
-          </field>
-          <field name="groupTypeMappings">
-            <map type="java.util.HashMap">
-              <entry>
-                <key><string>/</string></key>
-                <value><string>root_type</string></value>
-              </entry>
-              <entry>
-                <key><string>/platform/*</string></key>
-                <value><string>platform_type</string></value>
-              </entry>
-              <entry>
-                <key><string>/platform/users</string></key>
-                <value><string>users_type</string></value>
-              </entry>
-               <entry>
-                <key><string>/organization/acme/france</string></key>
-                <value><string>france_type</string></value>
-              </entry>
-              <entry>
-                <key><string>/toto/*</string></key>
-                <value><string>toto_type</string></value>
-              </entry>
-            </map>
-          </field>
-          <!-- If this option is used then each Membership created with MembrshipType that is
-               equal to value specified here will be stored in PicketLink IDM as simple
-               Group-User association-->
-          <field name="associationMembershipType">
-            <string>member</string>
-          </field>
-          <!-- if "associationMembershipType" option is used and this option is set to true
-                then Membership with MembershipType configured to be stored as PicketLink IDM association
-                will not be stored as PicketLink IDM Role -->
-          <field name="ignoreMappedMembershipType">
-            <boolean>false</boolean>
-          </field>
-        </object>
-      </object-param>
-    </init-params>
-  </component>
-
-  <component>
-    <key>org.exoplatform.services.database.HibernateService</key>
-    <jmx-name>database:type=HibernateService</jmx-name>
-    <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
-    <init-params>
-      <properties-param>
-        <name>hibernate.properties</name>
-        <description>Default Hibernate Service</description>
-        <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-        <!--<property name="hibernate.show_sql" value="true"/>-->
-        <!--<property name="hibernate.use_sql_comments" value="true"/>-->
-        <!--<property name="hibernate.format_sql" value="true"/>-->
-        <property name="hibernate.current_session_context_class" value="thread"/>
-        <property name="hibernate.jdbc.batch_size" value="0"/>
-        <property name="hibernate.cache.use_second_level_cache" value="true"/>
-        <property name="hibernate.cache.use_query_cache" value="true"/>
-        <!--CHANGEME HashtableCacheProvider shold not be used in production env-->
-        <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
-        <property name="hibernate.connection.url" value="jdbc:hsqldb:file:${basedir}/target/temp/data/exodb${container.name.suffix}"/>
-        <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
-        <property name="hibernate.connection.autocommit" value="true"/>
-        <property name="hibernate.connection.username" value="sa"/>
-        <property name="hibernate.connection.password" value=""/>
-        <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
-        <property name="hibernate.c3p0.min_size" value="5"/>
-        <property name="hibernate.c3p0.max_size" value="20"/>
-        <property name="hibernate.c3p0.timeout" value="1800"/>
-        <property name="hibernate.c3p0.max_statements" value="50"/>
-      </properties-param>
-    </init-params>
-  </component>
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.services.database.HibernateService</target-component>
-    <component-plugin>
-      <name>add.hibernate.mapping</name>
-      <set-method>addPlugin</set-method>
-      <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type>
-      <init-params>
-        <values-param>
-          <name>hibernate.mapping</name>
-          <value>mappings/HibernateRealm.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value>
-          <value>mappings/HibernateIdentityObject.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectCredential.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectCredentialType.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectAttribute.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectType.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectRelationship.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
-          <value>mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-</configuration>

Modified: portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/organization-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-    xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-  <external-component-plugins>  
-    <target-component>org.exoplatform.services.organization.OrganizationService</target-component>       
-    <component-plugin>
-      <name>init.service.listener</name>
-      <set-method>addListenerPlugin</set-method>
-      <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
-      <description>this listener populate organization data for the first launch</description>
-      <init-params>
-        <value-param>
-          <name>checkDatabaseAlgorithm</name>
-          <description>check database</description>
-          <value>empty</value>
-        </value-param>
-        <value-param>
-           <name>printInformation</name>
-           <description>Print information init database</description>
-           <value>true</value>
-        </value-param>
-        <object-param>
-          <name>configuration</name>
-          <description>description</description>
-          <object type="org.exoplatform.services.organization.OrganizationConfig">
-            <field  name="membershipType">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
-                    <field  name="type"><string>member</string></field>
-                    <field  name="description"><string>member membershipt type</string></field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-
-            <field  name="group">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
-                    <field  name="name"><string>users</string></field>
-                    <field  name="parentId"><string></string></field>
-                    <!--<field  name="type"><string>hierachy</string></field>-->
-                    <field  name="description"><string>the /users group</string></field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-
-            <field  name="user">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
-                    <field  name="userName"><string>demo</string></field>
-                    <field  name="password"><string>exo</string></field>
-                    <field  name="firstName"><string>demo</string></field>
-                    <field  name="lastName"><string>demo</string></field>
-                    <field  name="email"><string>demo at localhost</string></field>
-              			<field  name="groups">
-                      <string>member:/users</string>
-                    </field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-
-    <component-plugin>
-      <name>new.user.event.listener</name>
-      <set-method>addListenerPlugin</set-method>
-      <type>org.exoplatform.services.organization.impl.NewUserEventListener</type>
-      <description>this listener assign group and membership to a new created user</description>
-      <init-params>
-        <object-param>
-          <name>configuration</name>
-          <description>description</description>
-          <object type="org.exoplatform.services.organization.impl.NewUserConfig">
-            <field  name="group">
-              <collection type="java.util.ArrayList">
-                <value>
-                  <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup">
-                    <field  name="groupId"><string>/users</string></field>
-                    <field  name="membership"><string>member</string></field>
-                  </object>
-                </value>
-              </collection>
-            </field>
-            <field  name="ignoredUser">
-              <collection type="java.util.HashSet">
-                <value><string>demo</string></value>
-                <value><string>admin</string></value>
-              </collection>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
-</configuration>

Modified: portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/identity/src/test/java/conf/portal/test-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-    xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-   <component>
-      <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
-      <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
-      <init-params>
-         <value-param>
-            <name>logger</name>
-            <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
-         </value-param>
-         <value-param>
-            <name>configurator</name>
-            <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
-         </value-param>
-         <properties-param>
-            <name>properties</name>
-            <description>Log4J properties</description>
-            <property name="log4j.rootLogger" value="DEBUG, stdout" />
-            <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" />
-            <property name="log4j.appender.stdout.threshold" value="INFO" />
-            <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" />
-            <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
-         </properties-param>
-      </init-params>
-   </component>
-
-   <component>
-      <key>org.exoplatform.services.cache.CacheService</key>
-      <jmx-name>cache:type=CacheService</jmx-name>
-      <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
-      <init-params>
-         <object-param>
-            <name>cache.config.default</name>
-            <description>The default cache configuration</description>
-            <object type="org.exoplatform.services.cache.ExoCacheConfig">
-               <field  name="name"><string>default</string></field>
-               <field  name="maxSize"><int>300</int></field>
-               <field  name="liveTime"><long>300</long></field>
-               <field  name="distributed"><boolean>false</boolean></field>
-               <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
-            </object>
-         </object-param>
-      </init-params>
-   </component>
-
-   <component>
-      <key>org.exoplatform.services.database.DatabaseService</key>
-      <type>org.exoplatform.services.database.impl.XAPoolTxSupportDatabaseService</type>
-      <init-params>
-         <properties-param>
-            <name>default</name>
-            <description>Connection configuration</description>
-            <property name='connection.driver' value='org.hsqldb.jdbcDriver' />
-            <property name='connection.url' value='jdbc:hsqldb:mem:db/default' />
-            <property name='connection.login' value='sa' />
-            <property name='connection.password' value='' />
-            <property name='connection.min-size' value='3' />
-            <property name='connection.max-size' value='5' />
-         </properties-param>
-      </init-params>
-   </component>
-
-	<import>classpath:/conf/portal/idm-configuration.xml</import>
-	<import>classpath:/conf/portal/organization-configuration.xml</import>
-</configuration>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/idm-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+               xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+  <component>
+    <key>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</key>
+    <type>org.exoplatform.services.organization.idm.PicketLinkIDMCacheService</type>
+  </component> 
+
+  <component>
+    <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key>
+    <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type>
+    <init-params>
+      <value-param>
+        <name>config</name>
+        <value>jar:/conf/portal/idm-config.xml</value>
+      </value-param>
+    </init-params>
+  </component>
+
+  <component>
+    <key>org.exoplatform.services.organization.OrganizationService</key>
+    <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type>
+    <init-params>
+      <object-param>
+        <name>configuration</name>
+        <object type="org.exoplatform.services.organization.idm.Config">
+          <field name="useParentIdAsGroupType">
+            <boolean>true</boolean>
+          </field>
+          <field name="groupTypeMappings">
+            <map type="java.util.HashMap">
+              <entry>
+                <key><string>/</string></key>
+                <value><string>root_type</string></value>
+              </entry>
+              <entry>
+                <key><string>/platform/*</string></key>
+                <value><string>platform_type</string></value>
+              </entry>
+              <entry>
+                <key><string>/platform/users</string></key>
+                <value><string>users_type</string></value>
+              </entry>
+               <entry>
+                <key><string>/organization/acme/france</string></key>
+                <value><string>france_type</string></value>
+              </entry>
+              <entry>
+                <key><string>/toto/*</string></key>
+                <value><string>toto_type</string></value>
+              </entry>
+            </map>
+          </field>
+          <!-- If this option is used then each Membership created with MembrshipType that is
+               equal to value specified here will be stored in PicketLink IDM as simple
+               Group-User association-->
+          <field name="associationMembershipType">
+            <string>member</string>
+          </field>
+          <!-- if "associationMembershipType" option is used and this option is set to true
+                then Membership with MembershipType configured to be stored as PicketLink IDM association
+                will not be stored as PicketLink IDM Role -->
+          <field name="ignoreMappedMembershipType">
+            <boolean>false</boolean>
+          </field>
+        </object>
+      </object-param>
+    </init-params>
+  </component>
+
+  <component>
+    <key>org.exoplatform.services.database.HibernateService</key>
+    <jmx-name>database:type=HibernateService</jmx-name>
+    <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
+    <init-params>
+      <properties-param>
+        <name>hibernate.properties</name>
+        <description>Default Hibernate Service</description>
+        <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+        <!--<property name="hibernate.show_sql" value="true"/>-->
+        <!--<property name="hibernate.use_sql_comments" value="true"/>-->
+        <!--<property name="hibernate.format_sql" value="true"/>-->
+        <property name="hibernate.current_session_context_class" value="thread"/>
+        <property name="hibernate.jdbc.batch_size" value="0"/>
+        <property name="hibernate.cache.use_second_level_cache" value="true"/>
+        <property name="hibernate.cache.use_query_cache" value="true"/>
+        <!--CHANGEME HashtableCacheProvider shold not be used in production env-->
+        <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+        <property name="hibernate.connection.url" value="jdbc:hsqldb:file:${basedir}/target/temp/data/exodb${container.name.suffix}"/>
+        <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
+        <property name="hibernate.connection.autocommit" value="true"/>
+        <property name="hibernate.connection.username" value="sa"/>
+        <property name="hibernate.connection.password" value=""/>
+        <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+        <property name="hibernate.c3p0.min_size" value="5"/>
+        <property name="hibernate.c3p0.max_size" value="20"/>
+        <property name="hibernate.c3p0.timeout" value="1800"/>
+        <property name="hibernate.c3p0.max_statements" value="50"/>
+      </properties-param>
+    </init-params>
+  </component>
+
+  <external-component-plugins>
+    <target-component>org.exoplatform.services.database.HibernateService</target-component>
+    <component-plugin>
+      <name>add.hibernate.mapping</name>
+      <set-method>addPlugin</set-method>
+      <type>org.exoplatform.services.database.impl.AddHibernateMappingPlugin</type>
+      <init-params>
+        <values-param>
+          <name>hibernate.mapping</name>
+          <value>mappings/HibernateRealm.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectCredentialBinaryValue.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectAttributeBinaryValue.hbm.xml</value>
+          <value>mappings/HibernateIdentityObject.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectCredential.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectCredentialType.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectAttribute.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectType.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectRelationship.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectRelationshipType.hbm.xml</value>
+          <value>mappings/HibernateIdentityObjectRelationshipName.hbm.xml</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+</configuration>

Added: portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/organization-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+    xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+  <external-component-plugins>  
+    <target-component>org.exoplatform.services.organization.OrganizationService</target-component>       
+    <component-plugin>
+      <name>init.service.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
+      <description>this listener populate organization data for the first launch</description>
+      <init-params>
+        <value-param>
+          <name>checkDatabaseAlgorithm</name>
+          <description>check database</description>
+          <value>empty</value>
+        </value-param>
+        <value-param>
+           <name>printInformation</name>
+           <description>Print information init database</description>
+           <value>true</value>
+        </value-param>
+        <object-param>
+          <name>configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.services.organization.OrganizationConfig">
+            <field  name="membershipType">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>member</string></field>
+                    <field  name="description"><string>member membershipt type</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+
+            <field  name="group">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>users</string></field>
+                    <field  name="parentId"><string></string></field>
+                    <!--<field  name="type"><string>hierachy</string></field>-->
+                    <field  name="description"><string>the /users group</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+
+            <field  name="user">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>demo</string></field>
+                    <field  name="password"><string>exo</string></field>
+                    <field  name="firstName"><string>demo</string></field>
+                    <field  name="lastName"><string>demo</string></field>
+                    <field  name="email"><string>demo at localhost</string></field>
+              			<field  name="groups">
+                      <string>member:/users</string>
+                    </field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+
+    <component-plugin>
+      <name>new.user.event.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.services.organization.impl.NewUserEventListener</type>
+      <description>this listener assign group and membership to a new created user</description>
+      <init-params>
+        <object-param>
+          <name>configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.services.organization.impl.NewUserConfig">
+            <field  name="group">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup">
+                    <field  name="groupId"><string>/users</string></field>
+                    <field  name="membership"><string>member</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+            <field  name="ignoredUser">
+              <collection type="java.util.HashSet">
+                <value><string>demo</string></value>
+                <value><string>admin</string></value>
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+</configuration>

Added: portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/identity/src/test/resources/conf/portal/test-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+    xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+   <component>
+      <key>org.exoplatform.services.log.LogConfigurationInitializer</key>
+      <type>org.exoplatform.services.log.LogConfigurationInitializer</type>
+      <init-params>
+         <value-param>
+            <name>logger</name>
+            <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value>
+         </value-param>
+         <value-param>
+            <name>configurator</name>
+            <value>org.exoplatform.services.log.impl.Log4JConfigurator</value>
+         </value-param>
+         <properties-param>
+            <name>properties</name>
+            <description>Log4J properties</description>
+            <property name="log4j.rootLogger" value="DEBUG, stdout" />
+            <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender" />
+            <property name="log4j.appender.stdout.threshold" value="INFO" />
+            <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout" />
+            <property name="log4j.appender.stdout.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n" />
+         </properties-param>
+      </init-params>
+   </component>
+
+   <component>
+      <key>org.exoplatform.services.cache.CacheService</key>
+      <jmx-name>cache:type=CacheService</jmx-name>
+      <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
+      <init-params>
+         <object-param>
+            <name>cache.config.default</name>
+            <description>The default cache configuration</description>
+            <object type="org.exoplatform.services.cache.ExoCacheConfig">
+               <field  name="name"><string>default</string></field>
+               <field  name="maxSize"><int>300</int></field>
+               <field  name="liveTime"><long>300</long></field>
+               <field  name="distributed"><boolean>false</boolean></field>
+               <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
+            </object>
+         </object-param>
+      </init-params>
+   </component>
+
+   <component>
+      <key>org.exoplatform.services.database.DatabaseService</key>
+      <type>org.exoplatform.services.database.impl.XAPoolTxSupportDatabaseService</type>
+      <init-params>
+         <properties-param>
+            <name>default</name>
+            <description>Connection configuration</description>
+            <property name='connection.driver' value='org.hsqldb.jdbcDriver' />
+            <property name='connection.url' value='jdbc:hsqldb:mem:db/default' />
+            <property name='connection.login' value='sa' />
+            <property name='connection.password' value='' />
+            <property name='connection.min-size' value='3' />
+            <property name='connection.max-size' value='5' />
+         </properties-param>
+      </init-params>
+   </component>
+
+	<import>classpath:/conf/portal/idm-configuration.xml</import>
+	<import>classpath:/conf/portal/organization-configuration.xml</import>
+</configuration>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml
===================================================================
--- portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+  xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+  <component>
+  	<key>org.exoplatform.services.cache.CacheService</key>
+    <jmx-name>cache:type=CacheService</jmx-name>
+  	<type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
+  	<init-params>
+      <object-param>
+        <name>cache.config.default</name>
+        <description>The default cache configuration</description>
+        <object type="org.exoplatform.services.cache.ExoCacheConfig">
+          <field name="name"><string>default</string></field>
+          <field name="maxSize"><int>30000</int></field>
+          <field name="liveTime"><long>60000</long></field>
+          <field name="distributed"><boolean>false</boolean></field>
+          <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
+        </object>
+      </object-param>
+    </init-params>
+  </component>
+
+  <component>
+     <key>org.exoplatform.services.security.Authenticator</key>
+     <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type>
+  </component>
+
+  <component>
+     <key>org.exoplatform.services.listener.ListenerService</key>
+     <type>org.exoplatform.services.listener.ListenerService</type>
+  </component>
+
+  <component>
+    <key>org.exoplatform.commons.chromattic.ChromatticManager</key>
+    <type>org.exoplatform.commons.chromattic.ChromatticManager</type>
+  </component>
+
+  <component>
+    <key>org.exoplatform.portal.pom.config.POMSessionManager</key>
+    <type>org.exoplatform.portal.pom.config.POMSessionManager</type>
+  </component>
+
+  <component>
+    <key>org.exoplatform.portal.pom.data.ModelDataStorage</key>
+    <type>org.exoplatform.portal.pom.config.POMDataStorage</type>
+  </component>
+
+  <component>
+    <key>org.exoplatform.portal.config.DataStorage</key>
+    <type>org.exoplatform.portal.config.DataStorageImpl</type>
+  </component>
+
+  <component>
+    <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
+    <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
+  </component>
+
+  <component>
+    <key>org.exoplatform.portal.config.UserACL</key>
+    <type>org.exoplatform.portal.config.UserACL</type>
+    <init-params>
+      <value-param>
+        <name>super.user</name>
+        <description>administrator</description>
+        <value>root</value>
+      </value-param>
+      <value-param>
+        <name>guests.group</name>
+        <description>guests group</description>
+        <value>/platform/guests</value>
+      </value-param>
+      <value-param>
+        <name>navigation.creator.membership.type</name>
+        <description>specific membership type have full permission with group navigation</description>
+        <value>manager</value>
+      </value-param>
+    </init-params>
+  </component>
+
+  <component>
+    <key>org.exoplatform.portal.config.UserPortalConfigService</key>
+    <type>org.exoplatform.portal.config.UserPortalConfigService</type>
+  </component>
+
+  <external-component-plugins>
+ 		<target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
+ 		<component-plugin>
+ 		  <name>add.namespaces</name>
+ 		  <set-method>addPlugin</set-method>
+ 		  <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ 		  <init-params>
+ 		    <properties-param>
+ 		      <name>namespaces</name>
+          <property name="gtn" value="http://www.gatein.org/jcr/gatein/1.0/"/>
+          <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/>
+ 		      </properties-param>
+ 		  </init-params>
+ 		</component-plugin>
+ 		<component-plugin>
+ 		  <name>add.nodeType</name>
+ 		  <set-method>addPlugin</set-method>
+ 		  <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ 		  <init-params>
+ 		    <values-param>
+ 		      <name>autoCreatedInNewRepository</name>
+ 		      <description>Node types configuration file</description>
+           <value>jar:/conf/gatein-nodetypes.xml</value>
+           <value>jar:/conf/mop-nodetypes.xml</value>
+           <value>jar:/conf/content-nodetypes.xml</value>
+ 		    </values-param>
+ 		  </init-params>
+ 		</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.portal.pom.config.MOPChromatticLifeCycle</type>
+      <init-params>
+        <value-param>
+          <name>domain-name</name>
+          <value>mop</value>
+        </value-param>
+        <value-param>
+          <name>workspace-name</name>
+          <value>portal-test</value>
+        </value-param>
+        <values-param>
+          <name>entities</name>
+          <value>org.gatein.mop.core.api.workspace.WorkspaceImpl</value>
+          <value>org.gatein.mop.core.api.workspace.UIContainerImpl</value>
+          <value>org.gatein.mop.core.api.workspace.UIWindowImpl</value>
+          <value>org.gatein.mop.core.api.workspace.UIBodyImpl</value>
+          <value>org.gatein.mop.core.api.workspace.PageImpl</value>
+          <value>org.gatein.mop.core.api.workspace.PageContainer</value>
+          <value>org.gatein.mop.core.api.workspace.NavigationImpl</value>
+          <value>org.gatein.mop.core.api.workspace.NavigationContainer</value>
+          <value>org.gatein.mop.core.api.workspace.PageLinkImpl</value>
+          <value>org.gatein.mop.core.api.workspace.URLLinkImpl</value>
+          <value>org.gatein.mop.core.api.workspace.PortalSiteContainer</value>
+          <value>org.gatein.mop.core.api.workspace.PortalSite</value>
+          <value>org.gatein.mop.core.api.workspace.GroupSiteContainer</value>
+          <value>org.gatein.mop.core.api.workspace.GroupSite</value>
+          <value>org.gatein.mop.core.api.workspace.UserSiteContainer</value>
+          <value>org.gatein.mop.core.api.workspace.UserSite</value>
+          <value>org.gatein.mop.core.api.workspace.TemplatizedImpl</value>
+          <value>org.gatein.mop.core.api.AttributesImpl</value>
+          <value>org.gatein.mop.core.api.Attribute</value>
+          <value>org.gatein.mop.core.api.PathAttribute</value>
+          <value>org.gatein.mop.core.api.StringAttribute</value>
+          <value>org.gatein.mop.core.api.BooleanAttribute</value>
+          <value>org.gatein.mop.core.api.IntegerAttribute</value>
+          <value>org.gatein.mop.core.api.DateAttribute</value>
+          <value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value>
+          <value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value>
+          <value>org.gatein.mop.core.api.workspace.content.ContextType</value>
+          <value>org.gatein.mop.core.api.workspace.content.ContextSpecialization</value>
+          <value>org.gatein.mop.core.api.workspace.content.WorkspaceClone</value>
+          <value>org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization</value>
+          <value>org.exoplatform.portal.pom.spi.portlet.PortletState</value>
+          <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value>
+          <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value>
+          <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value>
+          <value>org.exoplatform.portal.mop.ProtectedResource</value>
+          <value>org.exoplatform.portal.mop.Described</value>
+          <value>org.exoplatform.portal.mop.Visible</value>
+        </values-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+
+  <external-component-plugins>
+    <target-component>org.exoplatform.services.organization.OrganizationService</target-component>
+    <component-plugin>
+      <name>new.user.event.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.services.organization.impl.NewUserEventListener</type>
+      <description>this listener assign group and membership to a new created user</description>
+      <init-params>
+        <object-param>
+          <name>configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.services.organization.impl.NewUserConfig">
+            <field  name="group">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup">
+                    <field  name="groupId"><string>/platform/users</string></field>
+                    <field  name="membership"><string>member</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+            <field  name="ignoredUser">
+              <collection type="java.util.HashSet">
+                <value><string>root</string></value>
+                <value><string>john</string></value>
+                <value><string>mary</string></value>
+                <value><string>demo</string></value>
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+    <component-plugin>
+      <name>user.portal.config.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.portal.config.UserPortalConfigListener</type>
+    </component-plugin>
+    <component-plugin>
+      <name>group.portal.config.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.portal.config.GroupPortalConfigListener</type>
+    </component-plugin>
+  </external-component-plugins>
+
+</configuration>

Added: portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml
===================================================================
--- portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,435 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+  xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+  <external-component-plugins>
+    <target-component>org.exoplatform.portal.config.UserPortalConfigService</target-component>
+    <component-plugin>
+      <name>new.portal.config.user.listener</name>
+      <set-method>initListener</set-method>
+      <type>org.exoplatform.portal.config.NewPortalConfigListener</type>
+      <description>this listener init the portal configuration</description>
+      <init-params>
+        <value-param>
+          <name>default.portal</name>
+          <description>The default portal for checking db is empty or not</description>
+          <value>classic</value>
+        </value-param>
+        <value-param>
+          <name>initializing.failure.ignore</name>
+          <description>In the run method, use try catch or not (value is true/false)</description>
+          <value>true</value>
+        </value-param>
+        <value-param>
+          <name>page.templates.location</name>
+          <description>the path to the location that contains Page templates</description>
+          <value>classpath:/portal/template/pages</value>
+        </value-param>
+				<object-param>
+          <name>site.templates.location</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.SiteConfigTemplates">
+						<field name="location">
+              <string>classpath:/portal</string>
+            </field>
+            <field name="portalTemplates">
+              <collection type="java.util.HashSet">
+								<value>
+                  <string>classic</string>
+                </value>
+                <value>
+                  <string>test</string>
+                </value>
+							</collection>
+            </field>
+            <field name="groupTemplates">
+              <collection type="java.util.HashSet">
+								<value>
+                  <string>group</string>
+                </value>
+							</collection>
+            </field>
+            <field name="userTemplates">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>user</string>
+                </value>
+							</collection>
+            </field>
+          </object>
+        </object-param>
+        <object-param>
+          <name>portal.configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.NewPortalConfig">
+            <field name="predefinedOwner">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>classic</string>
+                </value>
+                <value>
+                  <string>test</string>
+                </value>
+                <value>
+                  <string>system</string>
+                </value>
+              </collection>
+            </field>
+            <field name="ownerType">
+              <string>portal</string>
+            </field>
+            <field name="templateLocation">
+              <string>classpath:/portal</string>
+            </field>
+          </object>
+        </object-param>
+        <object-param>
+          <name>group.configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.NewPortalConfig">
+            <field name="predefinedOwner">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>platform/administrators</string>
+                </value>
+                <value>
+                  <string>platform/users</string>
+                </value>
+                <value>
+                  <string>platform/guests</string>
+                </value>
+                <value>
+                  <string>platform/test/legacy</string>
+                </value>
+                <value>
+                  <string>platform/test/normalized</string>
+                </value>
+                <value>
+                  <string>organization/management/executive-board</string>
+                </value>
+              </collection>
+            </field>
+            <field name="ownerType">
+              <string>group</string>
+            </field>
+            <field name="templateLocation">
+              <string>classpath:/portal</string>
+            </field>
+          </object>
+        </object-param>
+        <object-param>
+          <name>user.configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.portal.config.NewPortalConfig">
+            <field name="predefinedOwner">
+              <collection type="java.util.HashSet">
+                <value>
+                  <string>root</string>
+                </value>
+                <value>
+                  <string>john</string>
+                </value>
+                <value>
+                  <string>mary</string>
+                </value>
+                <value>
+                  <string>demo</string>
+                </value>
+                <value>
+                  <string>overwritelayout</string>
+                </value>
+              </collection>
+            </field>
+            <field name="ownerType">
+              <string>user</string>
+            </field>
+            <field name="templateLocation">
+              <string>classpath:/portal</string>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+  </external-component-plugins>
+
+  <external-component-plugins>
+    <target-component>org.exoplatform.services.organization.OrganizationService</target-component>
+    <component-plugin>
+      <name>init.service.listener</name>
+      <set-method>addListenerPlugin</set-method>
+      <type>org.exoplatform.services.organization.OrganizationDatabaseInitializer</type>
+      <description>this listener populate organization data for the first launch</description>
+      <init-params>
+        <value-param>
+          <name>checkDatabaseAlgorithm</name>
+          <description>check database</description>
+          <value>entry</value>
+        </value-param>
+        <value-param>
+          <name>printInformation</name>
+          <description>Print information init database</description>
+          <value>true</value>
+        </value-param>
+        <object-param>
+          <name>configuration</name>
+          <description>description</description>
+          <object type="org.exoplatform.services.organization.OrganizationConfig">
+            <field  name="membershipType">
+              <collection type="java.util.ArrayList">
+              	<value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>manager</string></field>
+                    <field  name="description"><string>manager membership type</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>member</string></field>
+                    <field  name="description"><string>member membership type</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType">
+                    <field  name="type"><string>validator</string></field>
+                    <field  name="description"><string>validator membership type</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+
+            <field  name="group">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>platform</string></field>
+                    <field  name="parentId"><string></string></field>
+                    <field  name="description"><string>the /platform group</string></field>
+                    <field  name="label"><string>Platform</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>administrators</string></field>
+                    <field  name="parentId"><string>/platform</string></field>
+                    <field  name="description"><string>the /platform/administrators group</string></field>
+                    <field  name="label"><string>Administrators</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>users</string></field>
+                    <field  name="parentId"><string>/platform</string></field>
+                    <field  name="description"><string>the /platform/users group</string></field>
+                    <field  name="label"><string>Users</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>guests</string></field>
+                    <field  name="parentId"><string>/platform</string></field>
+                    <field  name="description"><string>the /platform/guests group</string></field>
+                    <field  name="label"><string>Guests</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>organization</string></field>
+                    <field  name="parentId"><string></string></field>
+                    <field  name="description"><string>the organization group</string></field>
+                    <field  name="label"><string>Organization</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>management</string></field>
+                    <field  name="parentId"><string>/organization</string></field>
+                    <field  name="description"><string>the /organization/management group</string></field>
+                    <field  name="label"><string>Management</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>executive-board</string></field>
+                    <field  name="parentId"><string>/organization/management</string></field>
+                    <field  name="description"><string>the /organization/management/executive-board group</string></field>
+                    <field  name="label"><string>Executive Board</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>human-resources</string></field>
+                    <field  name="parentId"><string>/organization/management</string></field>
+                    <field  name="description"><string>the /organization/management/human-resource group</string></field>
+                    <field  name="label"><string>Human Resources</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>communication</string></field>
+                    <field  name="parentId"><string>/organization</string></field>
+                    <field  name="description"><string>the /organization/communication group</string></field>
+                    <field  name="label"><string>Communication</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>marketing</string></field>
+                    <field  name="parentId"><string>/organization/communication</string></field>
+                    <field  name="description"><string>the /organization/communication/marketing group</string></field>
+                    <field  name="label"><string>Marketing</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>press-and-media</string></field>
+                    <field  name="parentId"><string>/organization/communication</string></field>
+                    <field  name="description"><string>the /organization/communication/press-and-media group</string></field>
+                    <field  name="label"><string>Press and Media</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>operations</string></field>
+                    <field  name="parentId"><string>/organization</string></field>
+                    <field  name="description"><string>the /organization/operations and media group</string></field>
+                    <field  name="label"><string>Operations</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>sales</string></field>
+                    <field  name="parentId"><string>/organization/operations</string></field>
+                    <field  name="description"><string>the /organization/operations/sales group</string></field>
+                    <field  name="label"><string>Sales</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>finances</string></field>
+                    <field  name="parentId"><string>/organization/operations</string></field>
+                    <field  name="description"><string>the /organization/operations/finances group</string></field>
+                    <field  name="label"><string>Finances</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>customers</string></field>
+                    <field  name="parentId"><string></string></field>
+                    <field  name="description"><string>the /customers group</string></field>
+                    <field  name="label"><string>Customers</string></field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$Group">
+                    <field  name="name"><string>partners</string></field>
+                    <field  name="parentId"><string></string></field>
+                    <field  name="description"><string>the /partners group</string></field>
+                    <field  name="label"><string>Partners</string></field>
+                  </object>
+                </value>
+              </collection>
+            </field>
+
+            <field  name="user">
+              <collection type="java.util.ArrayList">
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>root</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>Root</string></field>
+                    <field  name="lastName"><string>Root</string></field>
+                    <field  name="email"><string>root at localhost</string></field>
+                    <field  name="groups">
+                      <string>
+                      	manager:/platform/administrators,member:/platform/users,
+                      	member:/organization/management/executive-board
+                      </string>
+                    </field>
+                  </object>
+                </value>
+
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>john</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>John</string></field>
+                    <field  name="lastName"><string>Anthony</string></field>
+                    <field  name="email"><string>john at localhost</string></field>
+                    <field  name="groups">
+                      <string>
+                      	member:/platform/administrators,member:/platform/users,
+                      	manager:/organization/management/executive-board
+                      </string>
+                    </field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>mary</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>Mary</string></field>
+                    <field  name="lastName"><string>Kelly</string></field>
+                    <field  name="email"><string>mary at localhost</string></field>
+                    <field  name="groups">
+                      <string>member:/platform/users</string>
+                    </field>
+                  </object>
+                </value>
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field  name="userName"><string>demo</string></field>
+                    <field  name="password"><string>gtn</string></field>
+                    <field  name="firstName"><string>Demo</string></field>
+                    <field  name="lastName"><string>gtn</string></field>
+                    <field  name="email"><string>demo at localhost</string></field>
+                    <field  name="groups">
+                      <string>member:/platform/guests,member:/platform/users</string>
+                    </field>
+                  </object>
+                </value>
+
+                <value>
+                  <object type="org.exoplatform.services.organization.OrganizationConfig$User">
+                    <field name="userName"><string>overwritelayout</string></field>
+                    <field name="password"><string>whatever</string></field>
+                    <field name="firstName"><string>whatever</string></field>
+                    <field name="lastName"><string>whatever</string></field>
+                    <field name="email"><string>whatever at localhost</string></field>
+                    <field name="groups">
+                      <string>member:/platform/guests</string>
+                    </field>
+                  </object>
+                </value>
+
+              </collection>
+            </field>
+          </object>
+        </object-param>
+      </init-params>
+    </component-plugin>
+
+  </external-component-plugins>
+
+</configuration>

Modified: portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/conf/exo.portal.component.resources-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-   xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-
-  <component>
-  	<key>org.exoplatform.services.cache.CacheService</key>
-    <jmx-name>cache:type=CacheService</jmx-name>
-  	<type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
-  	<init-params>
-      <object-param>
-        <name>cache.config.default</name>
-        <description>The default cache configuration</description>
-        <object type="org.exoplatform.services.cache.ExoCacheConfig">
-          <field name="name"><string>default</string></field>
-          <field name="maxSize"><int>300</int></field>
-          <field name="liveTime"><long>60</long></field>
-          <field name="distributed"><boolean>false</boolean></field>
-          <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
-        </object>
-      </object-param>
-    </init-params>
-  </component>
-
-  <component>
-    <key>org.exoplatform.services.resources.LocaleConfigService</key>
-    <type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type>
-      <init-params>
-        <value-param>
-          <name>locale.config.file</name>
-          <value>jar:/conf/locales-config.xml</value>
-        </value-param>
-      </init-params>
-  </component>
-
-  <component>
-    <key>org.exoplatform.services.resources.ResourceBundleManager</key>
-    <type>org.exoplatform.services.resources.ResourceBundleManager</type>
-  </component>
-
-    <component>
-      <key>org.exoplatform.services.resources.ResourceBundleService</key>
-      <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type>
-        <init-params>
-          <values-param>
-            <name>classpath.resources</name>
-            <description>The resources  that start with the following package name should be load from file system</description>
-            <value>locale.portlet</value>
-          </values-param>
-
-          <values-param>
-            <name>init.resources</name>
-            <description>Store the following resources into the db for  the first launch </description>
-            <value>locale.test.resources.test</value>
-          </values-param>
-
-          <values-param>
-            <name>portal.resource.names</name>
-            <description>The properties files of  the portal ,  those file will be merged
-              into one ResourceBundle properties </description>
-            <value>local.portal.portal</value>
-            <value>local.portal.custom</value>
-          </values-param>
-        </init-params>
-    </component>
-
-</configuration>

Modified: portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/conf/locales-config.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<locales-config>
-  <!--
-    Check http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt for locale code 
-    The encoding parameter will be used for the request  response stream.
-    The input-encoding parameter will be used for request setCharacterEncoding(..) 
-
-    encoding: ISO-8859-1 
-  -->
-  
-  <locale-config>
-    <locale>en</locale>
-    <output-encoding>UTF-8</output-encoding>
-    <input-encoding>UTF-8</input-encoding>
-    <description>Default configuration for english locale</description>
-  </locale-config>
-
-  <locale-config>
-    <locale>fr</locale>
-    <output-encoding>UTF-8</output-encoding>
-    <input-encoding>UTF-8</input-encoding>
-    <description>Default configuration for the french locale</description>
-  </locale-config>
-  
-	<locale-config>
-		<locale>ar</locale>
-		<output-encoding>UTF-8</output-encoding>
-		<input-encoding>UTF-8</input-encoding>
-		<description>Default configuration for the arabic locale</description>
-		<orientation>rt</orientation>
-	</locale-config>
-	
-  <locale-config>
-    <locale>vi</locale>
-    <output-encoding>UTF-8</output-encoding>
-    <input-encoding>UTF-8</input-encoding>
-    <description>Default configuration for the vietnam locale</description>
-  </locale-config>
-</locales-config>

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,28 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-	<my>
-		<!-- Key 1 -->
-		<key1>My Default Value In English v2</key1>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,32 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-	<my>
-		<!-- Key 1 -->
-		<key1>My Default Value In English</key1>
-		<!-- Key 2 -->
-		<key2>My Default Value In English</key2>
-		<!-- Key 3 -->
-		<key3>My Default Value In English</key3>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-	<my>
-		<!-- Key 2 -->
-		<key2>My New Value In English v2</key2>
-		<!-- Key 3 -->
-		<key3>My New Value In English v2</key3>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_en.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-	<my>
-		<!-- Key 1 -->
-		<key1>My New Value In English</key1>
-		<!-- Key 3 -->
-		<key3>My New Value In English</key3>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,30 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<bundle>
-	<my>
-		<!-- Key 1 -->
-		<key1>My Value In French v2 with special characters such as éçàùƔ௵</key1>
-		<!-- Key 3 -->
-		<key3>My Value In French v2 with special characters such as éçàùƔ௵</key3>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_fr.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,30 +0,0 @@
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<bundle>
-	<my>
-		<!-- Key 1 -->
-		<key1>My Value In French with special characters such as éçàùƔ௵</key1>
-		<!-- Key 2 -->
-		<key2>My Value In French with special characters such as éçàùƔ௵</key2>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-	<my>
-		<!-- Key 2 -->
-		<key2>Il Mio Nuovo Valore In Italiano v2</key2>
-		<!-- Key 3 -->
-		<key3>Il Mio Nuovo Valore In Italiano v2</key3>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB1_it.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,30 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-	<my>
-		<!-- Key 1 -->
-		<key1>Il Mio Nuovo Valore In Italiano</key1>
-		<!-- Key 3 -->
-		<key3>Il Mio Nuovo Valore In Italiano</key3>
-	</my>
-</bundle>
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,21 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key1
-my.key1=My Default Value In English v2

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key1
-my.key1=My Default Value In English
-# key2
-my.key2=My Default Value In English
-# key3
-my.key3=My Default Value In English
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key2
-my.key2=My New Value In English v2
-# key3
-my.key3=My New Value In English v2

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_en.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key1
-my.key1=My New Value In English
-# key3
-my.key3=My New Value In English

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key1
-my.key1=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5
-# key3
-my.key3=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_fr.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key1
-my.key1=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5
-# key2
-my.key2=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key2
-my.key2=Il mio nuovo valore in italiano v2
-# key3
-my.key3=Il mio nuovo valore in italiano v2

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/myRB2_it.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# key1
-my.key1=Il mio nuovo valore in italiano
-# key3
-my.key3=Il mio nuovo valore in italiano

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language=English

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_en.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language.language=English

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_fr.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language.language=French

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_it.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language=Italiano
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_ru.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language.language=Русский

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/resources/test_vi.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language.language=TiengViet

Modified: portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/locale/test/test_it.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-# 
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-# 
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-language=Italiano
\ No newline at end of file

Modified: portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/resources/src/test/java/resources/locales-config.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<locales-config>
-
-  <locale-config>
-    <locale>en</locale>
-    <output-encoding>UTF-8</output-encoding>
-    <input-encoding>UTF-8</input-encoding>
-    <description>Default configuration for english locale</description>
-  </locale-config>
-
-  <locale-config>
-    <locale>fr</locale>
-    <output-encoding>UTF-8</output-encoding>
-    <input-encoding>UTF-8</input-encoding>
-    <description>Default configuration for the french locale</description>
-  </locale-config>
-
-	<locale-config>
-		<locale>ar</locale>
-		<output-encoding>UTF-8</output-encoding>
-		<input-encoding>UTF-8</input-encoding>
-		<description>Default configuration for the arabic locale</description>
-		<orientation>rt</orientation>
-	</locale-config>
-
-  <locale-config>
-    <locale>vi</locale>
-    <output-encoding>UTF-8</output-encoding>
-    <input-encoding>UTF-8</input-encoding>
-    <description>Default configuration for the vietnam locale</description>
-    <orientation>lt</orientation>
-  </locale-config>
-</locales-config>

Added: portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/conf/exo.portal.component.resources-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+   xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+
+  <component>
+  	<key>org.exoplatform.services.cache.CacheService</key>
+    <jmx-name>cache:type=CacheService</jmx-name>
+  	<type>org.exoplatform.services.cache.impl.CacheServiceImpl</type>
+  	<init-params>
+      <object-param>
+        <name>cache.config.default</name>
+        <description>The default cache configuration</description>
+        <object type="org.exoplatform.services.cache.ExoCacheConfig">
+          <field name="name"><string>default</string></field>
+          <field name="maxSize"><int>300</int></field>
+          <field name="liveTime"><long>60</long></field>
+          <field name="distributed"><boolean>false</boolean></field>
+          <field name="implementation"><string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string></field>
+        </object>
+      </object-param>
+    </init-params>
+  </component>
+
+  <component>
+    <key>org.exoplatform.services.resources.LocaleConfigService</key>
+    <type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type>
+      <init-params>
+        <value-param>
+          <name>locale.config.file</name>
+          <value>jar:/conf/locales-config.xml</value>
+        </value-param>
+      </init-params>
+  </component>
+
+  <component>
+    <key>org.exoplatform.services.resources.ResourceBundleManager</key>
+    <type>org.exoplatform.services.resources.ResourceBundleManager</type>
+  </component>
+
+    <component>
+      <key>org.exoplatform.services.resources.ResourceBundleService</key>
+      <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type>
+        <init-params>
+          <values-param>
+            <name>classpath.resources</name>
+            <description>The resources  that start with the following package name should be load from file system</description>
+            <value>locale.portlet</value>
+          </values-param>
+
+          <values-param>
+            <name>init.resources</name>
+            <description>Store the following resources into the db for  the first launch </description>
+            <value>locale.test.resources.test</value>
+          </values-param>
+
+          <values-param>
+            <name>portal.resource.names</name>
+            <description>The properties files of  the portal ,  those file will be merged
+              into one ResourceBundle properties </description>
+            <value>local.portal.portal</value>
+            <value>local.portal.custom</value>
+          </values-param>
+        </init-params>
+    </component>
+
+</configuration>

Added: portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/conf/locales-config.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<locales-config>
+  <!--
+    Check http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt for locale code 
+    The encoding parameter will be used for the request  response stream.
+    The input-encoding parameter will be used for request setCharacterEncoding(..) 
+
+    encoding: ISO-8859-1 
+  -->
+  
+  <locale-config>
+    <locale>en</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for english locale</description>
+  </locale-config>
+
+  <locale-config>
+    <locale>fr</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for the french locale</description>
+  </locale-config>
+  
+	<locale-config>
+		<locale>ar</locale>
+		<output-encoding>UTF-8</output-encoding>
+		<input-encoding>UTF-8</input-encoding>
+		<description>Default configuration for the arabic locale</description>
+		<orientation>rt</orientation>
+	</locale-config>
+	
+  <locale-config>
+    <locale>vi</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for the vietnam locale</description>
+  </locale-config>
+</locales-config>

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<bundle>
+	<my>
+		<!-- Key 1 -->
+		<key1>My Default Value In English v2</key1>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<bundle>
+	<my>
+		<!-- Key 1 -->
+		<key1>My Default Value In English</key1>
+		<!-- Key 2 -->
+		<key2>My Default Value In English</key2>
+		<!-- Key 3 -->
+		<key3>My Default Value In English</key3>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<bundle>
+	<my>
+		<!-- Key 2 -->
+		<key2>My New Value In English v2</key2>
+		<!-- Key 3 -->
+		<key3>My New Value In English v2</key3>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_en.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<bundle>
+	<my>
+		<!-- Key 1 -->
+		<key1>My New Value In English</key1>
+		<!-- Key 3 -->
+		<key3>My New Value In English</key3>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,30 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<bundle>
+	<my>
+		<!-- Key 1 -->
+		<key1>My Value In French v2 with special characters such as éçàùƔ௵</key1>
+		<!-- Key 3 -->
+		<key3>My Value In French v2 with special characters such as éçàùƔ௵</key3>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_fr.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,30 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<bundle>
+	<my>
+		<!-- Key 1 -->
+		<key1>My Value In French with special characters such as éçàùƔ௵</key1>
+		<!-- Key 2 -->
+		<key2>My Value In French with special characters such as éçàùƔ௵</key2>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it-2.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<bundle>
+	<my>
+		<!-- Key 2 -->
+		<key2>Il Mio Nuovo Valore In Italiano v2</key2>
+		<!-- Key 3 -->
+		<key3>Il Mio Nuovo Valore In Italiano v2</key3>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB1_it.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<bundle>
+	<my>
+		<!-- Key 1 -->
+		<key1>Il Mio Nuovo Valore In Italiano</key1>
+		<!-- Key 3 -->
+		<key3>Il Mio Nuovo Valore In Italiano</key3>
+	</my>
+</bundle>
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key1
+my.key1=My Default Value In English v2

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key1
+my.key1=My Default Value In English
+# key2
+my.key2=My Default Value In English
+# key3
+my.key3=My Default Value In English
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key2
+my.key2=My New Value In English v2
+# key3
+my.key3=My New Value In English v2

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_en.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key1
+my.key1=My New Value In English
+# key3
+my.key3=My New Value In English

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key1
+my.key1=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5
+# key3
+my.key3=My Value In French v2 with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_fr.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key1
+my.key1=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5
+# key2
+my.key2=My Value In French with special characters such as \u00E9\u00E7\u00E0\u00F9\u0194\u0BF5

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it-2.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key2
+my.key2=Il mio nuovo valore in italiano v2
+# key3
+my.key3=Il mio nuovo valore in italiano v2

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/myRB2_it.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+# key1
+my.key1=Il mio nuovo valore in italiano
+# key3
+my.key3=Il mio nuovo valore in italiano

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language=English

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_en.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language.language=English

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_fr.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language.language=French

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_it.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language=Italiano
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_ru.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language.language=Русский

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/resources/test_vi.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language.language=TiengViet

Added: portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/locale/test/test_it.properties	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2009 eXo Platform SAS.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+
+language=Italiano
\ No newline at end of file

Added: portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml
===================================================================
--- portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/resources/src/test/resources/resources/locales-config.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<locales-config>
+
+  <locale-config>
+    <locale>en</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for english locale</description>
+  </locale-config>
+
+  <locale-config>
+    <locale>fr</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for the french locale</description>
+  </locale-config>
+
+	<locale-config>
+		<locale>ar</locale>
+		<output-encoding>UTF-8</output-encoding>
+		<input-encoding>UTF-8</input-encoding>
+		<description>Default configuration for the arabic locale</description>
+		<orientation>rt</orientation>
+	</locale-config>
+
+  <locale-config>
+    <locale>vi</locale>
+    <output-encoding>UTF-8</output-encoding>
+    <input-encoding>UTF-8</input-encoding>
+    <description>Default configuration for the vietnam locale</description>
+    <orientation>lt</orientation>
+  </locale-config>
+</locales-config>

Modified: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml
===================================================================
--- portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright (C) 2009 eXo Platform SAS.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<gatein-resources
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
-    xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
-
-	<!-- Portal skins -->
-	<portal-skin>
-		<skin-name>Default</skin-name>
-    <skin-module>MyModule</skin-module>
-		<css-path>/skin/Stylesheet.css</css-path>
-	</portal-skin>
-
-	<!-- BannerPortlet skins -->
-
-	<portlet-skin>
-		<application-name>web</application-name>
-		<portlet-name>BannerPortlet</portlet-name>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path>
-	</portlet-skin>
-
-	<!-- FooterPortlet skins -->
-
-	<portlet-skin>
-		<application-name>web</application-name>
-		<portlet-name>FooterPortlet</portlet-name>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path>
-	</portlet-skin>
-
-	<!-- Simple window style -->
-	<window-style>
-		<style-name>Simple</style-name>
-		<style-theme>
-			<theme-name>SimpleBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimplePink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleGreen</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- RoundConer window style -->
-	<window-style>
-		<style-name>RoundConer</style-name>
-		<style-theme>
-			<theme-name>RoundConerBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerPink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerGreen</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- Shadow window style -->
-	<window-style>
-		<style-name>Shadow</style-name>
-		<style-theme>
-			<theme-name>ShadowBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowPink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowGreen</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- MacStyle window style -->
-	<window-style>
-		<style-name>MacStyle</style-name>
-		<style-theme>
-			<theme-name>MacTheme</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>MacGray</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>MacGreenSteel</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- VistaStyle window style -->
-	<window-style>
-		<style-name>VistaStyle</style-name>
-		<style-theme>
-			<theme-name>VistaTheme</theme-name>
-		</style-theme>
-	</window-style>
-
-	<javascript>
-		<param>
-			<js-module>eXo</js-module>
-			<js-path>/javascript/eXo.js</js-path>
-			<js-priority>0</js-priority>
-		</param>
-	</javascript>
-
-	<!-- CORE Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.core.Utils</js-module>
-			<js-path>/javascript/eXo/core/Util.js</js-path>
-			<js-priority>1</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.DOMUtil</js-module>
-			<js-path>/javascript/eXo/core/DOMUtil.js</js-path>
-			<js-priority>1</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.Browser</js-module>
-			<js-path>/javascript/eXo/core/Browser.js</js-path>
-			<js-priority>2</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.MouseEventManager</js-module>
-			<js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.UIMaskLayer</js-module>
-			<js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Skin</js-module>
-			<js-path>/javascript/eXo/core/Skin.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.DragDrop</js-module>
-			<js-path>/javascript/eXo/core/DragDrop.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.DragDrop2</js-module>
-			<js-path>/javascript/eXo/core/DragDrop2.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Topic</js-module>
-			<js-path>/javascript/eXo/core/Topic.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.JSON</js-module>
-			<js-path>/javascript/eXo/core/JSON.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Cometd</js-module>
-			<js-path>/javascript/eXo/core/Cometd.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Spliter</js-module>
-			<js-path>/javascript/eXo/core/Spliter.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Notification</js-module>
-			<js-path>/javascript/eXo/core/Notification.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Loader</js-module>
-			<js-path>/javascript/eXo/core/Loader.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.I18n</js-module>
-			<js-path>/javascript/eXo/core/I18n.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- Gadget Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.gadget.UIGadget</js-module>
-			<js-path>/javascript/eXo/gadget/UIGadget.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- WebUI Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.webui.UIItemSelector</js-module>
-			<js-path>/javascript/eXo/webui/UIItemSelector.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIForm</js-module>
-			<js-path>/javascript/eXo/webui/UIForm.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopup</js-module>
-			<js-path>/javascript/eXo/webui/UIPopup.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupSelectCategory</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupWindow</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIHorizontalTabs</js-module>
-			<js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupMenu</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDropDownControl</js-module>
-			<js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIRightClickPopupMenu</js-module>
-			<js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIVerticalSlideTabs</js-module>
-			<js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPermissionSelectorTab</js-module>
-			<js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDashboard</js-module>
-			<js-path>/javascript/eXo/webui/UIDashboard.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDashboardUtil</js-module>
-			<js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UINotification</js-module>
-			<js-path>/javascript/eXo/webui/UINotification.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIUserSelector</js-module>
-			<js-path>/javascript/eXo/webui/UIUserSelector.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UICombobox</js-module>
-			<js-path>/javascript/eXo/webui/UICombobox.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UICombobox</js-module>
-			<js-path>/javascript/eXo/webui/UIVirtualList.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIColorPicker</js-module>
-			<js-path>/javascript/eXo/webui/UIColorPicker.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- Portal Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.portal.PortalHttpRequest</js-module>
-			<js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortal</js-module>
-			<js-path>/javascript/eXo/portal/UIPortal.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIWorkspace</js-module>
-			<js-path>/javascript/eXo/portal/UIWorkspace.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortalControl</js-module>
-			<js-path>/javascript/eXo/portal/UIPortalControl.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.PortalDragDrop</js-module>
-			<js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortalNavigation</js-module>
-			<js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIMaskWorkspace</js-module>
-			<js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIBrowseContent</js-module>
-			<js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path>
-		</param>
-	</javascript>
-
-	<javascript>
-		<param>
-			<js-module>eXo.webui.UIPortlet</js-module>
-			<js-path>/javascript/eXo/webui/UIPortlet.js</js-path>
-		</param>
-	</javascript>
-</gatein-resources>

Modified: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml
===================================================================
--- portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2009 eXo Platform SAS.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<gatein-resources
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
-    xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
-
-	<!-- Portal skins -->
-	<portal-skin>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/Stylesheet.css</css-path>
-	</portal-skin>
-
-	<!-- BannerPortlet skins -->
-
-	<portlet-skin>
-		<application-name>web</application-name>
-		<portlet-name>BannerPortlet</portlet-name>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path>
-	</portlet-skin>
-
-	<!-- FooterPortlet skins -->
-
-	<portlet-skin>
-		<application-name>web</application-name>
-		<portlet-name>FooterPortlet</portlet-name>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path>
-	</portlet-skin>
-
-	<!-- Simple window style -->
-	<window-style>
-		<style-name>Simple</style-name>
-		<style-theme>
-			<theme-name>SimpleBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimplePink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleGreen</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- RoundConer window style -->
-	<window-style>
-		<style-name>RoundConer</style-name>
-		<style-theme>
-			<theme-name>RoundConerBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerPink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerGreen</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- Shadow window style -->
-	<window-style>
-		<style-name>Shadow</style-name>
-		<style-theme>
-			<theme-name>ShadowBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowPink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowGreen</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- MacStyle window style -->
-	<window-style>
-		<style-name>MacStyle</style-name>
-		<style-theme>
-			<theme-name>MacTheme</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>MacGray</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>MacGreenSteel</theme-name>
-		</style-theme>
-	</window-style>
-
-	<!-- VistaStyle window style -->
-	<window-style>
-		<style-name>VistaStyle</style-name>
-		<style-theme>
-			<theme-name>VistaTheme</theme-name>
-		</style-theme>
-	</window-style>
-
-	<javascript>
-		<param>
-			<js-module>eXo</js-module>
-			<js-path>/javascript/eXo.js</js-path>
-			<js-priority>0</js-priority>
-		</param>
-	</javascript>
-
-	<!-- CORE Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.core.Utils</js-module>
-			<js-path>/javascript/eXo/core/Util.js</js-path>
-			<js-priority>1</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.DOMUtil</js-module>
-			<js-path>/javascript/eXo/core/DOMUtil.js</js-path>
-			<js-priority>1</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.Browser</js-module>
-			<js-path>/javascript/eXo/core/Browser.js</js-path>
-			<js-priority>2</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.MouseEventManager</js-module>
-			<js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.UIMaskLayer</js-module>
-			<js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Skin</js-module>
-			<js-path>/javascript/eXo/core/Skin.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.DragDrop</js-module>
-			<js-path>/javascript/eXo/core/DragDrop.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.DragDrop2</js-module>
-			<js-path>/javascript/eXo/core/DragDrop2.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Topic</js-module>
-			<js-path>/javascript/eXo/core/Topic.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.JSON</js-module>
-			<js-path>/javascript/eXo/core/JSON.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Cometd</js-module>
-			<js-path>/javascript/eXo/core/Cometd.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Spliter</js-module>
-			<js-path>/javascript/eXo/core/Spliter.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Notification</js-module>
-			<js-path>/javascript/eXo/core/Notification.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Loader</js-module>
-			<js-path>/javascript/eXo/core/Loader.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.I18n</js-module>
-			<js-path>/javascript/eXo/core/I18n.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- Gadget Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.gadget.UIGadget</js-module>
-			<js-path>/javascript/eXo/gadget/UIGadget.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- WebUI Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.webui.UIItemSelector</js-module>
-			<js-path>/javascript/eXo/webui/UIItemSelector.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIForm</js-module>
-			<js-path>/javascript/eXo/webui/UIForm.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopup</js-module>
-			<js-path>/javascript/eXo/webui/UIPopup.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupSelectCategory</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupWindow</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIHorizontalTabs</js-module>
-			<js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupMenu</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDropDownControl</js-module>
-			<js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIRightClickPopupMenu</js-module>
-			<js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIVerticalSlideTabs</js-module>
-			<js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPermissionSelectorTab</js-module>
-			<js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDashboard</js-module>
-			<js-path>/javascript/eXo/webui/UIDashboard.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDashboardUtil</js-module>
-			<js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UINotification</js-module>
-			<js-path>/javascript/eXo/webui/UINotification.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIUserSelector</js-module>
-			<js-path>/javascript/eXo/webui/UIUserSelector.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UICombobox</js-module>
-			<js-path>/javascript/eXo/webui/UICombobox.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UICombobox</js-module>
-			<js-path>/javascript/eXo/webui/UIVirtualList.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIColorPicker</js-module>
-			<js-path>/javascript/eXo/webui/UIColorPicker.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- Portal Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.portal.PortalHttpRequest</js-module>
-			<js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortal</js-module>
-			<js-path>/javascript/eXo/portal/UIPortal.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIWorkspace</js-module>
-			<js-path>/javascript/eXo/portal/UIWorkspace.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortalControl</js-module>
-			<js-path>/javascript/eXo/portal/UIPortalControl.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.PortalDragDrop</js-module>
-			<js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortalNavigation</js-module>
-			<js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIMaskWorkspace</js-module>
-			<js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIBrowseContent</js-module>
-			<js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path>
-		</param>
-	</javascript>
-
-	<javascript>
-		<param>
-			<js-module>eXo.webui.UIPortlet</js-module>
-			<js-path>/javascript/eXo/webui/UIPortlet.js</js-path>
-		</param>
-	</javascript>
-</gatein-resources>

Modified: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml
===================================================================
--- portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright (C) 2009 eXo Platform SAS.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-<gatein-resources
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
-    xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
-
-	<!-- Portal skins -->
-	<portal-skin>
-		<skin-name>Default</skin-name>
-    <skin-module>MyModule</skin-module>
-		<css-path>/skin/Stylesheet.css</css-path>
-	</portal-skin>	
-
-	<!-- BannerPortlet skins -->
-
-	<portlet-skin>
-		<application-name>web</application-name>
-		<portlet-name>BannerPortlet</portlet-name>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path>
-	</portlet-skin>
-		
-	<!-- FooterPortlet skins -->
-
-	<portlet-skin>
-		<application-name>web</application-name>
-		<portlet-name>FooterPortlet</portlet-name>
-		<skin-name>Default</skin-name>
-		<css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path>
-	</portlet-skin>
-		
-	<!-- Simple window style -->
-	<window-style>
-		<style-name>Simple</style-name>
-		<style-theme>
-			<theme-name>SimpleBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimplePink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>SimpleGreen</theme-name>
-		</style-theme>
-	</window-style>
-	
-	<!-- RoundConer window style -->
-	<window-style>
-		<style-name>RoundConer</style-name>
-		<style-theme>
-			<theme-name>RoundConerBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerPink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>RoundConerGreen</theme-name>
-		</style-theme>
-	</window-style>
-	
-	<!-- Shadow window style -->
-	<window-style>
-		<style-name>Shadow</style-name>
-		<style-theme>
-			<theme-name>ShadowBlue</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowViolet</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowOrange</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowPink</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>ShadowGreen</theme-name>
-		</style-theme>
-	</window-style>
-	
-	<!-- MacStyle window style -->
-	<window-style>
-		<style-name>MacStyle</style-name>
-		<style-theme>
-			<theme-name>MacTheme</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>MacGray</theme-name>
-		</style-theme>
-		<style-theme>
-			<theme-name>MacGreenSteel</theme-name>
-		</style-theme>
-	</window-style>
-	
-	<!-- VistaStyle window style -->
-	<window-style>
-		<style-name>VistaStyle</style-name>
-		<style-theme>
-			<theme-name>VistaTheme</theme-name>
-		</style-theme>
-	</window-style>
-	
-	<javascript>
-		<param>
-			<js-module>eXo</js-module>
-			<js-path>/javascript/eXo.js</js-path>
-			<js-priority>0</js-priority>
-		</param>
-	</javascript>
-
-	<!-- CORE Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.core.Utils</js-module>
-			<js-path>/javascript/eXo/core/Util.js</js-path>
-			<js-priority>1</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.DOMUtil</js-module>
-			<js-path>/javascript/eXo/core/DOMUtil.js</js-path>
-			<js-priority>1</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.Browser</js-module>
-			<js-path>/javascript/eXo/core/Browser.js</js-path>
-			<js-priority>2</js-priority>
-		</param>
-		<param>
-			<js-module>eXo.core.MouseEventManager</js-module>
-			<js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.UIMaskLayer</js-module>
-			<js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Skin</js-module>
-			<js-path>/javascript/eXo/core/Skin.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.DragDrop</js-module>
-			<js-path>/javascript/eXo/core/DragDrop.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.DragDrop2</js-module>
-			<js-path>/javascript/eXo/core/DragDrop2.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Topic</js-module>
-			<js-path>/javascript/eXo/core/Topic.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.JSON</js-module>
-			<js-path>/javascript/eXo/core/JSON.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Cometd</js-module>
-			<js-path>/javascript/eXo/core/Cometd.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Spliter</js-module>
-			<js-path>/javascript/eXo/core/Spliter.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Notification</js-module>
-			<js-path>/javascript/eXo/core/Notification.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.Loader</js-module>
-			<js-path>/javascript/eXo/core/Loader.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.core.I18n</js-module>
-			<js-path>/javascript/eXo/core/I18n.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- Gadget Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.gadget.UIGadget</js-module>
-			<js-path>/javascript/eXo/gadget/UIGadget.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- WebUI Javascripts -->
-	<javascript> 
-		<param>
-			<js-module>eXo.webui.UIItemSelector</js-module>
-			<js-path>/javascript/eXo/webui/UIItemSelector.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIForm</js-module>
-			<js-path>/javascript/eXo/webui/UIForm.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopup</js-module>
-			<js-path>/javascript/eXo/webui/UIPopup.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupSelectCategory</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupWindow</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIHorizontalTabs</js-module>
-			<js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPopupMenu</js-module>
-			<js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDropDownControl</js-module>
-			<js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIRightClickPopupMenu</js-module>
-			<js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIVerticalSlideTabs</js-module>
-			<js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIPermissionSelectorTab</js-module>
-			<js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDashboard</js-module>
-			<js-path>/javascript/eXo/webui/UIDashboard.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIDashboardUtil</js-module>
-			<js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UINotification</js-module>
-			<js-path>/javascript/eXo/webui/UINotification.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIUserSelector</js-module>
-			<js-path>/javascript/eXo/webui/UIUserSelector.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UICombobox</js-module>
-			<js-path>/javascript/eXo/webui/UICombobox.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UICombobox</js-module>
-			<js-path>/javascript/eXo/webui/UIVirtualList.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.webui.UIColorPicker</js-module>
-			<js-path>/javascript/eXo/webui/UIColorPicker.js</js-path>
-		</param>
-	</javascript>
-
-	<!-- Portal Javascripts -->
-	<javascript>
-		<param>
-			<js-module>eXo.portal.PortalHttpRequest</js-module>
-			<js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortal</js-module>
-			<js-path>/javascript/eXo/portal/UIPortal.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIWorkspace</js-module>
-			<js-path>/javascript/eXo/portal/UIWorkspace.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortalControl</js-module>
-			<js-path>/javascript/eXo/portal/UIPortalControl.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.PortalDragDrop</js-module>
-			<js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIPortalNavigation</js-module>
-			<js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIMaskWorkspace</js-module>
-			<js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path>
-		</param>
-		<param>
-			<js-module>eXo.portal.UIBrowseContent</js-module>
-			<js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path>
-		</param>
-	</javascript>
-
-	<javascript>
-		<param>
-			<js-module>eXo.webui.UIPortlet</js-module>
-			<js-path>/javascript/eXo/webui/UIPortlet.js</js-path>
-		</param>
-	</javascript>
-</gatein-resources>

Added: portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml
===================================================================
--- portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2009 eXo Platform SAS.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<gatein-resources
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+    xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+
+	<!-- Portal skins -->
+	<portal-skin>
+		<skin-name>Default</skin-name>
+    <skin-module>MyModule</skin-module>
+		<css-path>/skin/Stylesheet.css</css-path>
+	</portal-skin>
+
+	<!-- BannerPortlet skins -->
+
+	<portlet-skin>
+		<application-name>web</application-name>
+		<portlet-name>BannerPortlet</portlet-name>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path>
+	</portlet-skin>
+
+	<!-- FooterPortlet skins -->
+
+	<portlet-skin>
+		<application-name>web</application-name>
+		<portlet-name>FooterPortlet</portlet-name>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path>
+	</portlet-skin>
+
+	<!-- Simple window style -->
+	<window-style>
+		<style-name>Simple</style-name>
+		<style-theme>
+			<theme-name>SimpleBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimplePink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleGreen</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- RoundConer window style -->
+	<window-style>
+		<style-name>RoundConer</style-name>
+		<style-theme>
+			<theme-name>RoundConerBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerPink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerGreen</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- Shadow window style -->
+	<window-style>
+		<style-name>Shadow</style-name>
+		<style-theme>
+			<theme-name>ShadowBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowPink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowGreen</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- MacStyle window style -->
+	<window-style>
+		<style-name>MacStyle</style-name>
+		<style-theme>
+			<theme-name>MacTheme</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>MacGray</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>MacGreenSteel</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- VistaStyle window style -->
+	<window-style>
+		<style-name>VistaStyle</style-name>
+		<style-theme>
+			<theme-name>VistaTheme</theme-name>
+		</style-theme>
+	</window-style>
+
+	<javascript>
+		<param>
+			<js-module>eXo</js-module>
+			<js-path>/javascript/eXo.js</js-path>
+			<js-priority>0</js-priority>
+		</param>
+	</javascript>
+
+	<!-- CORE Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.core.Utils</js-module>
+			<js-path>/javascript/eXo/core/Util.js</js-path>
+			<js-priority>1</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.DOMUtil</js-module>
+			<js-path>/javascript/eXo/core/DOMUtil.js</js-path>
+			<js-priority>1</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.Browser</js-module>
+			<js-path>/javascript/eXo/core/Browser.js</js-path>
+			<js-priority>2</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.MouseEventManager</js-module>
+			<js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.UIMaskLayer</js-module>
+			<js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Skin</js-module>
+			<js-path>/javascript/eXo/core/Skin.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.DragDrop</js-module>
+			<js-path>/javascript/eXo/core/DragDrop.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.DragDrop2</js-module>
+			<js-path>/javascript/eXo/core/DragDrop2.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Topic</js-module>
+			<js-path>/javascript/eXo/core/Topic.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.JSON</js-module>
+			<js-path>/javascript/eXo/core/JSON.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Cometd</js-module>
+			<js-path>/javascript/eXo/core/Cometd.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Spliter</js-module>
+			<js-path>/javascript/eXo/core/Spliter.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Notification</js-module>
+			<js-path>/javascript/eXo/core/Notification.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Loader</js-module>
+			<js-path>/javascript/eXo/core/Loader.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.I18n</js-module>
+			<js-path>/javascript/eXo/core/I18n.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- Gadget Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.gadget.UIGadget</js-module>
+			<js-path>/javascript/eXo/gadget/UIGadget.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- WebUI Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.webui.UIItemSelector</js-module>
+			<js-path>/javascript/eXo/webui/UIItemSelector.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIForm</js-module>
+			<js-path>/javascript/eXo/webui/UIForm.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopup</js-module>
+			<js-path>/javascript/eXo/webui/UIPopup.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupSelectCategory</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupWindow</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIHorizontalTabs</js-module>
+			<js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupMenu</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDropDownControl</js-module>
+			<js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIRightClickPopupMenu</js-module>
+			<js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIVerticalSlideTabs</js-module>
+			<js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPermissionSelectorTab</js-module>
+			<js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDashboard</js-module>
+			<js-path>/javascript/eXo/webui/UIDashboard.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDashboardUtil</js-module>
+			<js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UINotification</js-module>
+			<js-path>/javascript/eXo/webui/UINotification.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIUserSelector</js-module>
+			<js-path>/javascript/eXo/webui/UIUserSelector.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UICombobox</js-module>
+			<js-path>/javascript/eXo/webui/UICombobox.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UICombobox</js-module>
+			<js-path>/javascript/eXo/webui/UIVirtualList.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIColorPicker</js-module>
+			<js-path>/javascript/eXo/webui/UIColorPicker.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- Portal Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.portal.PortalHttpRequest</js-module>
+			<js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortal</js-module>
+			<js-path>/javascript/eXo/portal/UIPortal.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIWorkspace</js-module>
+			<js-path>/javascript/eXo/portal/UIWorkspace.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortalControl</js-module>
+			<js-path>/javascript/eXo/portal/UIPortalControl.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.PortalDragDrop</js-module>
+			<js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortalNavigation</js-module>
+			<js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIMaskWorkspace</js-module>
+			<js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIBrowseContent</js-module>
+			<js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path>
+		</param>
+	</javascript>
+
+	<javascript>
+		<param>
+			<js-module>eXo.webui.UIPortlet</js-module>
+			<js-path>/javascript/eXo/webui/UIPortlet.js</js-path>
+		</param>
+	</javascript>
+</gatein-resources>

Added: portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml
===================================================================
--- portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_0.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2009 eXo Platform SAS.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<gatein-resources
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_0 http://www.gatein.org/xml/ns/gatein_resources_1_0"
+    xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_0">
+
+	<!-- Portal skins -->
+	<portal-skin>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/Stylesheet.css</css-path>
+	</portal-skin>
+
+	<!-- BannerPortlet skins -->
+
+	<portlet-skin>
+		<application-name>web</application-name>
+		<portlet-name>BannerPortlet</portlet-name>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path>
+	</portlet-skin>
+
+	<!-- FooterPortlet skins -->
+
+	<portlet-skin>
+		<application-name>web</application-name>
+		<portlet-name>FooterPortlet</portlet-name>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path>
+	</portlet-skin>
+
+	<!-- Simple window style -->
+	<window-style>
+		<style-name>Simple</style-name>
+		<style-theme>
+			<theme-name>SimpleBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimplePink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleGreen</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- RoundConer window style -->
+	<window-style>
+		<style-name>RoundConer</style-name>
+		<style-theme>
+			<theme-name>RoundConerBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerPink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerGreen</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- Shadow window style -->
+	<window-style>
+		<style-name>Shadow</style-name>
+		<style-theme>
+			<theme-name>ShadowBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowPink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowGreen</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- MacStyle window style -->
+	<window-style>
+		<style-name>MacStyle</style-name>
+		<style-theme>
+			<theme-name>MacTheme</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>MacGray</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>MacGreenSteel</theme-name>
+		</style-theme>
+	</window-style>
+
+	<!-- VistaStyle window style -->
+	<window-style>
+		<style-name>VistaStyle</style-name>
+		<style-theme>
+			<theme-name>VistaTheme</theme-name>
+		</style-theme>
+	</window-style>
+
+	<javascript>
+		<param>
+			<js-module>eXo</js-module>
+			<js-path>/javascript/eXo.js</js-path>
+			<js-priority>0</js-priority>
+		</param>
+	</javascript>
+
+	<!-- CORE Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.core.Utils</js-module>
+			<js-path>/javascript/eXo/core/Util.js</js-path>
+			<js-priority>1</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.DOMUtil</js-module>
+			<js-path>/javascript/eXo/core/DOMUtil.js</js-path>
+			<js-priority>1</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.Browser</js-module>
+			<js-path>/javascript/eXo/core/Browser.js</js-path>
+			<js-priority>2</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.MouseEventManager</js-module>
+			<js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.UIMaskLayer</js-module>
+			<js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Skin</js-module>
+			<js-path>/javascript/eXo/core/Skin.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.DragDrop</js-module>
+			<js-path>/javascript/eXo/core/DragDrop.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.DragDrop2</js-module>
+			<js-path>/javascript/eXo/core/DragDrop2.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Topic</js-module>
+			<js-path>/javascript/eXo/core/Topic.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.JSON</js-module>
+			<js-path>/javascript/eXo/core/JSON.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Cometd</js-module>
+			<js-path>/javascript/eXo/core/Cometd.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Spliter</js-module>
+			<js-path>/javascript/eXo/core/Spliter.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Notification</js-module>
+			<js-path>/javascript/eXo/core/Notification.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Loader</js-module>
+			<js-path>/javascript/eXo/core/Loader.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.I18n</js-module>
+			<js-path>/javascript/eXo/core/I18n.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- Gadget Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.gadget.UIGadget</js-module>
+			<js-path>/javascript/eXo/gadget/UIGadget.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- WebUI Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.webui.UIItemSelector</js-module>
+			<js-path>/javascript/eXo/webui/UIItemSelector.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIForm</js-module>
+			<js-path>/javascript/eXo/webui/UIForm.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopup</js-module>
+			<js-path>/javascript/eXo/webui/UIPopup.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupSelectCategory</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupWindow</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIHorizontalTabs</js-module>
+			<js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupMenu</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDropDownControl</js-module>
+			<js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIRightClickPopupMenu</js-module>
+			<js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIVerticalSlideTabs</js-module>
+			<js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPermissionSelectorTab</js-module>
+			<js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDashboard</js-module>
+			<js-path>/javascript/eXo/webui/UIDashboard.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDashboardUtil</js-module>
+			<js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UINotification</js-module>
+			<js-path>/javascript/eXo/webui/UINotification.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIUserSelector</js-module>
+			<js-path>/javascript/eXo/webui/UIUserSelector.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UICombobox</js-module>
+			<js-path>/javascript/eXo/webui/UICombobox.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UICombobox</js-module>
+			<js-path>/javascript/eXo/webui/UIVirtualList.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIColorPicker</js-module>
+			<js-path>/javascript/eXo/webui/UIColorPicker.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- Portal Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.portal.PortalHttpRequest</js-module>
+			<js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortal</js-module>
+			<js-path>/javascript/eXo/portal/UIPortal.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIWorkspace</js-module>
+			<js-path>/javascript/eXo/portal/UIWorkspace.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortalControl</js-module>
+			<js-path>/javascript/eXo/portal/UIPortalControl.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.PortalDragDrop</js-module>
+			<js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortalNavigation</js-module>
+			<js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIMaskWorkspace</js-module>
+			<js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIBrowseContent</js-module>
+			<js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path>
+		</param>
+	</javascript>
+
+	<javascript>
+		<param>
+			<js-module>eXo.webui.UIPortlet</js-module>
+			<js-path>/javascript/eXo/webui/UIPortlet.js</js-path>
+		</param>
+	</javascript>
+</gatein-resources>

Added: portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml
===================================================================
--- portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml	                        (rev 0)
+++ portal/branches/branched-r3845/component/web/resources/src/test/resources/org/exoplatform/portal/resource/gatein-resources-1_1.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2009 eXo Platform SAS.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+<gatein-resources
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
+    xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
+
+	<!-- Portal skins -->
+	<portal-skin>
+		<skin-name>Default</skin-name>
+    <skin-module>MyModule</skin-module>
+		<css-path>/skin/Stylesheet.css</css-path>
+	</portal-skin>	
+
+	<!-- BannerPortlet skins -->
+
+	<portlet-skin>
+		<application-name>web</application-name>
+		<portlet-name>BannerPortlet</portlet-name>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/portal/webui/component/UIBannerPortlet/DefaultStylesheet.css</css-path>
+	</portlet-skin>
+		
+	<!-- FooterPortlet skins -->
+
+	<portlet-skin>
+		<application-name>web</application-name>
+		<portlet-name>FooterPortlet</portlet-name>
+		<skin-name>Default</skin-name>
+		<css-path>/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.css</css-path>
+	</portlet-skin>
+		
+	<!-- Simple window style -->
+	<window-style>
+		<style-name>Simple</style-name>
+		<style-theme>
+			<theme-name>SimpleBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimplePink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>SimpleGreen</theme-name>
+		</style-theme>
+	</window-style>
+	
+	<!-- RoundConer window style -->
+	<window-style>
+		<style-name>RoundConer</style-name>
+		<style-theme>
+			<theme-name>RoundConerBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerPink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>RoundConerGreen</theme-name>
+		</style-theme>
+	</window-style>
+	
+	<!-- Shadow window style -->
+	<window-style>
+		<style-name>Shadow</style-name>
+		<style-theme>
+			<theme-name>ShadowBlue</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowViolet</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowOrange</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowPink</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>ShadowGreen</theme-name>
+		</style-theme>
+	</window-style>
+	
+	<!-- MacStyle window style -->
+	<window-style>
+		<style-name>MacStyle</style-name>
+		<style-theme>
+			<theme-name>MacTheme</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>MacGray</theme-name>
+		</style-theme>
+		<style-theme>
+			<theme-name>MacGreenSteel</theme-name>
+		</style-theme>
+	</window-style>
+	
+	<!-- VistaStyle window style -->
+	<window-style>
+		<style-name>VistaStyle</style-name>
+		<style-theme>
+			<theme-name>VistaTheme</theme-name>
+		</style-theme>
+	</window-style>
+	
+	<javascript>
+		<param>
+			<js-module>eXo</js-module>
+			<js-path>/javascript/eXo.js</js-path>
+			<js-priority>0</js-priority>
+		</param>
+	</javascript>
+
+	<!-- CORE Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.core.Utils</js-module>
+			<js-path>/javascript/eXo/core/Util.js</js-path>
+			<js-priority>1</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.DOMUtil</js-module>
+			<js-path>/javascript/eXo/core/DOMUtil.js</js-path>
+			<js-priority>1</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.Browser</js-module>
+			<js-path>/javascript/eXo/core/Browser.js</js-path>
+			<js-priority>2</js-priority>
+		</param>
+		<param>
+			<js-module>eXo.core.MouseEventManager</js-module>
+			<js-path>/javascript/eXo/core/MouseEventManager.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.UIMaskLayer</js-module>
+			<js-path>/javascript/eXo/core/UIMaskLayer.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Skin</js-module>
+			<js-path>/javascript/eXo/core/Skin.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.DragDrop</js-module>
+			<js-path>/javascript/eXo/core/DragDrop.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.DragDrop2</js-module>
+			<js-path>/javascript/eXo/core/DragDrop2.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Topic</js-module>
+			<js-path>/javascript/eXo/core/Topic.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.JSON</js-module>
+			<js-path>/javascript/eXo/core/JSON.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Cometd</js-module>
+			<js-path>/javascript/eXo/core/Cometd.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Spliter</js-module>
+			<js-path>/javascript/eXo/core/Spliter.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Notification</js-module>
+			<js-path>/javascript/eXo/core/Notification.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.Loader</js-module>
+			<js-path>/javascript/eXo/core/Loader.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.core.I18n</js-module>
+			<js-path>/javascript/eXo/core/I18n.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- Gadget Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.gadget.UIGadget</js-module>
+			<js-path>/javascript/eXo/gadget/UIGadget.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- WebUI Javascripts -->
+	<javascript> 
+		<param>
+			<js-module>eXo.webui.UIItemSelector</js-module>
+			<js-path>/javascript/eXo/webui/UIItemSelector.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIForm</js-module>
+			<js-path>/javascript/eXo/webui/UIForm.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopup</js-module>
+			<js-path>/javascript/eXo/webui/UIPopup.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupSelectCategory</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupSelectCategory.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupWindow</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupWindow.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIHorizontalTabs</js-module>
+			<js-path>/javascript/eXo/webui/UIHorizontalTabs.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPopupMenu</js-module>
+			<js-path>/javascript/eXo/webui/UIPopupMenu.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDropDownControl</js-module>
+			<js-path>/javascript/eXo/webui/UIDropDownControl.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIRightClickPopupMenu</js-module>
+			<js-path>/javascript/eXo/webui/UIRightClickPopupMenu.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIVerticalSlideTabs</js-module>
+			<js-path>/javascript/eXo/webui/UIVerticalSlideTabs.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIPermissionSelectorTab</js-module>
+			<js-path>/javascript/eXo/webui/UIPermissionSelectorTab.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDashboard</js-module>
+			<js-path>/javascript/eXo/webui/UIDashboard.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIDashboardUtil</js-module>
+			<js-path>/javascript/eXo/webui/UIDashboardUtil.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UINotification</js-module>
+			<js-path>/javascript/eXo/webui/UINotification.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIUserSelector</js-module>
+			<js-path>/javascript/eXo/webui/UIUserSelector.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UICombobox</js-module>
+			<js-path>/javascript/eXo/webui/UICombobox.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UICombobox</js-module>
+			<js-path>/javascript/eXo/webui/UIVirtualList.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.webui.UIColorPicker</js-module>
+			<js-path>/javascript/eXo/webui/UIColorPicker.js</js-path>
+		</param>
+	</javascript>
+
+	<!-- Portal Javascripts -->
+	<javascript>
+		<param>
+			<js-module>eXo.portal.PortalHttpRequest</js-module>
+			<js-path>/javascript/eXo/portal/PortalHttpRequest.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortal</js-module>
+			<js-path>/javascript/eXo/portal/UIPortal.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIWorkspace</js-module>
+			<js-path>/javascript/eXo/portal/UIWorkspace.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortalControl</js-module>
+			<js-path>/javascript/eXo/portal/UIPortalControl.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.PortalDragDrop</js-module>
+			<js-path>/javascript/eXo/portal/PortalDragDrop.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIPortalNavigation</js-module>
+			<js-path>/javascript/eXo/portal/UIPortalNavigation.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIMaskWorkspace</js-module>
+			<js-path>/javascript/eXo/portal/UIMaskWorkspace.js</js-path>
+		</param>
+		<param>
+			<js-module>eXo.portal.UIBrowseContent</js-module>
+			<js-path>/javascript/eXo/portal/UIBrowseContent.js</js-path>
+		</param>
+	</javascript>
+
+	<javascript>
+		<param>
+			<js-module>eXo.webui.UIPortlet</js-module>
+			<js-path>/javascript/eXo/webui/UIPortlet.js</js-path>
+		</param>
+	</javascript>
+</gatein-resources>

Modified: portal/branches/branched-r3845/pom.xml
===================================================================
--- portal/branches/branched-r3845/pom.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/pom.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -792,16 +792,11 @@
       </resources>
       <testResources>
          <testResource>
-            <directory>src/test/java</directory>
+            <directory>src/test/resources</directory>
             <includes>
-               <include>**/*.properties</include>
-               <include>**/*.xml</include>
-               <include>**/*.jstmpl</include>
+               <include>**/*.*</include>
             </includes>
          </testResource>
-         <testResource>
-            <directory>src/test/resources</directory>
-         </testResource>
       </testResources>
       <pluginManagement>
          <plugins>

Modified: portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml
===================================================================
--- portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml	2010-08-31 02:25:43 UTC (rev 3971)
+++ portal/branches/branched-r3845/webui/core/src/test/java/conf/portal/test-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
-   xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
-</configuration>

Added: portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml
===================================================================
--- portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml	                        (rev 0)
+++ portal/branches/branched-r3845/webui/core/src/test/resources/conf/portal/test-configuration.xml	2010-08-31 06:45:13 UTC (rev 3972)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<configuration
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
+   xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
+</configuration>



More information about the gatein-commits mailing list