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

Merged DEV/SWIFT to HEAD

Browse Source 
27168: Added generics for cannedQueryRegistry
   27169: Fixed formatting
   27170: SOLR queries
          - ALF-7072 RSOLR 013: Remote API to get ACLs and readers
            - Queries for ACL ChangeSets and ACLs
            - WebScripts for AclChangeSetsGet
          - ALF-7071 and ALF-7072: Fix naming conventions
   27171: Fixed MySQL create script (ALF-8336: RSOLR 013: DB upgrade scripts for ACL changes)
   27337: Initial draft of the publishing API
   27516: Get the basic WCM ML tests working, covering the simpler use cases
   27517: More on the WCM-QS multi lingual support, further on the aspect and the unit tests for it
   27518: Begin the WCM-QS webscript to return the translation details on a node
   27519: Push some WCM-QS ML search logic into SiteHelper, and add a unit test for it
   27542: - Initial skeleton of the channel API.
          - Initial draft of the publishing content model.
   27546: ALF-7481: RSOLR 018: Execute query against SOLR
          - pass authority filter in json body to avoid possible issue over-running the max URL length
   27559: Created a Web Site Generator tool which randomly generates WCM QS websites.
   27561: Created ChannelServiceImpl and implemented the ChannelType registry.
   27577: Start to pull across the WCM-QS ML custom action
   27579: More pulling across the WCM-QS ML custom action
   27580: More WCM-QS ML ui porting
   27588: ALF-8421: RSOLR 037: Encapsulate the CMIS Query Parser
   27589: Created a PublishingModel to hold Web Publishing constants.
   27610: ALF-7874 Add iWorks mimetype entries
   27624: Restructure index tracking
   27630: ALF-8182: SVC 03: Object Picker needs to use new NodeLocatorService to resolve startLocation parameter
          The picker now uses the NodeLocatorService to look up some start locations and most importantly allows
		  custom 'locators' to be used. All the current start location tokens are still supported
		  i.e. {companyhome}, {userhome}, {siteshome}, {doclib}, {self} and {parent}. A new one has been added called {ancestor},
		  this will allow an ancestor node to be located, the node can be selected by type or aspect, see example below.
          Some node locators can take parameters, a "startLocationParams" has therefore been added to allow these to be specified.

		  The example below shows how to configure a picker to start in the root folder of the site the node being edited is located within.

		  <field id="fdk:contentMultiple">
             <control>
                <control-param name="startLocation">{ancestor}</control-param>
                <control-param name="startLocationParams">type=st:site</control-param>
             </control>
          </field>
   27631: ALF-8182: SVC 03: Object Picker needs to use new NodeLocatorService to resolve startLocation parameter
          Centralised node locator classes to repo.nodelocator package
		  (moved out of repo.node package as that area is reserved for low level node processing)
		  and made all naming consistent i.e. nodelocator rather than nodelocation.
   27633: Fixed cmis:objectTypeId property definition (required = true, see CMIS 1.0 errata 1)
   27635: CMIS compliance fixes
   27638: - Initial operational publishing context with model bootstrapped.
          - First implementation of ChannelService.getChannels and ChannelService.createChannel. Test cases to follow imminently...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-06-09 12:08:12 +00:00
parent c47ecc4208
commit 2af7da2c23
23 changed files with 1033 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/alfresco/templates/webscripts/org/alfresco/repository/forms/pickerchildren.get.desc.xml
View File

@@ -2,9 +2,10 @@
<shortname>PickerList</shortname> <shortname>PickerList</shortname>
<description>Service to return metadata of child items in a parent space to display in the object finder.</description> <description>Service to return metadata of child items in a parent space to display in the object finder.</description>
<url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/children</url> <url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/children</url>
<url>/api/forms/picker/{type}/children</url>
<!-- The following 2 URLs are deprectated as of 4.0, the nodelocator service is now used by the picker -->
<url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/siblings</url> <url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/siblings</url>
<url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/doclib</url> <url>/api/forms/picker/{type}/{store_type}/{store_id}/{id}/doclib</url>
<url>/api/forms/picker/{type}/children</url>
<format default="json"/> <format default="json"/>
<authentication>user</authentication> <authentication>user</authentication>
<transaction allow="readonly">required</transaction> <transaction allow="readonly">required</transaction>

11
config/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-location.get.json.ftl
View File

@@ -1,11 +0,0 @@
{
data:
{
<#if nodeRef?? >
nodeRef: "${nodeRef}"
<#else >
nodeRef: null
</#if>
}
}

2
config/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-location.get.desc.xml → config/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.desc.xml
View File

@@ -1,5 +1,5 @@
<webscript> <webscript>
<shortname>Locate Node</shortname> <shortname>Node Locator</shortname>
<description> <description>
Locates a Node in the repository using the specified Node Location strategy. Locates a Node in the repository using the specified Node Location strategy.
</description> </description>

11
config/alfresco/templates/webscripts/org/alfresco/repository/nodelocator/node-locator.get.json.ftl Normal file
View File

@@ -0,0 +1,11 @@
{
"data":
{
<#if nodeRef?? >
"nodeRef": "${nodeRef}"
<#else >
"nodeRef": null
</#if>
}
}

10
config/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.desc.xml Normal file
View File

@@ -0,0 +1,10 @@
<webscript>
<shortname>Get ACL ChangeSets</shortname>
<description>Get the ACL ChangeSets from the given commit time.</description>
<url>/api/solr/aclchangesets?fromId={fromId?}&amp;fromTime={fromTime?}&amp;maxResults={maxResults?}</url>
<format default="json">argument</format>
<authentication>admin</authentication>
<transaction allow="readonly">required</transaction>
<lifecycle>internal</lifecycle>
<family>SOLR</family>
</webscript>

10
config/alfresco/templates/webscripts/org/alfresco/repository/solr/aclChangeSets.get.json.ftl Normal file
View File

@@ -0,0 +1,10 @@
<#import "solr.lib.ftl" as solrLib/>
{
"aclChangeSets" :
[
<#list aclChangeSets as aclChangeSet>
<@solrLib.aclChangeSetJSON aclChangeSet=aclChangeSet/>
<#if aclChangeSet_has_next>,</#if>
</#list>
]
}

17
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getNodeContent.get.desc.xml → config/alfresco/templates/webscripts/org/alfresco/repository/solr/nodeContent.get.desc.xml
View File

@@ -1,9 +1,10 @@
<webscript> <webscript>
<shortname>Get node property content as text</shortname> <shortname>Get node property content as text</shortname>
<description>Get the content for the node property as text.</description> <description>Get the content for the node property as text.</description>
<url>/api/solr/textContent?nodeId={nodeId}&amp;propertyQName={propertyQName?}</url> <url>/api/solr/textContent?nodeId={nodeId}&amp;propertyQName={propertyQName?}</url>
<format default="json">argument</format> <format default="json">argument</format>
<authentication>admin</authentication> <authentication>admin</authentication>
<transaction allow="readonly">required</transaction> <transaction allow="readonly">required</transaction>
<lifecycle>internal</lifecycle> <lifecycle>internal</lifecycle>
<family>SOLR</family>
</webscript> </webscript>

17
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getNodes.post.desc.xml → config/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.desc.xml
View File

@@ -1,9 +1,10 @@
<webscript> <webscript>
<shortname>Get the nodes in the given transactions</shortname> <shortname>Get the nodes in the given transactions</shortname>
<description>Get the nodes updated/deleted in the given transactions.</description> <description>Get the nodes updated/deleted in the given transactions.</description>
<url>/api/solr/nodes</url> <url>/api/solr/nodes</url>
<format default="json">argument</format> <format default="json">argument</format>
<authentication>admin</authentication> <authentication>admin</authentication>
<transaction allow="readonly">required</transaction> <transaction allow="readonly">required</transaction>
<lifecycle>internal</lifecycle> <lifecycle>internal</lifecycle>
<family>SOLR</family>
</webscript> </webscript>

