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

Merged CMIS063 to HEAD

Browse Source 
17102: Add Date svn:keyword
  17103: - mask out cmis-tck-ws build/classes folder, fix JRE dependency in cmis-tck-ws .classpath
  17106: MOB-1330: Upgrade Web Services Repository to 0.7.
  17117: Now moved to Chemistry.
  17120: CMIS Update to v1.0 Committee Draft 04
  17123: Checkin mistake.
  17129: Updated Chemistry AtomPub TCK with appropriate UTF-8 encoding.
  17138: Fix reference to CMIS change list in CMIS Front Page.
  17142: Move all CMIS web scripts into same package.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17259 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-10-30 14:40:17 +00:00
parent ba3e8ad9c0
commit 6d65594cb8
5 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
config/alfresco/cmis-api-context.xml
View File

@@ -3,32 +3,6 @@
<beans> <beans>
<bean id="lucene.sql.cmis.strict" class="org.alfresco.repo.search.impl.lucene.LuceneCmisStrictSqlQueryLanguage" >
<property name="cmisQueryService">
<ref bean="CMISQueryService" />
</property>
<property name="factories">
<list>
<ref bean="admLuceneIndexerAndSearcherFactory" />
<ref bean="admLuceneUnIndexedIndexerAndSearcherFactory" />
<ref bean="avmLuceneIndexerAndSearcherFactory" />
</list>
</property>
</bean>
<bean id="lucene.sql.alfresco" class="org.alfresco.repo.search.impl.lucene.LuceneAlfrescoSqlQueryLanguage">
<property name="cmisQueryService">
<ref bean="CMISQueryService" />
</property>
<property name="factories">
<list>
<ref bean="admLuceneIndexerAndSearcherFactory" />
<ref bean="admLuceneUnIndexedIndexerAndSearcherFactory" />
<ref bean="avmLuceneIndexerAndSearcherFactory" />
</list>
</property>
</bean>
<bean id="CMISMapping" class="org.alfresco.cmis.mapping.CMISMapping" > <bean id="CMISMapping" class="org.alfresco.cmis.mapping.CMISMapping" >
<property name="serviceRegistry"> <property name="serviceRegistry">
<ref bean="ServiceRegistry" /> <ref bean="ServiceRegistry" />
@@ -39,7 +13,8 @@
</bean> </bean>
<bean id="CMISService" class="org.alfresco.cmis.mapping.CMISServicesImpl"> <bean id="CMISService" class="org.alfresco.cmis.mapping.CMISServicesImpl">
<property name="CMISSpecVersion"><value>0.7</value></property> <property name="CMISSpecVersion"><value>1.0</value></property>
<property name="CMISSpecTitle"><value>Version 1.0 Committee Draft 04</value></property>
<property name="defaultStore"><value>workspace://SpacesStore</value></property> <property name="defaultStore"><value>workspace://SpacesStore</value></property>
<property name="defaultRootPath"><value>/Company Home</value></property> <property name="defaultRootPath"><value>/Company Home</value></property>
<property name="dictionaryService" ref="dictionaryService" /> <property name="dictionaryService" ref="dictionaryService" />
@@ -98,6 +73,33 @@
<property name="CMISDictionaryService" ref="CMISDictionaryService" /> <property name="CMISDictionaryService" ref="CMISDictionaryService" />
</bean> </bean>
<bean id="lucene.sql.cmis.strict" class="org.alfresco.repo.search.impl.lucene.LuceneCmisStrictSqlQueryLanguage" >
<property name="cmisQueryService">
<ref bean="CMISQueryService" />
</property>
<property name="factories">
<list>
<ref bean="admLuceneIndexerAndSearcherFactory" />
<ref bean="admLuceneUnIndexedIndexerAndSearcherFactory" />
<ref bean="avmLuceneIndexerAndSearcherFactory" />
</list>
</property>
</bean>
<bean id="lucene.sql.alfresco" class="org.alfresco.repo.search.impl.lucene.LuceneAlfrescoSqlQueryLanguage">
<property name="cmisQueryService">
<ref bean="CMISQueryService" />
</property>
<property name="factories">
<list>
<ref bean="admLuceneIndexerAndSearcherFactory" />
<ref bean="admLuceneUnIndexedIndexerAndSearcherFactory" />
<ref bean="avmLuceneIndexerAndSearcherFactory" />
</list>
</property>
</bean>
<bean id="adm.luceneQueryEngine" class="org.springframework.aop.framework.ProxyFactoryBean"> <bean id="adm.luceneQueryEngine" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces"> <property name="proxyInterfaces">
<value>org.alfresco.repo.search.impl.querymodel.QueryEngine</value> <value>org.alfresco.repo.search.impl.querymodel.QueryEngine</value>
@@ -124,6 +126,4 @@
</property> </property>
</bean> </bean>
</beans> </beans>

