inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV/SWIFT to HEAD

Browse Source 
26012: OpenCMIS server bug fixes: PWC properties update and document version delete
   26205: - integrated the CMIS Client API project into the build
          - made the local CMIS client use the Alfresco OpenCMIS Extension
          - updated OpenCMIS
   26300: expose all non-child associations through OpenCMIS and check relationship source and target instead of the relationship type
   26356: OpenCMIS update
   26378: added more CMIS client examples
   26380: added helper methods for CMIS client
   26500: - fixed CMIS date aspect property encoding 
          - fixed CMIS rendition filter handling
   26519: OpenCMIS update
   26523: fixed CMISConnectionManager
   26596: renamed CMIS JavaScript root objects (cmis -> cmisserver, cmisclient -> cmis)
   26651: removed the cmis-client-api project and replaced it with a jar in 3rd-party
   26652: - corrected CMIS samples
   26656: - removed cmis-client-api from build
   26658: - removed the last bit of cmis-client-api
   26663: - added CMIS samples (browser and upload)
   26742: CMIS webscripts samples update
   26743: CMIS webscripts samples update
   26939: removed duplicate commons-fileupload
   26942: updated commons-lang to 2.6
   26943: updated OpenCMIS (browser binding is now included in the server framework)
   26953: refactored OpenCMIS client integration
   26974: Update classpath for Florian - OpenCMIS browser bindings are now rolled into the main jar, no need for their own one
   26975: removed outdated CMIS browser binding demo page
   27048: port of the Spring Surf CMIS browser plus a few new features (create folder, create document, delete object)
   27077: bug fix: CMIS id for associations
   27079: OpenCMIS update
   27085: added check if CMIS is supported
   27086: OpenCMIS client bindings update (force JAX-WS RI)
   27138: clean up
   27764: CMIS default connection handling
   27879: OpenCMIS client: moved server definitions to separate config file
   27880: OpenCMIS client: removed test repositories from configuration
   27918: changed CMIS server configuration tag name to match Spring Surf configuration
   27920: enabled relationships in CMIS browser
   27924: Updated Spring Surf and added the Spring Surf CMIS framework
          [Merge note: Kept most recent HEAD jars where conflicts occured]
   27926: Updated Spring Surf source jars
          [Merge note: Kept most recent HEAD jars where conflicts occured]

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28219 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-06-06 19:49:42 +00:00
parent 23207fbf7f
commit 633aa3b36e
108 changed files with 2258 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
source/java/org/alfresco/repo/cmis/client/CMISRemoteConnectionManagerImpl.java
View File

@@ -18,21 +18,54 @@
*/
package org.alfresco.repo.cmis.client;
import java.util.HashMap;
import java.util.Map;
import org.apache.chemistry.opencmis.client.api.Session;
import org.apache.chemistry.opencmis.commons.SessionParameter;
/**
* CMIS Connection manager with a remote default connection.
*/
public class CMISRemoteConnectionManagerImpl extends AbstractCMISConnectionManagerImpl implements CMISConnectionManager
{
private CMISServer defaultServer;
/**
* Sets the remote server details.
*/
public void setDefaultServer(Map<String, String> defaultServerProperties)
@Override
public CMISConnection createDefaultConnection(CMISServer server)
{
defaultServer = createServerDefinition(defaultServerProperties);
lock.writeLock().lock();
try
{
CMISConnection connection = getConnection();
if (connection != null)
{
throw new IllegalStateException("Connection id is already in use!");
}
if (server == null)
{
throw new IllegalStateException("Server definition must be set!");
}
String currentUser = authenticationService.getCurrentUserName();
if (!server.getParameters().containsKey(SessionParameter.USER))
{
Map<String, String> parameters = new HashMap<String, String>(server.getParameters());
parameters.put(SessionParameter.USER, currentUser);
server = createServerDefinition(server.getName(), parameters);
}
String userConnectionId = createUserConnectionId(currentUser, DEFAULT_CONNECTION_ID);
Session session = createSession(server.getParameters());
connection = new CMISConnectionImpl(this, userConnectionId, session, server, currentUser, true, false);
userConnections.put(userConnectionId, connection);
return connection;
} finally
{
lock.writeLock().unlock();
}
}
/**
@@ -41,28 +74,6 @@ public class CMISRemoteConnectionManagerImpl extends AbstractCMISConnectionManag
@Override
public CMISConnection getConnection()
{
lock.writeLock().lock();
try
{
CMISConnection connection = getUserConnections(LOCAL_CONNECTION_ID);
if (connection != null)
{
return connection;
}
String currentUser = authenticationService.getCurrentUserName();
if (defaultServer == null)
{
throw new IllegalStateException("No default server defined!");
}
CMISServer server = createServerDefinition(defaultServer, currentUser, null);
return createUserConnection(server, LOCAL_CONNECTION_ID);
} finally
{
lock.writeLock().unlock();
}
return getConnection(DEFAULT_CONNECTION_ID);
}
}