[gatein-commits] gatein SVN: r7974 - in portal/trunk: examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal and 2 other directories.

[do-not-reply at jboss.org]

Author: phuong_vu
Date: 2011-11-04 06:27:36 -0400 (Fri, 04 Nov 2011)
New Revision: 7974

Modified:
   portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
   portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml
   portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml
   portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
Log:
GTNPORTAL-1976 Invalid groupsites created in JCR with clean DB

Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java	2011-11-04 10:14:53 UTC (rev 7973)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java	2011-11-04 10:27:36 UTC (rev 7974)
@@ -587,13 +587,14 @@
       PortalConfig pConfig;
       if (obj == null)
       {
-         if (dataStorage_.getPortalConfig(type, owner) != null)
+         String fixedName = fixOwnerName(type, owner);
+         if (dataStorage_.getPortalConfig(type, fixedName) != null)
          {
             return true;
          }
          else
          {
-            pConfig = new PortalConfig(type, owner);
+            pConfig = new PortalConfig(type, fixedName);
          }
       }
       else

Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml	2011-11-04 10:14:53 UTC (rev 7973)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml	2011-11-04 10:27:36 UTC (rev 7974)
@@ -64,7 +64,7 @@
 						<field name="predefinedOwner">
 							<collection type="java.util.HashSet">
 								<value>
-									<string>platform/users</string>
+									<string>/platform/users</string>
 								</value>
 							</collection>
 						</field>

Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml	2011-11-04 10:14:53 UTC (rev 7973)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml	2011-11-04 10:27:36 UTC (rev 7974)
@@ -64,7 +64,7 @@
 						<field name="predefinedOwner">
 							<collection type="java.util.HashSet">
 								<value>
-									<string>platform/users</string>
+									<string>/platform/users</string>
 								</value>
 							</collection>
 						</field>

Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml	2011-11-04 10:14:53 UTC (rev 7973)
+++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml	2011-11-04 10:27:36 UTC (rev 7974)
@@ -172,7 +172,7 @@
                   <field name="predefinedOwner">
                      <collection type="java.util.HashSet">
                         <value>
-                           <string>platform/administrators</string>
+                           <string>/platform/administrators</string>
                         </value>
                      </collection>
                   </field>