18
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getNodes.post.json.ftl → config/alfresco/templates/webscripts/org/alfresco/repository/solr/nodes.post.json.ftl
View File

@@ -1,10 +1,10 @@
<#import "solr.lib.ftl" as solrLib/> <#import "solr.lib.ftl" as solrLib/>
{ {
"nodes" : "nodes" :
[ [
<#list nodes as node> <#list nodes as node>
<@solrLib.nodeJSON node=node/> <@solrLib.nodeJSON node=node/>
<#if node_has_next>,</#if> <#if node_has_next>,</#if>
</#list> </#list>
] ]
} }

17
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getNodesMetaData.post.desc.xml → config/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.desc.xml
View File

@@ -1,9 +1,10 @@
<webscript> <webscript>
<shortname>Get the metadata for the specified nodes</shortname> <shortname>Get the metadata for the specified nodes</shortname>
<description>Get the metadata for the specified nodes.</description> <description>Get the metadata for the specified nodes.</description>
<url>/api/solr/metadata</url> <url>/api/solr/metadata</url>
<format default="json">argument</format> <format default="json">argument</format>
<authentication>admin</authentication> <authentication>admin</authentication>
<transaction allow="readonly">required</transaction> <transaction allow="readonly">required</transaction>
<lifecycle>internal</lifecycle> <lifecycle>internal</lifecycle>
<family>SOLR</family>
</webscript> </webscript>

16
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getNodesMetaData.post.json.ftl → config/alfresco/templates/webscripts/org/alfresco/repository/solr/nodesMetaData.post.json.ftl
View File

@@ -1,9 +1,9 @@
<#import "solr.lib.ftl" as solrLib/> <#import "solr.lib.ftl" as solrLib/>
{ {
"nodes" : "nodes" :
[ [
<#list nodes as nodeMetaData> <#list nodes as nodeMetaData>
<@solrLib.nodeMetaDataJSON nodeMetaData=nodeMetaData filter=filter/><#if nodeMetaData_has_next>,</#if> <@solrLib.nodeMetaDataJSON nodeMetaData=nodeMetaData filter=filter/><#if nodeMetaData_has_next>,</#if>
</#list> </#list>
] ]
} }

8
config/alfresco/templates/webscripts/org/alfresco/repository/solr/solr.lib.ftl
View File

