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
This commit is contained in:
Mark Rogers
2014-07-23 17:03:28 +00:00
parent 9c3e8b3e34
commit e10bbbcecb
2 changed files with 5 additions and 7 deletions

View File

@@ -32,11 +32,8 @@
<ref bean="networkContentStore" /> <ref bean="networkContentStore" />
</list> </list>
</property> </property>
<property name="inbound">
<value>true</value>
</property>
<property name="outbound"> <property name="outbound">
<value>true</value> <value>false</value>
</property> </property>
<property name="retryingTransactionHelper"> <property name="retryingTransactionHelper">
<ref bean="retryingTransactionHelper"/> <ref bean="retryingTransactionHelper"/>

View File

@@ -54,8 +54,7 @@ import org.apache.commons.logging.LogFactory;
* from first to last. The stores should therefore be arranged in order of * from first to last. The stores should therefore be arranged in order of
* speed. * speed.
* <p> * <p>
* It supports the notion of inbound and/or outbound replication, both of which can be * It supports outbound replication for duplication of data.
* operational at the same time.
* *
* </h2><u>Outbound Replication</u></h2> * </h2><u>Outbound Replication</u></h2>
* <p> * <p>
@@ -70,7 +69,7 @@ import org.apache.commons.logging.LogFactory;
* occurs during the replication. Depending on the configuration of the server, * occurs during the replication. Depending on the configuration of the server,
* further action may need to be taken to rectify the problem manually. * 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> * <p>
* This can be used to lazily replicate content onto the primary store. When * 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 * 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 * @param inbound true to pull content onto the primary store when found
* on one of the other stores * on one of the other stores
* @deprecated Use {@link CachingContentStore}
*/ */
public void setInbound(boolean inbound) 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; this.inbound = inbound;
} }