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

Merge from SEAMIST3

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 10:44:42 +00:00
parent f50701a46c
commit 6cd69d17a2
4 changed files with 229 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/application-context.xml
View File

@@ -45,6 +45,7 @@
<import resource="classpath:alfresco/swf-transform-context.xml"/> <import resource="classpath:alfresco/swf-transform-context.xml"/>
<import resource="classpath:alfresco/site-services-context.xml"/> <import resource="classpath:alfresco/site-services-context.xml"/>
<import resource="classpath:alfresco/tagging-services-context.xml"/> <import resource="classpath:alfresco/tagging-services-context.xml"/>
<import resource="classpath:alfresco/cmis-ws-context.xml"/>
<import resource="classpath*:alfresco/patch/*-context.xml" /> <import resource="classpath*:alfresco/patch/*-context.xml" />
<import resource="classpath*:alfresco/domain/*-context.xml" /> <import resource="classpath*:alfresco/domain/*-context.xml" />

2
config/alfresco/bootstrap/descriptor.xml
View File

@@ -2,6 +2,7 @@
xmlns:sys="http://www.alfresco.org/model/system/1.0"> xmlns:sys="http://www.alfresco.org/model/system/1.0">
<sys:descriptor view:childName="${system.descriptor.childname}"> <sys:descriptor view:childName="${system.descriptor.childname}">
<sys:name>${repository.name}</sys:name>
<sys:versionMajor>${version.major}</sys:versionMajor> <sys:versionMajor>${version.major}</sys:versionMajor>
<sys:versionMinor>${version.minor}</sys:versionMinor> <sys:versionMinor>${version.minor}</sys:versionMinor>
<sys:versionRevision>${version.revision}</sys:versionRevision> <sys:versionRevision>${version.revision}</sys:versionRevision>
@@ -11,6 +12,7 @@
</sys:descriptor> </sys:descriptor>
<sys:descriptor view:childName="${system.descriptor.current.childname}"> <sys:descriptor view:childName="${system.descriptor.current.childname}">
<sys:name>${repository.name}</sys:name>
<sys:versionMajor>${version.major}</sys:versionMajor> <sys:versionMajor>${version.major}</sys:versionMajor>
<sys:versionMinor>${version.minor}</sys:versionMinor> <sys:versionMinor>${version.minor}</sys:versionMinor>
<sys:versionRevision>${version.revision}</sys:versionRevision> <sys:versionRevision>${version.revision}</sys:versionRevision>

218
config/alfresco/cmis-ws-context.xml Normal file
View File

