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
2007-03-06 07:26:41 +00:00
parent 4866ed4fc7
commit 20068f981b
17 changed files with 147 additions and 1164 deletions

View File

@@ -4,38 +4,10 @@
<beans>
<import resource="classpath:alfresco/public-services-security-context.xml"/>
<!-- Base Service Descriptor for Alfresco Services -->
<bean id="AlfrescoServiceDescriptor" abstract="true" class="org.alfresco.repo.service.ServiceDescriptorAdvisorFactory">
<property name="namespace">
<value>http://www.alfresco.org</value>
</property>
</bean>
<!-- Service Registry -->
<bean id="ServiceRegistry" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.service.ServiceRegistry</value>
</property>
<property name="target">
<bean class="org.alfresco.repo.service.ServiceDescriptorRegistry"/>
</property>
<property name="interceptorNames">
<list>
<idref local="ServiceRegistry_descriptor"/>
</list>
</property>
</bean>
<bean id="ServiceRegistry_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.ServiceRegistry</value>
</property>
<property name="description">
<value>Repository service registry</value>
</property>
</bean>
<bean id="ServiceRegistry" class="org.alfresco.repo.service.ServiceDescriptorRegistry" />
<!-- Exception Translation -->
<bean id="exceptionTranslator" class="org.alfresco.repo.security.permissions.impl.ExceptionTranslatorMethodInterceptor"/>
@@ -52,20 +24,10 @@
<property name="interceptorNames">
<list>
<idref local="exceptionTranslator"/>
<idref local="DescriptorService_descriptor"/>
</list>
</property>
</bean>
<bean id="DescriptorService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.descriptor.DescriptorService</value>
</property>
<property name="description">
<value>Descriptor service</value>
</property>
</bean>
<!-- AuditMethodInterceptor -->
<bean id="AuditMethodInterceptor" class="org.alfresco.repo.audit.AuditMethodInterceptor">
@@ -81,26 +43,6 @@
<!-- Namespace Service -->
<alias name="namespaceService" alias="NamespaceService"/>
<bean id="NamespaceService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<bean id="NamespaceService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.namespace.NamespaceService</value>
</property>
<property name="description">
<value>Namespace service</value>
</property>
</bean>
<!-- Transaction Service -->
@@ -109,33 +51,12 @@
<!-- Dictionary Service -->
<alias name="dictionaryService" alias="DictionaryService"/>
<bean id="DictionaryService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<bean id="DictionaryService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.dictionary.DictionaryService</value>
</property>
<property name="description">
<value>Dictionary Service</value>
</property>
</bean>
<!-- Node Service -->
<bean id="NodeService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<list>
<value>org.alfresco.service.ServiceDescriptor</value>
<value>org.alfresco.service.cmr.repository.NodeService</value>
</list>
</property>
@@ -148,7 +69,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="NodeService_security"/>
<idref local="NodeService_descriptor"/>
</list>
</property>
</bean>
@@ -167,15 +87,6 @@
</property>
</bean>
<bean id="NodeService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.NodeService</value>
</property>
<property name="description">
<value>Node Service</value>
</property>
</bean>
<!-- Content Service -->
<bean id="ContentService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -191,7 +102,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="ContentService_security"/>
<idref local="ContentService_descriptor"/>
</list>
</property>
</bean>
@@ -206,29 +116,11 @@
</props>
</property>
</bean>
<bean id="ContentService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.ContentService</value>
</property>
<property name="description">
<value>Content Service</value>
</property>
</bean>
<!-- Mime Type Service -->
<alias name="mimetypeService" alias="MimetypeService"/>
<bean id="MimetypeService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.MimetypeService</value>
</property>
<property name="description">
<value>Mime Type Service</value>
</property>
</bean>
<!-- Search Service -->
<bean id="SearchService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -244,7 +136,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="SearchService_security"/>
<idref local="SearchService_descriptor"/>
</list>
</property>
</bean>
@@ -260,15 +151,6 @@
</property>
</bean>
<bean id="SearchService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.search.SearchService</value>
</property>
<property name="description">
<value>Search Service</value>
</property>
</bean>
<!-- Category Service -->
<bean id="CategoryService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -284,7 +166,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="CategoryService_security"/>
<idref local="CategoryService_descriptor"/>
</list>
</property>
</bean>
@@ -300,15 +181,6 @@
</property>
</bean>
<bean id="CategoryService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.search.CategoryService</value>
</property>
<property name="description">
<value>Category Service</value>
</property>
</bean>
<!-- Copy Service -->
<bean id="CopyService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -324,7 +196,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="CopyService_security"/>
<idref local="CopyService_descriptor"/>
</list>
</property>
</bean>
@@ -340,15 +211,6 @@
</property>
</bean>
<bean id="CopyService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.CopyService</value>
</property>
<property name="description">
<value>Copy Service</value>
</property>
</bean>
<!-- Lock Service -->
<bean id="LockService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -364,7 +226,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="LockService_security"/>
<idref local="LockService_descriptor"/>
</list>
</property>
</bean>
@@ -380,15 +241,6 @@
</property>
</bean>
<bean id="LockService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.lock.LockService</value>
</property>
<property name="description">
<value>Lock Service</value>
</property>
</bean>
<!-- Version Service -->
<bean id="VersionService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -404,7 +256,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="VersionService_security"/>
<idref local="VersionService_descriptor"/>
</list>
</property>
</bean>
@@ -420,15 +271,6 @@
</property>
</bean>
<bean id="VersionService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.version.VersionService</value>
</property>
<property name="description">
<value>Version Service</value>
</property>
</bean>
<!-- COCI Service -->
<bean id="CheckoutCheckinService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -444,7 +286,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="CheckoutCheckinService_security"/>
<idref local="CheckoutCheckinService_descriptor"/>
</list>
</property>
</bean>
@@ -460,15 +301,6 @@
</property>
</bean>
<bean id="CheckoutCheckinService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.coci.CheckOutCheckInService</value>
</property>
<property name="description">
<value>Version Service</value>
</property>
</bean>
<!-- Rule Service -->
<bean id="RuleService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -484,7 +316,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="RuleService_security"/>
<idref local="RuleService_descriptor"/>
</list>
</property>
</bean>
@@ -500,15 +331,6 @@
</property>
</bean>
<bean id="RuleService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.rule.RuleService</value>
</property>
<property name="description">
<value>Rule Service</value>
</property>
</bean>
<!-- Importer Service -->
<bean id="ImporterService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -524,7 +346,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="ImporterService_security"/>
<idref local="ImporterService_descriptor"/>
</list>
</property>
</bean>
@@ -539,16 +360,7 @@
</props>
</property>
</bean>
<bean id="ImporterService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.view.ImporterService</value>
</property>
<property name="description">
<value>Importer Service</value>
</property>
</bean>
<!-- Exporter Service -->
<bean id="ExporterService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -562,7 +374,6 @@
<list>
<idref local="ExporterService_transaction"/>
<idref local="AuditMethodInterceptor"/>
<idref local="ExporterService_descriptor"/>
</list>
</property>
</bean>
@@ -578,15 +389,6 @@
</property>
</bean>
<bean id="ExporterService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.view.ExporterService</value>
</property>
<property name="description">
<value>Exporter Service</value>
</property>
</bean>
<!-- Action Service -->
<bean id="ActionService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -602,7 +404,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="ActionService_security"/>
<idref local="ActionService_descriptor"/>
</list>
</property>
</bean>
@@ -618,15 +419,6 @@
</property>
</bean>
<bean id="ActionService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.action.ActionService</value>
</property>
<property name="description">
<value>Action Service</value>
</property>
</bean>
<!-- Permission Service -->
<bean id="PermissionService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -642,7 +434,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="PermissionService_security"/>
<idref local="PermissionService_descriptor"/>
</list>
</property>
</bean>
@@ -658,15 +449,6 @@
</property>
</bean>
<bean id="PermissionService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.security.PermissionService</value>
</property>
<property name="description">
<value>Permission Service</value>
</property>
</bean>
<!-- Authority Service -->
<bean id="AuthorityService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -682,7 +464,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="AuthorityService_security"/>
<idref local="AuthorityService_descriptor"/>
</list>
</property>
</bean>
@@ -698,15 +479,6 @@
</property>
</bean>
<bean id="AuthorityService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.security.AuthorityService</value>
</property>
<property name="description">
<value>Authority Service</value>
</property>
</bean>
<!-- Ownable Service -->
<bean id="OwnableService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -722,7 +494,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="OwnableService_security"/>
<idref local="OwnableService_descriptor"/>
</list>
</property>
</bean>
@@ -738,15 +509,6 @@
</property>
</bean>
<bean id="OwnableService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.security.OwnableService</value>
</property>
<property name="description">
<value>OwnableService Service</value>
</property>
</bean>
<!-- Person Service -->
<bean id="PersonService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -762,7 +524,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="PersonService_security"/>
<idref local="PersonService_descriptor"/>
</list>
</property>
</bean>
@@ -778,15 +539,6 @@
</property>
</bean>
<bean id="PersonService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.security.PersonService</value>
</property>
<property name="description">
<value>PersonService Service</value>
</property>
</bean>
<!-- Authentication Service -->
<bean id="AuthenticationService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -802,7 +554,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="AuthenticationService_security"/>
<idref local="AuthenticationService_descriptor"/>
</list>
</property>
</bean>
@@ -824,15 +575,6 @@
</property>
</bean>
<bean id="AuthenticationService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.security.AuthenticationService</value>
</property>
<property name="description">
<value>AuthenticationService Service</value>
</property>
</bean>
<!-- Template Service -->
<bean id="TemplateService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -848,7 +590,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="TemplateService_security"/>
<idref local="TemplateService_descriptor"/>
</list>
</property>
</bean>
@@ -864,15 +605,6 @@
</property>
</bean>
<bean id="TemplateService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.TemplateService</value>
</property>
<property name="description">
<value>TemplateService Service</value>
</property>
</bean>
<!-- Script Service -->
<bean id="ScriptService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -888,7 +620,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="ScriptService_security"/>
<idref local="ScriptService_descriptor"/>
</list>
</property>
</bean>
@@ -904,15 +635,6 @@
</property>
</bean>
<bean id="ScriptService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.ScriptService</value>
</property>
<property name="description">
<value>ScriptService Service</value>
</property>
</bean>
<!-- File/Folder Service -->
<bean id="FileFolderService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -928,7 +650,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="FileFolderService_security"/>
<idref bean="FileFolderService_descriptor"/>
<idref bean="tempFileMarkerInterceptor"/>
</list>
</property>
@@ -949,15 +670,6 @@
</property>
</bean>
<bean id="FileFolderService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.model.FileFolderService</value>
</property>
<property name="description">
<value>FileFolderService Service</value>
</property>
</bean>
<!-- The CrossRepositoryCopyService -->
<bean id="crossRepositoryCopyService" class="org.alfresco.repo.copy.CrossRepositoryCopyServiceImpl">
@@ -1208,7 +920,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="WorkflowService_security"/>
<idref local="WorkflowService_descriptor"/>
</list>
</property>
</bean>
@@ -1223,17 +934,7 @@
</props>
</property>
</bean>
<bean id="WorkflowService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.workflow.WorkflowService</value>
</property>
<property name="description">
<value>Workflow Service</value>
</property>
</bean>
<!-- Audit Service -->
<bean id="AuditService" class="org.springframework.aop.framework.ProxyFactoryBean">
@@ -1249,7 +950,6 @@
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="AuditService_security"/>
<idref local="AuditService_descriptor"/>
</list>
</property>
</bean>
@@ -1265,15 +965,6 @@
</property>
</bean>
<bean id="AuditService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.audit.AuditService</value>
</property>
<property name="description">
<value>Audit Service</value>
</property>
</bean>
<!-- MultilingualContentService -->
@@ -1288,7 +979,6 @@
<list>
<idref local="MultilingualContentService_transaction"/>
<idref local="exceptionTranslator"/>
<idref local="MultilingualContentService_descriptor"/>
</list>
</property>
</bean>
@@ -1304,15 +994,6 @@
</property>
</bean>
<bean id="MultilingualContentService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.ml.MultilingualContentService</value>
</property>
<property name="description">
<value>Multilingual Content Service</value>
</property>
</bean>
<!-- ConfigurableService -->
<bean id="ConfigurableService" class="org.springframework.aop.framework.ProxyFactoryBean">