[gatein-commits] gatein SVN: r7094 - in portal/trunk/examples: portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal and 1 other directory.

Author: ndkhoiits Date: 2011-08-14 00:58:44 -0400 (Sun, 14 Aug 2011) New Revision: 7094 Modified: 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 Log: GTNPORTAL-2011 Import mode should be defined in sample extension and sample portal 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-08-14 04:56:45 UTC (rev 7093) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal-configuration.xml 2011-08-14 04:58:44 UTC (rev 7094) @@ -52,6 +52,9 @@ <field name="templateLocation"> <string>war:/conf/sample-ext/portal</string> </field> + <field name="importMode"> + <string>merge</string> + </field> </object> </object-param> <object-param> @@ -71,6 +74,9 @@ <field name="templateLocation"> <string>war:/conf/sample-ext/portal</string> </field> + <field name="importMode"> + <string>merge</string> + </field> </object> </object-param> <object-param> @@ -90,6 +96,9 @@ <field name="templateLocation"> <string>war:/conf/sample-ext/portal</string> </field> + <field name="importMode"> + <string>merge</string> + </field> </object> </object-param> </init-params> 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-08-14 04:56:45 UTC (rev 7093) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal-configuration.xml 2011-08-14 04:58:44 UTC (rev 7094) @@ -52,6 +52,9 @@ <field name="templateLocation"> <string>war:/conf/sample-portal/portal</string> </field> + <field name="importMode"> + <string>merge</string> + </field> </object> </object-param> <object-param> @@ -71,6 +74,9 @@ <field name="templateLocation"> <string>war:/conf/sample-portal/portal</string> </field> + <field name="importMode"> + <string>merge</string> + </field> </object> </object-param> <object-param> @@ -90,6 +96,9 @@ <field name="templateLocation"> <string>war:/conf/sample-portal/portal</string> </field> + <field name="importMode"> + <string>merge</string> + </field> </object> </object-param> </init-params>