Merged DEV/SWIFT to HEAD

25629: ALF-7069:
          - changed getNodes to a POST request
          - beefed up unit tests + some performance tests
          ALF-7070:
          - initial checkin, works end-to-end, still work-in-progress
          - unit + performance tests
   25630: ALF-7069: removed files that are no longer needed
   25640: Merged BRANCHES\DEV\SOLR to BRANCHES\DEV\SWIFT
      25079: SOLR check point: ALF-4259: SOLR Integration
      25217: ALF-7068: SOLR 075 Improved cache rebuild performance - delta + query cache warming
      25315: ALF-7068: SOLR 075 Improved cache rebuild performance - delta + query cache warming
      25577: ALF-7068: SOLR 075 Improved cache rebuild performance - delta + query cache warming
      25604: ALF-7068: SOLR 075 Improved cache rebuild performance - delta + query cache warming
      25610: ALF-7068: SOLR 075 Improved cache rebuild performance - delta + query cache warming
   25651: - enabled OpenCMIS server ticket authentication 
          - added OpenCMIS client API (incomplete)
   25667: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      25030: Repo BM Sprint 1 - example using JMeter (WebDAV & CMIS)
      25054: Repo BM Sprint 1 - milestone 2
      25078: Repo BM sprint 1 - milestone 3 (ALF-6794)
   25675: ALF-7068: SOLR 075 Improved cache rebuild performance - delta + query cache warming
          - fix queries against un-optimized index
   25676: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT: commit mergeinfo
   25683: RepoBM: OpenCMIS 
          - use shared libs (from 3rd-party project)
          - change default url (from ".../alfresco/opencmis-atom" to ".../alfresco/cmisatom")
   25767: ALF-7339: SOLR 020 Index track and build from SOLR
          - Initial hook up point and proto type for config
   25787: ALF-7070:
          - owner, associations, type conversions
          SOLR Client-side API to call into repository SOLR APIs
   25818: added webscripts root object as an entry point to OpenCMIS client sessions (local and remote)
   25855: Bug fix: keep CMIS connection manager reference

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-05-28 21:31:19 +00:00
parent 4490431ba9
commit 9d194f9363
36 changed files with 3358 additions and 570 deletions

View File

