Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -100,6 +100,25 @@ public class AlfrescoCmisServiceFactory extends AbstractServiceFactory
public void init(Map<String, String> parameters)
{
}
public void init()
{
// this.service = getCmisServiceTarget(connector);
//
// // Wrap it
// ProxyFactory proxyFactory = new ProxyFactory(service);
// proxyFactory.addInterface(AlfrescoCmisService.class);
// proxyFactory.addAdvice(cmisExceptions);
// proxyFactory.addAdvice(cmisControl);
// proxyFactory.addAdvice(cmisStreams);
// proxyFactory.addAdvice(cmisTransactions);
// AlfrescoCmisService cmisService = (AlfrescoCmisService) proxyFactory.getProxy();
//
// this.serviceWrapper = new CmisServiceWrapper<CmisService>(
// cmisService,
// connector.getTypesDefaultMaxItems(), connector.getTypesDefaultDepth(),
// connector.getObjectsDefaultMaxItems(), connector.getObjectsDefaultDepth());
}
@Override
public void destroy()
@@ -111,7 +130,7 @@ public class AlfrescoCmisServiceFactory extends AbstractServiceFactory
* We are producing new instances each time.
*/
@Override
public CmisService getService(CallContext context)
public CmisService getService(final CallContext context)
{
if (logger.isDebugEnabled())
{
@@ -129,17 +148,17 @@ public class AlfrescoCmisServiceFactory extends AbstractServiceFactory
AuthenticationUtil.clearCurrentSecurityContext();
}
AlfrescoCmisService cmisServiceTarget = getCmisServiceTarget(connector);
AlfrescoCmisService service = getCmisServiceTarget(connector);
// Wrap it
ProxyFactory proxyFactory = new ProxyFactory(cmisServiceTarget);
ProxyFactory proxyFactory = new ProxyFactory(service);
proxyFactory.addInterface(AlfrescoCmisService.class);
proxyFactory.addAdvice(cmisExceptions);
proxyFactory.addAdvice(cmisControl);
proxyFactory.addAdvice(cmisStreams);
proxyFactory.addAdvice(cmisTransactions);
AlfrescoCmisService cmisService = (AlfrescoCmisService) proxyFactory.getProxy();
CmisServiceWrapper<CmisService> wrapperService = new CmisServiceWrapper<CmisService>(
cmisService,
connector.getTypesDefaultMaxItems(), connector.getTypesDefaultDepth(),
@@ -147,7 +166,7 @@ public class AlfrescoCmisServiceFactory extends AbstractServiceFactory
// We use our specific open method here because only we know about it
cmisService.open(context);
return wrapperService;
}