From 2e277a86789d1894a6284340c8852bc1d1eb6178 Mon Sep 17 00:00:00 2001
From: haquangtan <tanhq@exoplatform.com>
Date: Mon, 25 Nov 2013 14:27:27 +0700
Subject: [PATCH 1/2] PLF-5510: [acme] Simplify the deployment of acme website

---
 .../wcm/deployment/office-deployment-configuration.xml        | 4 ++++
 .../wcm/deployment/acme-deployment-configuration.xml          | 4 ++++
 .../WEB-INF/conf/acme-portal/wcm/newsletter-configuration.xml | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/samples/acme-intranet/webapp/src/main/webapp/WEB-INF/conf/office-extension/wcm/deployment/office-deployment-configuration.xml b/samples/acme-intranet/webapp/src/main/webapp/WEB-INF/conf/office-extension/wcm/deployment/office-deployment-configuration.xml
index 0b39496c11..66722e1b25 100644
--- a/samples/acme-intranet/webapp/src/main/webapp/WEB-INF/conf/office-extension/wcm/deployment/office-deployment-configuration.xml
+++ b/samples/acme-intranet/webapp/src/main/webapp/WEB-INF/conf/office-extension/wcm/deployment/office-deployment-configuration.xml
@@ -54,6 +54,10 @@
           <description>indicates if this plugin will override data over legacy data, default value:false</description>
           <value>${intranet.portalConfig.metadata.override:false}</value>
         </value-param>
+        <value-param>
+          <name>siteName</name>
+          <value>intranet</value>
+        </value-param>
         <object-param>
           <name>Office jira Data</name>
           <description>Deployment Descriptor</description>
diff --git a/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml b/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml
index 2ebc4997d9..dd0fe13b19 100644
--- a/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml
+++ b/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml
@@ -56,6 +56,10 @@
           <description>The flag parameter to decide if portal metadata is overriden on restarting server</description>
           <value>${acme.portalConfig.metadata.override:false}</value>
         </value-param>
+        <value-param>
+          <name>siteName</name>
+          <value>acme</value>
+        </value-param>
         <object-param>
           <name>ACME French translations directory</name>
           <description>Deployment Descriptor</description>
diff --git a/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/newsletter-configuration.xml b/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/newsletter-configuration.xml
index 4be2ef1cae..48b462622e 100644
--- a/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/newsletter-configuration.xml
+++ b/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/newsletter-configuration.xml
@@ -148,6 +148,10 @@
       <type>org.exoplatform.services.deployment.plugins.XMLDeploymentPlugin</type>
       <description>XML Deployment Plugin</description>
       <init-params>
+        <value-param>
+          <name>siteName</name>
+          <value>acme</value>
+        </value-param>
         <object-param>
           <name>Demo newsletter for acme site</name>
           <description>Deployment Descriptor</description>

From b0d748f358bc7690935349ec0cb733807529eee3 Mon Sep 17 00:00:00 2001
From: TRAN Trung Thanh <thanhtt@exoplatform.com>
Date: Tue, 26 Nov 2013 15:27:36 +0700
Subject: [PATCH 2/2] PLF-5510: [acme] Simplify the deployment of acme website

Fix description:
	- Declare explicitly the site name when deploying portal data
---
 .../wcm/deployment/acme-deployment-configuration.xml          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml b/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml
index dd0fe13b19..fd3aab8f84 100644
--- a/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml
+++ b/samples/acme-website/webapp/src/main/webapp/WEB-INF/conf/acme-portal/wcm/deployment/acme-deployment-configuration.xml
@@ -937,6 +937,10 @@
           <description>The flag parameter to decide if portal metadata is overriden on restarting server</description>
           <value>${acme.portalConfig.metadata.override:false}</value>
         </value-param>
+        <value-param>
+          <name>siteName</name>
+          <value>acme</value>
+        </value-param>
         <!-- put "acme-news-1" in categories -->
         <object-param>
           <name>news1Link</name>