From e10bbbcecb580605d7dafe404d0aca374ae6801c Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 23 Jul 2014 17:03:28 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    77274:
 Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       76625:
 Deprecated ReplicatingContentStore's 'inbound' property and change sample 
 for outbound to false

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../replicating-content-services-context.xml.sample        | 5 +----
 .../repo/content/replication/ReplicatingContentStore.java  | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/alfresco/extension/replicating-content-services-context.xml.sample b/config/alfresco/extension/replicating-content-services-context.xml.sample
index a1ad467ec5..dfcfb6af80 100644
--- a/config/alfresco/extension/replicating-content-services-context.xml.sample
+++ b/config/alfresco/extension/replicating-content-services-context.xml.sample
@@ -32,11 +32,8 @@
             <ref bean="networkContentStore" />
          </list>
       </property>
-      <property name="inbound">
-         <value>true</value>
-      </property>
       <property name="outbound">
-         <value>true</value>
+         <value>false</value>
       </property>
       <property name="retryingTransactionHelper">
          <ref bean="retryingTransactionHelper"/>
diff --git a/source/java/org/alfresco/repo/content/replication/ReplicatingContentStore.java b/source/java/org/alfresco/repo/content/replication/ReplicatingContentStore.java
index 6853c6a14f..cbd343093e 100644
--- a/source/java/org/alfresco/repo/content/replication/ReplicatingContentStore.java
+++ b/source/java/org/alfresco/repo/content/replication/ReplicatingContentStore.java
@@ -54,8 +54,7 @@ import org.apache.commons.logging.LogFactory;
  * from first to last.  The stores should therefore be arranged in order of
  * speed.
  * <p>
- * It supports the notion of inbound and/or outbound replication, both of which can be
- * operational at the same time.
+ * It supports outbound replication for duplication of data.
  * 
  * </h2><u>Outbound Replication</u></h2>
  * <p>
@@ -70,7 +69,7 @@ import org.apache.commons.logging.LogFactory;
  * occurs during the replication.  Depending on the configuration of the server,
  * further action may need to be taken to rectify the problem manually.
  *  
- * </h2><u>Inbound Replication</u></h2>
+ * </h2><u>Inbound Replication</u> [DEPRECATED: Usage {@link CachingContentStore}]</h2>
  * <p>
  * This can be used to lazily replicate content onto the primary store.  When
  * content can't be found in the primary store, the other stores are checked
@@ -169,9 +168,11 @@ public class ReplicatingContentStore extends AbstractContentStore
      *  
      * @param inbound true to pull content onto the primary store when found
      *      on one of the other stores
+     * @deprecated Use {@link CachingContentStore}
      */
     public void setInbound(boolean inbound)
     {
+        logger.warn("The 'inbound' property has been deprecated in the ReplicatingContentStore in 5.0.  Use the CachingContentStore.");
         this.inbound = inbound;
     }