mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
20954: Calendar Dashlet updates. Fixes: ALF-2907 (meeting workspace issue) 20968: Minor VersionableAspect fix to onDeleteNode policy firing (follow-on for r19507) 20981: Removed Install Jammer installers from V3.3.3 20982: AVMTestSuite - run PurgeTestP after AVMServiceTest (investigating ALF-3611) 20997: Fix for ALF-2605 - updated share-config-custom.xml.sample and removed obsolete extension files 21030: Pulled XAMConnector AMP into main 3.3SP3 codeline. Apart from build changes (incl. EOL), there are no repo changes. 21032: StoreSelector passes through NodeContentContext allowing stores access to node information 21036: Fix ALF-245: Can't delete space that contains "translation without content" - Delete triggers 'unmakeTranslation' - Empty translations are marked with sys:temporary before being deleted 21051: More on fix ALF-245. Reduced complexity by not deleting empty translations twice 21064: Merged V3.3 to V3.3-BUG_FIX 20898: Merged HEAD to V3.3 20724: AVMTestSuite - temporarily comment out PurgeTestP - TODO: investigate intermittent test failure 20903: Incremented version revision 20921: AVM - fix purge store so that vr nodes are actually orphaned (ALF-3627) 20952: Fix for ALF-3704: Module conflict - Alfresco web client config property page missing metadata. This is application of a fix made to the config service in a hotfix. The change provides a deterministic load order for config files loaded via the ConfigBootstrap spring bean. More importantly it means that config files loaded by modules on different machines in a cluster load in the same order. The forms client and AWE config files have been updated to take advantage of the new loading order. 21061: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY) 20890: ALF-3687: Apply LUCENE-1383 patch to Lucene 2.1.0 to reduce memory leaks from ThreadLocals 20891: ALF-3687: Build classpath fix 20892: Incremented version label 21062: Merged PATCHES/V3.2.1 to V3.3 20897: (RECORD ONLY) Incremented version label 20901: (RECORD ONLY) ALF-3740: Merged V3.3 to PATCHES/V3.2.1 20524: VersionMigrator - option to run as scheduled job (ALF-1000) 20904: (RECORD ONLY) ALF-3732: Merged PATCHES/V3.2.r to PATCHES/V3.2.1 19803: ALF-558: File servers (CIFS / FTP / NFS) can now handle concurrent write operations on Alfresco repository - ContentDiskDriver / AVMDiskDriver now use retrying transactions for write operations - Disable EagerContentStoreCleaner on ContentDiskDriver / AVMDiskDriver closeFile() operations so that they may be retried after rollback (Sony zero byte problem) - Allow manual association of AVM ContentData with nodes so that closeFile() may be retried - Propagation of new argument through AVM interfaces 20905: (RECORD ONLY) ALF-3732: Rolled back the now unnecessary reference()/dereference() stuff from ALF-558 20906: (RECORD ONLY) ALF-3732: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1 20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS 20907: (RECORD ONLY) ALF-3732: Merged V3.3 to PATCHES/V3.2.1 20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver 20950: ALF-3779: Upgrades on large repositories from v2.1 and v2.2 were failing on MySQL due to "The total number of locks exceeds the lock table size" errors - Solution was to add support for new --BEGIN TXN and --END TXN comments and execute LOCK TABLES statements in the same transaction as large INSERT - SELECT statements. 20990: ALF-3789: Concurrency issues with InMemoryTicketComponentImpl - Previous ETHREEOH-1842 method of caching web session 'ref counts' against tickets could cause tickets to unpredictably fall out of the transactional cache - Rolled back original ETHREEOH-1842 fix. Would be too much overhead to keep these ref counts consistent across a cluster. - Instead, avoid invalidating tickets on web session timeout and only do it on explicit log out. - Now tickets maintained in non-transactional shared cache so they can't drop out unpredictably - Logic for ticket inactivity timeout caching improved so that it should work across a cluster 20991: (RECORD ONLY) Incremented version label 20993: ALF-3789: Fixed Spring configuration backward compatibily issue with previous fix - Ticket cache bean name restored to ticketsCache. This is actually now a non-transactional cache. - Also externalized parameters so that they can now be controlled by alfresco-global.properties without any bean overrides authentication.ticket.ticketsExpire=false authentication.ticket.expiryMode=AFTER_FIXED_TIME authentication.ticket.validDuration=PT1H 20994: Eclipse classpath fixes for unit testing after ant build 21057: ALF-3592: PassthruCifsAuthenticator now auto-creates / imports users who do not already exist in Alfresco - At least one of the following properties must be true for this to happen synchronization.autoCreatePeopleOnLogin synchronization.syncWhenMissingPeopleLogIn - Also improved debug logging of unknown passthru domains 21063: Merged PATCHES/V3.2.r to V3.3 21037: ALF-3793: Final attempt at realigning saved XForm data with a modified Schema - removeRemovedNodes / insertUpdatedNodes / insertPrototypeNodes replaced by a one stop recursive process that builds a new instance tree from scratch - Nodes copied over in correct order - Missing nodes added in and extra nodes discarded - Prototype nodes appended at appropriate points 21038: (RECORD ONLY) Incremented version label git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
492 lines
14 KiB
Java
492 lines
14 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.repo.remote;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.alfresco.service.cmr.remote.RepoRemote;
|
|
import org.alfresco.service.cmr.remote.RepoRemoteTransport;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.security.AuthenticationService;
|
|
import org.alfresco.util.GUID;
|
|
import org.alfresco.util.Pair;
|
|
|
|
/**
|
|
* The server side implementation of RepoRemoteTransport. It
|
|
* handles ticket validation, and expiration of idle streams.
|
|
* @author britt
|
|
*/
|
|
public class RepoRemoteTransportService implements RepoRemoteTransport,
|
|
Runnable
|
|
{
|
|
/**
|
|
* The map of handles to open input streams.
|
|
*/
|
|
private Map<String, InputStream> fInputStreams;
|
|
|
|
/**
|
|
* The map of handles to last accesses for input streams.
|
|
*/
|
|
private Map<String, Long> fInputLastAccessTimes;
|
|
|
|
/**
|
|
* The map of handles to busy flags.
|
|
*/
|
|
private Map<String, Boolean> fInputBusy;
|
|
|
|
/**
|
|
* The map of handles to open output streams.
|
|
*/
|
|
private Map<String, OutputStream> fOutputStreams;
|
|
|
|
/**
|
|
* The map of handles to last accesses for output streams.
|
|
*/
|
|
private Map<String, Long> fOutputLastAccessTimes;
|
|
|
|
/**
|
|
* The map of handles to busy flags.
|
|
*/
|
|
private Map<String, Boolean> fOutputBusy;
|
|
|
|
/**
|
|
* The stale handle time. This is the maximum time a handle
|
|
* can stay idle in milliseconds.
|
|
*/
|
|
private long fIdleTimeout;
|
|
|
|
/**
|
|
* The thread for this Runnable.
|
|
*/
|
|
private Thread fThread;
|
|
|
|
/**
|
|
* Flag for whether this Runnable is done.
|
|
*/
|
|
private boolean fDone;
|
|
|
|
/**
|
|
* The RepoRemote instance.
|
|
*/
|
|
private RepoRemote fRepoRemote;
|
|
|
|
/**
|
|
* The AuthenticationService instance.
|
|
*/
|
|
private AuthenticationService fAuthService;
|
|
|
|
/**
|
|
* Default constructor.
|
|
*/
|
|
public RepoRemoteTransportService()
|
|
{
|
|
fIdleTimeout = 30000;
|
|
fInputStreams = new HashMap<String, InputStream>();
|
|
fInputLastAccessTimes = new HashMap<String, Long>();
|
|
fInputBusy = new HashMap<String, Boolean>();
|
|
fOutputStreams = new HashMap<String, OutputStream>();
|
|
fOutputLastAccessTimes = new HashMap<String, Long>();
|
|
fOutputBusy = new HashMap<String, Boolean>();
|
|
}
|
|
|
|
/**
|
|
* Set the Idle Timeout value.
|
|
* @param timeout The value to set.
|
|
*/
|
|
public void setIdleTimeout(long timeout)
|
|
{
|
|
fIdleTimeout = timeout;
|
|
}
|
|
|
|
/**
|
|
* Set the RepoRemote instance.
|
|
*/
|
|
public void setRepoRemote(RepoRemote remote)
|
|
{
|
|
fRepoRemote = remote;
|
|
}
|
|
|
|
/**
|
|
* Set the AuthenticationService instance.
|
|
*/
|
|
public void setAuthenticationService(AuthenticationService service)
|
|
{
|
|
fAuthService = service;
|
|
}
|
|
|
|
/**
|
|
* The init method. This fires up a thread to check
|
|
* for closable streams.
|
|
*/
|
|
public void init()
|
|
{
|
|
fThread = new Thread(this);
|
|
fDone = false;
|
|
fThread.start();
|
|
}
|
|
|
|
/**
|
|
* The body of this Runnable.
|
|
*/
|
|
public synchronized void run()
|
|
{
|
|
while (!fDone)
|
|
{
|
|
try
|
|
{
|
|
wait(fIdleTimeout);
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
long now = System.currentTimeMillis();
|
|
List<String> toClose = new ArrayList<String>();
|
|
for (String handle : fInputLastAccessTimes.keySet())
|
|
{
|
|
if (fInputBusy.get(handle))
|
|
{
|
|
continue;
|
|
}
|
|
if (now - fInputLastAccessTimes.get(handle) > fIdleTimeout)
|
|
{
|
|
toClose.add(handle);
|
|
}
|
|
}
|
|
for (String handle : toClose)
|
|
{
|
|
try
|
|
{
|
|
fInputStreams.get(handle).close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fInputStreams.remove(handle);
|
|
fInputLastAccessTimes.remove(handle);
|
|
fInputBusy.remove(handle);
|
|
}
|
|
toClose.clear();
|
|
for (String handle : fOutputLastAccessTimes.keySet())
|
|
{
|
|
if (fOutputBusy.get(handle))
|
|
{
|
|
continue;
|
|
}
|
|
if (now - fOutputLastAccessTimes.get(handle) > fIdleTimeout)
|
|
{
|
|
toClose.add(handle);
|
|
}
|
|
}
|
|
for (String handle : toClose)
|
|
{
|
|
try
|
|
{
|
|
fOutputStreams.get(handle).close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fOutputStreams.remove(handle);
|
|
fOutputLastAccessTimes.remove(handle);
|
|
fOutputBusy.remove(handle);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Shutdown the Runnable cleanly.
|
|
*/
|
|
public void shutDown()
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fDone = true;
|
|
notifyAll();
|
|
}
|
|
try
|
|
{
|
|
fThread.join();
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#closeInputHandle(java.lang.String, java.lang.String)
|
|
*/
|
|
public synchronized void closeInputHandle(String ticket, String handle)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
InputStream in = fInputStreams.get(handle);
|
|
if (in != null)
|
|
{
|
|
try
|
|
{
|
|
in.close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fInputStreams.remove(handle);
|
|
fInputLastAccessTimes.remove(handle);
|
|
fInputBusy.remove(handle);
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#closeOutputHandle(java.lang.String, java.lang.String)
|
|
*/
|
|
public synchronized void closeOutputHandle(String ticket, String handle)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
OutputStream out = fOutputStreams.get(handle);
|
|
if (out != null)
|
|
{
|
|
try
|
|
{
|
|
out.close();
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
// Do nothing.
|
|
}
|
|
fOutputStreams.remove(handle);
|
|
fOutputLastAccessTimes.remove(handle);
|
|
fOutputBusy.remove(handle);
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#createDirectory(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public NodeRef createDirectory(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
return fRepoRemote.createDirectory(base, path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#createFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public String createFile(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
OutputStream out = fRepoRemote.createFile(base, path);
|
|
return getOutputHandle(out);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#getListing(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
|
|
*/
|
|
public Map<String, Pair<NodeRef, Boolean>> getListing(String ticket, NodeRef dir)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
return fRepoRemote.getListing(dir);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#getRoot(java.lang.String)
|
|
*/
|
|
public NodeRef getRoot(String ticket)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
return fRepoRemote.getRoot();
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#lookup(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public Pair<NodeRef, Boolean> lookup(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
return fRepoRemote.lookup(base, path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#readFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public String readFile(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
InputStream in = fRepoRemote.readFile(base, path);
|
|
return getInputHandle(in);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#readFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
|
|
*/
|
|
public String readFile(String ticket, NodeRef fileRef)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
InputStream in = fRepoRemote.readFile(fileRef);
|
|
return getInputHandle(in);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#readInput(java.lang.String, java.lang.String, int)
|
|
*/
|
|
public byte[] readInput(String ticket, String handle, int count)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
InputStream in = null;
|
|
synchronized (this)
|
|
{
|
|
in = fInputStreams.get(handle);
|
|
if (in == null)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid Input Handle.");
|
|
}
|
|
fInputBusy.put(handle, true);
|
|
fInputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
}
|
|
byte [] buff = new byte[count];
|
|
try
|
|
{
|
|
int read = in.read(buff);
|
|
if (read == -1)
|
|
{
|
|
read = 0;
|
|
}
|
|
if (read != count)
|
|
{
|
|
byte [] newBuff = new byte[read];
|
|
for (int i = 0; i < read; i++)
|
|
{
|
|
newBuff[i] = buff[i];
|
|
}
|
|
return newBuff;
|
|
}
|
|
return buff;
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
throw new AlfrescoRuntimeException("I/O Error.");
|
|
}
|
|
finally
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fInputBusy.put(handle, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#removeNode(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public void removeNode(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
fRepoRemote.removeNode(base, path);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#removeNode(java.lang.String, org.alfresco.service.cmr.repository.NodeRef)
|
|
*/
|
|
public void removeNode(String ticket, NodeRef toRemove)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
fRepoRemote.removeNode(toRemove);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#rename(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String, java.lang.String)
|
|
*/
|
|
public void rename(String ticket, NodeRef base, String src, String dst)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
fRepoRemote.rename(base, src, dst);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#writeFile(java.lang.String, org.alfresco.service.cmr.repository.NodeRef, java.lang.String)
|
|
*/
|
|
public String writeFile(String ticket, NodeRef base, String path)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
OutputStream out = fRepoRemote.writeFile(base, path);
|
|
return getOutputHandle(out);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.remote.RepoRemoteTransport#writeOutput(java.lang.String, java.lang.String, byte[], int)
|
|
*/
|
|
public void writeOutput(String ticket, String handle, byte[] buff, int count)
|
|
{
|
|
fAuthService.validate(ticket);
|
|
OutputStream out = null;
|
|
synchronized (this)
|
|
{
|
|
out = fOutputStreams.get(handle);
|
|
if (out == null)
|
|
{
|
|
throw new AlfrescoRuntimeException("Invalid Output Handle.");
|
|
}
|
|
fOutputBusy.put(handle, true);
|
|
fOutputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
}
|
|
try
|
|
{
|
|
out.write(buff, 0, count);
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
throw new AlfrescoRuntimeException("I/O Errror.");
|
|
}
|
|
finally
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fOutputBusy.put(handle, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
private synchronized String getOutputHandle(OutputStream out)
|
|
{
|
|
String handle = GUID.generate();
|
|
fOutputStreams.put(handle, out);
|
|
fOutputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
fOutputBusy.put(handle, false);
|
|
return handle;
|
|
}
|
|
|
|
private synchronized String getInputHandle(InputStream in)
|
|
{
|
|
String handle = GUID.generate();
|
|
fInputStreams.put(handle, in);
|
|
fInputLastAccessTimes.put(handle, System.currentTimeMillis());
|
|
fInputBusy.put(handle, false);
|
|
return handle;
|
|
}
|
|
}
|