2
config/alfresco/model/cmisModel.xml
View File

@@ -9,7 +9,7 @@
</imports> </imports>
<namespaces> <namespaces>
<namespace uri="http://www.alfresco.org/model/cmis/0.62" prefix="cmis" /> <namespace uri="http://www.alfresco.org/model/cmis/1.0/cd04" prefix="cmis" />
</namespaces> </namespaces>
<data-types> <data-types>

7
source/java/org/alfresco/cmis/CMISServices.java
View File

@@ -46,6 +46,13 @@ public interface CMISServices
*/ */
public String getCMISVersion(); public String getCMISVersion();
/**
* Gets the supported CMIS Specification Title
*
* @return CMIS pecification Title
*/
public String getCMISSpecTitle();
/** /**
* Gets the default root node path * Gets the default root node path
* *

3
source/java/org/alfresco/cmis/mapping/CMISMapping.java
View File

@@ -65,7 +65,7 @@ public class CMISMapping implements InitializingBean
* The Alfresco CMIS Namespace * The Alfresco CMIS Namespace
*/ */
public static String CMIS_MODEL_NS = "cmis"; public static String CMIS_MODEL_NS = "cmis";
public static String CMIS_MODEL_URI = "http://www.alfresco.org/model/cmis/0.62"; public static String CMIS_MODEL_URI = "http://www.alfresco.org/model/cmis/1.0/cd04";
/** /**
* The Alfresco CMIS Model name. * The Alfresco CMIS Model name.
@@ -225,6 +225,7 @@ public class CMISMapping implements InitializingBean
registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_DELETE_OBJECT, PermissionService.DELETE_NODE));
registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_UPDATE_PROPERTIES, PermissionService.WRITE_PROPERTIES)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_UPDATE_PROPERTIES, PermissionService.WRITE_PROPERTIES));
registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_FOLDER_TREE, PermissionService.READ_CHILDREN));
registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES)); registerEvaluator(CMISScope.FOLDER, new PermissionActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_PROPERTIES, PermissionService.READ_PROPERTIES));
registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_RELATIONSHIPS, true)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_RELATIONSHIPS, true));
registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_PARENTS, true)); registerEvaluator(CMISScope.FOLDER, new FixedValueActionEvaluator(serviceRegistry, CMISAllowedActionEnum.CAN_GET_OBJECT_PARENTS, true));

20
source/java/org/alfresco/cmis/mapping/CMISServicesImpl.java
View File

@@ -114,6 +114,7 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
// CMIS supported version // CMIS supported version
private String cmisVersion = "[undefined]"; private String cmisVersion = "[undefined]";
private String cmisSpecTitle = "[undefined]";
// default CMIS store and path // default CMIS store and path
private StoreRef defaultStoreRef; private StoreRef defaultStoreRef;
@@ -135,6 +136,16 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
this.cmisVersion = cmisVersion; this.cmisVersion = cmisVersion;
} }
/**
* Sets the CMIS specification title
*
* @param cmisTitle
*/
public void setCMISSpecTitle(String cmisSpecTitle)
{
this.cmisSpecTitle = cmisSpecTitle;
}
/** /**
* Sets the default root store * Sets the default root store
* *
@@ -295,6 +306,15 @@ public class CMISServicesImpl implements CMISServices, ApplicationContextAware,
return cmisVersion; return cmisVersion;
} }
/*
* (non-Javadoc)
* @see org.alfresco.cmis.CMISServices#getCMISSpecTitle()
*/
public String getCMISSpecTitle()
{
return cmisSpecTitle;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.alfresco.cmis.CMISServices#getDefaultRootPath() * @see org.alfresco.cmis.CMISServices#getDefaultRootPath()