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

Merged 5.2.N-REPO-2156 (5.2.1) to 5.2.N (5.2.1)

Browse Source 
135730 jvonka: REPO-2165: MNT-16748: Failing to extract auditing entries from Search & CMISQuery
   - SearchService (using Share) or CMISQueryService (using CMIS Query)
   - to follow: temporarily change pom to use data-model 6.9-SNAPSHOT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2017-03-15 11:52:47 +00:00
parent f180ab89c8
commit 4fc7f98618
2 changed files with 73 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
config/alfresco/opencmis-context.xml
View File

@@ -190,32 +190,61 @@
<property name="bulkWorkerThreads" value="${opencmis.bulkUpdateProperties.workerThreads}" /> <property name="bulkWorkerThreads" value="${opencmis.bulkUpdateProperties.workerThreads}" />
</bean> </bean>
<bean id="OpenCMISQueryService" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
<property name="sourceApplicationContextFactory"> <bean id="OpenCMISQueryService" class="org.springframework.aop.framework.ProxyFactoryBean">
<ref bean="Search" /> <property name="proxyInterfaces">
</property>
<property name="sourceBeanName">
<value>search.OpenCMISQueryService</value>
</property>
<property name="interfaces">
<list>
<value>org.alfresco.opencmis.search.CMISQueryService</value> <value>org.alfresco.opencmis.search.CMISQueryService</value>
</list> </property>
</property> <property name="target">
<ref bean="subOpenCMISQueryService" />
</property>
<property name="interceptorNames">
<list>
<idref bean="AuditMethodInterceptor" />
</list>
</property>
</bean> </bean>
<bean id="OpenCMISQueryService1.1" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory"> <bean id="subOpenCMISQueryService" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
<property name="sourceApplicationContextFactory"> <property name="sourceApplicationContextFactory">
<ref bean="Search" /> <ref bean="Search" />
</property> </property>
<property name="sourceBeanName"> <property name="sourceBeanName">
<value>search.OpenCMISQueryService1.1</value> <value>search.OpenCMISQueryService</value>
</property> </property>
<property name="interfaces"> <property name="interfaces">
<list> <list>
<value>org.alfresco.opencmis.search.CMISQueryService</value>
</list>
</property>
</bean>
<bean id="OpenCMISQueryService1.1" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.opencmis.search.CMISQueryService</value> <value>org.alfresco.opencmis.search.CMISQueryService</value>
</list> </property>
</property> <property name="target">
<ref bean="subOpenCMISQueryService1.1" />
</property>
<property name="interceptorNames">
<list>
<idref bean="AuditMethodInterceptor" />
</list>
</property>
</bean>
<bean id="subOpenCMISQueryService1.1" class="org.alfresco.repo.management.subsystems.SubsystemProxyFactory">
<property name="sourceApplicationContextFactory">
<ref bean="Search" />
</property>
<property name="sourceBeanName">
<value>search.OpenCMISQueryService1.1</value>
</property>
<property name="interfaces">
<list>
<value>org.alfresco.opencmis.search.CMISQueryService</value>
</list>
</property>
</bean> </bean>
<bean id="CMISChangeLogDataExtractor" class="org.alfresco.opencmis.CMISChangeLogDataExtractor"> <bean id="CMISChangeLogDataExtractor" class="org.alfresco.opencmis.CMISChangeLogDataExtractor">

41
source/java/org/alfresco/opencmis/search/CMISQueryService.java
View File

@@ -23,23 +23,26 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.opencmis.search; package org.alfresco.opencmis.search;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.Auditable;
import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin; import org.alfresco.service.cmr.repository.StoreRef;
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery; import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
public interface CMISQueryService
{ public interface CMISQueryService
CMISResultSet query(CMISQueryOptions options); {
@Auditable(parameters = {"options"})
CMISResultSet query(String query, StoreRef storeRef); CMISResultSet query(CMISQueryOptions options);
boolean getPwcSearchable(); @Auditable(parameters = {"query", "storeRef"})
CMISResultSet query(String query, StoreRef storeRef);
boolean getAllVersionsSearchable();
boolean getPwcSearchable();
CapabilityQuery getQuerySupport();
boolean getAllVersionsSearchable();
CapabilityJoin getJoinSupport();
CapabilityQuery getQuerySupport();
CapabilityJoin getJoinSupport();
} }