mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Upgraded to Hibernate 3.2.1
The code changes were pulled from the fix branch and V1.4 (HIBERNATE_UPGRADE 5207 5293) The jars were manually dropped in again due to the new directory structure git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -1,111 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import org.alfresco.service.ServiceDescriptor;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
|
||||
|
||||
/**
|
||||
* Service Descriptor.
|
||||
*
|
||||
* @author David Caruana
|
||||
*/
|
||||
public class BeanServiceDescriptor
|
||||
implements ServiceDescriptor
|
||||
{
|
||||
// Service Name
|
||||
private QName serviceName;
|
||||
|
||||
// Service Description
|
||||
private String description;
|
||||
|
||||
// Service interface class
|
||||
private Class interfaceClass;
|
||||
|
||||
// Supported Store Protocols
|
||||
Collection<String> protocols = null;
|
||||
|
||||
// Supported Stores
|
||||
Collection<StoreRef> stores = null;
|
||||
|
||||
|
||||
/*package*/ BeanServiceDescriptor(QName serviceName, ServiceDescriptorMetaData metaData, StoreRedirector redirector)
|
||||
{
|
||||
this.serviceName = serviceName;
|
||||
this.interfaceClass = metaData.getInterface();
|
||||
this.description = metaData.getDescription();
|
||||
|
||||
if (redirector != null)
|
||||
{
|
||||
protocols = redirector.getSupportedStoreProtocols();
|
||||
stores = redirector.getSupportedStores();
|
||||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.ServiceDescriptor#getQualifiedName()
|
||||
*/
|
||||
public QName getQualifiedName()
|
||||
{
|
||||
return serviceName;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.ServiceDescriptor#getDescription()
|
||||
*/
|
||||
public String getDescription()
|
||||
{
|
||||
return description;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.ServiceDescriptor#getInterface()
|
||||
*/
|
||||
public Class getInterface()
|
||||
{
|
||||
return interfaceClass;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.service.ServiceDescriptor#getSupportedStoreProtocols()
|
||||
*/
|
||||
public Collection<String> getSupportedStoreProtocols()
|
||||
{
|
||||
return protocols;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.service.StoreRedirector#getSupportedStores()
|
||||
*/
|
||||
public Collection<StoreRef> getSupportedStores()
|
||||
{
|
||||
return stores;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
import org.springframework.aop.support.DefaultIntroductionAdvisor;
|
||||
|
||||
/**
|
||||
* Service Descriptor Advisor
|
||||
*
|
||||
* @author David Caruana
|
||||
*/
|
||||
public class ServiceDescriptorAdvisor extends DefaultIntroductionAdvisor
|
||||
{
|
||||
private static final long serialVersionUID = -3327182176681357761L;
|
||||
|
||||
|
||||
/**
|
||||
* Construct Service Descriptor Advisor
|
||||
*
|
||||
* @param namespace service name namespace
|
||||
* @param description service description
|
||||
* @param interfaceClass service interface class
|
||||
*/
|
||||
public ServiceDescriptorAdvisor(String namespace, String description, Class interfaceClass)
|
||||
{
|
||||
super(new ServiceDescriptorMixin(namespace, description, interfaceClass), ServiceDescriptorMetaData.class);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
import org.springframework.beans.factory.FactoryBean;
|
||||
|
||||
/**
|
||||
* Factory for creating Service Descriptor Advisors.
|
||||
*
|
||||
* @author David Caruana
|
||||
*/
|
||||
public class ServiceDescriptorAdvisorFactory implements FactoryBean
|
||||
{
|
||||
|
||||
private String namespace;
|
||||
private String description;
|
||||
private Class interfaceClass;
|
||||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.beans.factory.FactoryBean#getObject()
|
||||
*/
|
||||
public Object getObject() throws Exception
|
||||
{
|
||||
return new ServiceDescriptorAdvisor(namespace, description, interfaceClass);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.beans.factory.FactoryBean#getObjectType()
|
||||
*/
|
||||
public Class getObjectType()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return ServiceDescriptorAdvisor.class;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.beans.factory.FactoryBean#isSingleton()
|
||||
*/
|
||||
public boolean isSingleton()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param namespace the service name namespace
|
||||
*/
|
||||
public void setNamespace(String namespace)
|
||||
{
|
||||
this.namespace = namespace;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param description the service description
|
||||
*/
|
||||
public void setDescription(String description)
|
||||
{
|
||||
this.description = description;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param interfaceClass the service interface class
|
||||
*/
|
||||
public void setInterface(Class interfaceClass)
|
||||
{
|
||||
this.interfaceClass = interfaceClass;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
|
||||
/**
|
||||
* Service Meta Data
|
||||
*
|
||||
* @author David Caruana
|
||||
*/
|
||||
public interface ServiceDescriptorMetaData
|
||||
{
|
||||
/**
|
||||
* @return the service name namespace
|
||||
*/
|
||||
public String getNamespace();
|
||||
|
||||
/**
|
||||
* @return the service description
|
||||
*/
|
||||
public String getDescription();
|
||||
|
||||
/**
|
||||
* @return the service interface class
|
||||
*/
|
||||
public Class getInterface();
|
||||
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
import org.springframework.aop.support.DelegatingIntroductionInterceptor;
|
||||
|
||||
/**
|
||||
* Service Descriptor Mixin.
|
||||
*
|
||||
* @author David Caruana
|
||||
*/
|
||||
public class ServiceDescriptorMixin extends DelegatingIntroductionInterceptor
|
||||
implements ServiceDescriptorMetaData
|
||||
{
|
||||
private static final long serialVersionUID = -6511459263796802334L;
|
||||
|
||||
private String namespace;
|
||||
private String description;
|
||||
private Class interfaceClass;
|
||||
|
||||
|
||||
/**
|
||||
* Construct Service Descriptor Mixin
|
||||
*
|
||||
* @param namespace
|
||||
* @param description
|
||||
* @param interfaceClass
|
||||
*/
|
||||
public ServiceDescriptorMixin(String namespace, String description, Class interfaceClass)
|
||||
{
|
||||
this.namespace = namespace;
|
||||
this.description = description;
|
||||
this.interfaceClass = interfaceClass;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.service.ServiceDescriptorMetaData#getNamespace()
|
||||
*/
|
||||
public String getNamespace()
|
||||
{
|
||||
return namespace;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.service.ServiceDescriptorMetaData#getDescription()
|
||||
*/
|
||||
public String getDescription()
|
||||
{
|
||||
return description;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.service.ServiceDescriptorMetaData#getInterface()
|
||||
*/
|
||||
public Class getInterface()
|
||||
{
|
||||
return interfaceClass;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,12 +25,7 @@
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
|
||||
import org.alfresco.service.ServiceDescriptor;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.action.ActionService;
|
||||
import org.alfresco.service.cmr.audit.AuditService;
|
||||
@@ -66,8 +61,6 @@ import org.alfresco.service.transaction.TransactionService;
|
||||
import org.springframework.beans.BeansException;
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.BeanFactoryAware;
|
||||
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
|
||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||
|
||||
|
||||
/**
|
||||
@@ -77,33 +70,12 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
||||
* @author David Caruana
|
||||
*/
|
||||
public class ServiceDescriptorRegistry
|
||||
implements BeanFactoryAware, BeanFactoryPostProcessor, ServiceRegistry
|
||||
implements BeanFactoryAware, ServiceRegistry
|
||||
{
|
||||
// Bean Factory within which the registry lives
|
||||
private BeanFactory beanFactory = null;
|
||||
|
||||
// Service Descriptor map
|
||||
private Map<QName, BeanServiceDescriptor> descriptors = new HashMap<QName, BeanServiceDescriptor>();
|
||||
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.beans.factory.config.BeanFactoryPostProcessor#postProcessBeanFactory(org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
|
||||
*/
|
||||
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
|
||||
{
|
||||
Map beans = beanFactory.getBeansOfType(ServiceDescriptorMetaData.class);
|
||||
Iterator iter = beans.entrySet().iterator();
|
||||
while (iter.hasNext())
|
||||
{
|
||||
Map.Entry entry = (Map.Entry)iter.next();
|
||||
ServiceDescriptorMetaData metaData = (ServiceDescriptorMetaData)entry.getValue();
|
||||
QName serviceName = QName.createQName(metaData.getNamespace(), (String)entry.getKey());
|
||||
StoreRedirector redirector = (entry.getValue() instanceof StoreRedirector) ? (StoreRedirector)entry.getValue() : null;
|
||||
BeanServiceDescriptor serviceDescriptor = new BeanServiceDescriptor(serviceName, metaData, redirector);
|
||||
descriptors.put(serviceDescriptor.getQualifiedName(), serviceDescriptor);
|
||||
}
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
|
||||
*/
|
||||
@@ -117,7 +89,8 @@ public class ServiceDescriptorRegistry
|
||||
*/
|
||||
public Collection<QName> getServices()
|
||||
{
|
||||
return Collections.unmodifiableSet(descriptors.keySet());
|
||||
// TODO: Implement
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
@@ -125,15 +98,8 @@ public class ServiceDescriptorRegistry
|
||||
*/
|
||||
public boolean isServiceProvided(QName service)
|
||||
{
|
||||
return descriptors.containsKey(service);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.alfresco.repo.service.ServiceRegistry#getServiceDescriptor(org.alfresco.repo.ref.QName)
|
||||
*/
|
||||
public ServiceDescriptor getServiceDescriptor(QName service)
|
||||
{
|
||||
return descriptors.get(service);
|
||||
// TODO: Implement
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
|
||||
@@ -1,196 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2007 Alfresco Software Limited.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program 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 General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
* As a special exception to the terms and conditions of version 2.0 of
|
||||
* the GPL, you may redistribute this Program in connection with Free/Libre
|
||||
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
||||
* FLOSS exception. You should have recieved a copy of the text describing
|
||||
* the FLOSS exception, and it is also available here:
|
||||
* http://www.alfresco.com/legal/licensing"
|
||||
*/
|
||||
package org.alfresco.repo.service;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import javax.transaction.UserTransaction;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import org.alfresco.service.ServiceDescriptor;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.lock.LockService;
|
||||
import org.alfresco.service.cmr.repository.ContentService;
|
||||
import org.alfresco.service.cmr.repository.CopyService;
|
||||
import org.alfresco.service.cmr.repository.MimetypeService;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.search.SearchService;
|
||||
import org.alfresco.service.cmr.version.VersionService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
||||
|
||||
public class ServiceDescriptorRegistryTest extends TestCase
|
||||
{
|
||||
|
||||
private ApplicationContext factory = null;
|
||||
|
||||
private static String TEST_NAMESPACE = "http://www.alfresco.org/test/serviceregistrytest";
|
||||
private static QName invalidService = QName.createQName(TEST_NAMESPACE, "invalid");
|
||||
private static QName service1 = QName.createQName(TEST_NAMESPACE, "service1");
|
||||
private static QName service2 = QName.createQName(TEST_NAMESPACE, "service2");
|
||||
private static QName service3 = QName.createQName(TEST_NAMESPACE, "service3");
|
||||
|
||||
|
||||
public void setUp()
|
||||
{
|
||||
factory = new ClassPathXmlApplicationContext("org/alfresco/repo/service/testregistry.xml");
|
||||
}
|
||||
|
||||
public void testDescriptor()
|
||||
{
|
||||
ServiceRegistry registry = (ServiceRegistry)factory.getBean("serviceRegistry");
|
||||
|
||||
Collection services = registry.getServices();
|
||||
assertNotNull(services);
|
||||
assertEquals(3, services.size());
|
||||
|
||||
assertTrue(registry.isServiceProvided(service1));
|
||||
assertFalse(registry.isServiceProvided(invalidService));
|
||||
|
||||
ServiceDescriptor invalid = registry.getServiceDescriptor(invalidService);
|
||||
assertNull(invalid);
|
||||
ServiceDescriptor desc1 = registry.getServiceDescriptor(service1);
|
||||
assertNotNull(desc1);
|
||||
assertEquals(service1, desc1.getQualifiedName());
|
||||
assertEquals("Test Service 1", desc1.getDescription());
|
||||
assertEquals(TestServiceInterface.class, desc1.getInterface());
|
||||
ServiceDescriptor desc2 = registry.getServiceDescriptor(service2);
|
||||
assertNotNull(desc2);
|
||||
assertEquals(service2, desc2.getQualifiedName());
|
||||
assertEquals("Test Service 2", desc2.getDescription());
|
||||
assertEquals(TestServiceInterface.class, desc2.getInterface());
|
||||
}
|
||||
|
||||
|
||||
public void testService()
|
||||
{
|
||||
ServiceRegistry registry = (ServiceRegistry)factory.getBean("serviceRegistry");
|
||||
|
||||
TestServiceInterface theService1 = (TestServiceInterface)registry.getService(service1);
|
||||
assertNotNull(service1);
|
||||
assertEquals("Test1:service1", theService1.test("service1"));
|
||||
TestServiceInterface theService2 = (TestServiceInterface)registry.getService(service2);
|
||||
assertNotNull(service2);
|
||||
assertEquals("Test2:service2", theService2.test("service2"));
|
||||
}
|
||||
|
||||
|
||||
public void testStores()
|
||||
{
|
||||
ServiceRegistry registry = (ServiceRegistry)factory.getBean("serviceRegistry");
|
||||
|
||||
ServiceDescriptor desc3 = registry.getServiceDescriptor(service3);
|
||||
assertNotNull(desc3);
|
||||
StoreRedirector theService3 = (StoreRedirector)registry.getService(service3);
|
||||
assertNotNull(service3);
|
||||
|
||||
Collection<String> descStores = desc3.getSupportedStoreProtocols();
|
||||
assertTrue(descStores.contains("Type1"));
|
||||
assertTrue(descStores.contains("Type2"));
|
||||
assertFalse(descStores.contains("Invalid"));
|
||||
|
||||
Collection<String> serviceStores = theService3.getSupportedStoreProtocols();
|
||||
for (String store: descStores)
|
||||
{
|
||||
assertTrue(serviceStores.contains(store));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void testAppContext()
|
||||
{
|
||||
ApplicationContext appContext = new ClassPathXmlApplicationContext("alfresco/application-context.xml");
|
||||
|
||||
ServiceRegistry registry = (ServiceRegistry)appContext.getBean(ServiceRegistry.SERVICE_REGISTRY);
|
||||
assertNotNull(registry);
|
||||
NodeService s1 = registry.getNodeService();
|
||||
assertNotNull(s1);
|
||||
CheckOutCheckInService s2 = registry.getCheckOutCheckInService();
|
||||
assertNotNull(s2);
|
||||
ContentService s3 = registry.getContentService();
|
||||
assertNotNull(s3);
|
||||
CopyService s4 = registry.getCopyService();
|
||||
assertNotNull(s4);
|
||||
DictionaryService s5 = registry.getDictionaryService();
|
||||
assertNotNull(s5);
|
||||
LockService s6 = registry.getLockService();
|
||||
assertNotNull(s6);
|
||||
MimetypeService s7 = registry.getMimetypeService();
|
||||
assertNotNull(s7);
|
||||
SearchService s8 = registry.getSearchService();
|
||||
assertNotNull(s8);
|
||||
TransactionService transactionService = registry.getTransactionService();
|
||||
UserTransaction s9 = transactionService.getUserTransaction();
|
||||
assertNotNull(s9);
|
||||
UserTransaction s10 = transactionService.getUserTransaction();
|
||||
assertNotNull(s10);
|
||||
assertFalse(s9.equals(s10));
|
||||
VersionService s11 = registry.getVersionService();
|
||||
assertNotNull(s11);
|
||||
}
|
||||
|
||||
|
||||
public interface TestServiceInterface
|
||||
{
|
||||
public String test(String arg);
|
||||
}
|
||||
|
||||
public static abstract class Component implements TestServiceInterface
|
||||
{
|
||||
private String type;
|
||||
|
||||
private Component(String type)
|
||||
{
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String test(String arg)
|
||||
{
|
||||
return type + ":" + arg;
|
||||
}
|
||||
}
|
||||
|
||||
public static class Test1Component extends Component
|
||||
{
|
||||
private Test1Component()
|
||||
{
|
||||
super("Test1");
|
||||
}
|
||||
}
|
||||
|
||||
public static class Test2Component extends Component
|
||||
{
|
||||
private Test2Component()
|
||||
{
|
||||
super("Test2");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,111 +0,0 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
|
||||
|
||||
<beans>
|
||||
|
||||
<import resource="testredirector.xml" />
|
||||
|
||||
|
||||
<bean id="namespaceDAO" class="org.alfresco.repo.dictionary.NamespaceDAOImpl"></bean>
|
||||
|
||||
<bean id="dictionaryDAO" class="org.alfresco.repo.dictionary.DictionaryDAOImpl">
|
||||
<constructor-arg index="0">
|
||||
<ref bean="namespaceDAO" />
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
<bean id="dictionaryBootstrap" class="org.alfresco.repo.dictionary.DictionaryBootstrap" init-method="bootstrap">
|
||||
<property name="dictionaryDAO"><ref local="dictionaryDAO"/></property>
|
||||
<property name="models">
|
||||
<list>
|
||||
<value>alfresco/model/dictionaryModel.xml</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="serviceRegistry" class="org.alfresco.repo.service.ServiceDescriptorRegistry"></bean>
|
||||
|
||||
<bean id="AlfrescoServiceDescriptor" abstract="true"
|
||||
class="org.alfresco.repo.service.ServiceDescriptorAdvisorFactory">
|
||||
<property name="namespace">
|
||||
<value>http://www.alfresco.org/test/serviceregistrytest</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="service1" class="org.springframework.aop.framework.ProxyFactoryBean">
|
||||
<property name="proxyInterfaces">
|
||||
<value>org.alfresco.repo.service.ServiceDescriptorRegistryTest$TestServiceInterface</value>
|
||||
</property>
|
||||
<property name="target">
|
||||
<ref local="test1Component" />
|
||||
</property>
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<idref local="service1_descriptor" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="service1_descriptor" parent="AlfrescoServiceDescriptor">
|
||||
<property name="interface">
|
||||
<value>org.alfresco.repo.service.ServiceDescriptorRegistryTest$TestServiceInterface</value>
|
||||
</property>
|
||||
<property name="description">
|
||||
<value>Test Service 1</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="service2" class="org.springframework.aop.framework.ProxyFactoryBean">
|
||||
<property name="proxyInterfaces">
|
||||
<value>org.alfresco.repo.service.ServiceDescriptorRegistryTest$TestServiceInterface</value>
|
||||
</property>
|
||||
<property name="target">
|
||||
<ref local="test2Component" />
|
||||
</property>
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<idref local="service2_descriptor" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="service2_descriptor" parent="AlfrescoServiceDescriptor">
|
||||
<property name="interface">
|
||||
<value>org.alfresco.repo.service.ServiceDescriptorRegistryTest$TestServiceInterface</value>
|
||||
</property>
|
||||
<property name="description">
|
||||
<value>Test Service 2</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="service3" class="org.springframework.aop.framework.ProxyFactoryBean">
|
||||
<property name="proxyInterfaces">
|
||||
<value>org.alfresco.repo.service.ServiceDescriptorRegistryTest$TestServiceInterface, org.alfresco.repo.service.StoreRedirector</value>
|
||||
</property>
|
||||
<property name="target">
|
||||
<ref bean="redirector_service1" />
|
||||
</property>
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<idref local="service3_descriptor" />
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="service3_descriptor" parent="AlfrescoServiceDescriptor">
|
||||
<property name="interface">
|
||||
<value>org.alfresco.repo.service.ServiceDescriptorRegistryTest$TestServiceInterface</value>
|
||||
</property>
|
||||
<property name="description">
|
||||
<value>Test Service 3</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="test1Component" class="org.alfresco.repo.service.ServiceDescriptorRegistryTest$Test1Component"></bean>
|
||||
|
||||
<bean id="test2Component" class="org.alfresco.repo.service.ServiceDescriptorRegistryTest$Test2Component"></bean>
|
||||
|
||||
</beans>
|
||||
Reference in New Issue
Block a user