Derek Hulley 138d1780cb Merged V2.0 to HEAD
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
2007-04-12 01:41:14 +00:00

522 lines
18 KiB
Java

/**
*
*/
package org.alfresco.repo.remote;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.SortedMap;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
import org.alfresco.service.cmr.avm.LayeringDescriptor;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.remote.AVMRemote;
import org.alfresco.service.cmr.remote.AVMRemoteTransport;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
/**
* Client side wrapper for AVMRemoteTransport.
* @author britt
*/
public class AVMRemoteImpl implements AVMRemote
{
/**
* The reference to the AVMRemoteTransport instance.
*/
private AVMRemoteTransport fTransport;
/**
* The client ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* Default constructor.
*/
public AVMRemoteImpl()
{
}
/**
* Set the remote transport.
*/
public void setAvmRemoteTransport(AVMRemoteTransport transport)
{
fTransport = transport;
}
public void setClientTicketHolder(ClientTicketHolder ticketHolder)
{
fTicketHolder = ticketHolder;
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createAVMStore(java.lang.String)
*/
public void createStore(String name)
{
fTransport.createStore(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createBranch(int, java.lang.String, java.lang.String, java.lang.String)
*/
public void createBranch(int version, String srcPath, String dstPath,
String name)
{
fTransport.createBranch(fTicketHolder.getTicket(), version,
srcPath, dstPath, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createDirectory(java.lang.String, java.lang.String)
*/
public void createDirectory(String path, String name)
{
fTransport.createDirectory(fTicketHolder.getTicket(), path, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createFile(java.lang.String, java.lang.String)
*/
public OutputStream createFile(String path, String name)
{
return new AVMRemoteOutputStream(fTransport.createFile(fTicketHolder.getTicket(), path, name), fTransport, fTicketHolder);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createLayeredDirectory(java.lang.String, java.lang.String, java.lang.String)
*/
public void createLayeredDirectory(String targetPath, String parent,
String name)
{
fTransport.createLayeredDirectory(fTicketHolder.getTicket(), targetPath, parent, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createLayeredFile(java.lang.String, java.lang.String, java.lang.String)
*/
public void createLayeredFile(String targetPath, String parent, String name)
{
fTransport.createLayeredFile(fTicketHolder.getTicket(), targetPath, parent, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#createSnapshot(java.lang.String)
*/
public int createSnapshot(String store, String label, String comment)
{
return fTransport.createSnapshot(fTicketHolder.getTicket(), store, label, comment);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#deleteNodeProperties(java.lang.String)
*/
public void deleteNodeProperties(String path)
{
fTransport.deleteNodeProperties(fTicketHolder.getTicket(), path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#deleteNodeProperty(java.lang.String, org.alfresco.service.namespace.QName)
*/
public void deleteNodeProperty(String path, QName name)
{
fTransport.deleteNodeProperty(fTicketHolder.getTicket(), path, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#deleteStoreProperty(java.lang.String, org.alfresco.service.namespace.QName)
*/
public void deleteStoreProperty(String store, QName name)
{
fTransport.deleteStoreProperty(fTicketHolder.getTicket(), store, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStore(java.lang.String)
*/
public AVMStoreDescriptor getStore(String name)
{
return fTransport.getStore(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreRoot(int, java.lang.String)
*/
public AVMNodeDescriptor getStoreRoot(int version, String name)
{
return fTransport.getStoreRoot(fTicketHolder.getTicket(), version, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreVersions(java.lang.String)
*/
public List<VersionDescriptor> getStoreVersions(String name)
{
return fTransport.getStoreVersions(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStoreVersions(java.lang.String, java.util.Date, java.util.Date)
*/
public List<VersionDescriptor> getStoreVersions(String name, Date from,
Date to)
{
return fTransport.getStoreVersions(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getAVMStores()
*/
public List<AVMStoreDescriptor> getStores()
{
return fTransport.getStores(fTicketHolder.getTicket());
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getCommonAncestor(org.alfresco.service.cmr.avm.AVMNodeDescriptor, org.alfresco.service.cmr.avm.AVMNodeDescriptor)
*/
public AVMNodeDescriptor getCommonAncestor(AVMNodeDescriptor left,
AVMNodeDescriptor right)
{
return fTransport.getCommonAncestor(fTicketHolder.getTicket(), left, right);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getDeleted(int, java.lang.String)
*/
public List<String> getDeleted(int version, String path)
{
return fTransport.getDeleted(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getDirectoryListing(int, java.lang.String)
*/
public SortedMap<String, AVMNodeDescriptor> getDirectoryListing(
int version, String path)
{
return fTransport.getDirectoryListing(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getDirectoryListing(org.alfresco.service.cmr.avm.AVMNodeDescriptor)
*/
public SortedMap<String, AVMNodeDescriptor> getDirectoryListing(
AVMNodeDescriptor dir)
{
return fTransport.getDirectoryListing(fTicketHolder.getTicket(), dir);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getDirectoryListingDirect(int, java.lang.String)
*/
public SortedMap<String, AVMNodeDescriptor> getDirectoryListingDirect(
int version, String path)
{
return fTransport.getDirectoryListing(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getFileInputStream(int, java.lang.String)
*/
public InputStream getFileInputStream(int version, String path)
{
return new AVMRemoteInputStream(fTransport.getInputHandle(fTicketHolder.getTicket(), version, path),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getFileInputStream(org.alfresco.service.cmr.avm.AVMNodeDescriptor)
*/
public InputStream getFileInputStream(AVMNodeDescriptor desc)
{
return new AVMRemoteInputStream(fTransport.getInputHandle(fTicketHolder.getTicket(), desc),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getFileOutputStream(java.lang.String)
*/
public OutputStream getFileOutputStream(String path)
{
return new AVMRemoteOutputStream(fTransport.getOutputHandle(fTicketHolder.getTicket(), path),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getHistory(org.alfresco.service.cmr.avm.AVMNodeDescriptor, int)
*/
public List<AVMNodeDescriptor> getHistory(AVMNodeDescriptor desc, int count)
{
return fTransport.getHistory(fTicketHolder.getTicket(), desc, count);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getIndirectionPath(int, java.lang.String)
*/
public String getIndirectionPath(int version, String path)
{
return fTransport.getIndirectionPath(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getLatestSnapshotID(java.lang.String)
*/
public int getLatestSnapshotID(String storeName)
{
return fTransport.getLatestSnapshotID(fTicketHolder.getTicket(), storeName);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getLatestVersionID(java.lang.String)
*/
public int getNextVersionID(String storeName)
{
return fTransport.getNextVersionID(fTicketHolder.getTicket(), storeName);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getLayeringInfo(int, java.lang.String)
*/
public LayeringDescriptor getLayeringInfo(int version, String path)
{
return fTransport.getLayeringInfo(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getNodeProperties(int, java.lang.String)
*/
public Map<QName, PropertyValue> getNodeProperties(int version, String path)
{
return fTransport.getNodeProperties(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getNodeProperty(int, java.lang.String, org.alfresco.service.namespace.QName)
*/
public PropertyValue getNodeProperty(int version, String path, QName name)
{
return fTransport.getNodeProperty(fTicketHolder.getTicket(), version, path, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getStoreProperties(java.lang.String)
*/
public Map<QName, PropertyValue> getStoreProperties(String store)
{
return fTransport.getStoreProperties(fTicketHolder.getTicket(), store);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#getStoreProperty(java.lang.String, org.alfresco.service.namespace.QName)
*/
public PropertyValue getStoreProperty(String store, QName name)
{
return fTransport.getStoreProperty(fTicketHolder.getTicket(), store, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#lookup(int, java.lang.String)
*/
public AVMNodeDescriptor lookup(int version, String path)
{
return fTransport.lookup(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#lookup(org.alfresco.service.cmr.avm.AVMNodeDescriptor, java.lang.String)
*/
public AVMNodeDescriptor lookup(AVMNodeDescriptor dir, String name)
{
return fTransport.lookup(fTicketHolder.getTicket(), dir, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#makePrimary(java.lang.String)
*/
public void makePrimary(String path)
{
fTransport.makePrimary(fTicketHolder.getTicket(), path);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#purgeAVMStore(java.lang.String)
*/
public void purgeStore(String name)
{
fTransport.purgeStore(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#purgeVersion(int, java.lang.String)
*/
public void purgeVersion(int version, String name)
{
fTransport.purgeVersion(fTicketHolder.getTicket(), version, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#queryStorePropertyKey(java.lang.String, org.alfresco.service.namespace.QName)
*/
public Map<QName, PropertyValue> queryStorePropertyKey(String store,
QName keyPattern)
{
return fTransport.queryStorePropertyKey(fTicketHolder.getTicket(), store, keyPattern);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#queryStoresPropertyKey(org.alfresco.service.namespace.QName)
*/
public Map<String, Map<QName, PropertyValue>> queryStoresPropertyKey(
QName keyPattern)
{
return fTransport.queryStoresPropertyKey(fTicketHolder.getTicket(), keyPattern);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#removeNode(java.lang.String, java.lang.String)
*/
public void removeNode(String parent, String name)
{
fTransport.removeNode(fTicketHolder.getTicket(), parent, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#rename(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
*/
public void rename(String srcParent, String srcName, String dstParent,
String dstName)
{
fTransport.rename(fTicketHolder.getTicket(), srcParent, srcName, dstParent, dstName);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#retargetLayeredDirectory(java.lang.String, java.lang.String)
*/
public void retargetLayeredDirectory(String path, String target)
{
fTransport.retargetLayeredDirectory(fTicketHolder.getTicket(), path, target);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#setNodeProperties(java.lang.String, java.util.Map)
*/
public void setNodeProperties(String path,
Map<QName, PropertyValue> properties)
{
fTransport.setNodeProperties(fTicketHolder.getTicket(), path, properties);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#setNodeProperty(java.lang.String, org.alfresco.service.namespace.QName, org.alfresco.repo.domain.PropertyValue)
*/
public void setNodeProperty(String path, QName name, PropertyValue value)
{
fTransport.setNodeProperty(fTicketHolder.getTicket(), path, name, value);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#setOpacity(java.lang.String, boolean)
*/
public void setOpacity(String path, boolean opacity)
{
fTransport.setOpacity(fTicketHolder.getTicket(), path, opacity);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#setStoreProperties(java.lang.String, java.util.Map)
*/
public void setStoreProperties(String store, Map<QName, PropertyValue> props)
{
fTransport.setStoreProperties(fTicketHolder.getTicket(), store, props);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#setStoreProperty(java.lang.String, org.alfresco.service.namespace.QName, org.alfresco.repo.domain.PropertyValue)
*/
public void setStoreProperty(String store, QName name, PropertyValue value)
{
fTransport.setStoreProperty(fTicketHolder.getTicket(), store, name, value);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#uncover(java.lang.String, java.lang.String)
*/
public void uncover(String dirPath, String name)
{
fTransport.uncover(fTicketHolder.getTicket(), dirPath, name);
}
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMRemote#renameStore(java.lang.String, java.lang.String)
*/
public void renameStore(String sourceName, String destName)
{
fTransport.renameStore(fTicketHolder.getTicket(), sourceName, destName);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#addAspect(java.lang.String, org.alfresco.service.namespace.QName)
*/
public void addAspect(String path, QName aspectName)
{
fTransport.addAspect(fTicketHolder.getTicket(), path, aspectName);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#getAspects(int, java.lang.String)
*/
public List<QName> getAspects(int version, String path)
{
return fTransport.getAspects(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#hasAspect(int, java.lang.String, org.alfresco.service.namespace.QName)
*/
public boolean hasAspect(int version, String path, QName aspectName)
{
return fTransport.hasAspect(fTicketHolder.getTicket(), version, path, aspectName);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#removeAspect(java.lang.String, org.alfresco.service.namespace.QName)
*/
public void removeAspect(String path, QName aspectName)
{
fTransport.removeAspect(fTicketHolder.getTicket(), path, aspectName);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#revert(java.lang.String, org.alfresco.service.cmr.avm.AVMNodeDescriptor)
*/
public void revert(String path, AVMNodeDescriptor toRevertTo)
{
fTransport.revert(fTicketHolder.getTicket(), path, toRevertTo);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#getAPath(org.alfresco.service.cmr.avm.AVMNodeDescriptor)
*/
public Pair<Integer, String> getAPath(AVMNodeDescriptor desc)
{
return fTransport.getAPath(fTicketHolder.getTicket(), desc);
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.AVMRemote#setGuid(java.lang.String, java.lang.String)
*/
public void setGuid(String path, String guid)
{
fTransport.setGuid(fTicketHolder.getTicket(), path, guid);
}
}