@@ -0,0 +1,397 @@
/*
* Copyright (C) 2005-2011 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.cmis.client;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.apache.chemistry.opencmis.client.api.Repository;
import org.apache.chemistry.opencmis.client.api.Session;
import org.apache.chemistry.opencmis.client.api.SessionFactory;
import org.apache.chemistry.opencmis.client.runtime.SessionFactoryImpl;
import org.apache.chemistry.opencmis.commons.SessionParameter;
import org.springframework.beans.factory.InitializingBean;
public abstract class AbstractCMISConnectionManagerImpl implements CMISConnectionManager, InitializingBean
{
public static final String SERVER_NAME = "name";
public static final String SERVER_DESCRIPTION = "description";
public static final String LOCAL_CONNECTION_ID = "local";
public static final char RESERVED_ID_CHAR = '$';
protected AuthenticationService authenticationService;
protected SessionFactory sessionFactory;
protected LinkedHashMap<String, CMISConnection> sharedConnections;
protected LinkedHashMap<String, CMISConnection> userConnections;
protected int userConnectionsCapacity = 1000;
protected int sharedConnectionsCapacity = 1000;
protected Map<String, CMISServer> servers;
protected ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
public void setAuthenticationService(AuthenticationService authenticationService)
{
this.authenticationService = authenticationService;
}
public void setUserConnectionsCapacity(int userConnectionsCapacity)
{
this.userConnectionsCapacity = userConnectionsCapacity;
}
public void setSharedConnectionsCapacity(int sharedConnectionsCapacity)
{
this.sharedConnectionsCapacity = sharedConnectionsCapacity;
}
public void setServers(List<Map<String, String>> serverList)
{
servers = new HashMap<String, CMISServer>();
for (Map<String, String> serverData : serverList)
{
CMISServer server = createServerDefinition(serverData);
if (server != null)
{
servers.put(server.getName(), server);
}
}
}
@Override
public void afterPropertiesSet() throws Exception
{
lock.writeLock().lock();
try
{
sessionFactory = SessionFactoryImpl.newInstance();
sharedConnections = new LinkedHashMap<String, CMISConnection>(sharedConnectionsCapacity,
(int) Math.ceil(sharedConnectionsCapacity / 0.75) + 1, true)
{
private static final long serialVersionUID = 1;
@Override
protected boolean removeEldestEntry(Map.Entry<String, CMISConnection> eldest)
{
return size() > sharedConnectionsCapacity;
}
};
userConnections = new LinkedHashMap<String, CMISConnection>(userConnectionsCapacity,
(int) Math.ceil(userConnectionsCapacity / 0.75) + 1, true)
{
private static final long serialVersionUID = 1;
@Override
protected boolean removeEldestEntry(Map.Entry<String, CMISConnection> eldest)
{
return size() > userConnectionsCapacity;
}
};
} finally
{
lock.writeLock().unlock();
}
}
@Override
public CMISConnection createUserConnection(CMISServer server, String connectionId)
{
String currentUser = authenticationService.getCurrentUserName();
if (currentUser == null)
{
throw new IllegalStateException("No current user!");
}
String userConnectionId = createUserConnectionId(currentUser, connectionId);
CMISConnection connection;
lock.writeLock().lock();
try
{
if (userConnections.containsKey(userConnectionId))
{
throw new IllegalStateException("Connection id is already in use!");
}
connection = createConnection(server, userConnectionId);
userConnections.put(userConnectionId, connection);
} finally
{
lock.writeLock().unlock();
}
return connection;
}
protected String createUserConnectionId(String username, String connectionId)
{
return connectionId + RESERVED_ID_CHAR + username;
}
@Override
public CMISConnection createSharedConnection(CMISServer server, String connectionId)
{
CMISConnection connection;
lock.writeLock().lock();
try
{
if (sharedConnections.containsKey(connectionId))
{
throw new IllegalStateException("Connection id is already in use!");
}
connection = createConnection(server, connectionId);
sharedConnections.put(connection.getId(), connection);
} finally
{
lock.writeLock().unlock();
}
return connection;
}
protected CMISConnection createConnection(CMISServer server, String connectionId)
{
if (connectionId == null || connectionId.length() == 0 || connectionId.indexOf(RESERVED_ID_CHAR) > -1)
{
throw new IllegalArgumentException("Invalid connection id!");
}
Session session = createSession(server.getParameters());
String username = server.getParameters().get(SessionParameter.USER);
return new CMISConnectionImpl(this, connectionId, session, server, username, false);
}
@Override
public abstract CMISConnection getConnection();
public Collection<CMISConnection> getUserConnections()
{
String currentUser = authenticationService.getCurrentUserName();
if (currentUser == null)
{
throw new IllegalStateException("No current user!");
}
lock.writeLock().lock();
try
{
List<CMISConnection> result = new ArrayList<CMISConnection>();
for (CMISConnection conn : userConnections.values())
{
int idx = conn.getId().indexOf(RESERVED_ID_CHAR);
if (idx > -1)
{
if (currentUser.equals(conn.getId().substring(idx + 1)))
{
result.add(conn);
}
}
}
return Collections.unmodifiableList(result);
} finally
{
lock.writeLock().unlock();
}
}
public CMISConnection getUserConnections(String connectionId)
{
String currentUser = authenticationService.getCurrentUserName();
if (currentUser == null)
{
throw new IllegalStateException("No current user!");
}
lock.writeLock().lock();
try
{
String userConnectionId = createUserConnectionId(currentUser, connectionId);
return userConnections.get(userConnectionId);
} finally
{
lock.writeLock().unlock();
}
}
public Collection<CMISConnection> getSharedConnections()
{
lock.writeLock().lock();
try
{
return Collections.unmodifiableCollection(sharedConnections.values());
} finally
{
lock.writeLock().unlock();
}
}
public CMISConnection getSharedConnection(String connectionId)
{
lock.writeLock().lock();
try
{
return sharedConnections.get(connectionId);
} finally
{
lock.writeLock().unlock();
}
}
public void removeConnection(CMISConnection connection)
{
if (connection == null || connection.getId() == null)
{
return;
}
lock.writeLock().lock();
try
{
if (connection.isLocal())
{
userConnections.remove(LOCAL_CONNECTION_ID);
} else
{
int idx = connection.getId().indexOf(RESERVED_ID_CHAR);
if (idx == -1)
{
sharedConnections.remove(connection.getId());
} else
{
userConnections.remove(connection.getId());
}
}
} finally
{
lock.writeLock().unlock();
}
}
protected Session createSession(Map<String, String> parameters)
{
if (parameters.containsKey(SessionParameter.REPOSITORY_ID))
{
return sessionFactory.createSession(new HashMap<String, String>(parameters));
} else
{
return sessionFactory.getRepositories(new HashMap<String, String>(parameters)).get(0).createSession();
}
}
@Override
public Collection<CMISServer> getServerDefinitions()
{
return servers == null ? null : servers.values();
}
@Override
public CMISServer getServerDefinition(String serverName)
{
return servers == null ? null : servers.get(serverName);
}
@Override
public CMISServer createServerDefinition(String serverName, Map<String, String> parameters)
{
return new CMISServerImpl(serverName, null, parameters);
}
@Override
public CMISServer createServerDefinition(CMISServer server, String username, String password)
{
if (server == null)
{
throw new IllegalArgumentException("Server must be set!");
}
Map<String, String> parameters = new HashMap<String, String>(server.getParameters());
parameters.put(SessionParameter.USER, username);
parameters.put(SessionParameter.PASSWORD, password);
return new CMISServerImpl(server.getName(), server.getDescription(), parameters);
}
@Override
public CMISServer createServerDefinition(CMISServer server, String username, String password, String repositoryId)
{
if (server == null)
{
throw new IllegalArgumentException("Server must be set!");
}
Map<String, String> parameters = new HashMap<String, String>(server.getParameters());
parameters.put(SessionParameter.USER, username);
parameters.put(SessionParameter.PASSWORD, password);
parameters.put(SessionParameter.REPOSITORY_ID, repositoryId);
return new CMISServerImpl(server.getName(), server.getDescription(), parameters);
}
protected CMISServer createServerDefinition(Map<String, String> parameters)
{
if (parameters == null)
{
throw new IllegalArgumentException("Parameters must be set!");
}
String name = parameters.get(SERVER_NAME);
parameters.remove(SERVER_NAME);
String description = parameters.get(SERVER_DESCRIPTION);
parameters.remove(SERVER_DESCRIPTION);
if (name != null)
{
return new CMISServerImpl(name, description, parameters);
}
return null;
}
@Override
public List<Repository> getRepositories(CMISServer server)
{
if (server == null)
{
throw new IllegalArgumentException("Server must be set!");
}
return sessionFactory.getRepositories(new HashMap<String, String>(server.getParameters()));
}
}