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

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);
}
}