@@ -1,3 +1,11 @@
<#macro aclChangeSetJSON aclChangeSet>
{
"id": ${aclChangeSet.id?c},
"commitTimeMs": ${aclChangeSet.commitTimeMs?c},
"aclCount": ${aclChangeSet.aclCount?c}
}
</#macro>
<#macro transactionJSON txn> <#macro transactionJSON txn>
{ {
"id": ${txn.id?c}, "id": ${txn.id?c},

17
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getTransactions.get.desc.xml → config/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.desc.xml
View File

@@ -1,9 +1,10 @@
<webscript> <webscript>
<shortname>Get transactions</shortname> <shortname>Get transactions</shortname>
<description>Get the transactions from the given commit time.</description> <description>Get the transactions from the given commit time.</description>
<url>/api/solr/transactions?fromTxnId={fromTxnId?}&amp;fromCommitTime={fromCommitTime?}&amp;maxResults={maxResults?}</url> <url>/api/solr/transactions?fromTxnId={fromTxnId?}&amp;fromCommitTime={fromCommitTime?}&amp;maxResults={maxResults?}</url>
<format default="json">argument</format> <format default="json">argument</format>
<authentication>admin</authentication> <authentication>admin</authentication>
<transaction allow="readonly">required</transaction> <transaction allow="readonly">required</transaction>
<lifecycle>internal</lifecycle> <lifecycle>internal</lifecycle>
<family>SOLR</family>
</webscript> </webscript>

18
config/alfresco/templates/webscripts/org/alfresco/repository/solr/getTransactions.get.json.ftl → config/alfresco/templates/webscripts/org/alfresco/repository/solr/transactions.get.json.ftl
View File

@@ -1,10 +1,10 @@
<#import "solr.lib.ftl" as solrLib/> <#import "solr.lib.ftl" as solrLib/>
{ {
"transactions" : "transactions" :
[ [
<#list transactions as txn> <#list transactions as txn>
<@solrLib.transactionJSON txn=txn/> <@solrLib.transactionJSON txn=txn/>
<#if txn_has_next>,</#if> <#if txn_has_next>,</#if>
</#list> </#list>
] ]
} }

26
config/alfresco/web-scripts-application-context.xml
View File

@@ -1227,27 +1227,33 @@
<property name="namespaceService" ref="namespaceService"/> <property name="namespaceService" ref="namespaceService"/>
</bean> </bean>
<bean id="webscript.org.alfresco.repository.solr.getTransactions.get" <bean id="webscript.org.alfresco.repository.solr.aclChangeSets.get"
class="org.alfresco.repo.web.scripts.solr.GetTransactions" class="org.alfresco.repo.web.scripts.solr.AclChangeSetsGet"
parent="webscript"> parent="webscript">
<property name="solrTrackingComponent" ref="solrTrackingComponent"/> <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
</bean> </bean>
<bean id="webscript.org.alfresco.repository.solr.getNodes.post" <bean id="webscript.org.alfresco.repository.solr.transactions.get"
class="org.alfresco.repo.web.scripts.solr.GetNodes" class="org.alfresco.repo.web.scripts.solr.TransactionsGet"
parent="webscript"> parent="webscript">
<property name="solrTrackingComponent" ref="solrTrackingComponent"/> <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
</bean> </bean>
<bean id="webscript.org.alfresco.repository.solr.getNodesMetaData.post" <bean id="webscript.org.alfresco.repository.solr.nodes.post"
class="org.alfresco.repo.web.scripts.solr.GetNodesMetaData" class="org.alfresco.repo.web.scripts.solr.NodesGet"
parent="webscript">
<property name="solrTrackingComponent" ref="solrTrackingComponent"/>
</bean>
<bean id="webscript.org.alfresco.repository.solr.nodesMetaData.post"
class="org.alfresco.repo.web.scripts.solr.NodesMetaDataGet"
parent="webscript"> parent="webscript">
<property name="solrTrackingComponent" ref="solrTrackingComponent"/> <property name="solrTrackingComponent" ref="solrTrackingComponent"/>
<property name="solrSerializer" ref="solrSerializer"/> <property name="solrSerializer" ref="solrSerializer"/>
</bean> </bean>
<bean id="webscript.org.alfresco.repository.solr.getNodeContent.get" <bean id="webscript.org.alfresco.repository.solr.nodeContent.get"
class="org.alfresco.repo.web.scripts.solr.GetNodeContent" class="org.alfresco.repo.web.scripts.solr.NodeContentGet"
parent="webscript"> parent="webscript">
<property name="contentService" ref="contentService"/> <property name="contentService" ref="contentService"/>
<property name="nodeService" ref="nodeService"/> <property name="nodeService" ref="nodeService"/>
@@ -1259,8 +1265,8 @@
<!-- --> <!-- -->
<!-- --> <!-- -->
<bean id="webscript.org.alfresco.repository.nodelocator.node-location.get" <bean id="webscript.org.alfresco.repository.nodelocator.node-locator.get"
class="org.alfresco.repo.web.scripts.nodelocator.NodeLocationGet" class="org.alfresco.repo.web.scripts.nodelocator.NodeLocatorGet"
parent="webscript"> parent="webscript">
<property name="nodeLocatorService" ref="nodeLocatorService"/> <property name="nodeLocatorService" ref="nodeLocatorService"/>
</bean> </bean>

4
source/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocationGet.java → source/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorGet.java
View File

@@ -25,7 +25,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.service.cmr.repository.NodeLocatorService; import org.alfresco.repo.nodelocator.NodeLocatorService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.springframework.extensions.surf.util.URLDecoder; import org.springframework.extensions.surf.util.URLDecoder;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.DeclarativeWebScript;
@@ -38,7 +38,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
* @since 4.0 * @since 4.0
* *
*/ */
public class NodeLocationGet extends DeclarativeWebScript public class NodeLocatorGet extends DeclarativeWebScript
{ {
private static final String NODE_ID = "node_id"; private static final String NODE_ID = "node_id";
private static final String STORE_ID = "store_id"; private static final String STORE_ID = "store_id";

14
source/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocationWebScriptTest.java → source/java/org/alfresco/repo/web/scripts/nodelocator/NodeLocatorWebScriptTest.java
View File

@@ -21,13 +21,13 @@ package org.alfresco.repo.web.scripts.nodelocator;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.Repository; import org.alfresco.repo.model.Repository;
import org.alfresco.repo.node.locator.AncestorNodeLocator; import org.alfresco.repo.nodelocator.AncestorNodeLocator;
import org.alfresco.repo.node.locator.CompanyHomeNodeLocator; import org.alfresco.repo.nodelocator.CompanyHomeNodeLocator;
import org.alfresco.repo.node.locator.DocLibNodeLocator; import org.alfresco.repo.nodelocator.SitesHomeNodeLocator;
import org.alfresco.repo.node.locator.SitesHomeNodeLocator; import org.alfresco.repo.nodelocator.UserHomeNodeLocator;
import org.alfresco.repo.node.locator.UserHomeNodeLocator; import org.alfresco.repo.nodelocator.XPathNodeLocator;
import org.alfresco.repo.node.locator.XPathNodeLocator;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.DocLibNodeLocator;
import org.alfresco.repo.site.SiteServiceInternal; import org.alfresco.repo.site.SiteServiceInternal;
import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -51,7 +51,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
* @since 4.0 * @since 4.0
* *
*/ */
public class NodeLocationWebScriptTest extends BaseWebScriptTest public class NodeLocatorWebScriptTest extends BaseWebScriptTest
{ {
private static final String baseURL = "api/nodelocator/"; private static final String baseURL = "api/nodelocator/";
private SiteServiceInternal siteService; private SiteServiceInternal siteService;

145
source/java/org/alfresco/repo/web/scripts/solr/GetAclChangeSets.java → source/java/org/alfresco/repo/web/scripts/solr/AclChangeSetsGet.java
View File

@@ -1,74 +1,71 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.alfresco.repo.web.scripts.solr; package org.alfresco.repo.web.scripts.solr;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.domain.solr.SOLRDAO; import org.alfresco.repo.solr.AclChangeSet;
import org.alfresco.repo.domain.solr.Transaction; import org.alfresco.repo.solr.SOLRTrackingComponent;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
/** /**
* Support for SOLR: Track ACL Change Sets * Support for SOLR: Track ACL Change Sets
* *
* @since 4.0 * @since 4.0
*/ */
public class GetAclChangeSets extends DeclarativeWebScript public class AclChangeSetsGet extends DeclarativeWebScript
{ {
protected static final Log logger = LogFactory.getLog(GetAclChangeSets.class); protected static final Log logger = LogFactory.getLog(AclChangeSetsGet.class);
private SOLRDAO solrDAO; private SOLRTrackingComponent solrTrackingComponent;
/** public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
* @param solrDAO the SOLDAO to set {
*/ this.solrTrackingComponent = solrTrackingComponent;
public void setSolrDAO(SOLRDAO solrDAO) }
{
this.solrDAO = solrDAO; protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
} {
String fromIdParam = req.getParameter("fromId");
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status) String fromTimeParam = req.getParameter("fromTime");
{ String maxResultsParam = req.getParameter("maxResults");
String minAclChangeSetIdParam = req.getParameter("minAclChangeSetId");
String fromCommitTimeParam = req.getParameter("fromCommitTime"); Long fromId = (fromIdParam == null ? null : Long.valueOf(fromIdParam));
String maxResultsParam = req.getParameter("maxResults"); Long fromTime = (fromTimeParam == null ? null : Long.valueOf(fromTimeParam));
int maxResults = (maxResultsParam == null ? 1024 : Integer.valueOf(maxResultsParam));
Long minAclChangeSetId = (minAclChangeSetIdParam == null ? null : Long.valueOf(minAclChangeSetIdParam));
Long fromCommitTime = (fromCommitTimeParam == null ? null : Long.valueOf(fromCommitTimeParam)); List<AclChangeSet> changesets = solrTrackingComponent.getAclChangeSets(fromId, fromTime, maxResults);
int maxResults = (maxResultsParam == null ? 0 : Integer.valueOf(maxResultsParam));
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
List<Transaction> transactions = solrDAO.getTransactions(minAclChangeSetId, fromCommitTime, maxResults); model.put("aclChangeSets", changesets);
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f); if (logger.isDebugEnabled())
model.put("transactions", transactions); {
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
if (logger.isDebugEnabled()) }
{
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model); return model;
} }
}
return model;
}
}

402
source/java/org/alfresco/repo/web/scripts/solr/GetNodeContent.java → source/java/org/alfresco/repo/web/scripts/solr/NodeContentGet.java
View File

@@ -1,201 +1,201 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.alfresco.repo.web.scripts.solr; package org.alfresco.repo.web.scripts.solr;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Locale; import java.util.Locale;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.ContentTransformer; import org.alfresco.repo.content.transform.ContentTransformer;
import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.web.scripts.content.StreamContent; import org.alfresco.repo.web.scripts.content.StreamContent;
import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentIOException;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WebScriptResponse; import org.springframework.extensions.webscripts.WebScriptResponse;
/** /**
* A web service to return the text content (transformed if required) of a node's * A web service to return the text content (transformed if required) of a node's
* content property. * content property.
* *
* @since 4.0 * @since 4.0
*/ */
public class GetNodeContent extends StreamContent public class NodeContentGet extends StreamContent
{ {
private static final String TRANSFORM_STATUS_HEADER = "X-Alfresco-transformStatus"; private static final String TRANSFORM_STATUS_HEADER = "X-Alfresco-transformStatus";
private static final String TRANSFORM_EXCEPTION_HEADER = "X-Alfresco-transformException"; private static final String TRANSFORM_EXCEPTION_HEADER = "X-Alfresco-transformException";
private static final Log logger = LogFactory.getLog(GetNodeContent.class); private static final Log logger = LogFactory.getLog(NodeContentGet.class);
/** /**
* format definied by RFC 822, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3 * format definied by RFC 822, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3
*/ */
private static final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US); private static final SimpleDateFormat dateFormat = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US);
private NodeDAO nodeDAO; private NodeDAO nodeDAO;
private NodeService nodeService; private NodeService nodeService;
private ContentService contentService; private ContentService contentService;
public void setNodeDAO(NodeDAO nodeDAO) public void setNodeDAO(NodeDAO nodeDAO)
{ {
this.nodeDAO = nodeDAO; this.nodeDAO = nodeDAO;
} }
public void setNodeService(NodeService nodeService) public void setNodeService(NodeService nodeService)
{ {
this.nodeService = nodeService; this.nodeService = nodeService;
} }
public void setContentService(ContentService contentService) public void setContentService(ContentService contentService)
{ {
this.contentService = contentService; this.contentService = contentService;
} }
/** /**
* @in * @in
*/ */
public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException public void execute(WebScriptRequest req, WebScriptResponse res) throws IOException
{ {
ContentReader textReader = null; ContentReader textReader = null;
Exception transformException = null; Exception transformException = null;
String nodeIDString = req.getParameter("nodeId"); String nodeIDString = req.getParameter("nodeId");
if(nodeIDString == null) if(nodeIDString == null)
{ {
throw new WebScriptException("nodeID parameter is required for GetNodeContent"); throw new WebScriptException("nodeID parameter is required for GetNodeContent");
} }
long nodeId = Long.valueOf(nodeIDString).longValue(); long nodeId = Long.valueOf(nodeIDString).longValue();
String propertyQName = req.getParameter("propertyQName"); String propertyQName = req.getParameter("propertyQName");
QName propertyName = null; QName propertyName = null;
if(propertyQName == null) if(propertyQName == null)
{ {
propertyName = ContentModel.PROP_CONTENT; propertyName = ContentModel.PROP_CONTENT;
} }
else else
{ {
propertyName = QName.createQName(propertyQName); propertyName = QName.createQName(propertyQName);
} }
Pair<Long, NodeRef> pair = nodeDAO.getNodePair(nodeId); Pair<Long, NodeRef> pair = nodeDAO.getNodePair(nodeId);
if(pair == null) if(pair == null)
{ {
throw new WebScriptException("Node id does not exist"); throw new WebScriptException("Node id does not exist");
} }
NodeRef nodeRef = pair.getSecond(); NodeRef nodeRef = pair.getSecond();
// check If-Modified-Since header and set Last-Modified header as appropriate // check If-Modified-Since header and set Last-Modified header as appropriate
Date modified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED); Date modified = (Date)nodeService.getProperty(nodeRef, ContentModel.PROP_MODIFIED);
long modifiedSince = -1; long modifiedSince = -1;
String modifiedSinceStr = req.getHeader("If-Modified-Since"); String modifiedSinceStr = req.getHeader("If-Modified-Since");
if(modifiedSinceStr != null) if(modifiedSinceStr != null)
{ {
try try
{ {
modifiedSince = dateFormat.parse(modifiedSinceStr).getTime(); modifiedSince = dateFormat.parse(modifiedSinceStr).getTime();
} }
catch (Throwable e) catch (Throwable e)
{ {
if (logger.isWarnEnabled()) if (logger.isWarnEnabled())
{ {
logger.warn("Browser sent badly-formatted If-Modified-Since header: " + modifiedSinceStr); logger.warn("Browser sent badly-formatted If-Modified-Since header: " + modifiedSinceStr);
} }
} }
if (modifiedSince > 0L) if (modifiedSince > 0L)
{ {
// round the date to the ignore millisecond value which is not supplied by header // round the date to the ignore millisecond value which is not supplied by header
long modDate = (modified.getTime() / 1000L) * 1000L; long modDate = (modified.getTime() / 1000L) * 1000L;
if (modDate <= modifiedSince) if (modDate <= modifiedSince)
{ {
res.setStatus(HttpServletResponse.SC_NOT_MODIFIED); res.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return; return;
} }
} }
} }
ContentReader reader = contentService.getReader(nodeRef, propertyName); ContentReader reader = contentService.getReader(nodeRef, propertyName);
if(reader == null) if(reader == null)
{ {
res.setStatus(HttpStatus.SC_NO_CONTENT); res.setStatus(HttpStatus.SC_NO_CONTENT);
return; return;
} }
// Perform transformation catering for mimetype AND encoding // Perform transformation catering for mimetype AND encoding
ContentWriter writer = contentService.getTempWriter(); ContentWriter writer = contentService.getTempWriter();
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN); writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
writer.setEncoding("UTF-8"); // Expect transformers to produce UTF-8 writer.setEncoding("UTF-8"); // Expect transformers to produce UTF-8
ContentTransformer transformer = contentService.getTransformer(reader.getMimetype(), MimetypeMap.MIMETYPE_TEXT_PLAIN); ContentTransformer transformer = contentService.getTransformer(reader.getMimetype(), MimetypeMap.MIMETYPE_TEXT_PLAIN);
if(transformer == null) if(transformer == null)
{ {
res.setHeader(TRANSFORM_STATUS_HEADER, "noTransform"); res.setHeader(TRANSFORM_STATUS_HEADER, "noTransform");
res.setStatus(HttpStatus.SC_NO_CONTENT); res.setStatus(HttpStatus.SC_NO_CONTENT);
return; return;
} }
try try
{ {
transformer.transform(reader, writer); transformer.transform(reader, writer);
} }
catch (ContentIOException e) catch (ContentIOException e)
{ {
transformException = e; transformException = e;
} }
if(transformException == null) if(transformException == null)
{ {
// point the reader to the new-written content // point the reader to the new-written content
textReader = writer.getReader(); textReader = writer.getReader();
// Check that the reader is a view onto something concrete // Check that the reader is a view onto something concrete
if (textReader == null || !textReader.exists()) if (textReader == null || !textReader.exists())
{ {
transformException = new ContentIOException( transformException = new ContentIOException(
"The transformation did not write any content, yet: \n" "The transformation did not write any content, yet: \n"
+ " transformer: " + transformer + "\n" + " temp writer: " + writer); + " transformer: " + transformer + "\n" + " temp writer: " + writer);
} }
} }
if(transformException != null) if(transformException != null)
{ {
res.setHeader(TRANSFORM_STATUS_HEADER, "transformFailed"); res.setHeader(TRANSFORM_STATUS_HEADER, "transformFailed");
res.setHeader(TRANSFORM_EXCEPTION_HEADER, transformException.getMessage()); res.setHeader(TRANSFORM_EXCEPTION_HEADER, transformException.getMessage());
res.setStatus(HttpStatus.SC_NO_CONTENT); res.setStatus(HttpStatus.SC_NO_CONTENT);
} }
else else
{ {
res.setStatus(HttpStatus.SC_OK); res.setStatus(HttpStatus.SC_OK);
streamContentImpl(req, res, textReader, false, modified, String.valueOf(modified.getTime()), null); streamContentImpl(req, res, textReader, false, modified, String.valueOf(modified.getTime()), null);
} }
} }
} }

