inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.0 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2007-04-12 01:41:14 +00:00
parent ad80d96da3
commit 138d1780cb
47 changed files with 1885 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
View File

@@ -31,6 +31,11 @@ public class AVMRemoteImpl implements AVMRemote
*/
private AVMRemoteTransport fTransport;
/**
* The client ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* Default constructor.
*/
@@ -46,12 +51,17 @@ public class AVMRemoteImpl implements AVMRemote
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(ClientTicketHolder.GetTicket(), name);
fTransport.createStore(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
@@ -60,7 +70,7 @@ public class AVMRemoteImpl implements AVMRemote
public void createBranch(int version, String srcPath, String dstPath,
String name)
{
fTransport.createBranch(ClientTicketHolder.GetTicket(), version,
fTransport.createBranch(fTicketHolder.getTicket(), version,
srcPath, dstPath, name);
}
@@ -69,7 +79,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void createDirectory(String path, String name)
{
fTransport.createDirectory(ClientTicketHolder.GetTicket(), path, name);
fTransport.createDirectory(fTicketHolder.getTicket(), path, name);
}
/* (non-Javadoc)
@@ -77,7 +87,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public OutputStream createFile(String path, String name)
{
return new AVMRemoteOutputStream(fTransport.createFile(ClientTicketHolder.GetTicket(), path, name), fTransport);
return new AVMRemoteOutputStream(fTransport.createFile(fTicketHolder.getTicket(), path, name), fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -86,7 +96,7 @@ public class AVMRemoteImpl implements AVMRemote
public void createLayeredDirectory(String targetPath, String parent,
String name)
{
fTransport.createLayeredDirectory(ClientTicketHolder.GetTicket(), targetPath, parent, name);
fTransport.createLayeredDirectory(fTicketHolder.getTicket(), targetPath, parent, name);
}
/* (non-Javadoc)
@@ -94,7 +104,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void createLayeredFile(String targetPath, String parent, String name)
{
fTransport.createLayeredFile(ClientTicketHolder.GetTicket(), targetPath, parent, name);
fTransport.createLayeredFile(fTicketHolder.getTicket(), targetPath, parent, name);
}
/* (non-Javadoc)
@@ -102,7 +112,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public int createSnapshot(String store, String label, String comment)
{
return fTransport.createSnapshot(ClientTicketHolder.GetTicket(), store, label, comment);
return fTransport.createSnapshot(fTicketHolder.getTicket(), store, label, comment);
}
/* (non-Javadoc)
@@ -110,7 +120,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void deleteNodeProperties(String path)
{
fTransport.deleteNodeProperties(ClientTicketHolder.GetTicket(), path);
fTransport.deleteNodeProperties(fTicketHolder.getTicket(), path);
}
/* (non-Javadoc)
@@ -118,7 +128,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void deleteNodeProperty(String path, QName name)
{
fTransport.deleteNodeProperty(ClientTicketHolder.GetTicket(), path, name);
fTransport.deleteNodeProperty(fTicketHolder.getTicket(), path, name);
}
/* (non-Javadoc)
@@ -126,7 +136,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void deleteStoreProperty(String store, QName name)
{
fTransport.deleteStoreProperty(ClientTicketHolder.GetTicket(), store, name);
fTransport.deleteStoreProperty(fTicketHolder.getTicket(), store, name);
}
/* (non-Javadoc)
@@ -134,7 +144,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public AVMStoreDescriptor getStore(String name)
{
return fTransport.getStore(ClientTicketHolder.GetTicket(), name);
return fTransport.getStore(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
@@ -142,7 +152,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public AVMNodeDescriptor getStoreRoot(int version, String name)
{
return fTransport.getStoreRoot(ClientTicketHolder.GetTicket(), version, name);
return fTransport.getStoreRoot(fTicketHolder.getTicket(), version, name);
}
/* (non-Javadoc)
@@ -150,7 +160,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public List<VersionDescriptor> getStoreVersions(String name)
{
return fTransport.getStoreVersions(ClientTicketHolder.GetTicket(), name);
return fTransport.getStoreVersions(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
@@ -159,7 +169,7 @@ public class AVMRemoteImpl implements AVMRemote
public List<VersionDescriptor> getStoreVersions(String name, Date from,
Date to)
{
return fTransport.getStoreVersions(ClientTicketHolder.GetTicket(), name);
return fTransport.getStoreVersions(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
@@ -167,7 +177,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public List<AVMStoreDescriptor> getStores()
{
return fTransport.getStores(ClientTicketHolder.GetTicket());
return fTransport.getStores(fTicketHolder.getTicket());
}
/* (non-Javadoc)
@@ -176,7 +186,7 @@ public class AVMRemoteImpl implements AVMRemote
public AVMNodeDescriptor getCommonAncestor(AVMNodeDescriptor left,
AVMNodeDescriptor right)
{
return fTransport.getCommonAncestor(ClientTicketHolder.GetTicket(), left, right);
return fTransport.getCommonAncestor(fTicketHolder.getTicket(), left, right);
}
/* (non-Javadoc)
@@ -184,7 +194,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public List<String> getDeleted(int version, String path)
{
return fTransport.getDeleted(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getDeleted(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -193,7 +203,7 @@ public class AVMRemoteImpl implements AVMRemote
public SortedMap<String, AVMNodeDescriptor> getDirectoryListing(
int version, String path)
{
return fTransport.getDirectoryListing(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getDirectoryListing(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -202,7 +212,7 @@ public class AVMRemoteImpl implements AVMRemote
public SortedMap<String, AVMNodeDescriptor> getDirectoryListing(
AVMNodeDescriptor dir)
{
return fTransport.getDirectoryListing(ClientTicketHolder.GetTicket(), dir);
return fTransport.getDirectoryListing(fTicketHolder.getTicket(), dir);
}
/* (non-Javadoc)
@@ -211,7 +221,7 @@ public class AVMRemoteImpl implements AVMRemote
public SortedMap<String, AVMNodeDescriptor> getDirectoryListingDirect(
int version, String path)
{
return fTransport.getDirectoryListing(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getDirectoryListing(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -219,8 +229,8 @@ public class AVMRemoteImpl implements AVMRemote
*/
public InputStream getFileInputStream(int version, String path)
{
return new AVMRemoteInputStream(fTransport.getInputHandle(ClientTicketHolder.GetTicket(), version, path),
fTransport);
return new AVMRemoteInputStream(fTransport.getInputHandle(fTicketHolder.getTicket(), version, path),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -228,8 +238,8 @@ public class AVMRemoteImpl implements AVMRemote
*/
public InputStream getFileInputStream(AVMNodeDescriptor desc)
{
return new AVMRemoteInputStream(fTransport.getInputHandle(ClientTicketHolder.GetTicket(), desc),
fTransport);
return new AVMRemoteInputStream(fTransport.getInputHandle(fTicketHolder.getTicket(), desc),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -237,8 +247,8 @@ public class AVMRemoteImpl implements AVMRemote
*/
public OutputStream getFileOutputStream(String path)
{
return new AVMRemoteOutputStream(fTransport.getOutputHandle(ClientTicketHolder.GetTicket(), path),
fTransport);
return new AVMRemoteOutputStream(fTransport.getOutputHandle(fTicketHolder.getTicket(), path),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -246,7 +256,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public List<AVMNodeDescriptor> getHistory(AVMNodeDescriptor desc, int count)
{
return fTransport.getHistory(ClientTicketHolder.GetTicket(), desc, count);
return fTransport.getHistory(fTicketHolder.getTicket(), desc, count);
}
/* (non-Javadoc)
@@ -254,7 +264,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public String getIndirectionPath(int version, String path)
{
return fTransport.getIndirectionPath(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getIndirectionPath(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -262,7 +272,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public int getLatestSnapshotID(String storeName)
{
return fTransport.getLatestSnapshotID(ClientTicketHolder.GetTicket(), storeName);
return fTransport.getLatestSnapshotID(fTicketHolder.getTicket(), storeName);
}
/* (non-Javadoc)
@@ -270,7 +280,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public int getNextVersionID(String storeName)
{
return fTransport.getNextVersionID(ClientTicketHolder.GetTicket(), storeName);
return fTransport.getNextVersionID(fTicketHolder.getTicket(), storeName);
}
/* (non-Javadoc)
@@ -278,7 +288,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public LayeringDescriptor getLayeringInfo(int version, String path)
{
return fTransport.getLayeringInfo(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getLayeringInfo(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -286,7 +296,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public Map<QName, PropertyValue> getNodeProperties(int version, String path)
{
return fTransport.getNodeProperties(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getNodeProperties(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -294,7 +304,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public PropertyValue getNodeProperty(int version, String path, QName name)
{
return fTransport.getNodeProperty(ClientTicketHolder.GetTicket(), version, path, name);
return fTransport.getNodeProperty(fTicketHolder.getTicket(), version, path, name);
}
/* (non-Javadoc)
@@ -302,7 +312,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public Map<QName, PropertyValue> getStoreProperties(String store)
{
return fTransport.getStoreProperties(ClientTicketHolder.GetTicket(), store);
return fTransport.getStoreProperties(fTicketHolder.getTicket(), store);
}
/* (non-Javadoc)
@@ -310,7 +320,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public PropertyValue getStoreProperty(String store, QName name)
{
return fTransport.getStoreProperty(ClientTicketHolder.GetTicket(), store, name);
return fTransport.getStoreProperty(fTicketHolder.getTicket(), store, name);
}
/* (non-Javadoc)
@@ -318,7 +328,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public AVMNodeDescriptor lookup(int version, String path)
{
return fTransport.lookup(ClientTicketHolder.GetTicket(), version, path);
return fTransport.lookup(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -326,7 +336,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public AVMNodeDescriptor lookup(AVMNodeDescriptor dir, String name)
{
return fTransport.lookup(ClientTicketHolder.GetTicket(), dir, name);
return fTransport.lookup(fTicketHolder.getTicket(), dir, name);
}
/* (non-Javadoc)
@@ -334,7 +344,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void makePrimary(String path)
{
fTransport.makePrimary(ClientTicketHolder.GetTicket(), path);
fTransport.makePrimary(fTicketHolder.getTicket(), path);
}
/* (non-Javadoc)
@@ -342,7 +352,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void purgeStore(String name)
{
fTransport.purgeStore(ClientTicketHolder.GetTicket(), name);
fTransport.purgeStore(fTicketHolder.getTicket(), name);
}
/* (non-Javadoc)
@@ -350,7 +360,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void purgeVersion(int version, String name)
{
fTransport.purgeVersion(ClientTicketHolder.GetTicket(), version, name);
fTransport.purgeVersion(fTicketHolder.getTicket(), version, name);
}
/* (non-Javadoc)
@@ -359,7 +369,7 @@ public class AVMRemoteImpl implements AVMRemote
public Map<QName, PropertyValue> queryStorePropertyKey(String store,
QName keyPattern)
{
return fTransport.queryStorePropertyKey(ClientTicketHolder.GetTicket(), store, keyPattern);
return fTransport.queryStorePropertyKey(fTicketHolder.getTicket(), store, keyPattern);
}
/* (non-Javadoc)
@@ -368,7 +378,7 @@ public class AVMRemoteImpl implements AVMRemote
public Map<String, Map<QName, PropertyValue>> queryStoresPropertyKey(
QName keyPattern)
{
return fTransport.queryStoresPropertyKey(ClientTicketHolder.GetTicket(), keyPattern);
return fTransport.queryStoresPropertyKey(fTicketHolder.getTicket(), keyPattern);
}
/* (non-Javadoc)
@@ -376,7 +386,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void removeNode(String parent, String name)
{
fTransport.removeNode(ClientTicketHolder.GetTicket(), parent, name);
fTransport.removeNode(fTicketHolder.getTicket(), parent, name);
}
/* (non-Javadoc)
@@ -385,7 +395,7 @@ public class AVMRemoteImpl implements AVMRemote
public void rename(String srcParent, String srcName, String dstParent,
String dstName)
{
fTransport.rename(ClientTicketHolder.GetTicket(), srcParent, srcName, dstParent, dstName);
fTransport.rename(fTicketHolder.getTicket(), srcParent, srcName, dstParent, dstName);
}
/* (non-Javadoc)
@@ -393,7 +403,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void retargetLayeredDirectory(String path, String target)
{
fTransport.retargetLayeredDirectory(ClientTicketHolder.GetTicket(), path, target);
fTransport.retargetLayeredDirectory(fTicketHolder.getTicket(), path, target);
}
/* (non-Javadoc)
@@ -402,7 +412,7 @@ public class AVMRemoteImpl implements AVMRemote
public void setNodeProperties(String path,
Map<QName, PropertyValue> properties)
{
fTransport.setNodeProperties(ClientTicketHolder.GetTicket(), path, properties);
fTransport.setNodeProperties(fTicketHolder.getTicket(), path, properties);
}
/* (non-Javadoc)
@@ -410,7 +420,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void setNodeProperty(String path, QName name, PropertyValue value)
{
fTransport.setNodeProperty(ClientTicketHolder.GetTicket(), path, name, value);
fTransport.setNodeProperty(fTicketHolder.getTicket(), path, name, value);
}
/* (non-Javadoc)
@@ -418,7 +428,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void setOpacity(String path, boolean opacity)
{
fTransport.setOpacity(ClientTicketHolder.GetTicket(), path, opacity);
fTransport.setOpacity(fTicketHolder.getTicket(), path, opacity);
}
/* (non-Javadoc)
@@ -426,7 +436,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void setStoreProperties(String store, Map<QName, PropertyValue> props)
{
fTransport.setStoreProperties(ClientTicketHolder.GetTicket(), store, props);
fTransport.setStoreProperties(fTicketHolder.getTicket(), store, props);
}
/* (non-Javadoc)
@@ -434,7 +444,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void setStoreProperty(String store, QName name, PropertyValue value)
{
fTransport.setStoreProperty(ClientTicketHolder.GetTicket(), store, name, value);
fTransport.setStoreProperty(fTicketHolder.getTicket(), store, name, value);
}
/* (non-Javadoc)
@@ -442,7 +452,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void uncover(String dirPath, String name)
{
fTransport.uncover(ClientTicketHolder.GetTicket(), dirPath, name);
fTransport.uncover(fTicketHolder.getTicket(), dirPath, name);
}
/* (non-Javadoc)
@@ -450,7 +460,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void renameStore(String sourceName, String destName)
{
fTransport.renameStore(ClientTicketHolder.GetTicket(), sourceName, destName);
fTransport.renameStore(fTicketHolder.getTicket(), sourceName, destName);
}
/* (non-Javadoc)
@@ -458,7 +468,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void addAspect(String path, QName aspectName)
{
fTransport.addAspect(ClientTicketHolder.GetTicket(), path, aspectName);
fTransport.addAspect(fTicketHolder.getTicket(), path, aspectName);
}
/* (non-Javadoc)
@@ -466,7 +476,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public List<QName> getAspects(int version, String path)
{
return fTransport.getAspects(ClientTicketHolder.GetTicket(), version, path);
return fTransport.getAspects(fTicketHolder.getTicket(), version, path);
}
/* (non-Javadoc)
@@ -474,7 +484,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public boolean hasAspect(int version, String path, QName aspectName)
{
return fTransport.hasAspect(ClientTicketHolder.GetTicket(), version, path, aspectName);
return fTransport.hasAspect(fTicketHolder.getTicket(), version, path, aspectName);
}
/* (non-Javadoc)
@@ -482,7 +492,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void removeAspect(String path, QName aspectName)
{
fTransport.removeAspect(ClientTicketHolder.GetTicket(), path, aspectName);
fTransport.removeAspect(fTicketHolder.getTicket(), path, aspectName);
}
/* (non-Javadoc)
@@ -490,7 +500,7 @@ public class AVMRemoteImpl implements AVMRemote
*/
public void revert(String path, AVMNodeDescriptor toRevertTo)
{
fTransport.revert(ClientTicketHolder.GetTicket(), path, toRevertTo);
fTransport.revert(fTicketHolder.getTicket(), path, toRevertTo);
}
/* (non-Javadoc)
@@ -498,6 +508,14 @@ public class AVMRemoteImpl implements AVMRemote
*/
public Pair<Integer, String> getAPath(AVMNodeDescriptor desc)
{
return fTransport.getAPath(ClientTicketHolder.GetTicket(), 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);
}
}

15
source/java/org/alfresco/repo/remote/AVMRemoteInputStream.java
View File

@@ -39,6 +39,11 @@ public class AVMRemoteInputStream extends InputStream
*/
private AVMRemoteTransport fAVMRemote;
/**
* The client ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* The handle to the input stream.
*/
@@ -49,10 +54,12 @@ public class AVMRemoteInputStream extends InputStream
* @param handle The handle returned by getInputStream();
* @param remote The AVMRemote instance.
*/
public AVMRemoteInputStream(String handle, AVMRemoteTransport remote)
public AVMRemoteInputStream(String handle, AVMRemoteTransport remote,
ClientTicketHolder ticketHolder)
{
fHandle = handle;
fAVMRemote = remote;
fTicketHolder = ticketHolder;
}
/**
@@ -64,7 +71,7 @@ public class AVMRemoteInputStream extends InputStream
{
try
{
byte [] buff = fAVMRemote.readInput(ClientTicketHolder.GetTicket(), fHandle, 1);
byte [] buff = fAVMRemote.readInput(fTicketHolder.getTicket(), fHandle, 1);
if (buff.length == 0)
{
return -1;
@@ -89,7 +96,7 @@ public class AVMRemoteInputStream extends InputStream
{
try
{
byte [] buff = fAVMRemote.readInput(ClientTicketHolder.GetTicket(), fHandle, len);
byte [] buff = fAVMRemote.readInput(fTicketHolder.getTicket(), fHandle, len);
if (buff.length == 0)
{
return -1;
@@ -111,7 +118,7 @@ public class AVMRemoteInputStream extends InputStream
{
try
{
fAVMRemote.closeInputHandle(ClientTicketHolder.GetTicket(), fHandle);
fAVMRemote.closeInputHandle(fTicketHolder.getTicket(), fHandle);
}
catch (Exception e)
{

12
source/java/org/alfresco/repo/remote/AVMRemoteOutputStream.java
View File

@@ -33,15 +33,19 @@ public class AVMRemoteOutputStream extends OutputStream
private String fHandle;
private ClientTicketHolder fTicketHolder;
/**
* Create a new one.
* @param handle The handle returned from an AVMRemote call.
* @param remote The AVMRemote instance.
*/
public AVMRemoteOutputStream(String handle, AVMRemoteTransport remote)
public AVMRemoteOutputStream(String handle, AVMRemoteTransport remote,
ClientTicketHolder ticketHolder)
{
fAVMRemote = remote;
fHandle = handle;
fTicketHolder = ticketHolder;
}
/**
@@ -66,7 +70,7 @@ public class AVMRemoteOutputStream extends OutputStream
{
try
{
fAVMRemote.closeOutputHandle(ClientTicketHolder.GetTicket(), fHandle);
fAVMRemote.closeOutputHandle(fTicketHolder.getTicket(), fHandle);
}
catch (Exception e)
{
@@ -88,13 +92,13 @@ public class AVMRemoteOutputStream extends OutputStream
{
if (off == 0)
{
fAVMRemote.writeOutput(ClientTicketHolder.GetTicket(), fHandle, b, len);
fAVMRemote.writeOutput(fTicketHolder.getTicket(), fHandle, b, len);
}
else
{
byte [] buff = new byte[len];
System.arraycopy(b, off, buff, 0, len);
fAVMRemote.writeOutput(ClientTicketHolder.GetTicket(), fHandle, buff, len);
fAVMRemote.writeOutput(fTicketHolder.getTicket(), fHandle, buff, len);
}
}
catch (Exception e)

22
source/java/org/alfresco/repo/remote/AVMSyncServiceClient.java
View File

@@ -21,6 +21,11 @@ public class AVMSyncServiceClient implements AVMSyncService
*/
private AVMSyncServiceTransport fTransport;
/**
* The ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* Default constructor.
*/
@@ -36,13 +41,22 @@ public class AVMSyncServiceClient implements AVMSyncService
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(ClientTicketHolder.GetTicket(), srcVersion, srcPath, dstVersion, dstPath, excluder);
return fTransport.compare(fTicketHolder.getTicket(), srcVersion, srcPath, dstVersion, dstPath, excluder);
}
/* (non-Javadoc)
@@ -50,7 +64,7 @@ public class AVMSyncServiceClient implements AVMSyncService
*/
public void flatten(String layerPath, String underlyingPath)
{
fTransport.flatten(ClientTicketHolder.GetTicket(), layerPath, underlyingPath);
fTransport.flatten(fTicketHolder.getTicket(), layerPath, underlyingPath);
}
/* (non-Javadoc)
@@ -58,7 +72,7 @@ public class AVMSyncServiceClient implements AVMSyncService
*/
public void resetLayer(String layerPath)
{
fTransport.resetLayer(ClientTicketHolder.GetTicket(), layerPath);
fTransport.resetLayer(fTicketHolder.getTicket(), layerPath);
}
/* (non-Javadoc)
@@ -69,6 +83,6 @@ public class AVMSyncServiceClient implements AVMSyncService
boolean ignoreOlder, boolean overrideConflicts,
boolean overrideOlder, String tag, String description)
{
fTransport.update(ClientTicketHolder.GetTicket(), diffList, excluder, ignoreConflicts, ignoreOlder, overrideConflicts, overrideOlder, tag, description);
fTransport.update(fTicketHolder.getTicket(), diffList, excluder, ignoreConflicts, ignoreOlder, overrideConflicts, overrideOlder, tag, description);
}
}

22
source/java/org/alfresco/repo/remote/ClientTicketHolder.java
View File

@@ -1,32 +1,18 @@
/**
*
*/
package org.alfresco.repo.remote;
/**
* Remote client utility to hold an authentication ticket.
* Interface for Authentication ticket caching.
* @author britt
*/
public class ClientTicketHolder
public interface ClientTicketHolder
{
/**
* Thread local tickets.
*/
private static String fTicket;
/**
* Set the ticket.
*/
public static void SetTicket(String ticket)
{
fTicket = ticket;
}
public void setTicket(String ticket);
/**
* Get the ticket.
*/
public static String GetTicket()
{
return fTicket;
}
public String getTicket();
}

32
source/java/org/alfresco/repo/remote/ClientTicketHolderGlobal.java Normal file
View File

@@ -0,0 +1,32 @@
/**
*
*/
package org.alfresco.repo.remote;
/**
* Remote client utility to hold an authentication ticket.
* @author britt
*/
public class ClientTicketHolderGlobal implements ClientTicketHolder
{
/**
* Thread local tickets.
*/
private String fTicket;
/* (non-Javadoc)
* @see org.alfresco.repo.remote.ClientTicketHolder#setTicket(java.lang.String)
*/
public void setTicket(String ticket)
{
fTicket = ticket;
}
/* (non-Javadoc)
* @see org.alfresco.repo.remote.ClientTicketHolder#getTicket()
*/
public String getTicket()
{
return fTicket;
}
}

34
source/java/org/alfresco/repo/remote/ClientTicketHolderThread.java Normal file
View File

@@ -0,0 +1,34 @@
package org.alfresco.repo.remote;
/**
* A Ticket holder that holds a ticket per thread.
* @author britt
*/
public class ClientTicketHolderThread implements ClientTicketHolder
{
/**
* The Thread Local storage for tickets.
*/
private ThreadLocal<String> fTicket;
public ClientTicketHolderThread()
{
fTicket = new ThreadLocal<String>();
}
/* (non-Javadoc)
* @see org.alfresco.repo.remote.ClientTicketHolder#getTicket()
*/
public String getTicket()
{
return fTicket.get();
}
/* (non-Javadoc)
* @see org.alfresco.repo.remote.ClientTicketHolder#setTicket(java.lang.String)
*/
public void setTicket(String ticket)
{
fTicket.set(ticket);
}
}

15
source/java/org/alfresco/repo/remote/ReauthenticatingAdvice.java
View File

@@ -21,6 +21,11 @@ public class ReauthenticatingAdvice implements MethodInterceptor
*/
private AuthenticationService fAuthService;
/**
* The ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* The user name.
*/
@@ -52,6 +57,14 @@ public class ReauthenticatingAdvice implements MethodInterceptor
fAuthService = service;
}
/**
* Setter.
*/
public void setClientTicketHolder(ClientTicketHolder ticketHolder)
{
fTicketHolder = ticketHolder;
}
/**
* Setter.
*/
@@ -104,7 +117,7 @@ public class ReauthenticatingAdvice implements MethodInterceptor
// Reauthenticate.
fAuthService.authenticate(fUser, fPassword.toCharArray());
String ticket = fAuthService.getCurrentTicket();
ClientTicketHolder.SetTicket(ticket);
fTicketHolder.setTicket(ticket);
// Modify the ticket argument.
mi.getArguments()[0] = ticket;
}

44
source/java/org/alfresco/repo/remote/RepoRemoteImpl.java
View File

@@ -23,6 +23,11 @@ public class RepoRemoteImpl implements RepoRemote
*/
private RepoRemoteTransport fTransport;
/**
* The ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* Default constructor.
*/
@@ -38,12 +43,21 @@ public class RepoRemoteImpl implements RepoRemote
fTransport = transport;
}
/**
* Setter.
* @param ticketHolder To set.
*/
public void setClientTicketHolder(ClientTicketHolder ticketHolder)
{
fTicketHolder = ticketHolder;
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.remote.RepoRemote#createDirectory(org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
*/
public NodeRef createDirectory(NodeRef base, String path)
{
return fTransport.createDirectory(ClientTicketHolder.GetTicket(), base, path);
return fTransport.createDirectory(fTicketHolder.getTicket(), base, path);
}
/* (non-Javadoc)
@@ -51,8 +65,8 @@ public class RepoRemoteImpl implements RepoRemote
*/
public OutputStream createFile(NodeRef base, String path)
{
return new RepoRemoteOutputStream(fTransport.createFile(ClientTicketHolder.GetTicket(), base, path),
fTransport);
return new RepoRemoteOutputStream(fTransport.createFile(fTicketHolder.getTicket(), base, path),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -60,7 +74,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public Map<String, Pair<NodeRef, Boolean>> getListing(NodeRef dir)
{
return fTransport.getListing(ClientTicketHolder.GetTicket(), dir);
return fTransport.getListing(fTicketHolder.getTicket(), dir);
}
/* (non-Javadoc)
@@ -68,7 +82,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public NodeRef getRoot()
{
return fTransport.getRoot(ClientTicketHolder.GetTicket());
return fTransport.getRoot(fTicketHolder.getTicket());
}
/* (non-Javadoc)
@@ -76,7 +90,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public Pair<NodeRef, Boolean> lookup(NodeRef base, String path)
{
return fTransport.lookup(ClientTicketHolder.GetTicket(), base, path);
return fTransport.lookup(fTicketHolder.getTicket(), base, path);
}
/* (non-Javadoc)
@@ -84,8 +98,8 @@ public class RepoRemoteImpl implements RepoRemote
*/
public InputStream readFile(NodeRef fileRef)
{
return new RepoRemoteInputStream(fTransport.readFile(ClientTicketHolder.GetTicket(), fileRef),
fTransport);
return new RepoRemoteInputStream(fTransport.readFile(fTicketHolder.getTicket(), fileRef),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -93,8 +107,8 @@ public class RepoRemoteImpl implements RepoRemote
*/
public InputStream readFile(NodeRef base, String path)
{
return new RepoRemoteInputStream(fTransport.readFile(ClientTicketHolder.GetTicket(), base, path),
fTransport);
return new RepoRemoteInputStream(fTransport.readFile(fTicketHolder.getTicket(), base, path),
fTransport, fTicketHolder);
}
/* (non-Javadoc)
@@ -102,7 +116,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public void removeNode(NodeRef toRemove)
{
fTransport.removeNode(ClientTicketHolder.GetTicket(), toRemove);
fTransport.removeNode(fTicketHolder.getTicket(), toRemove);
}
/* (non-Javadoc)
@@ -110,7 +124,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public void removeNode(NodeRef base, String path)
{
fTransport.removeNode(ClientTicketHolder.GetTicket(), base, path);
fTransport.removeNode(fTicketHolder.getTicket(), base, path);
}
/* (non-Javadoc)
@@ -118,7 +132,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public void rename(NodeRef base, String src, String dst)
{
fTransport.rename(ClientTicketHolder.GetTicket(), base, src, dst);
fTransport.rename(fTicketHolder.getTicket(), base, src, dst);
}
/* (non-Javadoc)
@@ -126,7 +140,7 @@ public class RepoRemoteImpl implements RepoRemote
*/
public OutputStream writeFile(NodeRef base, String path)
{
return new RepoRemoteOutputStream(fTransport.writeFile(ClientTicketHolder.GetTicket(), base, path),
fTransport);
return new RepoRemoteOutputStream(fTransport.writeFile(fTicketHolder.getTicket(), base, path),
fTransport, fTicketHolder);
}
}

15
source/java/org/alfresco/repo/remote/RepoRemoteInputStream.java
View File

@@ -20,6 +20,11 @@ public class RepoRemoteInputStream extends InputStream
*/
private RepoRemoteTransport fRepoRemote;
/**
* The ticket holder.
*/
private ClientTicketHolder fTicketHolder;
/**
* The handle to the input stream.
*/
@@ -30,10 +35,12 @@ public class RepoRemoteInputStream extends InputStream
* @param handle The handle returned by getInputStream();
* @param remote The AVMRemote instance.
*/
public RepoRemoteInputStream(String handle, RepoRemoteTransport remote)
public RepoRemoteInputStream(String handle, RepoRemoteTransport remote,
ClientTicketHolder ticketHolder)
{
fHandle = handle;
fRepoRemote = remote;
fTicketHolder = ticketHolder;
}
/**
@@ -45,7 +52,7 @@ public class RepoRemoteInputStream extends InputStream
{
try
{
byte [] buff = fRepoRemote.readInput(ClientTicketHolder.GetTicket(), fHandle, 1);
byte [] buff = fRepoRemote.readInput(fTicketHolder.getTicket(), fHandle, 1);
if (buff.length == 0)
{
return -1;
@@ -70,7 +77,7 @@ public class RepoRemoteInputStream extends InputStream
{
try
{
byte [] buff = fRepoRemote.readInput(ClientTicketHolder.GetTicket(), fHandle, len);
byte [] buff = fRepoRemote.readInput(fTicketHolder.getTicket(), fHandle, len);
if (buff.length == 0)
{
return -1;
@@ -92,7 +99,7 @@ public class RepoRemoteInputStream extends InputStream
{
try
{
fRepoRemote.closeInputHandle(ClientTicketHolder.GetTicket(), fHandle);
fRepoRemote.closeInputHandle(fTicketHolder.getTicket(), fHandle);
}
catch (Exception e)
{

12
source/java/org/alfresco/repo/remote/RepoRemoteOutputStream.java
View File

@@ -19,15 +19,19 @@ public class RepoRemoteOutputStream extends OutputStream
private String fHandle;
private ClientTicketHolder fTicketHolder;
/**
* Create a new one.
* @param handle The handle returned from an RepoRemoteTransport call.
* @param remote The AVMRemote instance.
*/
public RepoRemoteOutputStream(String handle, RepoRemoteTransport remote)
public RepoRemoteOutputStream(String handle, RepoRemoteTransport remote,
ClientTicketHolder ticketHolder)
{
fRepoRemote = remote;
fHandle = handle;
fTicketHolder = ticketHolder;
}
/**
@@ -52,7 +56,7 @@ public class RepoRemoteOutputStream extends OutputStream
{
try
{
fRepoRemote.closeOutputHandle(ClientTicketHolder.GetTicket(), fHandle);
fRepoRemote.closeOutputHandle(fTicketHolder.getTicket(), fHandle);
}
catch (Exception e)
{
@@ -74,13 +78,13 @@ public class RepoRemoteOutputStream extends OutputStream
{
if (off == 0)
{
fRepoRemote.writeOutput(ClientTicketHolder.GetTicket(), fHandle, b, len);
fRepoRemote.writeOutput(fTicketHolder.getTicket(), fHandle, b, len);
}
else
{
byte [] buff = new byte[len];
System.arraycopy(b, off, buff, 0, len);
fRepoRemote.writeOutput(ClientTicketHolder.GetTicket(), fHandle, buff, len);
fRepoRemote.writeOutput(fTicketHolder.getTicket(), fHandle, buff, len);
}
}
catch (Exception e)