mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-16 17:55:15 +00:00
138d1780cb
5456: (From WCM_DEPLOY)
There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
root\projects\repository\config\alfresco\public-services-context.xml
Reverted:
root\projects\web-client\source\web\images\icons\ajax_anim.gif
Reverted or Resolved (License text conflicts):
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
- why the change in method naming convention?
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java
Modified:
root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
89 lines
2.6 KiB
Java
89 lines
2.6 KiB
Java
/**
|
|
*
|
|
*/
|
|
package org.alfresco.repo.remote;
|
|
|
|
import java.util.List;
|
|
|
|
import org.alfresco.service.cmr.avmsync.AVMDifference;
|
|
import org.alfresco.service.cmr.avmsync.AVMSyncService;
|
|
import org.alfresco.service.cmr.remote.AVMSyncServiceTransport;
|
|
import org.alfresco.util.NameMatcher;
|
|
|
|
/**
|
|
* Client side wrapper around the RMI based AVMSyncServiceTransport.
|
|
* @author britt
|
|
*/
|
|
public class AVMSyncServiceClient implements AVMSyncService
|
|
{
|
|
/**
|
|
* The instance of AVMSyncServiceTransport.
|
|
*/
|
|
private AVMSyncServiceTransport fTransport;
|
|
|
|
/**
|
|
* The ticket holder.
|
|
*/
|
|
private ClientTicketHolder fTicketHolder;
|
|
|
|
/**
|
|
* Default constructor.
|
|
*/
|
|
public AVMSyncServiceClient()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Set the transport for the service.
|
|
*/
|
|
public void setAvmSyncServiceTransport(AVMSyncServiceTransport transport)
|
|
{
|
|
fTransport = transport;
|
|
}
|
|
|
|
/**
|
|
* Setter.
|
|
* @param ticketHolder To set.
|
|
*/
|
|
public void setClientTicketHolder(ClientTicketHolder ticketHolder)
|
|
{
|
|
fTicketHolder = ticketHolder;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.avmsync.AVMSyncService#compare(int, java.lang.String, int, java.lang.String)
|
|
*/
|
|
public List<AVMDifference> compare(int srcVersion, String srcPath,
|
|
int dstVersion, String dstPath, NameMatcher excluder)
|
|
{
|
|
return fTransport.compare(fTicketHolder.getTicket(), srcVersion, srcPath, dstVersion, dstPath, excluder);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.avmsync.AVMSyncService#flatten(java.lang.String, java.lang.String)
|
|
*/
|
|
public void flatten(String layerPath, String underlyingPath)
|
|
{
|
|
fTransport.flatten(fTicketHolder.getTicket(), layerPath, underlyingPath);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.avmsync.AVMSyncService#resetLayer(java.lang.String)
|
|
*/
|
|
public void resetLayer(String layerPath)
|
|
{
|
|
fTransport.resetLayer(fTicketHolder.getTicket(), layerPath);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.avmsync.AVMSyncService#update(java.util.List, boolean, boolean, boolean, boolean, java.lang.String, java.lang.String)
|
|
*/
|
|
public void update(List<AVMDifference> diffList,
|
|
NameMatcher excluder, boolean ignoreConflicts,
|
|
boolean ignoreOlder, boolean overrideConflicts,
|
|
boolean overrideOlder, String tag, String description)
|
|
{
|
|
fTransport.update(fTicketHolder.getTicket(), diffList, excluder, ignoreConflicts, ignoreOlder, overrideConflicts, overrideOlder, tag, description);
|
|
}
|
|
}
|