414
source/java/org/alfresco/repo/web/scripts/solr/GetNodes.java → source/java/org/alfresco/repo/web/scripts/solr/NodesGet.java
View File

@@ -1,208 +1,208 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.alfresco.repo.web.scripts.solr; package org.alfresco.repo.web.scripts.solr;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.repo.domain.node.Node; import org.alfresco.repo.domain.node.Node;
import org.alfresco.repo.solr.NodeParameters; import org.alfresco.repo.solr.NodeParameters;
import org.alfresco.repo.solr.SOLRTrackingComponent; import org.alfresco.repo.solr.SOLRTrackingComponent;
import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback; import org.alfresco.repo.solr.SOLRTrackingComponent.NodeQueryCallback;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.extensions.surf.util.Content; import org.springframework.extensions.surf.util.Content;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
/** /**
* Support for SOLR: Get a list of nodes in the given transactions. * Support for SOLR: Get a list of nodes in the given transactions.
* <p/> * <p/>
* Supports fromNodeId, toNodeId, count (all optional) to control the number of nodes returned<br/> * Supports fromNodeId, toNodeId, count (all optional) to control the number of nodes returned<br/>
* e.g. (null, null, 1000) will return at most 1000 nodes starting from the first node in the first transaction.<br/> * e.g. (null, null, 1000) will return at most 1000 nodes starting from the first node in the first transaction.<br/>
* e.g. (1234, null, 1000) will return at most 1000 nodes starting from the node id 1234.<br/> * e.g. (1234, null, 1000) will return at most 1000 nodes starting from the node id 1234.<br/>
* *
* @since 4.0 * @since 4.0
*/ */
public class GetNodes extends DeclarativeWebScript public class NodesGet extends DeclarativeWebScript
{ {
protected static final Log logger = LogFactory.getLog(GetNodes.class); protected static final Log logger = LogFactory.getLog(NodesGet.class);
private SOLRTrackingComponent solrTrackingComponent; private SOLRTrackingComponent solrTrackingComponent;
public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent) public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
{ {
this.solrTrackingComponent = solrTrackingComponent; this.solrTrackingComponent = solrTrackingComponent;
} }
@Override @Override
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status) protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
{ {
try try
{ {
Content content = req.getContent(); Content content = req.getContent();
if(content == null) if(content == null)
{ {
throw new WebScriptException("Failed to convert request to String"); throw new WebScriptException("Failed to convert request to String");
} }
JSONObject o = new JSONObject(content.getContent()); JSONObject o = new JSONObject(content.getContent());
JSONArray aTxnIds = o.has("txnIds") ? o.getJSONArray("txnIds") : null; JSONArray aTxnIds = o.has("txnIds") ? o.getJSONArray("txnIds") : null;
Long fromTxnId = o.has("fromTxnId") ? o.getLong("fromTxnId") : null; Long fromTxnId = o.has("fromTxnId") ? o.getLong("fromTxnId") : null;
Long toTxnId = o.has("toTxnId") ? o.getLong("toTxnId") : null; Long toTxnId = o.has("toTxnId") ? o.getLong("toTxnId") : null;
Long fromNodeId = o.has("fromNodeId") ? o.getLong("fromNodeId") : null; Long fromNodeId = o.has("fromNodeId") ? o.getLong("fromNodeId") : null;
Long toNodeId = o.has("toNodeId") ? o.getLong("toNodeId") : null; Long toNodeId = o.has("toNodeId") ? o.getLong("toNodeId") : null;
Set<QName> excludeAspects = null; Set<QName> excludeAspects = null;
if(o.has("excludeAspects")) if(o.has("excludeAspects"))
{ {
JSONArray aExcludeAspects = o.getJSONArray("excludeAspects"); JSONArray aExcludeAspects = o.getJSONArray("excludeAspects");
excludeAspects = new HashSet<QName>(aExcludeAspects.length()); excludeAspects = new HashSet<QName>(aExcludeAspects.length());
for(int i = 0; i < aExcludeAspects.length(); i++) for(int i = 0; i < aExcludeAspects.length(); i++)
{ {
excludeAspects.add(QName.createQName(aExcludeAspects.getString(i).trim())); excludeAspects.add(QName.createQName(aExcludeAspects.getString(i).trim()));
} }
} }
Set<QName> includeAspects = null; Set<QName> includeAspects = null;
if(o.has("includeAspects")) if(o.has("includeAspects"))
{ {
JSONArray aIncludeAspects = o.getJSONArray("includeAspects"); JSONArray aIncludeAspects = o.getJSONArray("includeAspects");
includeAspects = new HashSet<QName>(aIncludeAspects.length()); includeAspects = new HashSet<QName>(aIncludeAspects.length());
for(int i = 0; i < aIncludeAspects.length(); i++) for(int i = 0; i < aIncludeAspects.length(); i++)
{ {
includeAspects.add(QName.createQName(aIncludeAspects.getString(i).trim())); includeAspects.add(QName.createQName(aIncludeAspects.getString(i).trim()));
} }
} }
Set<QName> excludeNodeTypes = null; Set<QName> excludeNodeTypes = null;
if(o.has("excludeNodeTypes")) if(o.has("excludeNodeTypes"))
{ {
JSONArray aExcludeNodeTypes = o.getJSONArray("excludeNodeTypes"); JSONArray aExcludeNodeTypes = o.getJSONArray("excludeNodeTypes");
excludeNodeTypes = new HashSet<QName>(aExcludeNodeTypes.length()); excludeNodeTypes = new HashSet<QName>(aExcludeNodeTypes.length());
for(int i = 0; i < aExcludeNodeTypes.length(); i++) for(int i = 0; i < aExcludeNodeTypes.length(); i++)
{ {
excludeNodeTypes.add(QName.createQName(aExcludeNodeTypes.getString(i).trim())); excludeNodeTypes.add(QName.createQName(aExcludeNodeTypes.getString(i).trim()));
} }
} }
Set<QName> includeNodeTypes = null; Set<QName> includeNodeTypes = null;
if(o.has("includeNodeTypes")) if(o.has("includeNodeTypes"))
{ {
JSONArray aIncludeNodeTypes = o.getJSONArray("includeNodeTypes"); JSONArray aIncludeNodeTypes = o.getJSONArray("includeNodeTypes");
includeNodeTypes = new HashSet<QName>(aIncludeNodeTypes.length()); includeNodeTypes = new HashSet<QName>(aIncludeNodeTypes.length());
for(int i = 0; i < aIncludeNodeTypes.length(); i++) for(int i = 0; i < aIncludeNodeTypes.length(); i++)
{ {
includeNodeTypes.add(QName.createQName(aIncludeNodeTypes.getString(i).trim())); includeNodeTypes.add(QName.createQName(aIncludeNodeTypes.getString(i).trim()));
} }
} }
// 0 or Integer.MAX_VALUE => ignore // 0 or Integer.MAX_VALUE => ignore
int maxResults = o.has("maxResults") ? o.getInt("maxResults") : 0; int maxResults = o.has("maxResults") ? o.getInt("maxResults") : 0;
String storeProtocol = o.has("storeProtocol") ? o.getString("storeProtocol") : null; String storeProtocol = o.has("storeProtocol") ? o.getString("storeProtocol") : null;
String storeIdentifier = o.has("storeIdentifier") ? o.getString("storeIdentifier") : null; String storeIdentifier = o.has("storeIdentifier") ? o.getString("storeIdentifier") : null;
List<Long> txnIds = null; List<Long> txnIds = null;
if(aTxnIds != null) if(aTxnIds != null)
{ {
txnIds = new ArrayList<Long>(aTxnIds.length()); txnIds = new ArrayList<Long>(aTxnIds.length());
for(int i = 0; i < aTxnIds.length(); i++) for(int i = 0; i < aTxnIds.length(); i++)
{ {
txnIds.add(aTxnIds.getLong(i)); txnIds.add(aTxnIds.getLong(i));
} }
} }
WebNodeQueryCallback nodeQueryCallback = new WebNodeQueryCallback(maxResults); WebNodeQueryCallback nodeQueryCallback = new WebNodeQueryCallback(maxResults);
NodeParameters nodeParameters = new NodeParameters(); NodeParameters nodeParameters = new NodeParameters();
nodeParameters.setTransactionIds(txnIds); nodeParameters.setTransactionIds(txnIds);
nodeParameters.setFromTxnId(fromTxnId); nodeParameters.setFromTxnId(fromTxnId);
nodeParameters.setToTxnId(toTxnId); nodeParameters.setToTxnId(toTxnId);
nodeParameters.setFromNodeId(fromNodeId); nodeParameters.setFromNodeId(fromNodeId);
nodeParameters.setToNodeId(toNodeId); nodeParameters.setToNodeId(toNodeId);
nodeParameters.setExcludeAspects(excludeAspects); nodeParameters.setExcludeAspects(excludeAspects);
nodeParameters.setIncludeAspects(includeAspects); nodeParameters.setIncludeAspects(includeAspects);
nodeParameters.setExcludeNodeTypes(excludeNodeTypes); nodeParameters.setExcludeNodeTypes(excludeNodeTypes);
nodeParameters.setIncludeNodeTypes(includeNodeTypes); nodeParameters.setIncludeNodeTypes(includeNodeTypes);
nodeParameters.setStoreProtocol(storeProtocol); nodeParameters.setStoreProtocol(storeProtocol);
nodeParameters.setStoreIdentifier(storeIdentifier); nodeParameters.setStoreIdentifier(storeIdentifier);
nodeParameters.setMaxResults(maxResults); nodeParameters.setMaxResults(maxResults);
solrTrackingComponent.getNodes(nodeParameters, nodeQueryCallback); solrTrackingComponent.getNodes(nodeParameters, nodeQueryCallback);
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f); Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
List<Node> nodes = nodeQueryCallback.getNodes(); List<Node> nodes = nodeQueryCallback.getNodes();
model.put("nodes", nodes); model.put("nodes", nodes);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model); logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
} }
return model; return model;
} }
catch(IOException e) catch(IOException e)
{ {
throw new WebScriptException("IO exception parsing request", e); throw new WebScriptException("IO exception parsing request", e);
} }
catch(JSONException e) catch(JSONException e)
{ {
throw new WebScriptException("Invalid JSON", e); throw new WebScriptException("Invalid JSON", e);
} }
} }
/** /**
* Callback for DAO get nodes query * Callback for DAO get nodes query
* *
*/ */
private static class WebNodeQueryCallback implements NodeQueryCallback private static class WebNodeQueryCallback implements NodeQueryCallback
{ {
private ArrayList<Node> nodes; private ArrayList<Node> nodes;
public WebNodeQueryCallback(int count) { public WebNodeQueryCallback(int count) {
super(); super();
nodes = new ArrayList<Node>(count == 0 || count == Integer.MAX_VALUE ? 100 : count); nodes = new ArrayList<Node>(count == 0 || count == Integer.MAX_VALUE ? 100 : count);
} }
@Override @Override
public boolean handleNode(Node node) { public boolean handleNode(Node node) {
nodes.add(node); nodes.add(node);
// continue - get next node // continue - get next node
return true; return true;
} }
public List<Node> getNodes() public List<Node> getNodes()
{ {
return nodes; return nodes;
} }
} }
} }

