From 479bb589bbc0369254b48d393e5f485c88bac313 Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Fri, 7 Apr 2017 14:15:16 +0300 Subject: [PATCH 01/19] First changes. --- .../alfresco/rest/core/oldAPI/BaseApi.java | 439 ++++++++++++++++++ .../rest/rm/community/oldAPI/SearchApi.java | 176 +++++++ 2 files changed, 615 insertions(+) create mode 100644 rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java create mode 100644 rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java new file mode 100644 index 0000000000..2d0616248f --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java @@ -0,0 +1,439 @@ +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2017 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.rest.core.oldAPI; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.alfresco.dataprep.AlfrescoHttpClient; +import org.alfresco.dataprep.AlfrescoHttpClientFactory; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.ParseException; +import org.apache.http.client.methods.HttpDelete; +import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.entity.StringEntity; +import org.apache.http.util.EntityUtils; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +public abstract class BaseApi +{ + // logger + private static final Logger LOGGER = LoggerFactory.getLogger(BaseApi.class); + + /** exception key in JSON response body */ + private static final String EXCEPTION_KEY = "exception"; + + @Autowired + private AlfrescoHttpClientFactory alfrescoHttpClientFactory; + + /** + * Helper method to extract list of properties values from result. + * + * @param result + * @return list of specified property values in result + * @throws RuntimeException for malformed response + */ + public List getPropertyValues(JSONObject result, String propertyName) + { + ArrayList results = new ArrayList(); + try + { + JSONArray items = result.getJSONArray("items"); + + for (int i = 0; i < items.length(); i++) + { + results.add(items.getJSONObject(i).getString(propertyName)); + } + } + catch (JSONException error) + { + throw new RuntimeException("Unable to parse result", error); + } + + return results; + } + + /** + * Helper method to extract property values from request result and put them in map as a list that corresponds to a unique property value. + * + * @param requestResult + * @return a map containing information about multiple properties values that correspond to a unique one + * @throws RuntimeException for malformed response + */ + public Map> getPropertyValuesByUniquePropertyValue(JSONObject requestResult, String uniqueProperty, List otherProperties) + { + Map> valuesByUniqueProperty = new HashMap<>(); + try + { + JSONArray items = requestResult.getJSONArray("items"); + + for (int i = 0; i < items.length(); i++) + { + List otherPropertiesValues = new ArrayList<>(); + + for (int j = 0; j < otherProperties.size(); j++) + { + otherPropertiesValues.add(items.getJSONObject(i).get(otherProperties.get(j)).toString()); + } + valuesByUniqueProperty.put(items.getJSONObject(i).getString(uniqueProperty), otherPropertiesValues); + } + } + catch (JSONException error) + { + throw new RuntimeException("Unable to parse result", error); + } + + return valuesByUniqueProperty; + } + + /** + * Generic faceted request. + * + * @param username + * @param password + * @param parameters if the request has parameters + * @return result object (see API reference for more details), null for any errors + */ + public JSONObject facetedRequest(String username, String password, List parameters, String requestURI) + { + String requestURL; + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + + if (parameters == null || parameters.isEmpty()) + { + requestURL = MessageFormat.format( + requestURI, + client.getAlfrescoUrl()); + } + else + { + requestURL = MessageFormat.format( + requestURI, + client.getAlfrescoUrl(), + URLEncodedUtils.format(parameters, "UTF-8")); + } + client.close(); + return doGetRequest(username, password, requestURL); + } + + /** + * Helper method for GET requests + * @param adminUser user with administrative privileges + * @param adminPassword password for adminUser + * @param urlTemplate request URL template + * @param urlTemplateParams zero or more parameters used with urlTemplate + */ + public JSONObject doGetRequest(String adminUser, + String adminPassword, + String urlTemplate, + String ... urlTemplateParams) + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + String requestUrl = MessageFormat.format( + urlTemplate, + client.getApiUrl(), + urlTemplateParams); + client.close(); + + try + { + return doRequest(HttpGet.class, requestUrl, adminUser, adminPassword, null); + } + catch (InstantiationException | IllegalAccessException error) + { + throw new IllegalArgumentException("doGetRequest failed", error); + } + } + + /** + * Helper method for Delete requests + * @param adminUser user with administrative privileges + * @param adminPassword password for adminUser + * @param urlTemplate request URL template + * @param urlTemplateParams zero or more parameters used with urlTemplate + */ + public JSONObject doDeleteRequest(String adminUser, + String adminPassword, + String urlTemplate, + String ... urlTemplateParams) + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + String requestUrl = MessageFormat.format( + urlTemplate, + client.getApiUrl(), + urlTemplateParams); + client.close(); + + try + { + return doRequest(HttpDelete.class, requestUrl, adminUser, adminPassword, null); + } + catch (InstantiationException | IllegalAccessException error) + { + throw new IllegalArgumentException("doDeleteRequest failed", error); + } + } + + /** + * Helper method for PUT requests + * @param adminUser user with administrative privileges + * @param adminPassword password for adminUser + * @param requestParams zero or more endpoint specific request parameters + * @param urlTemplate request URL template + * @param urlTemplateParams zero or more parameters used with urlTemplate + */ + public JSONObject doPutRequest(String adminUser, + String adminPassword, + JSONObject requestParams, + String urlTemplate, + String ... urlTemplateParams) + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + String requestUrl = MessageFormat.format( + urlTemplate, + client.getApiUrl(), + urlTemplateParams); + client.close(); + + try + { + return doRequest(HttpPut.class, requestUrl, adminUser, adminPassword, requestParams); + } + catch (InstantiationException | IllegalAccessException error) + { + throw new IllegalArgumentException("doPutRequest failed", error); + } + } + + /** + * Helper method for POST requests + * @param adminUser user with administrative privileges + * @param adminPassword password for adminUser + * @param requestParams zero or more endpoint specific request parameters + * @param urlTemplate request URL template + * @param urlTemplateParams zero or more parameters used with urlTemplate + */ + public JSONObject doPostRequest(String adminUser, + String adminPassword, + JSONObject requestParams, + String urlTemplate, + String ... urlTemplateParams) + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + String requestUrl = MessageFormat.format( + urlTemplate, + client.getApiUrl(), + urlTemplateParams); + client.close(); + + try + { + return doRequest(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams); + } + catch (InstantiationException | IllegalAccessException error) + { + throw new IllegalArgumentException("doPostRequest failed", error); + } + } + + /** + * Helper method for POST requests + * + * @param adminUser user with administrative privileges + * @param adminPassword password for adminUser + * @param requestParams zero or more endpoint specific request parameters + * @param urlTemplate request URL template + * @param urlTemplateParams zero or more parameters used with urlTemplate + */ + public boolean doPostJsonRequest(String adminUser, + String adminPassword, + JSONObject requestParams, + String urlTemplate, + String... urlTemplateParams) + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + String requestUrl = MessageFormat.format( + urlTemplate, + client.getApiUrl(), + urlTemplateParams); + client.close(); + + try + { + return doRequestJson(HttpPost.class, requestUrl, adminUser, adminPassword, requestParams); + } + catch (InstantiationException | IllegalAccessException error) + { + throw new IllegalArgumentException("doPostRequest failed", error); + } + } + + /** + * Helper method for handling generic HTTP requests + * @param requestType request type (a subclass of {@link HttpRequestBase}) + * @param requestUrl URL the request is to be sent to + * @param adminUser user with administrative privileges + * @param adminPassword password for adminUser + * @param requestParams endpoint specific request parameters + * @return response body + * @throws IllegalAccessException for invalid requestType + * @throws InstantiationException for invalid requestType + */ + private JSONObject doRequest( + Class requestType, + String requestUrl, + String adminUser, + String adminPassword, + JSONObject requestParams) throws InstantiationException, IllegalAccessException + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + T request = requestType.newInstance(); + + HttpResponse response = null; + JSONObject responseBody = null; + JSONObject returnValues = null; + + try + { + request.setURI(new URI(requestUrl)); + + if (requestParams != null && request instanceof HttpEntityEnclosingRequestBase) + { + ((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity(requestParams.toString())); + } + response = client.execute(adminUser, adminPassword, request); + + try + { + responseBody = new JSONObject(EntityUtils.toString(response.getEntity())); + } + catch (ParseException | IOException | JSONException error) + { + LOGGER.error("Parsing message body failed", error); + } + + switch (response.getStatusLine().getStatusCode()) + { + case HttpStatus.SC_OK: + case HttpStatus.SC_CREATED: + // request successful + if (responseBody != null) + { + returnValues = responseBody; + } + break; + + case HttpStatus.SC_INTERNAL_SERVER_ERROR: + case HttpStatus.SC_BAD_REQUEST: + if (responseBody != null && responseBody.has(EXCEPTION_KEY)) + { + LOGGER.error("Request failed: " + responseBody.getString(EXCEPTION_KEY)); + } + break; + + default: + LOGGER.error("Request returned unexpected HTTP status " + response.getStatusLine().getStatusCode()); + break; + } + } + catch (JSONException error) + { + LOGGER.error("Unable to extract response parameter", error); + } + catch (UnsupportedEncodingException | URISyntaxException error1) + { + LOGGER.error("Unable to construct request", error1); + } + finally + { + if (request != null) + { + request.releaseConnection(); + } + client.close(); + } + + return returnValues; + } + + private boolean doRequestJson( + Class requestType, + String requestUrl, + String adminUser, + String adminPassword, + JSONObject requestParams) throws InstantiationException, IllegalAccessException + { + AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); + T request = requestType.newInstance(); + + try + { + request.setURI(new URI(requestUrl)); + request.setHeader("Content-Type", "application/json"); + + if (requestParams != null && request instanceof HttpEntityEnclosingRequestBase) + { + ((HttpEntityEnclosingRequestBase) request).setEntity(new StringEntity(requestParams.toString())); + } + + return client.execute(adminUser, adminPassword, request).getStatusLine().getStatusCode() == HttpStatus.SC_OK; + } + catch (UnsupportedEncodingException | URISyntaxException error1) + { + LOGGER.error("Unable to construct request", error1); + } + finally + { + if (request != null) + { + request.releaseConnection(); + } + client.close(); + } + + return false; + } +} diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java new file mode 100644 index 0000000000..b67475a6c9 --- /dev/null +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java @@ -0,0 +1,176 @@ +/* + * #%L + * Alfresco Records Management Module + * %% + * Copyright (C) 2005 - 2017 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.rest.rm.community.oldAPI; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.alfresco.dataprep.AlfrescoHttpClientFactory; +import org.alfresco.rest.core.oldAPI.BaseApi; +import org.apache.http.NameValuePair; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.message.BasicNameValuePair; +import org.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * Helper methods for performing search using various Alfresco search APIs. + * @author Kristijan Conkas + * @since 2.5 + */ +@Component +public class SearchApi extends BaseApi +{ + /** http client factory */ + @Autowired private AlfrescoHttpClientFactory alfrescoHttpClientFactory; + + /** faceted search API endpoint */ + private static final String FACETED_SEARCH_ENDPOINT = "{0}alfresco/s/slingshot/rmsearch/faceted/rmsearch?{1}"; + + /** RM search URL template */ + private static final String RM_SEARCH_ENDPOINT = "{0}alfresco/s/slingshot/rmsearch/{1}?{2}"; + + /** RM document search filters */ + private static final String RM_DEFAULT_RECORD_FILTERS = + "records/true,undeclared/true,vital/false,folders/false,categories/false,frozen/false,cutoff/false"; + + /** + * Perform search request on search endpoint as a user. + *

+ * This method is applicable only to endpoints that support HTTP GET requests and return JSON body as response. + * @param searchEndpoint + * @param searchUser + * @param searchPassword + * @return search results as a {@link JSONObject}, please refer to API documentation for details + */ + private JSONObject doSearch( + String searchEndpoint, + String searchUser, + String searchPassword) + { + return facetedRequest(searchUser, searchPassword, null, searchEndpoint); + } + + /** + * Generic rm search. + * @param username + * @param password + * @param site + * @param query + * @param filters + * @return search results (see API reference for more details), null for any errors + */ + public JSONObject rmSearch( + String username, + String password, + String site, + String query, + String filters) + { + List searchParameters = new ArrayList(); + searchParameters.add(new BasicNameValuePair("query", query)); + searchParameters.add(new BasicNameValuePair("filters", filters)); + + String requestURL = MessageFormat.format( + RM_SEARCH_ENDPOINT, + alfrescoHttpClientFactory.getObject().getAlfrescoUrl(), + (site != null) ? site : "rm", + URLEncodedUtils.format(searchParameters, "UTF-8")); + + return doSearch(requestURL, username, password); + } + + /** + * Search as a user for records on site "rm" matching query, using RM_DEFAULT_RECORD_FILTERS. + *
+ * If more fine-grained control of search parameters is required, use rmSearch() directly. + * @param username + * @param password + * @param query + * @return list of record names + */ + public List searchForRecordsAsUser( + String username, + String password, + String query) + { + return getItemNames(rmSearch(username, password, "rm", query, RM_DEFAULT_RECORD_FILTERS)); + } + + /** + * Generic faceted search. + * @param username + * @param password + * @param parameters + * @return search results (see API reference for more details), null for any errors + */ + public JSONObject facetedSearch(String username, String password, List parameters) + { + return facetedRequest(username, password, parameters, FACETED_SEARCH_ENDPOINT); + } + + /** + * Execute faceted search for term. + * @param searchUser + * @param searchPassword + * @param searchTerm + * @return search results (see API reference for more details) + */ + public JSONObject facetedSearchForTerm(String searchUser, String searchPassword, String searchTerm) + { + return facetedSearch( + searchUser, + searchPassword, + Arrays.asList(new BasicNameValuePair("term", searchTerm))); + } + + /** + * Helper method to search for documents as a user using faceted search. + * @param username to search as + * @param password for username + * @param term search term + * @return list of document names found + */ + public List searchForDocumentsAsUser(String username, String password, String term) + { + return getItemNames(facetedSearchForTerm(username, password, term)); + } + + /** + * Helper method to extract list of names from search result. + * @param searchResult + * @return list of document or record names in search result + * @throws RuntimeException for malformed search response + */ + private List getItemNames(JSONObject searchResult) + { + return getPropertyValues(searchResult, "name"); + } +} From 047793b823c5c1c6918b87b8e519d58511da92bf Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Sun, 9 Apr 2017 02:21:48 +0300 Subject: [PATCH 02/19] Actual valid changes. --- .../alfresco/rest/{rm/community => core}/oldAPI/SearchApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/{rm/community => core}/oldAPI/SearchApi.java (99%) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java similarity index 99% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java index b67475a6c9..9ef67f0302 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/oldAPI/SearchApi.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.rm.community.oldAPI; +package org.alfresco.rest.core.oldAPI; import java.text.MessageFormat; import java.util.ArrayList; From 8e38d71d9bacbfaa01223bb1217e82a849b953bb Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Sun, 9 Apr 2017 11:52:58 +0300 Subject: [PATCH 03/19] Some refactoring, moving the methods from classification API to security groups API where they should have been from the start. Trying to make the old classes behave, changing their names. --- .../alfresco/rest/core/oldAPI/{BaseApi.java => Base.java} | 4 ++-- .../rest/{core/oldAPI/SearchApi.java => oldAPI/Search.java} | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/{BaseApi.java => Base.java} (99%) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/{core/oldAPI/SearchApi.java => oldAPI/Search.java} (97%) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java similarity index 99% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java index 2d0616248f..8ac6329aa2 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/BaseApi.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java @@ -58,10 +58,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -public abstract class BaseApi +public abstract class Base { // logger - private static final Logger LOGGER = LoggerFactory.getLogger(BaseApi.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Base.class); /** exception key in JSON response body */ private static final String EXCEPTION_KEY = "exception"; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java similarity index 97% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java index 9ef67f0302..d7f510ac3e 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/SearchApi.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.core.oldAPI; +package org.alfresco.rest.oldAPI; import java.text.MessageFormat; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.List; import org.alfresco.dataprep.AlfrescoHttpClientFactory; -import org.alfresco.rest.core.oldAPI.BaseApi; +import org.alfresco.rest.core.oldAPI.Base; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.message.BasicNameValuePair; @@ -46,7 +46,7 @@ import org.springframework.stereotype.Component; * @since 2.5 */ @Component -public class SearchApi extends BaseApi +public class Search extends Base { /** http client factory */ @Autowired private AlfrescoHttpClientFactory alfrescoHttpClientFactory; From 2b5329b2aec136a1ac5398cc86edc97146778598 Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Sun, 9 Apr 2017 19:42:07 +0300 Subject: [PATCH 04/19] The only pom changes needed for release 2.5. --- rm-automation/pom.xml | 95 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 4 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 5121f23ad8..1e82d8ca5a 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -224,6 +224,87 @@ + + + + + apply-rm-community + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + + + + + org.alfresco + alfresco-rm-community-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-community-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + install-community-repo-amp + + install + + process-test-resources + + true + + ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp + + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + + install-community-share-amp + + install + + process-test-resources + + true + + ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp + + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + + apply-rm-enterprise + + maven-dependency-plugin @@ -267,8 +348,11 @@ process-test-resources true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + @@ -279,8 +363,11 @@ process-test-resources true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + From d30db5bddf9aa499feef8ed581c4af942c96a5cf Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Mon, 10 Apr 2017 12:22:28 +0300 Subject: [PATCH 05/19] Review change. --- .../main/java/org/alfresco/rest/core/{oldAPI => v0}/Base.java | 2 +- .../main/java/org/alfresco/rest/{oldAPI => v0}/Search.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/{oldAPI => v0}/Base.java (99%) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/{oldAPI => v0}/Search.java (98%) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/Base.java similarity index 99% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/Base.java index 8ac6329aa2..207957d9df 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/oldAPI/Base.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/Base.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.core.oldAPI; +package org.alfresco.rest.core.v0; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/Search.java similarity index 98% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/Search.java index d7f510ac3e..acd4dffae5 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/oldAPI/Search.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/Search.java @@ -24,7 +24,7 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.rest.oldAPI; +package org.alfresco.rest.v0; import java.text.MessageFormat; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.List; import org.alfresco.dataprep.AlfrescoHttpClientFactory; -import org.alfresco.rest.core.oldAPI.Base; +import org.alfresco.rest.core.v0.Base; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.message.BasicNameValuePair; From a3ad6f86caa3cdb1e50edbca2351d27499511507 Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Tue, 11 Apr 2017 16:48:18 +0100 Subject: [PATCH 06/19] GERMAN: Amended files for the use of the term "Child" --- .../messages/action-service_de.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties index 4a49744ed5..1b9a44e18e 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties @@ -28,7 +28,7 @@ rm.action.not-hold-type=Die Sperrung konnte nicht aufgehoben werden, da der Knot rm.action.no-read-mime-message=Die MimeType-Nachricht konnte nicht gelesen werden, da {0}. rm.action.email-declared=Die E-Mail konnte nicht geteilt werden, da der Record abgeschlossen ist. (actionedUponNodeRef={0}) rm.action.email-not-record=Die E-Mail konnte nicht geteilt werden, da der Knoten kein Record ist. (actionedUponNodeRef={0}) -rm.action.email-create-child-assoc=Benutzerdefinierte Kindzuordnung konnte nicht erstellt werden. +rm.action.email-create-child-assoc=Benutzerdefinierte Unterzuordnung konnte nicht erstellt werden. rm.action.node-already-transfer=Der Knoten wird bereits \u00fcbertragen. rm.action.node-not-transfer=Der Knoten ist kein \u00dcbertragungsobjekt. rm.action.undo-not-last=Trennung kann nicht aufgehoben werden, da die letzte Entsorgungsaktion nicht getrennt wurde. @@ -39,4 +39,3 @@ rm.action.parameter-not-supplied=Der Parameter ''{0}'' wurde nicht angegeben. rm.action.delete-not-hold-type=Der Sperrbereich konnte nicht gel\u00f6scht werden, da der Knoten nicht vom Typ {0} ist. (actionedUponNodeRef={1}) rm.action.cast-to-rm-type=Eine angepasster Ordner kann nicht in den Records Management Ablageplan hinzugef\u00fcgt werden. rm.action.record-folder-create=Operation fehlgeschlagen, da Sie einen Record-Ordner nicht in einem anderen Record-Ordner erstellen k\u00f6nnen. - From 3d7a93e3cefdd15164e5664af6ab7c622f4cbea1 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Fri, 4 Nov 2016 16:40:30 +0000 Subject: [PATCH 07/19] RM-5013 Cherry-pick "Merge branch 'hotfix-2.5/MNT-17007_solr_query' into 'release/V2.5.0.x'" Hotfix 2.5/mnt 17007 solr query 2.5.0.1 hotfix will contain the fix for the SOLR issue and Audit issue MNT-17007 - Cannot login with other user than admin, after RM 2.5 was installed RM-4249 - RM Audit doesn't work with alfresco 5.2 See merge request !602 Nb. This does not copy across the updates to the automation tests. (cherry picked from commit 54d673c1768eb16ce67f82bd608687592e02e954) --- .../job/NotifyOfRecordsDueForReviewJobExecuter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java index 0838a31372..a1be90c032 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java @@ -84,8 +84,8 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob // notification has not been sent. StringBuilder queryBuffer = new StringBuilder(); queryBuffer.append("+ASPECT:\"rma:vitalRecord\" "); - queryBuffer.append("+(@rma\\:reviewAsOf:[MIN TO NOW] ) "); - queryBuffer.append("+( "); + queryBuffer.append("AND @rma\\:reviewAsOf:[MIN TO NOW] "); + queryBuffer.append("AND ( "); queryBuffer.append("@rma\\:notificationIssued:false "); queryBuffer.append("OR ISNULL:\"rma:notificationIssued\" "); queryBuffer.append(") "); From 9cfd319f531512730ea51ed47fd3fb99d6a10adb Mon Sep 17 00:00:00 2001 From: Oana Nechiforescu Date: Wed, 12 Apr 2017 16:07:42 +0300 Subject: [PATCH 08/19] Additional re-factoring. --- .../src/main/java/org/alfresco/rest/core/v0/BaseAPI.java | 8 ++++++-- .../java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java | 6 ++++++ .../java/org/alfresco/rest/v0/RecordCategoriesAPI.java | 6 ++++++ .../main/java/org/alfresco/rest/v0/RecordFoldersAPI.java | 6 ++++++ .../src/main/java/org/alfresco/rest/v0/RecordsAPI.java | 6 ++++++ .../src/main/java/org/alfresco/rest/v0/SearchAPI.java | 1 + 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java index 234c4ec7c8..18e717bba0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/v0/BaseAPI.java @@ -61,6 +61,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +/** + * The base API class containing common methods for making v0 API requests + * + * @author Kristijan Conkas + * @since 2.5 + */ public abstract class BaseAPI { // logger @@ -607,6 +613,4 @@ public abstract class BaseAPI } return getObjectByPath(username, password, itemPath) == null; } - - } diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java index a88a07c2a9..6d33a69c12 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RMRolesAndActionsAPI.java @@ -57,6 +57,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; +/** + * Methods to make API requests using v0 API on RM items (move, update and other actions) including adding users to RM roles + * + * @author Oana Nechiforescu + * @since 2.5 + */ @Component public class RMRolesAndActionsAPI extends BaseAPI { diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java index df4824ad19..855b633cd0 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordCategoriesAPI.java @@ -37,6 +37,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +/** + * Methods to make API requests using v0 API on record categories + * + * @author Oana Nechiforescu + * @since 2.5 + */ @Component public class RecordCategoriesAPI extends BaseAPI { diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java index af439a1b34..48ac2e0a82 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordFoldersAPI.java @@ -35,6 +35,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +/** + * Methods to make API requests using v0 API on records folders + * + * @author Oana Nechiforescu + * @since 2.5 + */ @Component public class RecordFoldersAPI extends BaseAPI { diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java index b8d3a011c7..126829a099 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/RecordsAPI.java @@ -39,6 +39,12 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +/** + * Methods to make API requests using v0 API on records + * + * @author Oana Nechiforescu + * @since 2.5 + */ @Component public class RecordsAPI extends BaseAPI { diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java index 34af6581ce..7bcfff7d48 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java @@ -42,6 +42,7 @@ import org.springframework.stereotype.Component; /** * Helper methods for performing search using various Alfresco search APIs. + * * @author Kristijan Conkas * @since 2.5 */ From d07fbc9f860c6b99ea7c0ce9c4e8f9bda2d2b156 Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:04:18 +0100 Subject: [PATCH 09/19] GERMAN: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_de.properties | 3 +++ .../messages/records-model_de.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties index e8e0b7be46..347b9d0c0a 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=Audit l\u00f6schen rm.audit.audit-view=Audit anzeigen rm.audit.trail-file-fail=Audit-Bericht konnte nicht generiert werden. \u00dcberpr\u00fcfen Sie die Audit-Details und versuchen Sie es erneut. Sie k\u00f6nnen sich auch an Ihre IT-Abteilung wenden. rm.audit.audit-report=Audit-Bericht +rm.audit.set-permission=Berechtigung setzen +rm.audit.enable-inherit-permission=Vererbte Berechtigungen aktiv +rm.audit.disable-inherit-permission=Vererbte Berechtigungen inaktiv recordable-version-config=Optionen f\u00fcr automatische Deklaration diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties index 31ce0685a9..3ee924597a 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_de.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=Besonders relevanter Record rma_recordsmanagement.aspect.rma_vitalRecord.decription=Besonders relevanter Record rma_recordsmanagement.property.rma_reviewAsOf.title=N\u00e4chste \u00dcberpr\u00fcfung rma_recordsmanagement.property.rma_reviewAsOf.decription=N\u00e4chste \u00dcberpr\u00fcfung -rma_recordsmanagement.property.rma_notificationIssued.title=Gibt an, dass f\u00fcr diesen Record eine Benachrichtigung aufgrund einer f\u00e4lligen \u00dcberpr\u00fcfung ausgegeben wurde. -rma_recordsmanagement.property.rma_notificationIssued.decription=Gibt an, dass f\u00fcr diesen Record eine Benachrichtigung aufgrund einer f\u00e4lligen \u00dcberpr\u00fcfung ausgegeben wurde. rma_recordsmanagement.aspect.rma_scheduled.title=Geplant rma_recordsmanagement.aspect.rma_scheduled.decription=Geplant From 62f431ca82eace134ca1c1676289fd72b097bee8 Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:05:30 +0100 Subject: [PATCH 10/19] SPANISH: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_es.properties | 3 +++ .../messages/records-model_es.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties index 2b025db6f7..f1b82aad91 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=Limpiar auditor\u00eda rm.audit.audit-view=Ver auditor\u00eda rm.audit.trail-file-fail=No se pudo generar un informe de auditor\u00eda. Compruebe los detalles de auditor\u00eda y vuelva a intentarlo, o hable con el dep. de TI. rm.audit.audit-report=Informe de auditor\u00eda +rm.audit.set-permission=Establecer permisos +rm.audit.enable-inherit-permission=Permisos heredados activados +rm.audit.disable-inherit-permission=Permisos heredados desactivados recordable-version-config=Opciones de declaraci\u00f3n autom\u00e1tica diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties index d15d10d161..517c1d9a18 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_es.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=Documento de archivo vital rma_recordsmanagement.aspect.rma_vitalRecord.decription=Documento de archivo vital rma_recordsmanagement.property.rma_reviewAsOf.title=Pr\u00f3xima revisi\u00f3n rma_recordsmanagement.property.rma_reviewAsOf.decription=Pr\u00f3xima revisi\u00f3n -rma_recordsmanagement.property.rma_notificationIssued.title=Indica que se ha emitido una notificaci\u00f3n de pendiente de revisi\u00f3n para este documento de archivo -rma_recordsmanagement.property.rma_notificationIssued.decription=Indica que se ha emitido una notificaci\u00f3n de pendiente de revisi\u00f3n para este documento de archivo rma_recordsmanagement.aspect.rma_scheduled.title=Planificado rma_recordsmanagement.aspect.rma_scheduled.decription=Planificado From 7789ce215b1fdfa99a90f9019d03d53fd45dfe2d Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:06:22 +0100 Subject: [PATCH 11/19] ITALIAN: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_it.properties | 3 +++ .../messages/records-model_it.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties index 0901432148..8308977421 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=Cancellazione audit rm.audit.audit-view=Visualizzazione audit rm.audit.trail-file-fail=Impossibile generare il rapporto di audit. Verificare i dettagli dell'audit e riprovare o contattare il proprio dipartimento I.T. I.T. rm.audit.audit-report=Rapporto audit +rm.audit.set-permission=Imposta autorizzazione +rm.audit.enable-inherit-permission=Autorizzazioni ereditate attivate +rm.audit.disable-inherit-permission=Autorizzazioni ereditate disattivate recordable-version-config=Opzioni di dichiarazione automatica diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties index af5c55064c..72724015bb 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_it.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=Record fondamentale rma_recordsmanagement.aspect.rma_vitalRecord.decription=Record fondamentale rma_recordsmanagement.property.rma_reviewAsOf.title=Prossimo esame rma_recordsmanagement.property.rma_reviewAsOf.decription=Prossimo esame -rma_recordsmanagement.property.rma_notificationIssued.title=Indica che \u00e8 stata rilasciata una notifica di esame per questo record -rma_recordsmanagement.property.rma_notificationIssued.decription=Indica che \u00e8 stata rilasciata una notifica di esame per questo record rma_recordsmanagement.aspect.rma_scheduled.title=Programmato rma_recordsmanagement.aspect.rma_scheduled.decription=Programmato From 89f87a87c6753bea10c5d68fcddfc8a9e757bfde Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:07:06 +0100 Subject: [PATCH 12/19] JAPANESE: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_ja.properties | 3 +++ .../messages/records-model_ja.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties index 0df2727ab8..6bfdfc7e5c 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=\u76e3\u67fb\u306e\u6d88\u53bb rm.audit.audit-view=\u76e3\u67fb\u306e\u8868\u793a rm.audit.trail-file-fail=\u76e3\u67fb\u30ec\u30dd\u30fc\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 \u76e3\u67fb\u306e\u8a73\u7d30\u3092\u78ba\u8a8d\u3057\u3066\u304b\u3089\u64cd\u4f5c\u3092\u3084\u308a\u76f4\u3059\u304b\u3001IT \u62c5\u5f53\u8005\u306b\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 rm.audit.audit-report=\u76e3\u67fb\u30ec\u30dd\u30fc\u30c8 +rm.audit.set-permission=\u6a29\u9650\u306e\u8a2d\u5b9a +rm.audit.enable-inherit-permission=\u6a29\u9650\u306e\u8a2d\u5b9a +rm.audit.disable-inherit-permission=\u6a29\u9650\u306e\u8a2d\u5b9a recordable-version-config=\u81ea\u52d5\u5ba3\u8a00\u30aa\u30d7\u30b7\u30e7\u30f3 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties index 783157feb8..2a6c27af1a 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=\u30d0\u30a4\u30bf\u30eb\u30e rma_recordsmanagement.aspect.rma_vitalRecord.decription=\u30d0\u30a4\u30bf\u30eb\u30ec\u30b3\u30fc\u30c9 rma_recordsmanagement.property.rma_reviewAsOf.title=\u6b21\u56de\u306e\u30ec\u30d3\u30e5\u30fc rma_recordsmanagement.property.rma_reviewAsOf.decription=\u6b21\u56de\u306e\u30ec\u30d3\u30e5\u30fc -rma_recordsmanagement.property.rma_notificationIssued.title=\u3053\u306e\u30ec\u30b3\u30fc\u30c9\u306e\u30ec\u30d3\u30e5\u30fc\u4e88\u5b9a\u304c\u901a\u77e5\u3055\u308c\u305f\u3053\u3068\u3092\u793a\u3057\u307e\u3059 -rma_recordsmanagement.property.rma_notificationIssued.decription=\u3053\u306e\u30ec\u30b3\u30fc\u30c9\u306e\u30ec\u30d3\u30e5\u30fc\u4e88\u5b9a\u304c\u901a\u77e5\u3055\u308c\u305f\u3053\u3068\u3092\u793a\u3057\u307e\u3059 rma_recordsmanagement.aspect.rma_scheduled.title=\u30b9\u30b1\u30b8\u30e5\u30fc\u30eb\u6e08\u307f rma_recordsmanagement.aspect.rma_scheduled.decription=\u30b9\u30b1\u30b8\u30e5\u30fc\u30eb\u6e08\u307f From 720558f187746c5d1c40b08516ab60670f19268a Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:07:48 +0100 Subject: [PATCH 13/19] NORWEGIAN BOKMAL: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_nb.properties | 3 +++ .../messages/records-model_nb.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nb.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nb.properties index 0ed3afac1e..295c293b7c 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nb.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nb.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=Slett revisjon rm.audit.audit-view=Vis revisjon rm.audit.trail-file-fail=Kunne ikke generere en revisjonsrapport. Kontroller revisjonsdetaljene, og pr\u00f8v igjen eller snakk med din IT- avdeling. rm.audit.audit-report=Revisjonsrapport +rm.audit.set-permission=Still inn tillatelsen +rm.audit.enable-inherit-permission=Arvede tillatelser sl\u00e5tt p\u00e5 +rm.audit.disable-inherit-permission=Arvede tillatelser sl\u00e5tt av recordable-version-config=Alternativer med automatiske erkl\u00e6ringer diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nb.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nb.properties index b93a05b031..5fcdf8d9d9 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nb.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nb.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=Sv\u00e6rt viktig oppf\u00f8r rma_recordsmanagement.aspect.rma_vitalRecord.decription=Sv\u00e6rt viktig oppf\u00f8ring rma_recordsmanagement.property.rma_reviewAsOf.title=Neste gjennomgang rma_recordsmanagement.property.rma_reviewAsOf.decription=Neste gjennomgang -rma_recordsmanagement.property.rma_notificationIssued.title=Indikerer at en melding om at denne oppf\u00f8ringen skal gjennomg\u00e5s, er blitt utstedt -rma_recordsmanagement.property.rma_notificationIssued.decription=Indikerer at en melding om at denne oppf\u00f8ringen skal gjennomg\u00e5s, er blitt utstedt rma_recordsmanagement.aspect.rma_scheduled.title=Planlagt rma_recordsmanagement.aspect.rma_scheduled.decription=Planlagt From 1451479eb87b69efd2041b731c85cb19ad0597eb Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:08:23 +0100 Subject: [PATCH 14/19] DUTCH: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_nl.properties | 3 +++ .../messages/records-model_nl.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nl.properties index 37731dbda4..f547c80dce 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nl.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=Audit wissen rm.audit.audit-view=Audit bekijken rm.audit.trail-file-fail=Kan geen auditrapport maken. Controleer de auditgegevens en probeer het opnieuw of neem contact op met uw IT- afdeling rm.audit.audit-report=Auditrapport +rm.audit.set-permission=Recht instellen +rm.audit.enable-inherit-permission=Overgenomen rechten ingeschakeld +rm.audit.disable-inherit-permission=Overgenomen rechten uitgeschakeld recordable-version-config=Opties voor automatisch declareren diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nl.properties index b3f8f058b2..85cd12fc68 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_nl.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=Vitale record rma_recordsmanagement.aspect.rma_vitalRecord.decription=Vitale record rma_recordsmanagement.property.rma_reviewAsOf.title=Volgende revisie rma_recordsmanagement.property.rma_reviewAsOf.decription=Volgende revisie -rma_recordsmanagement.property.rma_notificationIssued.title=Geeft aan dat er een revisie-gereedmelding is afgegeven voor deze record -rma_recordsmanagement.property.rma_notificationIssued.decription=Geeft aan dat er een revisie-gereedmelding is afgegeven voor deze record rma_recordsmanagement.aspect.rma_scheduled.title=Gepland rma_recordsmanagement.aspect.rma_scheduled.decription=Gepland From 1e92de45e380ac2e77e8597c8ae632b7a7611f2b Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:09:01 +0100 Subject: [PATCH 15/19] RUSSIAN: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_ru.properties | 3 +++ .../messages/records-model_ru.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ru.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ru.properties index a59fa47df0..9db574317f 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ru.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ru.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=\u041e\u0447\u0438\u0441\u0442\u043a\u0430 \u0430\u0443\u04 rm.audit.audit-view=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0430\u0443\u0434\u0438\u0442\u0430 rm.audit.trail-file-fail=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u043e\u0442\u0447\u0435\u0442 \u043e\u0431 \u0430\u0443\u0434\u0438\u0442\u0435. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0430\u0443\u0434\u0438\u0442\u0430 \u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u0438\u043b\u0438 \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u0432 IT- \u043e\u0442\u0434\u0435\u043b. rm.audit.audit-report=\u041e\u0442\u0447\u0435\u0442 \u043e\u0431 \u0430\u0443\u0434\u0438\u0442\u0435 +rm.audit.set-permission=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435 +rm.audit.enable-inherit-permission=\u0423\u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u044b +rm.audit.disable-inherit-permission=\u0423\u043d\u0430\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u044b recordable-version-config=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e \u043e\u0431\u044a\u044f\u0432\u043b\u0435\u043d\u0438\u044f diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ru.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ru.properties index a780e43969..d92cd7be33 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ru.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ru.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=\u041a\u043b\u044e\u0447\u043 rma_recordsmanagement.aspect.rma_vitalRecord.decription=\u041a\u043b\u044e\u0447\u0435\u0432\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c rma_recordsmanagement.property.rma_reviewAsOf.title=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 rma_recordsmanagement.property.rma_reviewAsOf.decription=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 -rma_recordsmanagement.property.rma_notificationIssued.title=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442, \u0447\u0442\u043e \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043e \u0437\u0430\u043f\u0438\u0441\u0438, \u043f\u043e\u0434\u043b\u0435\u0436\u0430\u0449\u0435\u0439 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435 -rma_recordsmanagement.property.rma_notificationIssued.decription=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442, \u0447\u0442\u043e \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043e \u0437\u0430\u043f\u0438\u0441\u0438, \u043f\u043e\u0434\u043b\u0435\u0436\u0430\u0449\u0435\u0439 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435 rma_recordsmanagement.aspect.rma_scheduled.title=\u0417\u0430\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u043e rma_recordsmanagement.aspect.rma_scheduled.decription=\u0417\u0430\u043f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u043e From 50b363178df85ffe8d47117f061f671bb7786661 Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:09:49 +0100 Subject: [PATCH 16/19] BRAZILIAN PORTUGUESE: Updated bundles based on EN rev2017-04-11. --- .../messages/audit-service_pt_BR.properties | 3 +++ .../messages/records-model_pt_BR.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_pt_BR.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_pt_BR.properties index 60837c95db..f55fc7b90f 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_pt_BR.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_pt_BR.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=Limpeza de auditoria rm.audit.audit-view=Exibi\u00e7\u00e3o de auditoria rm.audit.trail-file-fail=N\u00e3o \u00e9 poss\u00edvel gerar um relat\u00f3rio de auditoria. Verifique os detalhes de auditoria e tente novamente, ou entre em contato com o Dept. de TI. rm.audit.audit-report=Relat\u00f3rio de auditoria +rm.audit.set-permission=Definir Permiss\u00e3o +rm.audit.enable-inherit-permission=Permiss\u00f5es herdadas ativadas +rm.audit.disable-inherit-permission=Permiss\u00f5es herdadas desativadas recordable-version-config=Op\u00e7\u00f5es de auto declara\u00e7\u00e3o diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_pt_BR.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_pt_BR.properties index 60082f9de3..f589b6c25a 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_pt_BR.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_pt_BR.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=Documento arquiv\u00edstico v rma_recordsmanagement.aspect.rma_vitalRecord.decription=Documento arquiv\u00edstico vital rma_recordsmanagement.property.rma_reviewAsOf.title=Pr\u00f3xima revis\u00e3o rma_recordsmanagement.property.rma_reviewAsOf.decription=Pr\u00f3xima revis\u00e3o -rma_recordsmanagement.property.rma_notificationIssued.title=Indica que foi emitida uma notifica\u00e7\u00e3o de prazo para revis\u00e3o para este documento arquiv\u00edstico -rma_recordsmanagement.property.rma_notificationIssued.decription=Indica que foi emitida uma notifica\u00e7\u00e3o de prazo para revis\u00e3o para este documento arquiv\u00edstico rma_recordsmanagement.aspect.rma_scheduled.title=Programado rma_recordsmanagement.aspect.rma_scheduled.decription=Programado From cf94e23efdbdb77acb8497cea97940375bc40454 Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Thu, 13 Apr 2017 11:10:30 +0100 Subject: [PATCH 17/19] SIMPLIFIED CHINESE --- .../messages/audit-service_zh_CN.properties | 3 +++ .../messages/records-model_zh_CN.properties | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_zh_CN.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_zh_CN.properties index a97467744d..38be513e1c 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_zh_CN.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_zh_CN.properties @@ -14,4 +14,7 @@ rm.audit.audit-clear=\u6e05\u9664\u5ba1\u8ba1 rm.audit.audit-view=\u67e5\u770b\u5ba1\u8ba1 rm.audit.trail-file-fail=\u6211\u4eec\u65e0\u6cd5\u751f\u6210\u5ba1\u8ba1\u62a5\u544a\u3002 \u68c0\u67e5\u5ba1\u8ba1\u8be6\u7ec6\u4fe1\u606f\u5e76\u91cd\u8bd5\uff0c\u6216\u8005\u54a8\u8be2\u60a8\u7684 IT \u90e8\u95e8\u3002 rm.audit.audit-report=\u5ba1\u8ba1\u62a5\u544a +rm.audit.set-permission=\u8bbe\u7f6e\u6743\u9650 +rm.audit.enable-inherit-permission=\u7ee7\u627f\u7684\u6743\u9650\u5df2\u6253\u5f00 +rm.audit.disable-inherit-permission=\u7ee7\u627f\u7684\u6743\u9650\u5df2\u5173\u95ed recordable-version-config=\u81ea\u52a8\u58f0\u660e\u9009\u9879 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_zh_CN.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_zh_CN.properties index 89413a3a32..0472358f41 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_zh_CN.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_zh_CN.properties @@ -174,8 +174,6 @@ rma_recordsmanagement.aspect.rma_vitalRecord.title=\u6838\u5fc3\u8bb0\u5f55 rma_recordsmanagement.aspect.rma_vitalRecord.decription=\u6838\u5fc3\u8bb0\u5f55 rma_recordsmanagement.property.rma_reviewAsOf.title=\u4e0b\u4e2a\u5ba1\u67e5 rma_recordsmanagement.property.rma_reviewAsOf.decription=\u4e0b\u4e2a\u5ba1\u67e5 -rma_recordsmanagement.property.rma_notificationIssued.title=\u6307\u793a\u5df2\u7ecf\u4e3a\u8be5\u8bb0\u5f55\u53d1\u51fa\u5ba1\u67e5\u5230\u671f\u901a\u77e5 -rma_recordsmanagement.property.rma_notificationIssued.decription=\u6307\u793a\u5df2\u7ecf\u4e3a\u8be5\u8bb0\u5f55\u53d1\u51fa\u5ba1\u67e5\u5230\u671f\u901a\u77e5 rma_recordsmanagement.aspect.rma_scheduled.title=\u5df2\u8ba1\u5212 rma_recordsmanagement.aspect.rma_scheduled.decription=\u5df2\u8ba1\u5212 From e4fb71bfdbed44a5259bb6be2bb2ff7a1d5c8cd2 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 17 Apr 2017 19:48:32 +0100 Subject: [PATCH 18/19] [maven-release-plugin] prepare release V2.4.1 --- pom.xml | 5 +++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c17028843d..a84d5c6658 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.4.1-SNAPSHOT + 2.4.1 Alfresco Records Management @@ -24,7 +24,8 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - + V2.4.1 + JIRA diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index cdfcdcf6e9..0a25e6f902 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.4.1-SNAPSHOT + 2.4.1 diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 84ea4765b3..0db56049ef 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.4.1-SNAPSHOT + 2.4.1 diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 3fe0b4b3e3..230b08dd14 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.4.1-SNAPSHOT + 2.4.1 From 1a47c4c44c5f868e355d97cda43408f5a9c1d3cc Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 17 Apr 2017 19:48:35 +0100 Subject: [PATCH 19/19] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- rm-automation/pom.xml | 2 +- rm-community/pom.xml | 2 +- rm-community/rm-community-repo/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a84d5c6658..2a97a41782 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-rm pom - 2.4.1 + 2.4.2-SNAPSHOT Alfresco Records Management @@ -24,7 +24,7 @@ scm:git:https://git.alfresco.com/records-management/records-management.git scm:git:https://git.alfresco.com/records-management/records-management.git https://git.alfresco.com/records-management/records-management - V2.4.1 + HEAD diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index 0a25e6f902..9682245bf1 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.4.1 + 2.4.2-SNAPSHOT diff --git a/rm-community/pom.xml b/rm-community/pom.xml index 0db56049ef..d149998854 100644 --- a/rm-community/pom.xml +++ b/rm-community/pom.xml @@ -8,7 +8,7 @@ org.alfresco alfresco-rm - 2.4.1 + 2.4.2-SNAPSHOT diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index 230b08dd14..0cb12aeee9 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -9,7 +9,7 @@ org.alfresco alfresco-rm-community - 2.4.1 + 2.4.2-SNAPSHOT