@@ -0,0 +1,218 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint address="/RepositoryService" implementor="#dmRepositoryService" implementorClass="org.alfresco.repo.cmis.ws.DMRepositoryServicePort">
<jaxws:inInterceptors>
<ref local="saajInInterceptor" />
<ref local="wss4jInInterceptor" />
<ref local="authenticationInterceptor" />
</jaxws:inInterceptors>
<jaxws:outInterceptors>
<ref local="saajOutInterceptor" />
<ref local="wss4jOutInterceptor" />
</jaxws:outInterceptors>
<jaxws:outFaultInterceptors>
<ref local="saajOutInterceptor" />
<ref local="wss4jOutInterceptor" />
</jaxws:outFaultInterceptors>
<jaxws:properties>
<entry key="mtom-enabled" value="false" />
</jaxws:properties>
<jaxws:features>
<bean class="org.apache.cxf.feature.LoggingFeature" />
</jaxws:features>
</jaxws:endpoint>
<jaxws:endpoint address="/NavigationService" implementor="#dmNavigationService" implementorClass="org.alfresco.repo.cmis.ws.DMNavigationServicePort">
<jaxws:inInterceptors>
<ref local="saajInInterceptor" />
<ref local="wss4jInInterceptor" />
<ref local="authenticationInterceptor" />
</jaxws:inInterceptors>
<jaxws:outInterceptors>
<ref local="saajOutInterceptor" />
<ref local="wss4jOutInterceptor" />
</jaxws:outInterceptors>
<jaxws:outFaultInterceptors>
<ref local="saajOutInterceptor" />
<ref local="wss4jOutInterceptor" />
</jaxws:outFaultInterceptors>
<jaxws:properties>
<entry key="mtom-enabled" value="false" />
</jaxws:properties>
<jaxws:features>
<bean class="org.apache.cxf.feature.LoggingFeature" />
</jaxws:features>
</jaxws:endpoint>
<jaxws:endpoint address="/ObjectService" implementor="#dmObjectService" implementorClass="org.alfresco.repo.cmis.ws.DMObjectServicePort">
<jaxws:inInterceptors>
<ref local="saajInInterceptor" />
<ref local="wss4jInInterceptor" />
<ref local="authenticationInterceptor" />
</jaxws:inInterceptors>
<jaxws:outInterceptors>
<ref local="saajOutInterceptor" />
<ref local="wss4jOutInterceptor" />
</jaxws:outInterceptors>
<jaxws:outFaultInterceptors>
<ref local="saajOutInterceptor" />
<ref local="wss4jOutInterceptor" />
</jaxws:outFaultInterceptors>
<jaxws:properties>
<entry key="mtom-enabled" value="true" />
</jaxws:properties>
<jaxws:features>
<bean class="org.apache.cxf.feature.LoggingFeature" />
</jaxws:features>
</jaxws:endpoint>
<bean id="dmRepositoryService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<list>
<value>org.alfresco.repo.cmis.ws.RepositoryServicePort</value>
</list>
</property>
<property name="target">
<ref bean="dmRepositoryServiceTarget" />
</property>
<property name="interceptorNames">
<list>
<idref local="dmAbstractServiceTx" />
<idref local="exceptionPointcutAdvisor" />
</list>
</property>
</bean>
<bean id="dmNavigationService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<list>
<value>org.alfresco.repo.cmis.ws.NavigationServicePort</value>
</list>
</property>
<property name="target">
<ref bean="dmNavigationServiceTarget" />
</property>
<property name="interceptorNames">
<list>
<idref local="dmAbstractServiceTx" />
<idref local="exceptionPointcutAdvisor" />
</list>
</property>
</bean>
<bean id="dmObjectService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<list>
<value>org.alfresco.repo.cmis.ws.ObjectServicePort</value>
</list>
</property>
<property name="target">
<ref bean="dmObjectServiceTarget" />
</property>
<property name="interceptorNames">
<list>
<idref local="dmAbstractServiceTx" />
<idref local="exceptionPointcutAdvisor" />
</list>
</property>
</bean>
<bean id="dmAbstractServiceTx" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager" />
</property>
<property name="transactionAttributes">
<props>
<prop key="get*">${server.transaction.mode.readOnly}</prop>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<bean id="dmRepositoryServiceTarget" parent="dmAbstractService" class="org.alfresco.repo.cmis.ws.DMRepositoryServicePort">
<property name="rootPath">
<value>workspace://SpacesStore/app:company_home</value>
</property>
</bean>
<bean id="dmNavigationServiceTarget" parent="dmAbstractService" class="org.alfresco.repo.cmis.ws.DMNavigationServicePort" />
<bean id="dmObjectServiceTarget" parent="dmAbstractService" class="org.alfresco.repo.cmis.ws.DMObjectServicePort" />
<bean id="dmAbstractService" abstract="true" class="org.alfresco.repo.cmis.ws.DMAbstractServicePort">
<property name="authenticationService" ref="authenticationService" />
<property name="personService" ref="personService" />
<property name="nodeService" ref="nodeService" />
<property name="dictionaryService" ref="dictionaryService" />
<property name="searchService" ref="searchService" />
<property name="namespaceService" ref="namespaceService" />
<property name="versionService" ref="versionService" />
<property name="checkOutCheckInService" ref="checkOutCheckInService" />
<property name="fileFolderService" ref="fileFolderService" />
</bean>
<bean id="exceptionPointcutAdvisor" class="org.springframework.aop.support.DefaultPointcutAdvisor">
<property name="advice">
<bean class="org.alfresco.repo.cmis.ws.DMServicePortThrowsAdvice" />
</property>
</bean>
<!-- ========================================================================================================= -->
<bean id="saajInInterceptor" class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor" />
<bean id="saajOutInterceptor" class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor" />
<bean id="wss4jInInterceptor" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
<constructor-arg>
<map>
<entry key="action" value="UsernameToken Timestamp" />
<entry key="passwordType" value="PasswordText" />
<entry>
<key>
<value>passwordCallbackRef</value>
</key>
<ref local="authenticationTokenCallback" />
</entry>
</map>
</constructor-arg>
</bean>
<bean id="wss4jOutInterceptor" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
<constructor-arg>
<map>
<entry key="action" value="Timestamp" />
</map>
</constructor-arg>
</bean>
<bean id="authenticationTokenCallback" class="org.alfresco.repo.cmis.ws.AuthenticationTokenCallbackHandler">
<property name="authenticationService" ref="AuthenticationService" />
</bean>
<bean id="authenticationInterceptor" class="org.alfresco.repo.cmis.ws.AuthenticationInterceptor" />
</beans>

9
source/java/org/alfresco/repo/version/VersionServiceImpl.java
View File

@@ -862,7 +862,14 @@ public class VersionServiceImpl extends AbstractVersionServiceImpl implements Ve
*/ */
protected NodeRef getVersionHistoryNodeRef(NodeRef nodeRef) protected NodeRef getVersionHistoryNodeRef(NodeRef nodeRef)
{ {
return this.dbNodeService.getChildByName(getRootNode(), CHILD_QNAME_VERSION_HISTORIES, nodeRef.getId()); if (nodeService.exists(nodeRef))
{
return this.dbNodeService.getChildByName(getRootNode(), CHILD_QNAME_VERSION_HISTORIES, (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NODE_UUID));
}
else
{
return this.dbNodeService.getChildByName(getRootNode(), CHILD_QNAME_VERSION_HISTORIES, nodeRef.getId());
}
} }
/** /**