668
source/java/org/alfresco/repo/web/scripts/solr/GetNodesMetaData.java → source/java/org/alfresco/repo/web/scripts/solr/NodesMetaDataGet.java
View File

@@ -1,334 +1,334 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.alfresco.repo.web.scripts.solr; package org.alfresco.repo.web.scripts.solr;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.solr.MetaDataResultsFilter; import org.alfresco.repo.solr.MetaDataResultsFilter;
import org.alfresco.repo.solr.NodeMetaData; import org.alfresco.repo.solr.NodeMetaData;
import org.alfresco.repo.solr.NodeMetaDataParameters; import org.alfresco.repo.solr.NodeMetaDataParameters;
import org.alfresco.repo.solr.SOLRTrackingComponent; import org.alfresco.repo.solr.SOLRTrackingComponent;
import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback; import org.alfresco.repo.solr.SOLRTrackingComponent.NodeMetaDataQueryCallback;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.Path; import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.extensions.surf.util.Content; import org.springframework.extensions.surf.util.Content;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.WebScriptException; import org.springframework.extensions.webscripts.WebScriptException;
import org.springframework.extensions.webscripts.WebScriptRequest; import org.springframework.extensions.webscripts.WebScriptRequest;
// todo url parameter to remove whitespace in results - make it the default? // todo url parameter to remove whitespace in results - make it the default?
/** /**
* Support for SOLR: Get metadata for nodes given IDs, ranges of IDs, etc. * Support for SOLR: Get metadata for nodes given IDs, ranges of IDs, etc.
* <p/> * <p/>
* *
* @since 4.0 * @since 4.0
*/ */
public class GetNodesMetaData extends DeclarativeWebScript public class NodesMetaDataGet extends DeclarativeWebScript
{ {
protected static final Log logger = LogFactory.getLog(GetNodesMetaData.class); protected static final Log logger = LogFactory.getLog(NodesMetaDataGet.class);
private static final int INITIAL_DEFAULT_SIZE = 100; private static final int INITIAL_DEFAULT_SIZE = 100;
private static final int BATCH_SIZE = 50; private static final int BATCH_SIZE = 50;
private SOLRTrackingComponent solrTrackingComponent; private SOLRTrackingComponent solrTrackingComponent;
private SOLRSerializer solrSerializer; private SOLRSerializer solrSerializer;
public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent) public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
{ {
this.solrTrackingComponent = solrTrackingComponent; this.solrTrackingComponent = solrTrackingComponent;
} }
public void setSolrSerializer(SOLRSerializer solrSerializer) public void setSolrSerializer(SOLRSerializer solrSerializer)
{ {
this.solrSerializer = solrSerializer; this.solrSerializer = solrSerializer;
} }
@Override @Override
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status) protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
{ {
try try
{ {
Content content = req.getContent(); Content content = req.getContent();
if(content == null) if(content == null)
{ {
throw new WebScriptException("Failed to convert request to String"); throw new WebScriptException("Failed to convert request to String");
} }
JSONObject o = new JSONObject(content.getContent()); JSONObject o = new JSONObject(content.getContent());
List<Long> nodeIds = null; List<Long> nodeIds = null;
if(o.has("nodeIds")) if(o.has("nodeIds"))
{ {
JSONArray jsonNodeIds = o.getJSONArray("nodeIds"); JSONArray jsonNodeIds = o.getJSONArray("nodeIds");
nodeIds = new ArrayList<Long>(jsonNodeIds.length()); nodeIds = new ArrayList<Long>(jsonNodeIds.length());
for(int i = 0; i < jsonNodeIds.length(); i++) for(int i = 0; i < jsonNodeIds.length(); i++)
{ {
Long nodeId = jsonNodeIds.getLong(i); Long nodeId = jsonNodeIds.getLong(i);
nodeIds.add(nodeId); nodeIds.add(nodeId);
} }
} }
Long fromNodeId = o.has("fromNodeId") ? o.getLong("fromNodeId") : null; Long fromNodeId = o.has("fromNodeId") ? o.getLong("fromNodeId") : null;
Long toNodeId = o.has("toNodeId") ? o.getLong("toNodeId") : null; Long toNodeId = o.has("toNodeId") ? o.getLong("toNodeId") : null;
// 0 or Integer.MAX_VALUE => ignore // 0 or Integer.MAX_VALUE => ignore
int maxResults = o.has("maxResults") ? o.getInt("maxResults") : 0; int maxResults = o.has("maxResults") ? o.getInt("maxResults") : 0;
int size = 0; int size = 0;
if(maxResults != 0 && maxResults != Integer.MAX_VALUE) if(maxResults != 0 && maxResults != Integer.MAX_VALUE)
{ {
size = maxResults; size = maxResults;
} }
else if(nodeIds != null) else if(nodeIds != null)
{ {
size = nodeIds.size(); size = nodeIds.size();
} }
else if(fromNodeId != null && toNodeId != null) else if(fromNodeId != null && toNodeId != null)
{ {
if((toNodeId.longValue() - fromNodeId.longValue()) > Integer.MAX_VALUE) if((toNodeId.longValue() - fromNodeId.longValue()) > Integer.MAX_VALUE)
{ {
throw new WebScriptException("Too many nodes expected, try changing the criteria"); throw new WebScriptException("Too many nodes expected, try changing the criteria");
} }
size = (int)(toNodeId - fromNodeId); size = (int)(toNodeId - fromNodeId);
} }
final boolean noSizeCalculated = (size == 0); final boolean noSizeCalculated = (size == 0);
// filters, defaults are 'true' // filters, defaults are 'true'
MetaDataResultsFilter filter = new MetaDataResultsFilter(); MetaDataResultsFilter filter = new MetaDataResultsFilter();
if(o.has("includeAclId")) if(o.has("includeAclId"))
{ {
filter.setIncludeAclId(o.getBoolean("includeAclId")); filter.setIncludeAclId(o.getBoolean("includeAclId"));
} }
if(o.has("includeAspects")) if(o.has("includeAspects"))
{ {
filter.setIncludeAspects(o.getBoolean("includeAspects")); filter.setIncludeAspects(o.getBoolean("includeAspects"));
} }
if(o.has("includeNodeRef")) if(o.has("includeNodeRef"))
{ {
filter.setIncludeNodeRef(o.getBoolean("includeNodeRef")); filter.setIncludeNodeRef(o.getBoolean("includeNodeRef"));
} }
if(o.has("includeOwner")) if(o.has("includeOwner"))
{ {
filter.setIncludeOwner(o.getBoolean("includeOwner")); filter.setIncludeOwner(o.getBoolean("includeOwner"));
} }
if(o.has("includeProperties")) if(o.has("includeProperties"))
{ {
filter.setIncludeProperties(o.getBoolean("includeProperties")); filter.setIncludeProperties(o.getBoolean("includeProperties"));
} }
if(o.has("includePaths")) if(o.has("includePaths"))
{ {
filter.setIncludePaths(o.getBoolean("includePaths")); filter.setIncludePaths(o.getBoolean("includePaths"));
} }
if(o.has("includeType")) if(o.has("includeType"))
{ {
filter.setIncludeType(o.getBoolean("includeType")); filter.setIncludeType(o.getBoolean("includeType"));
} }
if(o.has("includeAssociations")) if(o.has("includeAssociations"))
{ {
filter.setIncludeAssociations(o.getBoolean("includeAssociations")); filter.setIncludeAssociations(o.getBoolean("includeAssociations"));
} }
final ArrayList<FreemarkerNodeMetaData> nodesMetaData = final ArrayList<FreemarkerNodeMetaData> nodesMetaData =
new ArrayList<FreemarkerNodeMetaData>(size > 0 ? size : INITIAL_DEFAULT_SIZE); new ArrayList<FreemarkerNodeMetaData>(size > 0 ? size : INITIAL_DEFAULT_SIZE);
NodeMetaDataParameters params = new NodeMetaDataParameters(); NodeMetaDataParameters params = new NodeMetaDataParameters();
params.setNodeIds(nodeIds); params.setNodeIds(nodeIds);
params.setFromNodeId(fromNodeId); params.setFromNodeId(fromNodeId);
params.setToNodeId(toNodeId); params.setToNodeId(toNodeId);
params.setMaxResults(maxResults); params.setMaxResults(maxResults);
solrTrackingComponent.getNodesMetadata(params, filter, new NodeMetaDataQueryCallback() solrTrackingComponent.getNodesMetadata(params, filter, new NodeMetaDataQueryCallback()
{ {
private int counter = BATCH_SIZE; private int counter = BATCH_SIZE;
private int numBatches = 0; private int numBatches = 0;
@Override @Override
public boolean handleNodeMetaData(NodeMetaData nodeMetaData) public boolean handleNodeMetaData(NodeMetaData nodeMetaData)
{ {
// need to perform data structure conversions that are compatible with Freemarker // need to perform data structure conversions that are compatible with Freemarker
// e.g. Serializable -> String, QName -> String (because map keys must be string, number) // e.g. Serializable -> String, QName -> String (because map keys must be string, number)
try try
{ {
FreemarkerNodeMetaData fNodeMetaData = new FreemarkerNodeMetaData(solrSerializer, nodeMetaData); FreemarkerNodeMetaData fNodeMetaData = new FreemarkerNodeMetaData(solrSerializer, nodeMetaData);
nodesMetaData.add(fNodeMetaData); nodesMetaData.add(fNodeMetaData);
} }
catch(Exception e) catch(Exception e)
{ {
throw new AlfrescoRuntimeException("Problem converting to Freemarker", e); throw new AlfrescoRuntimeException("Problem converting to Freemarker", e);
} }
if(noSizeCalculated && --counter == 0) if(noSizeCalculated && --counter == 0)
{ {
counter = BATCH_SIZE; counter = BATCH_SIZE;
nodesMetaData.ensureCapacity(++numBatches*BATCH_SIZE); nodesMetaData.ensureCapacity(++numBatches*BATCH_SIZE);
} }
return true; return true;
} }
}); });
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f); Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
model.put("nodes", nodesMetaData); model.put("nodes", nodesMetaData);
model.put("filter", filter); model.put("filter", filter);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model); logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
} }
return model; return model;
} }
catch(IOException e) catch(IOException e)
{ {
throw new WebScriptException("IO exception parsing request", e); throw new WebScriptException("IO exception parsing request", e);
} }
catch(JSONException e) catch(JSONException e)
{ {
throw new WebScriptException("Invalid JSON", e); throw new WebScriptException("Invalid JSON", e);
} }
} }
/** /**
* Bean to store node meta data for use by FreeMarker templates * Bean to store node meta data for use by FreeMarker templates
* *
* @since 4.0 * @since 4.0
*/ */
public static class FreemarkerNodeMetaData public static class FreemarkerNodeMetaData
{ {
private Long nodeId; private Long nodeId;
private NodeRef nodeRef; private NodeRef nodeRef;
private QName nodeType; private QName nodeType;
private Long aclId; private Long aclId;
private Map<String, PropertyValue> properties; private Map<String, PropertyValue> properties;
private Set<QName> aspects; private Set<QName> aspects;
private List<String> paths; private List<String> paths;
private List<ChildAssociationRef> childAssocs; private List<ChildAssociationRef> childAssocs;
public FreemarkerNodeMetaData(SOLRSerializer solrSerializer, NodeMetaData nodeMetaData) throws IOException, JSONException public FreemarkerNodeMetaData(SOLRSerializer solrSerializer, NodeMetaData nodeMetaData) throws IOException, JSONException
{ {
setNodeId(nodeMetaData.getNodeId()); setNodeId(nodeMetaData.getNodeId());
setAclId(nodeMetaData.getAclId()); setAclId(nodeMetaData.getAclId());
setNodeRef(nodeMetaData.getNodeRef()); setNodeRef(nodeMetaData.getNodeRef());
setNodeType(nodeMetaData.getNodeType()); setNodeType(nodeMetaData.getNodeType());
// convert Paths to Strings // convert Paths to Strings
List<String> paths = new ArrayList<String>(); List<String> paths = new ArrayList<String>();
for(Pair<Path, QName> pair : nodeMetaData.getPaths()) for(Pair<Path, QName> pair : nodeMetaData.getPaths())
{ {
JSONObject o = new JSONObject(); JSONObject o = new JSONObject();
o.put("path", solrSerializer.serializeValue(String.class, pair.getFirst())); o.put("path", solrSerializer.serializeValue(String.class, pair.getFirst()));
o.put("qname", solrSerializer.serializeValue(String.class, pair.getSecond())); o.put("qname", solrSerializer.serializeValue(String.class, pair.getSecond()));
paths.add(o.toString(3)); paths.add(o.toString(3));
} }
setPaths(paths); setPaths(paths);
setChildAssocs(nodeMetaData.getChildAssocs()); setChildAssocs(nodeMetaData.getChildAssocs());
setAspects(nodeMetaData.getAspects()); setAspects(nodeMetaData.getAspects());
Map<QName, Serializable> props = nodeMetaData.getProperties(); Map<QName, Serializable> props = nodeMetaData.getProperties();
Map<String, PropertyValue> properties = (props != null ? new HashMap<String, PropertyValue>(props.size()) : null); Map<String, PropertyValue> properties = (props != null ? new HashMap<String, PropertyValue>(props.size()) : null);
for(QName propName : props.keySet()) for(QName propName : props.keySet())
{ {
Serializable value = props.get(propName); Serializable value = props.get(propName);
properties.put(solrSerializer.serializeValue(String.class, propName), properties.put(solrSerializer.serializeValue(String.class, propName),
solrSerializer.serialize(propName, value)); solrSerializer.serialize(propName, value));
} }
setProperties(properties); setProperties(properties);
} }
public NodeRef getNodeRef() public NodeRef getNodeRef()
{ {
return nodeRef; return nodeRef;
} }
public void setNodeRef(NodeRef nodeRef) public void setNodeRef(NodeRef nodeRef)
{ {
this.nodeRef = nodeRef; this.nodeRef = nodeRef;
} }
public List<String> getPaths() public List<String> getPaths()
{ {
return paths; return paths;
} }
public void setPaths(List<String> paths) public void setPaths(List<String> paths)
{ {
this.paths = paths; this.paths = paths;
} }
public QName getNodeType() public QName getNodeType()
{ {
return nodeType; return nodeType;
} }
public void setNodeType(QName nodeType) public void setNodeType(QName nodeType)
{ {
this.nodeType = nodeType; this.nodeType = nodeType;
} }
public Long getNodeId() public Long getNodeId()
{ {
return nodeId; return nodeId;
} }
public void setNodeId(Long nodeId) public void setNodeId(Long nodeId)
{ {
this.nodeId = nodeId; this.nodeId = nodeId;
} }
public Long getAclId() public Long getAclId()
{ {
return aclId; return aclId;
} }
public void setAclId(Long aclId) public void setAclId(Long aclId)
{ {
this.aclId = aclId; this.aclId = aclId;
} }
public Map<String, PropertyValue> getProperties() public Map<String, PropertyValue> getProperties()
{ {
return properties; return properties;
} }
public void setProperties(Map<String, PropertyValue> properties) public void setProperties(Map<String, PropertyValue> properties)
{ {
this.properties = properties; this.properties = properties;
} }
public Set<QName> getAspects() public Set<QName> getAspects()
{ {
return aspects; return aspects;
} }
public void setAspects(Set<QName> aspects) public void setAspects(Set<QName> aspects)
{ {
this.aspects = aspects; this.aspects = aspects;
} }
public List<ChildAssociationRef> getChildAssocs() public List<ChildAssociationRef> getChildAssocs()
{ {
return childAssocs; return childAssocs;
} }
public void setChildAssocs(List<ChildAssociationRef> childAssocs) public void setChildAssocs(List<ChildAssociationRef> childAssocs)
{ {
this.childAssocs = childAssocs; this.childAssocs = childAssocs;
} }
} }
} }

21
source/java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
View File

@@ -23,11 +23,9 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.node.NodeDAO;
@@ -167,6 +165,25 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
return transactions; return transactions;
} }
public void testAclChangeSetsGet() throws Exception
{
String url = "/api/solr/aclchangesets?fromTime=" + 0L + "&fromId=" + 0L;
TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
long startTime = System.currentTimeMillis();
Response response = sendRequest(req, Status.STATUS_OK, admin);
long endTime = System.currentTimeMillis();
if(logger.isDebugEnabled())
{
logger.debug(response.getContentAsString());
}
JSONObject json = new JSONObject(response.getContentAsString());
JSONArray aclChangeSets = json.getJSONArray("aclChangeSets");
System.out.println("Got " + aclChangeSets.length() + " txns in " + (endTime - startTime) + " ms");
}
private JSONArray getNodes(GetNodesParameters parameters, int maxResults, int expectedNumNodes) throws Exception private JSONArray getNodes(GetNodesParameters parameters, int maxResults, int expectedNumNodes) throws Exception
{ {
StringBuilder url = new StringBuilder("/api/solr/nodes"); StringBuilder url = new StringBuilder("/api/solr/nodes");

145
source/java/org/alfresco/repo/web/scripts/solr/GetTransactions.java → source/java/org/alfresco/repo/web/scripts/solr/TransactionsGet.java
View File

@@ -1,73 +1,72 @@
/* /*
* Copyright (C) 2005-2011 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.alfresco.repo.web.scripts.solr; package org.alfresco.repo.web.scripts.solr;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.domain.solr.SOLRDAO; import org.alfresco.repo.solr.SOLRTrackingComponent;
import org.alfresco.repo.domain.solr.Transaction; import org.alfresco.repo.solr.Transaction;
import org.alfresco.repo.solr.SOLRTrackingComponent; import org.apache.commons.logging.Log;
import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.LogFactory; import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.WebScriptRequest;
import org.springframework.extensions.webscripts.WebScriptRequest;
/**
/** * Support for SOLR: Get a list of transactions with a commit time greater than or equal to the given parameter.
* Support for SOLR: Get a list of transactions with a commit time greater than or equal to the given parameter. *
* * @since 4.0
* @since 4.0 */
*/ public class TransactionsGet extends DeclarativeWebScript
public class GetTransactions extends DeclarativeWebScript {
{ protected static final Log logger = LogFactory.getLog(TransactionsGet.class);
protected static final Log logger = LogFactory.getLog(GetTransactions.class);
private SOLRTrackingComponent solrTrackingComponent;
private SOLRTrackingComponent solrTrackingComponent;
public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent)
public void setSolrTrackingComponent(SOLRTrackingComponent solrTrackingComponent) {
{ this.solrTrackingComponent = solrTrackingComponent;
this.solrTrackingComponent = solrTrackingComponent; }
}
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status)
protected Map<String, Object> executeImpl(WebScriptRequest req, Status status) {
{ String minTxnIdParam = req.getParameter("minTxnId");
String minTxnIdParam = req.getParameter("minTxnId"); String fromCommitTimeParam = req.getParameter("fromCommitTime");
String fromCommitTimeParam = req.getParameter("fromCommitTime"); String maxResultsParam = req.getParameter("maxResults");
String maxResultsParam = req.getParameter("maxResults");
Long minTxnId = (minTxnIdParam == null ? null : Long.valueOf(minTxnIdParam));
Long minTxnId = (minTxnIdParam == null ? null : Long.valueOf(minTxnIdParam)); Long fromCommitTime = (fromCommitTimeParam == null ? null : Long.valueOf(fromCommitTimeParam));
Long fromCommitTime = (fromCommitTimeParam == null ? null : Long.valueOf(fromCommitTimeParam)); int maxResults = (maxResultsParam == null ? 1024 : Integer.valueOf(maxResultsParam));
int maxResults = (maxResultsParam == null ? 0 : Integer.valueOf(maxResultsParam));
List<Transaction> transactions = solrTrackingComponent.getTransactions(minTxnId, fromCommitTime, maxResults);
List<Transaction> transactions = solrTrackingComponent.getTransactions(minTxnId, fromCommitTime, maxResults);
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f);
Map<String, Object> model = new HashMap<String, Object>(1, 1.0f); model.put("transactions", transactions);
model.put("transactions", transactions);
if (logger.isDebugEnabled())
if (logger.isDebugEnabled()) {
{ logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model);
logger.debug("Result: \n\tRequest: " + req + "\n\tModel: " + model); }
}
return model;
return model; }
}
}
}