From e7dab88424d17d4dda4b5db3d5f5eb2f6f983882 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 07:02:45 +0300 Subject: [PATCH 01/75] APPS-261 Initial setup for WORM test automation --- .travis.yml | 8 ++++++ scripts/init.sh | 18 +++++++++++++ scripts/start-compose.sh | 58 ++++++++++++++++++++++++++++++++++++++++ scripts/stop-compose.sh | 19 +++++++++++++ scripts/worm-mb-tests.sh | 35 ++++++++++++++++++++++++ 5 files changed, 138 insertions(+) create mode 100644 scripts/init.sh create mode 100644 scripts/start-compose.sh create mode 100644 scripts/stop-compose.sh create mode 100644 scripts/worm-mb-tests.sh diff --git a/.travis.yml b/.travis.yml index 1ede9fe6aa..3ffc1297fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,6 +61,14 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Enterprise WORM automated Tests" + stage: tests + before_install: bash scripts/init.sh + script: bash scripts/worm-mb-tests.sh + # after_script: bash _ci/cleanup.sh + - echo "Enterprise WORM automated Tests" + + - name: "Community Integrations Tests on MySQL" stage: Tests script: diff --git a/scripts/init.sh b/scripts/init.sh new file mode 100644 index 0000000000..80c19417a1 --- /dev/null +++ b/scripts/init.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +echo "=========================== Starting Init Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex +pushd "$(dirname "${BASH_SOURCE[0]}")/../" + +mkdir -p ${HOME}/.m2 && cp -rf _ci/settings.xml ${HOME}/.m2/ +echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io +find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf + +# Enable experimental docker features (e.g. squash options) +echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json +sudo service docker restart + +popd +set +vex +echo "=========================== Finishing Init Script ==========================" \ No newline at end of file diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh new file mode 100644 index 0000000000..8845699d5d --- /dev/null +++ b/scripts/start-compose.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash + +export DOCKER_COMPOSE_PATH=$1 + +if [ -z "$DOCKER_COMPOSE_PATH" ] +then + echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" + exit 1 +fi + +# Fix uppercase bucket name if set +if [ -n "${S3_BUCKET_NAME}" ] +then + export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" +fi + +export DOCKER_COMPOSE_PATH=$1 + +if [ -z "$DOCKER_COMPOSE_PATH" ] +then + echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" + exit 1 +fi + +echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}" + +# .env files are picked up from project directory correctly on docker-compose 1.23.0+ +docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d + +if [ $? -eq 0 ] +then + echo "Docker Compose started ok" +else + echo "Docker Compose failed to start" >&2 + exit 1 +fi + +WAIT_INTERVAL=1 +COUNTER=0 +TIMEOUT=300 +t0=`date +%s` + +echo "Waiting for alfresco to start" +until $(curl --output /dev/null --silent --head --fail http://localhost:8080/alfresco) || [ "$COUNTER" -eq "$TIMEOUT" ]; do + printf '.' + sleep $WAIT_INTERVAL + COUNTER=$(($COUNTER+$WAIT_INTERVAL)) +done + +if (("$COUNTER" < "$TIMEOUT")) ; then + t1=`date +%s` + delta=$((($t1 - $t0)/60)) + echo "Alfresco Started in $delta minutes" +else + echo "Waited $COUNTER seconds" + echo "Alfresco Could not start in time." + exit 1 +fi \ No newline at end of file diff --git a/scripts/stop-compose.sh b/scripts/stop-compose.sh new file mode 100644 index 0000000000..6fe5738624 --- /dev/null +++ b/scripts/stop-compose.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +export DOCKER_COMPOSE_PATH=$1 + +if [ -z "$DOCKER_COMPOSE_PATH" ] +then + echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" + exit 1 +fi + +echo "Killing ACS stack in ${DOCKER_COMPOSE_PATH}" + +cd ${DOCKER_COMPOSE_PATH} + +docker-compose ps +# logs for debug +docker-compose logs --no-color -t alfresco +docker-compose kill +docker-compose rm -fv \ No newline at end of file diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh new file mode 100644 index 0000000000..3ca38a97f6 --- /dev/null +++ b/scripts/worm-mb-tests.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +echo "=========================== Starting Integration Tests Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex +pushd "$(dirname "${BASH_SOURCE[0]}")/../" + +export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} +export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} + +export BUCKET_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" +export BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" + +export S3_BUCKET_REGION="eu-west-1" +export S3_BUCKET_NAME="${BUCKET_NAME}" +export S3_BUCKET2_NAME="${BUCKET2_NAME}" +export S3_PROTOCOL=s3v2 +export S3_BUCKET2_PROTOCOL=s3vTest + +mvn -B -U clean install -DskipTests -Pbuild-test-image + +./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml + +# Run the WORM tests +# mvn -B -U clean test \ +# -Prun-tas-tests,run-multiple-buckets-tests \ +# -Denvironment=default \ +# -DrunBugs=false \ +# -Dalfresco.port=8080 \ +# -Dconnector.s3.bucketName=${BUCKET_NAME2} + + +popd +set +vex +echo "=========================== Finishing Integration Tests Script ==========================" \ No newline at end of file From 75ef7e26d4aacb999996c54d0a0932b66f40ac69 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 07:11:43 +0300 Subject: [PATCH 02/75] APPS:261 minor changes --- .travis.yml | 128 ++++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ffc1297fe..17b645b3c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,70 +69,70 @@ jobs: - echo "Enterprise WORM automated Tests" - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am - install: - - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community Rest API Tests" - - name: "Enterprise Rest API Tests" - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - install: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise Rest API Tests" - - name: "Community UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am - install: - - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." - stage: Tests - before_install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - install: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise UI Tests ..." + # - name: "Community Integrations Tests on MySQL" + # stage: Tests + # script: + # - echo "Community Integrations Tests on MySQL" + # - name: "Enterprise Integrations Tests on MySQL" + # stage: Tests + # script: + # - echo "Enterprise Integrations Tests on MySQL" + # - name: "Community Rest API Tests" + # stage: Tests + # before_install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am + # install: + # - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + # - bash scripts/waitForAlfrescoToStart.sh + # script: + # - echo "Community Rest API Tests" + # - name: "Enterprise Rest API Tests" + # stage: Tests + # before_install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am + # install: + # - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + # - bash scripts/waitForAlfrescoToStart.sh + # script: + # - echo "Enterprise Rest API Tests" + # - name: "Community UI Tests ..." + # stage: Tests + # before_install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am + # install: + # - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + # - bash scripts/waitForAlfrescoToStart.sh + # script: + # - echo "Community UI Tests ..." + # - name: "Enterprise UI Tests ..." + # stage: Tests + # before_install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + # install: + # - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + # - bash scripts/waitForAlfrescoToStart.sh + # script: + # - echo "Enterprise UI Tests ..." - - name: "Source Clear Scan (SCA)" - stage: Security Scans - script: - - echo "Source Clear Scan (SCA)" - - name: "Static Analysis (SAST)" - stage: Security Scans - script: - - echo "Static Analysis (SAST)" + # - name: "Source Clear Scan (SCA)" + # stage: Security Scans + # script: + # - echo "Source Clear Scan (SCA)" + # - name: "Static Analysis (SAST)" + # stage: Security Scans + # script: + # - echo "Static Analysis (SAST)" - - name: "Community Release" - stage: Release - script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" + # - name: "Community Release" + # stage: Release + # script: + # - echo "Community Release" + # - name: "Enterprise Release" + # stage: Release + # script: + # - echo "Enterprise Release" - - name: "Copy to S3 Release Bucket" - stage: Publish - script: - - echo "Copy to S3 Release Bucket" + # - name: "Copy to S3 Release Bucket" + # stage: Publish + # script: + # - echo "Copy to S3 Release Bucket" From 9275ce785d7152f567874253c88f49a9b936b228 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 07:20:13 +0300 Subject: [PATCH 03/75] APPS-261 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17b645b3c3..9666e98b88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ jobs: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Enterprise WORM automated Tests" - stage: tests + stage: Tests before_install: bash scripts/init.sh script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh From 1661ab8b9669c424b5c92b8699d58d5ea3362f5b Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 11:01:06 +0300 Subject: [PATCH 04/75] APPS-261 first build --- .travis.yml | 14 +++++++------- scripts/worm-mb-tests.sh | 17 +++++------------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9666e98b88..7429449d09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,19 +61,19 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Enterprise WORM automated Tests" + - name: "Enterprise WORM Tests" stage: Tests before_install: bash scripts/init.sh script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh - - echo "Enterprise WORM automated Tests" + - echo "Enterprise WORM Tests" - # - name: "Community Integrations Tests on MySQL" - # stage: Tests - # script: - # - echo "Community Integrations Tests on MySQL" - # - name: "Enterprise Integrations Tests on MySQL" + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" # stage: Tests # script: # - echo "Enterprise Integrations Tests on MySQL" diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 3ca38a97f6..43a3fa29d7 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -8,12 +8,9 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} -export BUCKET_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" -export BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" - export S3_BUCKET_REGION="eu-west-1" -export S3_BUCKET_NAME="${BUCKET_NAME}" -export S3_BUCKET2_NAME="${BUCKET2_NAME}" +export S3_BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" +export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest @@ -22,13 +19,9 @@ mvn -B -U clean install -DskipTests -Pbuild-test-image ./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests -# mvn -B -U clean test \ -# -Prun-tas-tests,run-multiple-buckets-tests \ -# -Denvironment=default \ -# -DrunBugs=false \ -# -Dalfresco.port=8080 \ -# -Dconnector.s3.bucketName=${BUCKET_NAME2} - +mvn -B -U clean test \ + -DsuiteXmlFile=wormTestSuite.xml + -Dconnector.s3.bucketName=${S3_BUCKET2_NAME} popd set +vex From 2799ce665672368c625243b3373bbc6da2ebaecb Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 11:38:32 +0300 Subject: [PATCH 05/75] APPS-261 travis.yml changes --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7429449d09..f08b7f0f58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +--- import: - source: travis-env-vars.yml os: linux @@ -66,8 +67,6 @@ jobs: before_install: bash scripts/init.sh script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh - - echo "Enterprise WORM Tests" - - name: "Community Integrations Tests on MySQL" stage: Tests From e47c1b5616cf8583ecf83da906fc850797782ea7 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 12:33:47 +0300 Subject: [PATCH 06/75] APPS-261 changes to init.sh --- scripts/init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init.sh b/scripts/init.sh index 80c19417a1..f038e39785 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -5,7 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" -mkdir -p ${HOME}/.m2 && cp -rf _ci/settings.xml ${HOME}/.m2/ +mkdir -p ${HOME}/.m2 && cp -rf ./.travis.settings.xml ${HOME}/.m2/ echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf From 9b48ff2580151b94c49910ae8c37d0d241b9f7be Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 15:07:34 +0300 Subject: [PATCH 07/75] APPS-261 tweaks to scripts --- .travis.yml | 74 +++++++++++++++++++--------------------- scripts/init.sh | 18 ---------- scripts/worm-mb-tests.sh | 2 +- 3 files changed, 37 insertions(+), 57 deletions(-) delete mode 100644 scripts/init.sh diff --git a/.travis.yml b/.travis.yml index f08b7f0f58..03add09234 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,9 @@ cache: - $HOME/.m2 # the cache can grow constantly -before_cache: - - rm -rf $HOME/.m2/repository/org/alfresco/alfresco-governance-services* +before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* -before_install: - - "cp .travis.settings.xml $HOME/.m2/settings.xml" +before_install: cp .travis.settings.xml ${HOME}/.m2/settings.xml install: skip stages: @@ -39,75 +37,75 @@ stages: jobs: include: - - name: "Build AGS Community" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # - name: "Build AGS Community" + # stage: Build AGS + # before_script: source scripts/setUpMavenPhase.sh + # script: + # - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Build AGS Enterprise" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 30 mvn -B deploy -N - - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # - name: "Build AGS Enterprise" + # stage: Build AGS + # before_script: source scripts/setUpMavenPhase.sh + # install: + # - travis_retry travis_wait 30 mvn -B deploy -N + # - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # script: + # - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Build AGS Benchmark" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # - name: "Build AGS Benchmark" + # stage: Build AGS + # before_script: source scripts/setUpMavenPhase.sh + # install: + # - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # script: + # - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Enterprise WORM Tests" stage: Tests - before_install: bash scripts/init.sh + install: travis_retry mvn -B -U clean install -DskipTests script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" + # - name: "Community Integrations Tests on MySQL" + # stage: Tests + # script: + # - echo "Community Integrations Tests on MySQL" + # - name: "Enterprise Integrations Tests on MySQL" # stage: Tests # script: # - echo "Enterprise Integrations Tests on MySQL" # - name: "Community Rest API Tests" # stage: Tests - # before_install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am # install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am + # before_script: # - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH # - bash scripts/waitForAlfrescoToStart.sh # script: # - echo "Community Rest API Tests" # - name: "Enterprise Rest API Tests" # stage: Tests - # before_install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am # install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am + # before_script: # - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH # - bash scripts/waitForAlfrescoToStart.sh # script: # - echo "Enterprise Rest API Tests" # - name: "Community UI Tests ..." # stage: Tests - # before_install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am # install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am + # before_script: # - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH # - bash scripts/waitForAlfrescoToStart.sh # script: # - echo "Community UI Tests ..." # - name: "Enterprise UI Tests ..." # stage: Tests - # before_install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am # install: + # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + # before_script: # - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH # - bash scripts/waitForAlfrescoToStart.sh # script: diff --git a/scripts/init.sh b/scripts/init.sh deleted file mode 100644 index f038e39785..0000000000 --- a/scripts/init.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -echo "=========================== Starting Init Script ===========================" -PS4="\[\e[35m\]+ \[\e[m\]" -set -vex -pushd "$(dirname "${BASH_SOURCE[0]}")/../" - -mkdir -p ${HOME}/.m2 && cp -rf ./.travis.settings.xml ${HOME}/.m2/ -echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io -find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - -# Enable experimental docker features (e.g. squash options) -echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json -sudo service docker restart - -popd -set +vex -echo "=========================== Finishing Init Script ==========================" \ No newline at end of file diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 43a3fa29d7..6079861686 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -16,7 +16,7 @@ export S3_BUCKET2_PROTOCOL=s3vTest mvn -B -U clean install -DskipTests -Pbuild-test-image -./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml +bash ./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests mvn -B -U clean test \ From 3a0edf1609d98f4f98b6aa2630f49f75545ab14f Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 15:24:55 +0300 Subject: [PATCH 08/75] APPS-261 change to travis.yml file --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03add09234..b0a60d11ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,9 @@ cache: # the cache can grow constantly before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* -before_install: cp .travis.settings.xml ${HOME}/.m2/settings.xml +before_install: + - cp .travis.settings.xml ${HOME}/.m2/settings.xml + - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} install: skip stages: From 6884e2cada30cca7dcd05456139b1f5f3cfdb228 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 15:43:27 +0300 Subject: [PATCH 09/75] APPS-261 changes to scripts and travis.yml --- .travis.yml | 2 +- scripts/worm-mb-tests.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0a60d11ab..e307d48016 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ jobs: - name: "Enterprise WORM Tests" stage: Tests - install: travis_retry mvn -B -U clean install -DskipTests + install: travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 6079861686..27c7d3de69 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -5,6 +5,8 @@ PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" +docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} + export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} @@ -14,8 +16,6 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMB export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest -mvn -B -U clean install -DskipTests -Pbuild-test-image - bash ./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests From eb3bcd9e249f50d9a048a985a50a9e842a704f05 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 16:51:49 +0300 Subject: [PATCH 10/75] APPS-261 changes to travis.yml and scripts --- .travis.yml | 1 + scripts/worm-mb-tests.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e307d48016..29b706c61d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-ser before_install: - cp .travis.settings.xml ${HOME}/.m2/settings.xml - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} + - docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} install: skip stages: diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 27c7d3de69..88ba553c33 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -16,11 +16,11 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMB export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest -bash ./scripts/start-compose.sh ./rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml +bash ./scripts/start-compose.sh rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests mvn -B -U clean test \ - -DsuiteXmlFile=wormTestSuite.xml + -DsuiteXmlFile=wormTestSuite.xml \ -Dconnector.s3.bucketName=${S3_BUCKET2_NAME} popd From 7b6a811af02115ee8de8155b0be09e7cc870db88 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 18:39:26 +0300 Subject: [PATCH 11/75] APPS-261 changes to scripts --- scripts/cleanup.sh | 24 ++++++++++++++++++++++++ scripts/worm-mb-tests.sh | 9 +++++++++ 2 files changed, 33 insertions(+) create mode 100644 scripts/cleanup.sh diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh new file mode 100644 index 0000000000..9e73810432 --- /dev/null +++ b/scripts/cleanup.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +echo "=========================== Starting Cleanup Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vx +pushd "$(dirname "${BASH_SOURCE[0]}")/../" + + +# Stop and remove the containers +docker ps -a -q | xargs -l -r docker stop +docker ps -a -q | xargs -l -r docker rm + +sudo apt-get update +sudo apt-get install -q -y awscli +printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure + +export BUCKET_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" + +aws s3 ls | awk '{print $3}' | grep "^${BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force + + +popd +set +vx +echo "=========================== Finishing Cleanup Script ==========================" \ No newline at end of file diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 88ba553c33..32169f0652 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -7,6 +7,10 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} +sudo apt-get update +sudo apt-get install -q -y awscli +printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure + export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} @@ -16,6 +20,11 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMB export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest +aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket +aws s3api put-object-lock-configuration \ + --bucket "${S3_BUCKET2_NAME}" \ + --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' + bash ./scripts/start-compose.sh rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests From a8cf3c5dffcf0646fdd6026a192d5461131aff78 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 18:47:59 +0300 Subject: [PATCH 12/75] APPS-261 changes to scripts --- scripts/cleanup.sh | 5 +++-- scripts/worm-mb-tests.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 9e73810432..83082b4df7 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -14,10 +14,11 @@ sudo apt-get update sudo apt-get install -q -y awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure -export BUCKET_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" +BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" +S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" aws s3 ls | awk '{print $3}' | grep "^${BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force - +aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force popd set +vx diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 32169f0652..c58bf0d3a1 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -20,7 +20,7 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMB export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest -aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket +aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 #--object-lock-enabled-for-bucket aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' From e2d62026ee7926f0b67c39720376067c3b31a0d6 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 18:55:02 +0300 Subject: [PATCH 13/75] APPS-261 changes to scripts --- scripts/cleanup.sh | 7 +++---- scripts/worm-mb-tests.sh | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 83082b4df7..3589dad2eb 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -10,12 +10,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" docker ps -a -q | xargs -l -r docker stop docker ps -a -q | xargs -l -r docker rm -sudo apt-get update -sudo apt-get install -q -y awscli +pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure -BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" -S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" +BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" +S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" aws s3 ls | awk '{print $3}' | grep "^${BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index c58bf0d3a1..7c411976e0 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -7,16 +7,15 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} -sudo apt-get update -sudo apt-get install -q -y awscli +pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} export S3_BUCKET_REGION="eu-west-1" -export S3_BUCKET_NAME="travis-ags-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}" -export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_BUILD_NUMBER}-${TRAVIS_JOB_NUMBER}-b2" +export S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" +export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest From 649e2dce0e4d9fdd43619b6cd2127566d9f66629 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 13 Aug 2020 19:02:51 +0300 Subject: [PATCH 14/75] APPS-261 changes to worm-mb-test.sh --- scripts/worm-mb-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 7c411976e0..28fc2cdc2a 100644 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -19,7 +19,7 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest -aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 #--object-lock-enabled-for-bucket +aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' From abf4df7b22e3e05aed792e68701a377ad2f26771 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Thu, 13 Aug 2020 21:16:26 +0300 Subject: [PATCH 15/75] APPS-261 Small improvements --- scripts/worm-mb-tests.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/worm-mb-tests.sh diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh old mode 100644 new mode 100755 From 236188b7d33c52b0a3830fec2dfc70ad478db35e Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 14 Aug 2020 09:58:38 +0300 Subject: [PATCH 16/75] APPS-261 changes to travis file and scripts --- .travis.yml | 18 +++++++++--------- scripts/create-worm-bucket.sh | 26 ++++++++++++++++++++++++++ scripts/worm-mb-tests.sh | 8 -------- 3 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 scripts/create-worm-bucket.sh diff --git a/.travis.yml b/.travis.yml index 29b706c61d..a1be747082 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,14 @@ jobs: # script: # - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - # - name: "Build AGS Enterprise" - # stage: Build AGS - # before_script: source scripts/setUpMavenPhase.sh - # install: - # - travis_retry travis_wait 30 mvn -B deploy -N - # - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - # script: - # - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Enterprise" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + install: + - travis_retry travis_wait 30 mvn -B deploy -N + - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - name: "Build AGS Benchmark" # stage: Build AGS @@ -65,7 +65,7 @@ jobs: - name: "Enterprise WORM Tests" stage: Tests - install: travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am + before_script: bash scripts/create-worm-bucket.sh script: bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh new file mode 100644 index 0000000000..e6ae397ce4 --- /dev/null +++ b/scripts/create-worm-bucket.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +echo "=========================== Create Worm Bucket ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex +pushd "$(dirname "${BASH_SOURCE[0]}")/../" + +pip install awscli +printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure + +export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} +export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} + +export S3_BUCKET_REGION="eu-west-1" +export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" +export S3_PROTOCOL=s3v2 +export S3_BUCKET2_PROTOCOL=s3vTest + +aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket +aws s3api put-object-lock-configuration \ + --bucket "${S3_BUCKET2_NAME}" \ + --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' + +popd +set +vex +echo "=========================== Finishing Create Worm Bucket Script ==========================" \ No newline at end of file diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 28fc2cdc2a..22ca1bba59 100755 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -7,9 +7,6 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} -pip install awscli -printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure - export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} @@ -19,11 +16,6 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest -aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket -aws s3api put-object-lock-configuration \ - --bucket "${S3_BUCKET2_NAME}" \ - --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' - bash ./scripts/start-compose.sh rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml # Run the WORM tests From 92e3a7eb677d740d862dcfe023bb5b6d783af0a2 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 14 Aug 2020 10:39:40 +0300 Subject: [PATCH 17/75] APPS-261 changes to travis file --- .travis.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1be747082..1bc343e1a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,14 @@ jobs: # script: # - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Build AGS Enterprise" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - install: - - travis_retry travis_wait 30 mvn -B deploy -N - - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # - name: "Build AGS Enterprise" + # stage: Build AGS + # before_script: source scripts/setUpMavenPhase.sh + # install: + # - travis_retry travis_wait 30 mvn -B deploy -N + # - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # script: + # - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - name: "Build AGS Benchmark" # stage: Build AGS @@ -65,8 +65,15 @@ jobs: - name: "Enterprise WORM Tests" stage: Tests - before_script: bash scripts/create-worm-bucket.sh - script: bash scripts/worm-mb-tests.sh + before_script: + - source scripts/setUpMavenPhase.sh + - bash scripts/create-worm-bucket.sh + install: + - travis_retry travis_wait 30 mvn -B deploy -N + - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh # - name: "Community Integrations Tests on MySQL" From 023b0b13fe9e9aed68203e9d1713b1f36847d0dc Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 14 Aug 2020 11:43:26 +0300 Subject: [PATCH 18/75] APPS-261 travis build changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1bc343e1a2..bcb26308a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ jobs: - travis_retry travis_wait 30 mvn -B deploy -N - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=true -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh From 5a9e227a36f84f790f1ae96d916bbd63a75b744f Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 18 Aug 2020 13:25:35 +0300 Subject: [PATCH 19/75] APPS-261 Build changes for worm test --- .travis.yml | 11 +++++------ scripts/setUpMavenPhase.sh | 39 +++++++++++++++++--------------------- scripts/worm-mb-tests.sh | 2 +- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcb26308a7..43d099699c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ cache: # the cache can grow constantly before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* -before_install: +before_install: - cp .travis.settings.xml ${HOME}/.m2/settings.xml - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} - docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} @@ -65,14 +65,13 @@ jobs: - name: "Enterprise WORM Tests" stage: Tests - before_script: + install: - source scripts/setUpMavenPhase.sh - bash scripts/create-worm-bucket.sh - install: - - travis_retry travis_wait 30 mvn -B deploy -N - - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: + - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=true -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh index 688f019df8..384131f1ee 100644 --- a/scripts/setUpMavenPhase.sh +++ b/scripts/setUpMavenPhase.sh @@ -2,27 +2,22 @@ echo "Branch name: ${TRAVIS_BRANCH}" echo "Pull request: ${TRAVIS_PULL_REQUEST}" echo "Travis job name: ${TRAVIS_JOB_NAME}" -branchName=${TRAVIS_BRANCH} -imageTag=${branchName:8} -echo "Image tag: ${imageTag}" +echo "Image tag: ${TRAVIS_BRANCH:8}" - if [[ ${TRAVIS_JOB_NAME} == "Build AGS Enterprise" ]]; - then - export BUILD_PROFILE="internal" - else - export BUILD_PROFILE="master" - fi +if [[ ${TRAVIS_JOB_NAME} == "Build AGS Enterprise" ]] ; then + export BUILD_PROFILE="internal" +else + export BUILD_PROFILE="master" +fi - if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]]; - then - export MAVEN_PHASE="deploy" - export IMAGE_TAG="latest" - elif [[ ${TRAVIS_BRANCH} = release* && "${TRAVIS_PULL_REQUEST}" == "false" ]]; - then - export MAVEN_PHASE="deploy" - export IMAGE_TAG="${imageTag}-latest" - else - export MAVEN_PHASE="verify" - export BUILD_PROFILE="buildDockerImage" - export IMAGE_TAG="latest" - fi +if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]] ; then + export MAVEN_PHASE="deploy" + export IMAGE_TAG="latest" +elif [[ ${TRAVIS_BRANCH} = release* && "${TRAVIS_PULL_REQUEST}" == "false" ]] ; then + export MAVEN_PHASE="deploy" + export IMAGE_TAG="${TRAVIS_BRANCH:8}-latest" +else + export MAVEN_PHASE="verify" + export BUILD_PROFILE="buildDockerImage" + export IMAGE_TAG="latest" +fi diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 22ca1bba59..bab453e535 100755 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -16,7 +16,7 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 export S3_BUCKET2_PROTOCOL=s3vTest -bash ./scripts/start-compose.sh rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml +bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml" # Run the WORM tests mvn -B -U clean test \ From ac7cb3f4a288fe0d5051a65c697ef7674e11278e Mon Sep 17 00:00:00 2001 From: gbroadbent Date: Fri, 26 Jun 2020 12:10:23 +0100 Subject: [PATCH 20/75] LOC-238 - All 10 languages - updated localised files for AGS 3.4 --- .../messages/dod5015-model_nl.properties | 24 ++--- .../dod5015/messages/dod5015_nl.properties | 4 +- .../messages/action-service_es.properties | 12 +-- .../messages/action-service_nl.properties | 44 ++++----- .../messages/actions_de.properties | 9 +- .../messages/actions_es.properties | 25 ++--- .../messages/actions_fr.properties | 9 +- .../messages/actions_it.properties | 9 +- .../messages/actions_ja.properties | 9 +- .../messages/actions_nb.properties | 9 +- .../messages/actions_nl.properties | 91 ++++++++++--------- .../messages/actions_pt_BR.properties | 9 +- .../messages/actions_ru.properties | 11 ++- .../messages/actions_zh_CN.properties | 9 +- .../messages/audit-service_es.properties | 10 +- .../messages/audit-service_nl.properties | 10 +- .../messages/capability-service_de.properties | 1 + .../messages/capability-service_es.properties | 15 +-- .../messages/capability-service_fr.properties | 1 + .../messages/capability-service_it.properties | 1 + .../messages/capability-service_ja.properties | 1 + .../messages/capability-service_nb.properties | 1 + .../messages/capability-service_nl.properties | 57 ++++++------ .../capability-service_pt_BR.properties | 1 + .../messages/capability-service_ru.properties | 1 + .../capability-service_zh_CN.properties | 1 + .../messages/hold-service_es.properties | 12 +-- .../messages/hold-service_nl.properties | 12 +-- .../notification-service_nl.properties | 2 +- .../records-management-service_nl.properties | 26 +++--- .../messages/records-model_es.properties | 20 ++-- .../messages/records-model_nl.properties | 88 +++++++++--------- .../messages/report-model_es.properties | 4 +- .../messages/report-model_nl.properties | 4 +- .../messages/rm-events_nl.properties | 2 +- .../messages/rm-system_es.properties | 6 +- .../messages/rm-system_nl.properties | 26 +++--- .../messages/template_es.properties | 8 +- .../messages/template_nl.properties | 16 ++-- .../rm-workflow-messages_nl.properties | 12 +-- 40 files changed, 326 insertions(+), 286 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties index af5358b985..f908d0dd87 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties @@ -6,11 +6,11 @@ dod_dod5015.type.dod_site.description=DOD5015-site dod_dod5015.type.dod_filePlan.title=DOD5015-ordeningsplan dod_dod5015.type.dod_filePlan.description=DOD5015-ordeningsplan -dod_dod5015.type.dod_recordSeries.title=Recordreeks (afgekeurd) -dod_dod5015.type.dod_recordSeries.description=Recordreeks (afgekeurd) +dod_dod5015.type.dod_recordSeries.title=Archiefstukreeks (afgekeurd) +dod_dod5015.type.dod_recordSeries.description=Archiefstukreeks (afgekeurd) -dod_dod5015.aspect.dod_dod5015record.title=DOD5015-record -dod_dod5015.aspect.dod_dod5015record.description=DOD5015-record +dod_dod5015.aspect.dod_dod5015record.title=DOD5015-archiefstuk +dod_dod5015.aspect.dod_dod5015record.description=DOD5015-archiefstuk dod_dod5015.property.dod_publicationDate.title=Publicatiedatum dod_dod5015.property.dod_publicationDate.decription=Publicatiedatum dod_dod5015.property.dod_originator.title=Herkomst @@ -28,8 +28,8 @@ dod_dod5015.property.dod_address.decription=Geadresseerde dod_dod5015.property.dod_otherAddress.title=Andere geadresseerde dod_dod5015.property.dod_otherAddress.decription=Andere geadresseerde -dod_dod5015.aspect.dod_scannedRecord.title=Gescande record -dod_dod5015.aspect.dod_scannedRecord.description=Gescande record +dod_dod5015.aspect.dod_scannedRecord.title=Gescand archiefstuk +dod_dod5015.aspect.dod_scannedRecord.description=Gescand archiefstuk dod_dod5015.property.dod_scannedFormat.title=Beeldindeling dod_dod5015.property.dod_scannedFormat.description=Beeldindeling dod_dod5015.property.dod_scannedFormatVersion.title=Beeldindeling en -versie @@ -41,8 +41,8 @@ dod_dod5015.property.dod_resolutionY.description=Beeldresolutie Y dod_dod5015.property.dod_scannedBitDepth.title=Gescande bitdiepte dod_dod5015.property.dod_scannedBitDepth.description=Gescande bitdiepte -dod_dod5015.aspect.dod_pdfRecord.title=PDF-record -dod_dod5015.aspect.dod_pdfRecord.description=PDF-record +dod_dod5015.aspect.dod_pdfRecord.title=PDF-archiefstuk +dod_dod5015.aspect.dod_pdfRecord.description=PDF-archiefstuk dod_dod5015.property.dod_producingApplication.title=Producerende applicatie dod_dod5015.property.dod_producingApplication.description=Producerende applicatie dod_dod5015.property.dod_producingApplicationVersion.title=Versie producerende applicatie @@ -54,8 +54,8 @@ dod_dod5015.property.dod_creatingApplication.description=Producerende applicatie dod_dod5015.property.dod_documentSecuritySettings.title=Documentbeveiligingsinstellingen dod_dod5015.property.dod_documentSecuritySettings.description=Documentbeveiligingsinstellingen -dod_dod5015.aspect.dod_digitalPhotographRecord.title=Digitale fotorecord -dod_dod5015.aspect.dod_digitalPhotographRecord.description=Digitale fotorecord +dod_dod5015.aspect.dod_digitalPhotographRecord.title=Digitaal fotoarchiefstuk +dod_dod5015.aspect.dod_digitalPhotographRecord.description=Digitaal fotoarchiefstuk dod_dod5015.property.dod_caption.title=Bijschrift dod_dod5015.property.dod_caption.description=Bijschrift dod_dod5015.property.dod_photographer.title=Fotograaf @@ -77,8 +77,8 @@ dod_dod5015.property.dod_iccIcmProfile.description=ICC-/ICM-profiel dod_dod5015.property.dod_exifInformation.title=EXIF-informatie dod_dod5015.property.dod_exifInformation.description=EXIF-informatie -dod_dod5015.aspect.dod_webRecord.title=Web-record -dod_dod5015.aspect.dod_webRecord.description=Web-record +dod_dod5015.aspect.dod_webRecord.title=Web-archiefstuk +dod_dod5015.aspect.dod_webRecord.description=Web-archiefstuk dod_dod5015.property.dod_webFileName.title=Web-bestandsnaam dod_dod5015.property.dod_webFileName.description=Web-bestandsnaam dod_dod5015.property.dod_webPlatform.title=Web-platform diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_nl.properties index 84884b5732..144f485fb3 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015_nl.properties @@ -1,8 +1,8 @@ # Classified Records Capabilities -capability.group.classifiedRecords.title=Niet geclassificeerde records +capability.group.classifiedRecords.title=Geclassificeerde archiefstukken capability.UpdateClassificationDates.title=Classificatiedata bijwerken capability.CreateModifyDestroyClassificationGuides.title=Classificatiegidsen maken aanpassen vernietigen -capability.UpgradeDowngradeAndDeclassifyRecords.title=Records upgraden, downgraden en declassificeren +capability.UpgradeDowngradeAndDeclassifyRecords.title=Archiefstukken upgraden, downgraden en declassificeren capability.UpdateExemptionCategories.title=Uitzonderingscategorie\u00ebn bijwerken capability.MapClassificationGuideMetadata.title=Metagegevens classificatiegids toewijzen capability.CreateModifyDestroyTimeframes.title=Tijdsperiodes maken aanpassen vernietigen diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties index 679a5f759f..5ea2ca053c 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties @@ -17,14 +17,14 @@ rm.action.no-declare-mand-prop=Debe definir todas las propiedades obligatorias d rm.action.ghosted-prop-update=No se puede actualizar las propiedades de un documento de archivo destruido anteriormente. rm.action.valid-date-disp-asof=Introduzca una fecha v\u00e1lida para la fecha de inicio de acci\u00f3n de la retenci\u00f3n. rm.action.disp-asof-lifecycle-applied=No se puede editar la fecha de inicio de la retenci\u00f3n para un documento de archivo o carpeta de documentos de archivo que tiene un ciclo de vida aplicado. -rm.action.hold-edit-reason-none=No se puede editar la raz\u00f3n de bloqueo porque el bloqueo se cre\u00f3 sin una raz\u00f3n. Trate de recrear el bloqueo. -rm.action.hold-edit-type=No se puede editar la raz\u00f3n de bloqueo {1} porque no es un bloqueo. +rm.action.hold-edit-reason-none=No se puede editar la raz\u00f3n de retenci\u00f3n legal porque se cre\u00f3 sin una raz\u00f3n. Trate de recrear la retenci\u00f3n legal. +rm.action.hold-edit-type=No se puede editar la raz\u00f3n de retenci\u00f3n legal para {1} porque no es una retenci\u00f3n legal. rm.action.specify-avlid-date=Introduzca una fecha v\u00e1lida para la fecha de inicio de la revisi\u00f3n. rm.action.review-details-only=Solo puede editar los detalles de revisi\u00f3n de documentos de archivo vitales. -rm.action.freeze-no-reason=No se puede bloquear un documento de archivo sin una raz\u00f3n. A\u00f1ada una raz\u00f3n al bloqueo. -rm.action.freeze-only-records-folders=Solo puede bloquear documentos de archivo o carpetas de documentos de archivo. +rm.action.freeze-no-reason=No se puede hacer retenci\u00f3n legal de un documento de archivo sin una raz\u00f3n. A\u00f1ada una raz\u00f3n de retenci\u00f3n legal. +rm.action.freeze-only-records-folders=Solo puede hacer retenci\u00f3n legal de documentos de archivo o carpetas de documentos de archivo. rm.action.no-open-record-folder=No se puede volver a abrir {0} porque no es una carpeta de documentos de archivo. -rm.action.not-hold-type=No se puede llevar a cabo la acci\u00f3n en {1} porque no es un bloqueo. +rm.action.not-hold-type=No se puede llevar a cabo la acci\u00f3n en {1} porque no es una retenci\u00f3n legal. rm.action.no-read-mime-message=No se pudo leer el mensaje de tipo de fichero debido a {0}. rm.action.email-declared=No se pudo separar el correo electr\u00f3nico porque el documento de archivo est\u00e1 completo. (actionedUponNodeRef={0}) rm.action.email-not-record=No se pudo separar el correo electr\u00f3nico porque el fichero, ni la carpeta ni la categor\u00eda son un documento de archivo. (actionedUponNodeRef={0}) @@ -36,7 +36,7 @@ rm.action.records_only_undeclared=Solo puede completar documentos de archivo. rm.action.event-not-undone=No se puede deshacer el evento {0} porque no se ha definido en el ciclo de vida de retenci\u00f3n. rm.action.node-not-record-category=No se puede crear una planificaci\u00f3n de retenci\u00f3n para ({0}) porque no es una categor\u00eda de documento de archivo. rm.action.parameter-not-supplied=A\u00f1ada un ''{0}'' para continuar. -rm.action.delete-not-hold-type=No se pudo eliminar el bloqueo porque {1} no es del tipo {0}. +rm.action.delete-not-hold-type=No se pudo eliminar la retenci\u00f3n legal porque {1} no es del tipo {0}. rm.action.cast-to-rm-type=No se puede cargar un tipo de carpeta personalizada al cuadro de clasificaci\u00f3n de Records Management. rm.action.record-folder-create=No se puede crear una carpeta de documentos de archivo en otra carpeta de documentos de archivo. rm.action.unique.child.type-error-message=No se pueden crear elementos m\u00faltiples de este tipo aqu\u00ed. diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nl.properties index abcddbafff..397f2ef9aa 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nl.properties @@ -1,48 +1,48 @@ rm.action.not-defined=De Records Management-actie {0} is niet gedefinieerd. rm.action.no-implicit-noderef=Er is een systeemfout opgetreden en de actie {0} is mogelijk niet geslaagd. -rm.action.record-not-declared=De retentieactie {0} kon niet worden uitgevoerd omdat de record {1} niet afgerond is. -rm.action.expected-record-level=De retentieactie {0} kon niet worden uitgevoerd omdat {1} geen record is. -rm.action.not-all-records-declared=De retentieactie {0} kon niet worden uitgevoerd omdat niet alle records in de archiefmap afgerond zijn. (actionedUponNodeRef={1}) -rm.action.not-eligible=De record of archiefmap {1} is nog niet gereed voor de retentieactie {0}. +rm.action.record-not-declared=De retentieactie {0} kon niet worden uitgevoerd omdat het archiefstuk {1} niet afgerond is. +rm.action.expected-record-level=De retentieactie {0} kon niet worden uitgevoerd omdat {1} geen archiefstuk is. +rm.action.not-all-records-declared=De retentieactie {0} kon niet worden uitgevoerd omdat niet alle archiefstukken in de archiefmap afgerond zijn. (actionedUponNodeRef={1}) +rm.action.not-eligible=Het archiefstuk of de archiefmap {1} is nog niet gereed voor de retentieactie {0}. rm.action.no-disposition-instructions=De retentieactie {0} kon niet worden uitgevoerd omdat er geen retentie-instructies zijn gevonden. (nodeRef={1}) rm.action.no-disposition-lisfecycle-set=De retentieactie {0} kon niet worden uitgevoerd omdat er geen retentiecyclus is ingesteld. (nodeRef={1}) rm.action.next-disp-not-set=De retentiesactie {0} kon niet worden uitgevoerd omdat de volgende retentieactie niet is ingesteld. (nodeRef={1}) -rm.action.not-next-disp=De retentieactie {0} kon niet worden uitgevoerd omdat dit niet de volgende retentieactie voor deze record of deze archiefmap is. (nodeRef={1}) +rm.action.not-next-disp=De retentieactie {0} kon niet worden uitgevoerd omdat dit niet de volgende retentieactie voor dit archiefstuk of deze archiefmap is. (nodeRef={1}) rm.action.not-record-folder=De retentieactie {0} kon niet worden uitgevoerd omdat {1} geen archiefmap is. -rm.action.actioned-upon-not-record=De actie {0} kan niet worden uitgevoerd omdat {1} geen record is. +rm.action.actioned-upon-not-record=De actie {0} kan niet worden uitgevoerd omdat {1} geen archiefstuk is. rm.action.custom-aspect-not-recognised=Het aangepaste type kan niet worden toegepast omdat het niet wordt herkend. (customAspect={0}) rm.action.event-no-disp-lc=De gebeurtenis {0} kan niet worden afgerond omdat deze niet is gedefinieerd in de retentiecyclus. -rm.action.undeclared-only-records=Er kunnen alleen records worden afgerond. (nodeRef={0}) -rm.action.no-declare-mand-prop=U moet alle verplichte eigenschappen van de record instellen voordat u de record kunt afronden. -rm.action.ghosted-prop-update=U kunt de eigenschappen van een eerder vernietigde record niet bijwerken. +rm.action.undeclared-only-records=Alleen archiefstukken kunnen worden afgerond. (nodeRef={0}) +rm.action.no-declare-mand-prop=U moet alle verplichte eigenschappen van het archiefstuk instellen voordat u het archiefstuk kunt afronden. +rm.action.ghosted-prop-update=U kunt de eigenschappen van een eerder vernietigd archiefstuk niet bijwerken. rm.action.valid-date-disp-asof=Voer een geldige datum in voor de begindatum van de retentieactie. -rm.action.disp-asof-lifecycle-applied=U kunt de begindatum van de retentie van een record of archiefmap waarvoor een levenscyclus is toegepast niet bewerken. -rm.action.hold-edit-reason-none=U kunt de reden van de wachtstand niet bewerken omdat de wachtstand is gemaakt zonder reden. Probeer de wachtstand opnieuw te maken. -rm.action.hold-edit-type=U kunt de reden van de wachtstand voor {1} niet bewerken omdat dit geen wachtstand is. +rm.action.disp-asof-lifecycle-applied=U kunt de begindatum van de retentie van een archiefstuk of archiefmap waarvoor een levenscyclus is toegepast niet bewerken. +rm.action.hold-edit-reason-none=U kunt de reden van de bewaring niet bewerken omdat de bewaring is gemaakt zonder reden. Probeer de bewaring opnieuw te maken. +rm.action.hold-edit-type=U kunt de reden van de bewaring voor {1} niet bewerken omdat dit geen bewaring is. rm.action.specify-avlid-date=Voer een geldige datum in voor de begindatum van de revisie. -rm.action.review-details-only=U kunt alleen de revisiegegevens van vitale records bewerken. -rm.action.freeze-no-reason=U kunt een record niet zonder reden in de wachtstand plaatsen. Voeg een reden toe aan de wachtstand. -rm.action.freeze-only-records-folders=U kunt alleen records of archiefmappen in de wachtstand plaatsen. +rm.action.review-details-only=U kunt alleen de revisiegegevens van vitale archiefstukken bewerken. +rm.action.freeze-no-reason=U kunt een archiefstuk niet zonder reden in de bewaring plaatsen. Voeg een reden toe aan de bewaring. +rm.action.freeze-only-records-folders=U kunt alleen archiefstukken of archiefmappen in de bewaring plaatsen. rm.action.no-open-record-folder=U kunt {0} niet heropenen omdat dit geen archiefmap is. -rm.action.not-hold-type=U kunt de actie niet uitvoeren voor {1} omdat dit geen wachtstand is. +rm.action.not-hold-type=U kunt de actie niet uitvoeren voor {1} omdat dit geen bewaring is. rm.action.no-read-mime-message=Het bestandstype kon niet worden gelezen omdat {0}. -rm.action.email-declared=De e-mail kan niet worden opgesplitst omdat de record is afgerond. (actionedUponNodeRef={0}) -rm.action.email-not-record=De e-mail kan niet worden opgesplitst omdat het bestand, de map of de categorie geen record is. (actionedUponNodeRef={0}) +rm.action.email-declared=De e-mail kan niet worden opgesplitst omdat het archiefstuk is afgerond. (actionedUponNodeRef={0}) +rm.action.email-not-record=De e-mail kan niet worden opgesplitst omdat het bestand, de map of de categorie geen archiefstuk is. (actionedUponNodeRef={0}) rm.action.email-create-child-assoc=Er kan geen aangepaste onderliggende koppeling worden gemaakt. rm.action.node-already-transfer=Het bestand, de map of de categorie wordt al overgezet. rm.action.node-not-transfer=Het bestand, de map of de categorie is geen overzetobject. rm.action.undo-not-last=U kunt het afsluiten niet ongedaan maken omdat de laatste retentieactie niet was afgesloten. -rm.action.records_only_undeclared=U kunt alleen records afronden. +rm.action.records_only_undeclared=U kunt alleen archiefstukken afronden. rm.action.event-not-undone=U kunt de gebeurtenis {0} niet ongedaan maken omdat deze niet in de retentiecyclus is gedefinieerd. -rm.action.node-not-record-category=U kunt geen retentieschema maken voor {0} omdat dit geen recordcategorie is. +rm.action.node-not-record-category=U kunt geen retentieschema maken voor {0} omdat dit geen archiefstukcategorie is. rm.action.parameter-not-supplied=Voeg een ''{0}'' toe om door te gaan. -rm.action.delete-not-hold-type=De wachtstand kan niet worden verwijderd omdat {1} niet van het type {0} is. +rm.action.delete-not-hold-type=De bewaring kan niet worden verwijderd omdat {1} niet van het type {0} is. rm.action.cast-to-rm-type=U kunt geen aangepast maptype uploaden naar het ordeningsplan van Records Management. rm.action.record-folder-create=U kunt geen archiefmap in een andere archiefmap maken. rm.action.unique.child.type-error-message=U kunt hier geen meerdere onderdelen van dit type maken. rm.action.multiple.children.type-error-message=U kunt hier geen {0} maken. rm.action.create.transfer.container.child-error-message=U kunt geen onderdelen maken in de overdrachtscontainer. rm.action.create.transfer.child-error-message=U kunt geen onderdelen maken in overdrachtsmappen. -rm.action.create.record.folder.child-error-message=U kunt alleen records maken in archiefmappen en dit was een {0}. +rm.action.create.record.folder.child-error-message=U kunt alleen archiefstukken maken in archiefmappen en dit was een {0}. rm.action.transfer-non-editable=U kunt metagegevens in een overdrachtsmap of -container niet bewerken. diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties index 8452202f37..0182d1829c 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties @@ -46,16 +46,19 @@ isRecordType.description=Records verf\u00fcgen \u00fcber einen angegebenen Recor # # i18n for Records Management Actions # -# Declare As Record -create-record.title=Als Record deklarieren +# File As Record +create-record.title=Als Record ablegen create-record.description=Deklariert Datei als Record und legt sie auf Wunsch ab create-record.file-plan.display-label=Ablageplan create-record.hide-record.display-label=Record ausblenden create-record.path.display-label=Ort f\u00fcr Record-Ordner + # Declare As Version Record declare-as-version-record.title=Version als Record deklarieren -declare-as-version-record.description=Deklariert diese Version der Datei als Record +declare-as-version-record.description=Deklariert diese Version der Datei als Record und legt sie auf Wunsch ab declare-as-version-record.file-plan.display-label=Ablageplan +declare-as-version-record.path.display-label=Ort f\u00fcr Record-Ordner + # Complete record declareRecord.title=Record abschlie\u00dfen declareRecord.description=Schlie\u00dft einen Record ab diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties index eb0eee8a10..c11b6d5160 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties @@ -14,8 +14,8 @@ isDeclared.title=Documento de archivo completado isDeclared.description=Documento de archivo completo # Is on hold -isFrozen.title=En espera -isFrozen.description=Documento de archivo o carpeta de documentos de archivo en espera +isFrozen.title=En retenci\u00f3n legal +isFrozen.description=Documento de archivo o carpeta de documentos de archivo en retenci\u00f3n legal # Are filed isRecordFiled.title=Documento de archivo archivado @@ -46,16 +46,19 @@ isRecordType.description=Los documentos de archivo tienen un tipo de documento d # # i18n for Records Management Actions # -# Declare As Record -create-record.title=Declarar como documento de archivo +# File As Record +create-record.title=Archivar como documento de archivo create-record.description=Declara el fichero como un documento de archivo y lo archiva opcionalmente. create-record.file-plan.display-label=Cuadro de clasificaci\u00f3n create-record.hide-record.display-label=Ocultar documento de archivo create-record.path.display-label=Ubicaci\u00f3n de la carpeta de documentos de archivo + # Declare As Version Record declare-as-version-record.title=Declarar la versi\u00f3n como documento de archivo -declare-as-version-record.description=Declara esta versi\u00f3n del fichero como un documento de archivo +declare-as-version-record.description=Declara esta versi\u00f3n del fichero como un documento de archivo y opcionalmente lo archiva. declare-as-version-record.file-plan.display-label=Cuadro de clasificaci\u00f3n +declare-as-version-record.path.display-label=Ubicaci\u00f3n de la carpeta de documentos de archivo + # Complete record declareRecord.title=Documento de archivo completo declareRecord.description=Completa un documento de archivo @@ -118,11 +121,11 @@ setPropertyValue.title=Establecer valor de la propiedad setPropertyValue.description=Establece un valor de la propiedad # Edit Hold Reason -editHoldReason.title=Editar raz\u00f3n de bloqueo -editHoldReason.description=Edita la raz\u00f3n de bloqueo +editHoldReason.title=Editar raz\u00f3n de retenci\u00f3n legal +editHoldReason.description=Edita la raz\u00f3n de retenci\u00f3n legal # Relinquish Hold -relinquishHold.title=Eliminar bloqueo -relinquishHold.description=Elimina el bloqueo +relinquishHold.title=Eliminar retenci\u00f3n legal +relinquishHold.description=Elimina retenci\u00f3n legal # Edit Review As Of Date editReviewAsOfDate.title=Editar fecha de inicio de revisi\u00f3n editReviewAsOfDate.description=Editar fecha de inicio de revisi\u00f3n @@ -184,8 +187,8 @@ addRecordTypes.description=A\u00f1ade los tipos seleccionados al documento de ar fileReport.title=Archivar informe fileReport.description=Archiva informe # Delete Hold -deleteHold.title=Eliminar bloqueo -deleteHold.description=Elimina bloqueo +deleteHold.title=Eliminar retenci\u00f3n legal +deleteHold.description=Elimina retenci\u00f3n legal # Move DM record move-dm-record.title=Mover documento de archivo move-dm-record.description=Mueve documento de archivo diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties index 26ceabf1a8..3c14adde40 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties @@ -46,16 +46,19 @@ isRecordType.description=Les documents d'archives ont un type de document d'arch # # i18n for Records Management Actions # -# Declare As Record -create-record.title=D\u00e9clarer comme document d'archives +# File As Record +create-record.title=Archiver comme document d'archives create-record.description=D\u00e9clare le fichier comme document d'archives et le classe facultativement create-record.file-plan.display-label=Plan de classement create-record.hide-record.display-label=Masquer le document d'archives create-record.path.display-label=Emplacement du dossier d'archives + # Declare As Version Record declare-as-version-record.title=D\u00e9clarer la version comme document d'archives -declare-as-version-record.description=D\u00e9clare cette version du fichier comme document d'archives +declare-as-version-record.description=D\u00e9clare cette version du fichier comme document d'archives et le classe, le cas \u00e9ch\u00e9ant declare-as-version-record.file-plan.display-label=Plan de classement +declare-as-version-record.path.display-label=Emplacement du dossier d'archives + # Complete record declareRecord.title=Compl\u00e9ter un document d'archives declareRecord.description=Compl\u00e8te un document d'archives diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties index 7a1a11e1f2..6f39a53e07 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties @@ -46,16 +46,19 @@ isRecordType.description=I record hanno un tipo di record specificato # # i18n for Records Management Actions # -# Declare As Record -create-record.title=Dichiara come record +# File As Record +create-record.title=Archivia come record create-record.description=Dichiara il file come record e lo archivia facoltativamente create-record.file-plan.display-label=Piano di fascicolazione create-record.hide-record.display-label=Nascondi record create-record.path.display-label=Posizione cartella di record + # Declare As Version Record declare-as-version-record.title=Dichiara versione come record -declare-as-version-record.description=Dichiara questa versione del file come record +declare-as-version-record.description=Dichiara questa versione del file come record e opzionalmente lo archivia declare-as-version-record.file-plan.display-label=Piano di fascicolazione +declare-as-version-record.path.display-label=Posizione cartella di record + # Complete record declareRecord.title=Completa record declareRecord.description=Completa un record. diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties index 63f5231670..2b80be56f9 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties @@ -46,16 +46,19 @@ isRecordType.description=\u7279\u5b9a\u306e\u30ec\u30b3\u30fc\u30c9\u30bf\u30a4\ # # i18n for Records Management Actions # -# Declare As Record -create-record.title=\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3059\u308b +# File As Record +create-record.title=\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u6574\u7406\u4fdd\u7ba1 create-record.description=\u30d5\u30a1\u30a4\u30eb\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3057\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u6574\u7406\u4fdd\u7ba1\u3057\u307e\u3059 create-record.file-plan.display-label=\u6574\u7406\u4fdd\u7ba1\u30d7\u30e9\u30f3 create-record.hide-record.display-label=\u30ec\u30b3\u30fc\u30c9\u3092\u975e\u8868\u793a\u306b\u3059\u308b create-record.path.display-label=\u30ec\u30b3\u30fc\u30c9\u30d5\u30a9\u30eb\u30c0\u306e\u5834\u6240 + # Declare As Version Record declare-as-version-record.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3059\u308b -declare-as-version-record.description=\u30d5\u30a1\u30a4\u30eb\u306e\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3057\u307e\u3059 +declare-as-version-record.description=\u30d5\u30a1\u30a4\u30eb\u306e\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3057\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u6574\u7406\u4fdd\u7ba1\u3057\u307e\u3059 declare-as-version-record.file-plan.display-label=\u6574\u7406\u4fdd\u7ba1\u30d7\u30e9\u30f3 +declare-as-version-record.path.display-label=\u30ec\u30b3\u30fc\u30c9\u30d5\u30a9\u30eb\u30c0\u306e\u5834\u6240 + # Complete record declareRecord.title=\u30ec\u30b3\u30fc\u30c9\u306e\u5b8c\u4e86 declareRecord.description=\u30ec\u30b3\u30fc\u30c9\u3092\u5b8c\u4e86\u3057\u307e\u3059 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties index 29ac899b1f..824b7e3486 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties @@ -46,16 +46,19 @@ isRecordType.description=Oppf\u00f8ringer har en bestemt oppf\u00f8ringstype # # i18n for Records Management Actions # -# Declare As Record -create-record.title=Erkl\u00e6r som oppf\u00f8ring +# File As Record +create-record.title=Registrer som oppf\u00f8ring create-record.description=Erkl\u00e6rer filen som en oppf\u00f8ring og arkiverer den ved \u00f8nske create-record.file-plan.display-label=Filplan create-record.hide-record.display-label=Skjul oppf\u00f8ring create-record.path.display-label=Plassering av oppf\u00f8ringsmappe + # Declare As Version Record declare-as-version-record.title=Erkl\u00e6r versjonen som oppf\u00f8ring -declare-as-version-record.description=Erkl\u00e6rer denne versjonen av filen som er oppf\u00f8ring +declare-as-version-record.description=Erkl\u00e6rer filen som en oppf\u00f8ring og arkiverer den ved \u00f8nske declare-as-version-record.file-plan.display-label=Filplan +declare-as-version-record.path.display-label=Plassering av oppf\u00f8ringsmappe + # Complete record declareRecord.title=Fullf\u00f8r oppf\u00f8ring declareRecord.description=Fullf\u00f8rer en oppf\u00f8ring diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties index 565e745529..d75f7fd6a4 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties @@ -3,35 +3,35 @@ # # Are classified isClassified.title=Geclassificeerd op retentieschema -isClassified.description=Records of archiefmappen zijn geclassificeerd op een retentieschema +isClassified.description=Archiefstukken of archiefmappen zijn geclassificeerd op een retentieschema # Are cutoff isCutoff.title=Afsluiten -isCutoff.description=Records of archiefmappen zijn afgesloten +isCutoff.description=Archiefstukken of archiefmappen zijn afgesloten # Are declared -isDeclared.title=Record afgerond -isDeclared.description=Record is afgerond +isDeclared.title=Archiefstuk afgerond +isDeclared.description=Archiefstuk is afgerond # Is on hold -isFrozen.title=In wachtstand -isFrozen.description=Record of archiefmap in wachtstand +isFrozen.title=In bewaring +isFrozen.description=Archiefstuk of archiefmap in bewaring # Are filed -isRecordFiled.title=Record gearchiveerd -isRecordFiled.description=Record is gearchiveerd +isRecordFiled.title=Archiefstuk gearchiveerd +isRecordFiled.description=Archiefstuk is gearchiveerd # Are closed record folders isRecordFolderClosed.title=Archiefmap gesloten isRecordFolderClosed.description=Archiefmap is gesloten # Are vital -isVital.title=Vitale record -isVital.description=Record of archiefmap is een vitale record +isVital.title=Vitaal archiefstuk +isVital.description=Archiefstuk of archiefmap is een vitaal archiefstuk # Have Rentention Action hasDispositionAction.title=Heeft retentieactie -hasDispositionAction.description=Records en mappen hebben de opgegeven gekoppelde retentieactie op de opgegeven relatieve positie +hasDispositionAction.description=Archiefstukken en mappen hebben de opgegeven gekoppelde retentieactie op de opgegeven relatieve positie # Are kind isKind.title=Type onderdeel Records Management @@ -39,29 +39,32 @@ isKind.description=Onderdelen zijn van een type ordeningsplancomponent isKind.kind.display-label=Type # Are Record Type -isRecordType.title=Heeft recordtype -isRecordType.description=Records hebben een opgegeven recordtype +isRecordType.title=Heeft archiefstuktype +isRecordType.description=Archiefstukken hebben een opgegeven recordtype # # i18n for Records Management Actions # -# Declare As Record -create-record.title=Declareren als record -create-record.description=Hiermee wordt het bestand gedeclareerd als een record en optioneel gearchiveerd +# File As Record +create-record.title=Archiveren als archiefstuk +create-record.description=Hiermee wordt het bestand gedeclareerd als een archiefstuk en optioneel gearchiveerd create-record.file-plan.display-label=Ordeningsplan create-record.hide-record.display-label=Record verbergen create-record.path.display-label=Locatie archiefmap + # Declare As Version Record -declare-as-version-record.title=Versie declareren als record -declare-as-version-record.description=Hiermee wordt deze versie van het bestand gedeclareerd als een record +declare-as-version-record.title=Versie declareren als archiefstuk +declare-as-version-record.description=Hiermee wordt deze versie van het bestand gedeclareerd als een archiefstuk en optioneel gearchiveerd declare-as-version-record.file-plan.display-label=Ordeningsplan +declare-as-version-record.path.display-label=Locatie archiefmap + # Complete record -declareRecord.title=Record afronden -declareRecord.description=Hiermee wordt een record afgerond +declareRecord.title=Archiefstuk afronden +declareRecord.description=Hiermee wordt een archiefstuk afgerond # Reopens record -undeclareRecord.title=Record heropenen -undeclareRecord.description=Hiermee wordt een record heropend +undeclareRecord.title=Archiefstuk heropenen +undeclareRecord.description=Hiermee wordt een archiefstuk heropend # Open record folder openRecordFolder.title=Archiefmap openen openRecordFolder.description=Hiermee wordt een archiefmap geopend @@ -74,38 +77,38 @@ completeEvent.description=Hiermee wordt een gebeurtenis afgerond completeEvent.eventName.display-label=Gebeurtenis # Freeze freeze.title=Bevriezen -freeze.description=Hiermee wordt een record bevroren +freeze.description=Hiermee wordt een archiefstuk bevroren freeze.reason.display-label=Reden # Unfreeze unfreeze.title=Bevriezen opheffen -unfreeze.description=Hiermee wordt de bevriezing van een record opgeheven +unfreeze.description=Hiermee wordt de bevriezing van een archiefstuk opgeheven # File to fileTo.title=Archiveren in -fileTo.description=Hiermee wordt een record gearchiveerd in de opgegeven archiefmap +fileTo.description=Hiermee wordt een archiefstuk gearchiveerd in de opgegeven archiefmap fileTo.path.display-label=Pad naar archiefmap fileTo.createRecordPath.display-label=Recordpad maken # Copy to copyTo.title=Kopi\u00ebren naar -copyTo.description=Hiermee wordt een record gekopieerd naar de opgegeven archiefmap +copyTo.description=Hiermee wordt een archiefstuk gekopieerd naar de opgegeven archiefmap copyTo.path.display-label=Pad naar archiefmap copyTo.createRecordPath.display-label=Recordpad maken # Move to moveTo.title=Verplaatsen naar -moveTo.description=Hiermee wordt een record verplaatst naar de opgegeven archiefmap +moveTo.description=Hiermee wordt een archiefstuk verplaatst naar de opgegeven archiefmap moveTo.path.display-label=Pad naar archiefmap moveTo.createRecordPath.display-label=Recordpad maken # Link to linkTo.title=Koppelen naar -linkTo.description=Hiermee wordt een record gekoppeld naar de opgegeven archiefmap +linkTo.description=Hiermee wordt een archiefstuk gekoppeld naar de opgegeven archiefmap linkTo.path.display-label=Pad naar archiefmap linkTo.createRecordPath.display-label=Recordpad maken # Reject reject.title=Afwijzen -reject.description=Hiermee wordt een record afgewezen en wordt het document naar de originele locatie verplaatst +reject.description=Hiermee wordt een archiefstuk afgewezen en wordt het document naar de originele locatie verplaatst reject.reason.display-label=Reden voor afwijzing # Request Information requestInfo.title=Informatie aanvragen -requestInfo.description=Hiermee wordt een workflow gestart voor het aanvragen van meer informatie over een record. +requestInfo.description=Hiermee wordt een workflow gestart voor het aanvragen van meer informatie over een archiefstuk. # Execute script executeScript.title=Script uitvoeren executeScript.description=Een script uitvoeren @@ -118,11 +121,11 @@ setPropertyValue.title=Eigenschapwaarde instellen setPropertyValue.description=Een eigenschapwaarde instellen # Edit Hold Reason -editHoldReason.title=Reden van wachtstand bewerken -editHoldReason.description=De reden van de wachtstand bewerken +editHoldReason.title=Reden van bewaring bewerken +editHoldReason.description=De reden van de bewaring bewerken # Relinquish Hold -relinquishHold.title=Wachtstand afwijzen -relinquishHold.description=De wachtstand afwijzen +relinquishHold.title=Bewaring afwijzen +relinquishHold.description=De bewaring afwijzen # Edit Review As Of Date editReviewAsOfDate.title=Begindatum revisie bewerken editReviewAsOfDate.description=Begindatum revisie bewerken @@ -130,8 +133,8 @@ editReviewAsOfDate.description=Begindatum revisie bewerken editDispositionActionAsOfDate.title=Begindatum retentieactie bewerken editDispositionActionAsOfDate.description=De begindatum van de retentieactie bewerken # Broadcast Vital Record Definition -broadcastVitalRecordDefinition.title=Definitie vitale record uitzenden -broadcastVitalRecordDefinition.description=Definitie van de vitale record uitzenden +broadcastVitalRecordDefinition.title=Definitie vitaal archiefstuk uitzenden +broadcastVitalRecordDefinition.description=Definitie van het vitale archiefstuk uitzenden # Broadcast Disposition Action Definition Update broadcastDispositionActionDefinitionUpdate.title=Update van definitie retentieactie uitzenden broadcastDispositionActionDefinitionUpdate.description=Update van definitie retentieactie uitzenden @@ -179,16 +182,16 @@ retain.title=Behouden retain.description=Behouden # Add Record Types addRecordTypes.title=Recordtypes toevoegen -addRecordTypes.description=Hiermee worden de geselecteerde types aan de record toegevoegd. +addRecordTypes.description=Hiermee worden de geselecteerde types aan het archiefstuk toegevoegd. # File report fileReport.title=Rapport archiveren fileReport.description=Rapport archiveren # Delete Hold -deleteHold.title=Wachtstand verwijderen -deleteHold.description=Wachtstand verwijderen +deleteHold.title=Bewaring verwijderen +deleteHold.description=Bewaring verwijderen # Move DM record -move-dm-record.title=Record verplaatsen -move-dm-record.description=Record verplaatsen +move-dm-record.title=Archiefstuk verplaatsen +move-dm-record.description=Archiefstuk verplaatsen # Unlink from unlinkFrom.title=Koppeling opheffen met unlinkFrom.description=Koppeling opheffen met @@ -196,12 +199,12 @@ unlinkFrom.description=Koppeling opheffen met # Recordable version config recordable-version-config.title=Opties voor automatisch declareren recordable-version-config.description=Opties voor automatisch declareren -recordable-version-config.version.display-label=Versies automatisch declareren als records +recordable-version-config.version.display-label=Versies automatisch declareren als archiefstukken # Action parameter constraints -rm-ac-is-kind-kinds.record_category=Recordcategorie +rm-ac-is-kind-kinds.record_category=Archiefstukcategorie rm-ac-is-kind-kinds.record_folder=Archiefmap -rm-ac-is-kind-kinds.record=Record +rm-ac-is-kind-kinds.record=Archiefstuk rm-ac-disposition-action-relative-positions.next=Volgende rm-ac-disposition-action-relative-positions.previous=Vorige diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties index 5cc22f14bd..dd0f333066 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties @@ -46,16 +46,19 @@ isRecordType.description=Os documentos arquiv\u00edsticos t\u00eam um tipo de do # # i18n for Records Management Actions # -# Declare As Record -create-record.title=Declarar como documento arquiv\u00edstico +# File As Record +create-record.title=Arquivar como documento arquiv\u00edstico create-record.description=Declara um arquivo como documento arquiv\u00edstico e opcionalmente o arquiva create-record.file-plan.display-label=Plano de arquivamento create-record.hide-record.display-label=Ocultar documento arquiv\u00edstico create-record.path.display-label=Local da pasta de documento arquiv\u00edstico + # Declare As Version Record declare-as-version-record.title=Declarar vers\u00e3o como documento arquiv\u00edstico -declare-as-version-record.description=Declara essa vers\u00e3o do arquivo como um documento arquiv\u00edstico +declare-as-version-record.description=Declara esta vers\u00e3o do arquivo como um documento arquiv\u00edstico e opcionalmente a arquiva declare-as-version-record.file-plan.display-label=Plano de arquivamento +declare-as-version-record.path.display-label=Local da pasta de documento arquiv\u00edstico + # Complete record declareRecord.title=Concluir documento arquiv\u00edstico declareRecord.description=Conclui um documento arquiv\u00edstico diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties index 8651086ed9..1ccb6bdc8f 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties @@ -46,16 +46,19 @@ isRecordType.description=\u0412 \u0437\u0430\u043f\u0438\u0441\u044f\u0445 \u043 # # i18n for Records Management Actions # -# Declare As Record -create-record.title=\u041e\u0431\u044a\u044f\u0432\u0438\u0442\u044c \u043a\u0430\u043a \u0437\u0430\u043f\u0438\u0441\u044c -create-record.description=\u041e\u0431\u044a\u044f\u0432\u043b\u044f\u0435\u0442 \u0444\u0430\u0439\u043b \u043a\u0430\u043a \u0437\u0430\u043f\u0438\u0441\u044c \u0438 \u043f\u0440\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442\u0438 \u0437\u0430\u043f\u0438\u0441\u044b\u0432\u0430\u0435\u0442 \u0435\u0435 \u043a\u0430\u043a \u0444\u0430\u0439\u043b +# File As Record +create-record.title=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0432\u0438\u0434\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +create-record.description=\u041e\u0431\u044a\u044f\u0432\u043b\u044f\u0435\u0442 \u0444\u0430\u0439\u043b \u0437\u0430\u043f\u0438\u0441\u044c\u044e \u0438 \u043f\u0440\u0438 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u0435\u0435 \u0432 \u0444\u0430\u0439\u043b create-record.file-plan.display-label=\u041a\u043b\u0430\u0441\u0441\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0441\u0445\u0435\u043c\u0430 create-record.hide-record.display-label=\u0421\u043a\u0440\u044b\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c create-record.path.display-label=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 + # Declare As Version Record declare-as-version-record.title=\u041e\u0431\u044a\u044f\u0432\u0438\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e \u0437\u0430\u043f\u0438\u0441\u044c\u044e -declare-as-version-record.description=\u041e\u0431\u044a\u044f\u0432\u043b\u0435\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0432\u0435\u0440\u0441\u0438\u0438 \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u043f\u0438\u0441\u044c\u044e +declare-as-version-record.description=\u041e\u0431\u044a\u044f\u0432\u043b\u044f\u0435\u0442 \u044d\u0442\u0443 \u0432\u0435\u0440\u0441\u0438\u044e \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u043f\u0438\u0441\u044c\u044e \u0438 (\u043d\u0435 \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e) \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u0435\u0435 \u0432 \u0444\u0430\u0439\u043b declare-as-version-record.file-plan.display-label=\u041a\u043b\u0430\u0441\u0441\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0441\u0445\u0435\u043c\u0430 +declare-as-version-record.path.display-label=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 + # Complete record declareRecord.title=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c declareRecord.description=\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties index af11967652..f6aaf69f00 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties @@ -46,16 +46,19 @@ isRecordType.description=\u8bb0\u5f55\u5177\u6709\u6307\u5b9a\u7684\u8bb0\u5f55\ # # i18n for Records Management Actions # -# Declare As Record -create-record.title=\u58f0\u660e\u4e3a\u8bb0\u5f55 +# File As Record +create-record.title=\u7acb\u5377\u4e3a\u8bb0\u5f55 create-record.description=\u5c06\u6587\u4ef6\u58f0\u660e\u4e3a\u8bb0\u5f55\uff0c\u5e76\u5bf9\u5176\u8fdb\u884c\u9009\u62e9\u6027\u7acb\u5377 create-record.file-plan.display-label=\u5f52\u7c7b\u65b9\u6848 create-record.hide-record.display-label=\u9690\u85cf\u8bb0\u5f55 create-record.path.display-label=\u8bb0\u5f55\u6587\u4ef6\u5939\u4f4d\u7f6e + # Declare As Version Record declare-as-version-record.title=\u5c06\u7248\u672c\u58f0\u660e\u4e3a\u8bb0\u5f55 -declare-as-version-record.description=\u5c06\u6587\u4ef6\u7684\u6b64\u7248\u672c\u58f0\u660e\u4e3a\u8bb0\u5f55 +declare-as-version-record.description=\u5c06\u6b64\u6587\u4ef6\u7248\u672c\u58f0\u660e\u4e3a\u8bb0\u5f55\uff0c\u5e76\u53ef\u9009\u62e9\u5c06\u5176\u5f52\u6863 declare-as-version-record.file-plan.display-label=\u5f52\u7c7b\u65b9\u6848 +declare-as-version-record.path.display-label=\u8bb0\u5f55\u6587\u4ef6\u5939\u4f4d\u7f6e + # Complete record declareRecord.title=\u5b8c\u6210\u8bb0\u5f55 declareRecord.description=\u5b8c\u6210\u8bb0\u5f55 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 c918319870..8b74c9f76f 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 @@ -13,11 +13,11 @@ rm.audit.linkTo=Enlace a rm.audit.moveTo=Mover a rm.audit.copyTo=Copiar a rm.audit.fileTo=Archivar en -rm.audit.createHold=Crear bloqueo -rm.audit.deleteHold=Eliminar bloqueo -rm.audit.addToHold=A\u00f1adir a bloqueo -rm.audit.removeFromHold=Eliminar de bloqueo -rm.audit.holdPermission-Error=No tiene permiso para ver este bloqueo. +rm.audit.createHold=Crear retenci\u00f3n legal +rm.audit.deleteHold=Eliminar retenci\u00f3n legal +rm.audit.addToHold=A\u00f1adir a retenci\u00f3n legal +rm.audit.removeFromHold=Eliminar de retenci\u00f3n legal +rm.audit.holdPermission-Error=No tiene permiso para ver esta retenci\u00f3n legal. rm.audit.audit-start=Iniciar auditor\u00eda rm.audit.audit-stop=Detener auditor\u00eda rm.audit.audit-clear=Limpiar auditor\u00eda 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 971d16d4a4..344c240b7e 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 @@ -13,11 +13,11 @@ rm.audit.linkTo=Koppelen naar rm.audit.moveTo=Verplaatsen naar rm.audit.copyTo=Kopi\u00ebren naar rm.audit.fileTo=Archiveren in -rm.audit.createHold=Wachtstand maken -rm.audit.deleteHold=Wachtstand verwijderen -rm.audit.addToHold=Toevoegen aan wachtstand -rm.audit.removeFromHold=Verwijderen uit wachtstand -rm.audit.holdPermission-Error=U hebt geen rechten voor het weergeven van deze wachtstand. +rm.audit.createHold=Bewaring maken +rm.audit.deleteHold=Bewaring verwijderen +rm.audit.addToHold=Toevoegen aan bewaring +rm.audit.removeFromHold=Verwijderen uit bewaring +rm.audit.holdPermission-Error=U hebt geen rechten voor het weergeven van deze bewaring. rm.audit.audit-start=Audit starten rm.audit.audit-stop=Audit stoppen rm.audit.audit-clear=Audit wissen diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties index baef6def5c..e84005ef42 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_de.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Ordner erstellen/\u00e4ndern/vernich capability.CloseFolders.title=Ordner schlie\u00dfen capability.ReOpenFolders.title=Ordner erneut \u00f6ffnen capability.DeclareRecordsInClosedFolders.title=Records in geschlossenen Ordnern abschlie\u00dfen +capability.FileVersionRecords.title=Records-Version ablegen # Vital Records capability.group.vitalRecords.title=Besonders relevante Records diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties index 4531ab069f..240bf7fe35 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_es.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Crear Modificar Destruir carpetas capability.CloseFolders.title=Cerrar carpetas capability.ReOpenFolders.title=Reabrir carpetas capability.DeclareRecordsInClosedFolders.title=Completar documentos de archivo en carpetas cerradas +capability.FileVersionRecords.title=Archivar documentos de archivo de versi\u00f3n # Vital Records capability.group.vitalRecords.title=Documentos de archivo vitales @@ -59,16 +60,16 @@ capability.FileTransferReport.title=Archivar informe de transferencia capability.EndRetention.title=Terminar retenci\u00f3n # Hold Controls -capability.group.holdControls.title=Bloquear controles +capability.group.holdControls.title=Controles de retenci\u00f3n legal capability.ExtendRetentionPeriodOrFreeze.title=Extender periodo de retenci\u00f3n o congelar capability.Unfreeze.title=Descongelar capability.ViewUpdateReasonsForFreeze.title=Ver razones actualizadas de congelaci\u00f3n -capability.CreateHold.title=Crear bloqueo -capability.AddToHold.title=A\u00f1adir a bloqueo -capability.RemoveFromHold.title=Eliminar de bloqueo -capability.FileHoldReport.title=Archivar informe de bloqueo -capability.DeleteHold.title=Eliminar bloqueo -capability.EditHold.title=Editar bloqueo +capability.CreateHold.title=Crear retenci\u00f3n legal +capability.AddToHold.title=A\u00f1adir a retenci\u00f3n legal +capability.RemoveFromHold.title=Eliminar de retenci\u00f3n legal +capability.FileHoldReport.title=Archivar informe de retenci\u00f3n legal +capability.DeleteHold.title=Eliminar retenci\u00f3n legal +capability.EditHold.title=Editar retenci\u00f3n legal # Audit capability.group.audit.title=Auditor\u00eda diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties index 5fe8c64895..d97a0a8c14 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Cr\u00e9er Modifier D\u00e9truire Do capability.CloseFolders.title=Fermer des dossiers capability.ReOpenFolders.title=Rouvrir des dossiers capability.DeclareRecordsInClosedFolders.title=Compl\u00e9ter des documents d'archives dans des dossiers ferm\u00e9s +capability.FileVersionRecords.title=Classer la version des documents d'archives # Vital Records capability.group.vitalRecords.title=Documents d'archives essentiels diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties index 52e456b4d2..e5e9070c83 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_it.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Crea Modifica Elimina definitivament capability.CloseFolders.title=Chiudi cartelle capability.ReOpenFolders.title=Riapri cartelle capability.DeclareRecordsInClosedFolders.title=Completa record nelle cartelle chiuse +capability.FileVersionRecords.title=Archivia versione dei record # Vital Records capability.group.vitalRecords.title=Record fondamentali diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties index cad66144c7..782bfd56fa 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ja.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=\u30d5\u30a9\u30eb\u30c0\u306e\u4f5c capability.CloseFolders.title=\u30d5\u30a9\u30eb\u30c0\u3092\u9589\u3058\u308b capability.ReOpenFolders.title=\u30d5\u30a9\u30eb\u30c0\u3092\u518d\u5ea6\u958b\u304f capability.DeclareRecordsInClosedFolders.title=\u9589\u3058\u305f\u30d5\u30a9\u30eb\u30c0\u5185\u306e\u5b8c\u4e86\u30ec\u30b3\u30fc\u30c9 +capability.FileVersionRecords.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u30ec\u30b3\u30fc\u30c9\u306e\u6574\u7406\u4fdd\u7ba1 # Vital Records capability.group.vitalRecords.title=\u30d0\u30a4\u30bf\u30eb\u30ec\u30b3\u30fc\u30c9 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nb.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nb.properties index 20f59108f3..87228f33a9 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nb.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nb.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Opprett Endre Destruer mapper capability.CloseFolders.title=Lukk mapper capability.ReOpenFolders.title=\u00c5pne mapper p\u00e5 nytt capability.DeclareRecordsInClosedFolders.title=Fullf\u00f8r oppf\u00f8ringer i lukkede mapper +capability.FileVersionRecords.title=Arkiver versjonsoppf\u00f8ringer # Vital Records capability.group.vitalRecords.title=Sv\u00e6t viktige oppf\u00f8ringer diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nl.properties index 4711692afc..adee5a002e 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_nl.properties @@ -1,33 +1,34 @@ # Records -capability.group.records.title=Records -capability.DeclareRecords.title=Records afronden -capability.ViewRecords.title=Records bekijken -capability.UndeclareRecords.title=Records heropenen -capability.CreateRecords.title=Records maken +capability.group.records.title=Archiefstukken +capability.DeclareRecords.title=Archiefstukken afronden +capability.ViewRecords.title=Archiefstukken bekijken +capability.UndeclareRecords.title=Archiefstukken heropenen +capability.CreateRecords.title=Archiefstukken maken capability.RequestRecordInformation.title=Recordgegevens opvragen -capability.RejectRecords.title=Records afwijzen -capability.FileUnfiledRecords.title=Niet gearchiveerde records archiveren -capability.LinkToRecords.title=Records koppelen +capability.RejectRecords.title=Archiefstukken afwijzen +capability.FileUnfiledRecords.title=Niet gearchiveerde archiefstukken archiveren +capability.LinkToRecords.title=Archiefstukken koppelen capability.DeleteLinks.title=Recordkoppeling opheffen # Metadata Control capability.group.metadataControl.title=Metagegevensbeheer -capability.EditRecordMetadata.title=Metagegevens van record bewerken -capability.EditDeclaredRecordMetadata.title=Metagegevens van afgeronde record bewerken -capability.EditNonRecordMetadata.title=Metagegevens zonder record bewerken -capability.MoveRecords.title=Records verplaatsen +capability.EditRecordMetadata.title=Metagegevens van archiefstuk bewerken +capability.EditDeclaredRecordMetadata.title=Metagegevens van afgerond archiefstukbewerken +capability.EditNonRecordMetadata.title=Metagegevens zonder archiefstuk bewerken +capability.MoveRecords.title=Archiefstukken verplaatsen # Folder Control capability.group.folderControl.title=Mapbeheer capability.CreateModifyDestroyFolders.title=Mappen maken aanpassen vernietigen capability.CloseFolders.title=Mappen sluiten capability.ReOpenFolders.title=Mappen heropenen -capability.DeclareRecordsInClosedFolders.title=Records in gesloten mappen afronden +capability.DeclareRecordsInClosedFolders.title=Archiefstukken in gesloten mappen afronden +capability.FileVersionRecords.title=Archiefstukkenversie archiveren # Vital Records -capability.group.vitalRecords.title=Vitale records -capability.UpdateVitalRecordCycleInformation.title=Cyclusgegevens van vitale record bijwerken -capability.CycleVitalRecords.title=Cyclus vitale records +capability.group.vitalRecords.title=Vitale archiefstukken +capability.UpdateVitalRecordCycleInformation.title=Cyclusgegevens van vitaal archiefstuk bijwerken +capability.CycleVitalRecords.title=Cyclus vitale archiefstukken capability.PlanningReviewCycles.title=Planning revisiecycli # References and Links @@ -41,8 +42,8 @@ capability.AddModifyEventDates.title=Datums van gebeurtenis wijzigen toevoegen # Cutoff capability.group.cutoff.title=Afsluiten -capability.ApproveRecordsScheduledForCutoff.title=Records goedkeuren die zijn ingepland voor afsluiten -capability.CreateModifyRecordsInCutoffFolders.title=Veranderingsrecords in afsluitmappen maken +capability.ApproveRecordsScheduledForCutoff.title=Archiefstukken goedkeuren die zijn ingepland voor afsluiten +capability.CreateModifyRecordsInCutoffFolders.title=Veranderingsarchiefstukken in afsluitmappen maken # Disposition and Transfers capability.group.dispositionAndTransfers.title=Retentie en overzettingen @@ -51,28 +52,28 @@ capability.ManuallyChangeDispositionDates.title=Retentiedatums handmatig wijzige capability.AuthorizeNominatedTransfers.title=Genomineerde overzettingen autoriseren capability.AuthorizeAllTransfers.title=Alle overzettingen autoriseren capability.DestroyRecordsScheduledForDestruction.title=Record of archiefmap vernietigen die is ingepland voor vernietiging -capability.DestroyRecords.title=Records vernietigen -capability.DeleteRecords.title=Records verwijderen +capability.DestroyRecords.title=Archiefstukken vernietigen +capability.DeleteRecords.title=Archiefstukken verwijderen capability.TriggerAnEvent.title=Een gebeurtenis triggeren capability.FileDestructionReport.title=Vernietigingsrapport archiveren capability.FileTransferReport.title=Overzetrapport archiveren capability.EndRetention.title=Retentie be\u00ebindigen # Hold Controls -capability.group.holdControls.title=Wachtstandbeheer +capability.group.holdControls.title=Bewaringsfuncties capability.ExtendRetentionPeriodOrFreeze.title=Retentieperiode of bevriezen verlengen capability.Unfreeze.title=Bevriezen opheffen capability.ViewUpdateReasonsForFreeze.title=Redenen voor bevriezen bijwerken bekijken -capability.CreateHold.title=Wachtstand maken -capability.AddToHold.title=Toevoegen aan wachtstand -capability.RemoveFromHold.title=Verwijderen uit wachtstand -capability.FileHoldReport.title=Wachtstandrapport archiveren -capability.DeleteHold.title=Wachtstand verwijderen -capability.EditHold.title=Wachtstand bewerken +capability.CreateHold.title=Bewaring maken +capability.AddToHold.title=Toevoegen aan bewaring +capability.RemoveFromHold.title=Verwijderen uit bewaring +capability.FileHoldReport.title=Bewaringsrapport archiveren +capability.DeleteHold.title=Bewaring verwijderen +capability.EditHold.title=Bewaring bewerken # Audit capability.group.audit.title=Audit -capability.DeclareAuditAsRecord.title=Audit declareren als record +capability.DeclareAuditAsRecord.title=Audit declareren als archiefstuk capability.EnableDisableAuditByTypes.title=Audit op type uitschakelen inschakelen capability.DeleteAudit.title=Audit verwijderen capability.SelectAuditMetadata.title=Metagegevens van audit selecteren diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_pt_BR.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_pt_BR.properties index 077512ccd1..b3b2bae02b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_pt_BR.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_pt_BR.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=Criar Modificar Destruir pastas capability.CloseFolders.title=Fechar pastas capability.ReOpenFolders.title=Reabrir pastas capability.DeclareRecordsInClosedFolders.title=Concluir documentos arquiv\u00edsticos em pastas fechadas +capability.FileVersionRecords.title=Arquivar vers\u00e3o de documento arquiv\u00edstico # Vital Records capability.group.vitalRecords.title=Documentos arquiv\u00edsticos vitais diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ru.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ru.properties index e36ed9403c..e5f5356df9 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ru.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_ru.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=\u0421\u043e\u0437\u0434\u0430\u0442 capability.CloseFolders.title=\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u043f\u0430\u043f\u043a\u0438 capability.ReOpenFolders.title=\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u043e \u043e\u0442\u043a\u0440\u044b\u0442\u044c \u043f\u0430\u043f\u043a\u0438 capability.DeclareRecordsInClosedFolders.title=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u0438 \u0432 \u0437\u0430\u043a\u0440\u044b\u0442\u044b\u0445 \u043f\u0430\u043f\u043a\u0430\u0445 +capability.FileVersionRecords.title=\u0417\u0430\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e \u0437\u0430\u043f\u0438\u0441\u0435\u0439 # Vital Records capability.group.vitalRecords.title=\u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_zh_CN.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_zh_CN.properties index 0173f9414e..2100d81769 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_zh_CN.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_zh_CN.properties @@ -23,6 +23,7 @@ capability.CreateModifyDestroyFolders.title=\u521b\u5efa\u4fee\u6539\u9500\u6bc1 capability.CloseFolders.title=\u5173\u95ed\u6587\u4ef6\u5939 capability.ReOpenFolders.title=\u91cd\u65b0\u6253\u5f00\u6587\u4ef6\u5939 capability.DeclareRecordsInClosedFolders.title=\u5b8c\u6210\u5df2\u5173\u95ed\u6587\u4ef6\u5939\u4e2d\u7684\u8bb0\u5f55 +capability.FileVersionRecords.title=\u6587\u4ef6\u7248\u672c\u8bb0\u5f55 # Vital Records capability.group.vitalRecords.title=\u6838\u5fc3\u8bb0\u5f55 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_es.properties index e9ea542e4f..89bae703e9 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_es.properties @@ -1,10 +1,10 @@ -rm.hold.not-hold={0} no es un bloqueo. -rm.hold.add-to-hold-invalid-type={0} no es un documento de archivo, una carpeta de documentos de archivo ni un elemento de contenido. Solo los documentos de archivo, las carpetas de documentos de archivo y los elementos de contenido pueden a\u00f1adirse a un bloqueo. -rm.hold.add-to-hold-archived-node=El contenido archivado no puede a\u00f1adirse a un bloqueo. -rm.hold.add-to-hold-locked-node=El contenido bloqueado no puede a\u00f1adirse a un bloqueo. +rm.hold.not-hold={0} no es una retenci\u00f3n legal. +rm.hold.add-to-hold-invalid-type={0} no es un documento de archivo, una carpeta de documentos de archivo ni un elemento de contenido. Solo los documentos de archivo, las carpetas de documentos de archivo y los elementos de contenido pueden a\u00f1adirse a una retenci\u00f3n legal. +rm.hold.add-to-hold-archived-node=El contenido archivado no puede a\u00f1adirse a una retenci\u00f3n legal. +rm.hold.add-to-hold-locked-node=El contenido bloqueado no puede a\u00f1adirse a una retenci\u00f3n legal. rm.hold.delete-frozen-node=El contenido congelado no puede eliminarse. rm.hold.delete-node-frozen-children=La carpeta no puede eliminarse porque contiene contenido congelado. rm.hold.move-frozen-node=El contenido congelado no puede moverse. rm.hold.update-frozen-node=El contenido congelado no puede actualizarse. -rm.hold.generic-permission-error=El bloqueo no puede eliminarse porque no dispone de los permisos adecuados para todos los elementos del bloqueo. -rm.hold.detailed-permission-error=El bloqueo no puede eliminarse porque es necesario disponer de permisos de archivado para al menos los siguientes elementos: +rm.hold.generic-permission-error=No puede eliminar la retenci\u00f3n legal porque no dispone de los permisos adecuados para todos los elementos en retenci\u00f3n legal. +rm.hold.detailed-permission-error=No puede eliminar la retenci\u00f3n legal porque es necesario disponer de permisos de archivado para al menos los siguientes elementos: diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_nl.properties index af2499e5d8..4c48f23a21 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/hold-service_nl.properties @@ -1,10 +1,10 @@ -rm.hold.not-hold={0} is geen wachtstand. -rm.hold.add-to-hold-invalid-type={0} is geen record, archiefmap of content. Alleen records, archiefmappen of content kunnen worden toegevoegd aan een wachtstand. -rm.hold.add-to-hold-archived-node=Gearchiveerde content kan niet worden toegevoegd aan een wachtstand. -rm.hold.add-to-hold-locked-node=Vergrendelde content kan niet worden toegevoegd aan een wachtstand. +rm.hold.not-hold={0} is geen bewaring. +rm.hold.add-to-hold-invalid-type={0} is geen archiefstuk, archiefmap of content. Alleen archiefstukken, archiefmappen of content kunnen worden toegevoegd aan een bewaring. +rm.hold.add-to-hold-archived-node=Gearchiveerde content kan niet worden toegevoegd aan een bewaring. +rm.hold.add-to-hold-locked-node=Vergrendelde content kan niet worden toegevoegd aan een bewaring. rm.hold.delete-frozen-node=Geblokkeerde content kan niet worden verwijderd. rm.hold.delete-node-frozen-children=De map kan niet worden verwijderd omdat deze geblokkeerde content bevat. rm.hold.move-frozen-node=Geblokkeerde content kan niet worden verplaatst. rm.hold.update-frozen-node=Geblokkeerde content kan niet worden bijgewerkt. -rm.hold.generic-permission-error=Kan wachtstand niet verwijderen, omdat u niet beschikt over de juiste rechten voor alle onderdelen in de wachtstand. -rm.hold.detailed-permission-error=Kan wachtstand niet verwijderen, omdat er alleen al voor de volgende onderdelen archiveringsrechten nodig zijn: +rm.hold.generic-permission-error=Kan bewaring niet verwijderen, omdat u niet beschikt over de juiste rechten voor alle onderdelen in de bewaring. +rm.hold.detailed-permission-error=Kan bewaring niet verwijderen, omdat er alleen al voor de volgende onderdelen archiveringsrechten nodig zijn: diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_nl.properties index b35accdefc..eba934e786 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_nl.properties @@ -1,3 +1,3 @@ -notification.dueforreview.subject=Melding Records gereed voor revisie +notification.dueforreview.subject=Melding Archiefstukken gereed voor revisie notification.superseded.subject=Melding Record vervangen notification.rejected.subject=Melding Record geweigerd diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_nl.properties index a1c9cdc528..44a763e38a 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_nl.properties @@ -1,25 +1,25 @@ -rm.service.error-add-content-container=U kunt records alleen archiveren in een archiefmap. +rm.service.error-add-content-container=U kunt archiefstukken alleen archiveren in een archiefmap. rm.service.update-disposition-action-def=U kunt de definitie van de retentieactie niet bijwerken omdat er wijzigingen in het retentieschema worden opgeslagen. Probeer het over een paar minuten opnieuw. rm.service.set-id=U kunt de id van {0} niet wijzigen omdat dit de eigenschap Alleen-lezen heeft. rm.service.path-node=Kan {0} niet vinden. Vernieuw de browser of neem contact op met uw IT- afdeling rm.service.invalid-rm-node=De node voor Records Management is niet geldig omdat het aspect {0} niet aanwezig is. -rm.service.no-root=Kan de Records Management-oorsprong niet vinden. Probeer de record opnieuw te archiveren. +rm.service.no-root=Kan de Records Management-oorsprong niet vinden. Probeer het archiefstuk opnieuw te archiveren. rm.service.dup-root=U kunt hier geen ordeningsplan maken omdat er al een is gemaakt in deze maphi\u00ebrarchie. rm.service.root-type=Kan het ordeningsplan niet maken omdat type {0} geen subtype is van rma:filePlan. Probeer het opnieuw met een ander type. -rm.service.container-parent-type=U kunt alleen een recordcategorie maken op het hoogste niveau van het ordeningsplan of in een andere recordcategorie (rma:recordCategory). -rm.service.container-type=U kunt alleen een recordcategorie maken op het hoogste niveau van het ordeningsplan of in een andere recordcategorie (rma:recordsManagementContainer of subtype). -rm.service.container-expected=U kunt alleen recordcategoriecontent vinden in een recordcategorie (rma:recordCategory of subtype). +rm.service.container-parent-type=U kunt alleen een archiefstukcategorie maken op het hoogste niveau van het ordeningsplan of in een andere archiefstukcategorie (rma:recordCategory). +rm.service.container-type=U kunt alleen een archiefstukcategorie maken op het hoogste niveau van het ordeningsplan of in een andere archiefstukcategorie (rma:recordsManagementContainer of subtype). +rm.service.container-expected=U kunt alleen archiefstukcategoriecontent vinden in een archiefstukcategorie (rma:recordCategory of subtype). rm.service.record-folder-expected=De actie kan alleen worden afgerond met behulp van een archiefmap van het type rma:recordFolder. -rm.service.parent-record-folder-root=U kunt hier geen archiefmap maken. Probeer de map te maken in een recordcategorie. -rm.service.parent-record-folder-type=U kunt hier geen archiefmap maken. Probeer de map te maken in een recordcategorie. +rm.service.parent-record-folder-root=U kunt hier geen archiefmap maken. Probeer de map te maken in een archiefstukcategorie. +rm.service.parent-record-folder-type=U kunt hier geen archiefmap maken. Probeer de map te maken in een archiefstukcategorie. rm.service.record-folder-type=Kan geen archiefmap maken tenzij u het type rma:recordFolder of een subtype gebruikt. -rm.service.not-record=De node {0} is geen record. -rm.service.vital-def-missing=Definitie-aspect van vitale record is niet aanwezig op node. (nodeRef={0}) +rm.service.not-record=De node {0} is geen archiefstuk. +rm.service.vital-def-missing=Definitie-aspect van vitaal archiefstuk is niet aanwezig op node. (nodeRef={0}) rm.service.close-record-folder-not-folder=De archiefmap kan niet worden gesloten omdat hij niet als een archiefmap is gedefinieerd.(nodeRef={0}) -rm.service.node-has-aspect=Het recordtype {1} wordt al weergegeven voor record {0}. +rm.service.node-has-aspect=Het archiefstuktype {1} wordt al weergegeven voor archiefstuk {0}. rm.service.final-version=Definitief -rm.service.final-version-description=De definitieve gearchiveerde recordversie -rm.service.enable-autoversion-on-record-creation=Automatische versie bij maken van record +rm.service.final-version-description=De definitieve gearchiveerde archiefstukversie +rm.service.enable-autoversion-on-record-creation=Automatische versie bij maken van archiefstuk rm.service.add-children-to-closed-record-folder=U kunt geen nieuwe onderdelen toevoegen aan een gesloten archiefmap. rm.service.add-children-to-frozen-record-folder=U kunt geen nieuwe onderdelen toevoegen aan een geblokkeerde archiefmap. -rm.service.update-record-content=U kunt de contenteigenschap van een record niet bijwerken. +rm.service.update-record-content=U kunt de contenteigenschap van een archiefstuk niet bijwerken. 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 742a37394b..2a6426478f 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 @@ -104,10 +104,10 @@ rma_recordsmanagement.property.rma_eventExecutionCompletedBy.decription=Evento c rma_recordsmanagement.property.rma_eventExecutionCompletedAt.title=Evento completado en rma_recordsmanagement.property.rma_eventExecutionCompletedAt.decription=Evento completado en -rma_recordsmanagement.type.rma_hold.title=Bloqueo -rma_recordsmanagement.type.rma_hold.decription=Bloqueo -rma_recordsmanagement.property.rma_holdReason.title=Raz\u00f3n de bloqueo -rma_recordsmanagement.property.rma_holdReason.decription=Raz\u00f3n de bloqueo +rma_recordsmanagement.type.rma_hold.title=Retenci\u00f3n legal +rma_recordsmanagement.type.rma_hold.decription=Retenci\u00f3n legal +rma_recordsmanagement.property.rma_holdReason.title=Raz\u00f3n de retenci\u00f3n legal +rma_recordsmanagement.property.rma_holdReason.decription=Raz\u00f3n de retenci\u00f3n legal rma_recordsmanagement.association.rma_frozenRecords.title=Documentos de archivo bloqueados rma_recordsmanagement.association.rma_frozenRecords.decription=Documentos de archivo bloqueados @@ -129,8 +129,8 @@ rma_recordsmanagement.property.rma_rootNodeRef.decription=Nodo ra\u00edz rma_recordsmanagement.aspect.rma_recordsManagementRoot.title=Ra\u00edz de gesti\u00f3n de documentos de archivo rma_recordsmanagement.aspect.rma_recordsManagementRoot.decription=Ra\u00edz de gesti\u00f3n de documentos de archivo -rma_recordsmanagement.association.rma_holds.title=Bloqueos -rma_recordsmanagement.association.rma_holds.decription=Bloqueos +rma_recordsmanagement.association.rma_holds.title=Retenciones legales +rma_recordsmanagement.association.rma_holds.decription=Retenciones legales rma_recordsmanagement.association.rma_transfers.title=Transferencias rma_recordsmanagement.association.rma_transfers.decription=Transferencias @@ -198,8 +198,8 @@ rma_recordsmanagement.aspect.rma_transferred.decription=Transferido rma_recordsmanagement.aspect.rma_ascended.title=Ascendido rma_recordsmanagement.aspect.rma_ascended.decription=Ascendido -rma_recordsmanagement.aspect.rma_frozen.title=En espera -rma_recordsmanagement.aspect.rma_frozen.decription=En espera +rma_recordsmanagement.aspect.rma_frozen.title=En retenci\u00f3n legal +rma_recordsmanagement.aspect.rma_frozen.decription=En retenci\u00f3n legal rma_recordsmanagement.property.rma_frozenAt.title=Bloqueado en rma_recordsmanagement.property.rma_frozenAt.decription=Bloqueado en rma_recordsmanagement.property.rma_frozenBy.title=Bloqueado por @@ -235,8 +235,8 @@ rma_recordsmanagement.property.rma_recordSearchDispositionAuthority.title=Autori rma_recordsmanagement.property.rma_recordSearchDispositionAuthority.description=Autoridad de retenci\u00f3n rma_recordsmanagement.property.rma_recordSearchDispositionInstructions.title=Instrucciones de retenci\u00f3n rma_recordsmanagement.property.rma_recordSearchDispositionInstructions.description=Instrucciones de retenci\u00f3n -rma_recordsmanagement.property.rma_recordSearchHoldReason.title=Raz\u00f3n de bloqueo -rma_recordsmanagement.property.rma_recordSearchHoldReason.description=Raz\u00f3n de bloqueo +rma_recordsmanagement.property.rma_recordSearchHoldReason.title=Raz\u00f3n de retenci\u00f3n legal +rma_recordsmanagement.property.rma_recordSearchHoldReason.description=Raz\u00f3n de retenci\u00f3n legal rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriod.title=Per\u00edodo de revisi\u00f3n de documento de archivo vital rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriod.description=Per\u00edodo de revisi\u00f3n de documento de archivo vital rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriodExpression.title=Expresi\u00f3n de per\u00edodo de revisi\u00f3n 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 85cd12fc68..4df5a9accb 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 @@ -24,8 +24,8 @@ rma_recordsmanagement.property.rma_dispositionAuthority.decription=Retentieautor rma_recordsmanagement.property.rma_dispositionInstructions.title=Retentie-instructies rma_recordsmanagement.property.rma_dispositionInstructions.decription=Retentie-instructies -rma_recordsmanagement.property.rma_recordLevelDisposition.title=Retentie op recordniveau -rma_recordsmanagement.property.rma_recordLevelDisposition.decription=Retentie op recordniveau +rma_recordsmanagement.property.rma_recordLevelDisposition.title=Retentie op archiefstukniveau +rma_recordsmanagement.property.rma_recordLevelDisposition.decription=Retentie op archiefstukniveau rma_recordsmanagement.association.rma_dispositionActionDefinitions.title=Retentieacties rma_recordsmanagement.association.rma_dispositionActionDefinitions.decription=Retentieacties @@ -49,11 +49,11 @@ rma_recordsmanagement.property.rma_dispositionEventCombination.decription=Combin rma_recordsmanagement.type.rma_recordFolder.title=Archiefmap rma_recordsmanagement.type.rma_recordFolder.decription=Archiefmap -rma_recordsmanagement.property.rma_isClosed.title=Record -rma_recordsmanagement.property.rma_isClosed.decription=Record +rma_recordsmanagement.property.rma_isClosed.title=Archiefstuk +rma_recordsmanagement.property.rma_isClosed.decription=Archiefstuk -rma_recordsmanagement.type.rma_recordCategory.title=Recordcategorie -rma_recordsmanagement.type.rma_recordCategory.decription=Recordcategorie +rma_recordsmanagement.type.rma_recordCategory.title=Archiefstukcategorie +rma_recordsmanagement.type.rma_recordCategory.decription=Archiefstukcategorie rma_recordsmanagement.type.rma_nonElectronicDocument.title=Niet-elektronisch document rma_recordsmanagement.type.rma_nonElectronicDocument.decription=Niet-elektronisch document @@ -62,13 +62,13 @@ rma_recordsmanagement.property.rma_physicalSize.decription=De grootte van het do rma_recordsmanagement.property.rma_numberOfCopies.title=Aantal exemplaren rma_recordsmanagement.property.rma_numberOfCopies.description=Het aantal exemplaren van het document. rma_recordsmanagement.property.rma_storageLocation.title=Opslaglocatie -rma_recordsmanagement.property.rma_storageLocation.decription=De fysieke opslaglocatie van de record. +rma_recordsmanagement.property.rma_storageLocation.decription=De fysieke opslaglocatie van het archiefstuk. rma_recordsmanagement.property.rma_shelf.title=Plank -rma_recordsmanagement.property.rma_shelf.decription=De plank waarop de record wordt bewaard. +rma_recordsmanagement.property.rma_shelf.decription=De plank waarop het archiefstuk wordt bewaard. rma_recordsmanagement.property.rma_box.title=Doos -rma_recordsmanagement.property.rma_box.description=De doos waarin de record wordt bewaard. +rma_recordsmanagement.property.rma_box.description=De doos waarin het archiefstuk wordt bewaard. rma_recordsmanagement.property.rma_file.title=Archiveren -rma_recordsmanagement.property.rma_file.decription=Het archief waarin de record wordt bewaard. +rma_recordsmanagement.property.rma_file.decription=Het archief waarin het archiefstuk wordt bewaard. rma_recordsmanagement.type.rma_dispositionAction.title=Retentieactie rma_recordsmanagement.type.rma_dispositionAction.decription=Retentieactie @@ -104,12 +104,12 @@ rma_recordsmanagement.property.rma_eventExecutionCompletedBy.decription=Gebeurte rma_recordsmanagement.property.rma_eventExecutionCompletedAt.title=Gebeurtenis afgerond op rma_recordsmanagement.property.rma_eventExecutionCompletedAt.decription=Gebeurtenis afgerond op -rma_recordsmanagement.type.rma_hold.title=Wachtstand -rma_recordsmanagement.type.rma_hold.decription=Wachtstand -rma_recordsmanagement.property.rma_holdReason.title=Reden van wachtstand -rma_recordsmanagement.property.rma_holdReason.decription=Reden van wachtstand -rma_recordsmanagement.association.rma_frozenRecords.title=Records in wachtstand -rma_recordsmanagement.association.rma_frozenRecords.decription=Records in wachtstand +rma_recordsmanagement.type.rma_hold.title=Bewaring +rma_recordsmanagement.type.rma_hold.decription=Bewaring +rma_recordsmanagement.property.rma_holdReason.title=Reden van bewaring +rma_recordsmanagement.property.rma_holdReason.decription=Reden van bewaring +rma_recordsmanagement.association.rma_frozenRecords.title=Archiefstukken in bewaring +rma_recordsmanagement.association.rma_frozenRecords.decription=Archiefstukken in bewaring rma_recordsmanagement.type.rma_transfer.title=Overzetten rma_recordsmanagement.type.rma_transfer.decription=Overzetten @@ -129,49 +129,49 @@ rma_recordsmanagement.property.rma_rootNodeRef.decription=Oorsprongnode rma_recordsmanagement.aspect.rma_recordsManagementRoot.title=Oorsprong Records Management rma_recordsmanagement.aspect.rma_recordsManagementRoot.decription=Oorsprong Records Management -rma_recordsmanagement.association.rma_holds.title=Wachtstanden -rma_recordsmanagement.association.rma_holds.decription=Wachtstanden +rma_recordsmanagement.association.rma_holds.title=Bewaringen +rma_recordsmanagement.association.rma_holds.decription=Bewaringen rma_recordsmanagement.association.rma_transfers.title=Overzettingen rma_recordsmanagement.association.rma_transfers.decription=Overzettingen -rma_recordsmanagement.aspect.rma_declaredRecord.title=Afgeronde record -rma_recordsmanagement.aspect.rma_declaredRecord.decription=Afgeronde record +rma_recordsmanagement.aspect.rma_declaredRecord.title=Afgerond archiefstuk +rma_recordsmanagement.aspect.rma_declaredRecord.decription=Afgerond archiefstuk rma_recordsmanagement.property.rma_declaredAt.title=Datum afgerond rma_recordsmanagement.property.rma_declaredAt.decription=Datum afgerond rma_recordsmanagement.property.rma_declaredBy.title=Afgerond door rma_recordsmanagement.property.rma_declaredBy.decription=Afgerond door -rma_recordsmanagement.aspect.rma_recordComponentIdentifier.title=Identificatie recordonderdeel +rma_recordsmanagement.aspect.rma_recordComponentIdentifier.title=Identificatie archiefstukonderdeel rma_recordsmanagement.aspect.rma_recordComponentIdentifier.decription=Identificatie recordonderdeel rma_recordsmanagement.property.rma_identifier.title=Record-id -rma_recordsmanagement.property.rma_identifier.decription=Unieke identificatie record +rma_recordsmanagement.property.rma_identifier.decription=Unieke identificatie archiefstuk rma_recordsmanagement.property.rma_dbUniquenessId.title=Uniekheid database rma_recordsmanagement.property.rma_dbUniquenessId.decription=Uniekheid database -rma_recordsmanagement.aspect.rma_vitalRecordDefinition.title=Definitie vitale record -rma_recordsmanagement.aspect.rma_vitalRecordDefinition.decription=Definitie vitale record +rma_recordsmanagement.aspect.rma_vitalRecordDefinition.title=Definitie vitaal archiefstuk +rma_recordsmanagement.aspect.rma_vitalRecordDefinition.decription=Definitie vitaal archiefstuk rma_recordsmanagement.property.rma_reviewPeriod.title=Revisieperiode rma_recordsmanagement.property.rma_reviewPeriod.decription=Revisieperiode -rma_recordsmanagement.property.rma_vitalRecordIndicator.title=Indicator vitale record -rma_recordsmanagement.property.rma_vitalRecordIndicator.decription=Indicator vitale record +rma_recordsmanagement.property.rma_vitalRecordIndicator.title=Indicator vitaal archiefstuk +rma_recordsmanagement.property.rma_vitalRecordIndicator.decription=Indicator vitaal archiefstuk -rma_recordsmanagement.aspect.rma_record.title=Record -rma_recordsmanagement.aspect.rma_record.decription=Record +rma_recordsmanagement.aspect.rma_record.title=Archiefstuk +rma_recordsmanagement.aspect.rma_record.decription=Archiefstuk rma_recordsmanagement.property.rma_dateFiled.title=Datum gearchiveerd rma_recordsmanagement.property.rma_dateFiled.decription=Datum gearchiveerd rma_recordsmanagement.property.rma_origionalName=Oorspronkelijke naam -rma_recordsmanagement.aspect.rma_recordMetaData.title=Metagegevens van record -rma_recordsmanagement.aspect.rma_recordMetaData.description=Markeraspect voor metagegevens van record +rma_recordsmanagement.aspect.rma_recordMetaData.title=Metagegevens van archiefstuk +rma_recordsmanagement.aspect.rma_recordMetaData.description=Markeraspect voor metagegevens van archiefstuk -rma_recordsmanagement.aspect.rma_commonRecordDetails.title=Algemene recordgegevens -rma_recordsmanagement.aspect.rma_commonRecordDetails.description=Algemene metagegevens voor alle recordtypes +rma_recordsmanagement.aspect.rma_commonRecordDetails.title=Algemene archiefstukgegevens +rma_recordsmanagement.aspect.rma_commonRecordDetails.description=Algemene metagegevens voor alle archiefstuktypes rma_recordsmanagement.property.rma_location.title=Locatie rma_recordsmanagement.property.rma_location.decription=Locatie -rma_recordsmanagement.aspect.rma_vitalRecord.title=Vitale record -rma_recordsmanagement.aspect.rma_vitalRecord.decription=Vitale record +rma_recordsmanagement.aspect.rma_vitalRecord.title=Vitaal archiefstuk +rma_recordsmanagement.aspect.rma_vitalRecord.decription=Vitaal archiefstuk rma_recordsmanagement.property.rma_reviewAsOf.title=Volgende revisie rma_recordsmanagement.property.rma_reviewAsOf.decription=Volgende revisie @@ -198,12 +198,12 @@ rma_recordsmanagement.aspect.rma_transferred.decription=Overgezet rma_recordsmanagement.aspect.rma_ascended.title=Opgelopen rma_recordsmanagement.aspect.rma_ascended.decription=Opgelopen -rma_recordsmanagement.aspect.rma_frozen.title=In wachtstand -rma_recordsmanagement.aspect.rma_frozen.decription=In wachtstand -rma_recordsmanagement.property.rma_frozenAt.title=In wachtstand in -rma_recordsmanagement.property.rma_frozenAt.decription=In wachtstand in -rma_recordsmanagement.property.rma_frozenBy.title=In wachtstand door -rma_recordsmanagement.property.rma_frozenBy.decription=In wachtstand door +rma_recordsmanagement.aspect.rma_frozen.title=In bewaring +rma_recordsmanagement.aspect.rma_frozen.decription=In bewaring +rma_recordsmanagement.property.rma_frozenAt.title=In bewaring in +rma_recordsmanagement.property.rma_frozenAt.decription=In bewaring in +rma_recordsmanagement.property.rma_frozenBy.title=In bewaring door +rma_recordsmanagement.property.rma_frozenBy.decription=In bewaring door rma_recordsmanagement.aspect.rma_caveatConfigRoot.title=Oorsprong Caveat-configuratie rma_recordsmanagement.aspect.rma_caveatConfigRoot.decription=Oorsprong Caveat-configuratie @@ -235,9 +235,9 @@ rma_recordsmanagement.property.rma_recordSearchDispositionAuthority.title=Retent rma_recordsmanagement.property.rma_recordSearchDispositionAuthority.description=Retentieautoriteit rma_recordsmanagement.property.rma_recordSearchDispositionInstructions.title=Retentie-instructies rma_recordsmanagement.property.rma_recordSearchDispositionInstructions.description=Retentie-instructies -rma_recordsmanagement.property.rma_recordSearchHoldReason.title=Reden van wachtstand -rma_recordsmanagement.property.rma_recordSearchHoldReason.description=Reden van wachtstand -rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriod.title=Revisieperiode vitale record +rma_recordsmanagement.property.rma_recordSearchHoldReason.title=Reden van bewaring +rma_recordsmanagement.property.rma_recordSearchHoldReason.description=Reden van bewaring +rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriod.title=Revisieperiode vitaal archiefstuk rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriod.description=Revisieperiode vitale record rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriodExpression.title=Uitdrukking van revisieperiode rma_recordsmanagement.property.rma_recordSearchVitalRecordReviewPeriodExpression.description=Uitdrukking van revisieperiode @@ -257,7 +257,7 @@ rma_recordsmanagement.property.rma_publishInProgress.title=Publicatie bezig rma_recordsmanagement.property.rma_publishInProgress.description=Geeft aan of er momenteel een publicatie wordt uitgevoerd rma_recordsmanagement.aspect.dod_ghosted.title=Record met alleen metagegevens -rma_recordsmanagement.aspect.dod_ghosted.description=Record met alleen metagegevens +rma_recordsmanagement.aspect.dod_ghosted.description=Archiefstuk met alleen metagegevens listconstraint.rmc_tlList.title=Overzetlocaties listconstraint.rmc_smList.title=Aanvullende markeringen diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties index 7916bff418..e1a0359220 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties @@ -9,5 +9,5 @@ rmr_recordsmanagementreport.type.rmr_destructionReport.description=Informe de tr rmr_recordsmanagementreport.type.rmr_destructionReport.title=Informe de destrucci\u00f3n rmr_recordsmanagementreport.type.rmr_destructionReport.description=Informe de destrucci\u00f3n de Records Management. -rmr_recordsmanagementreport.type.rmr_holdReport.title=Informe de bloqueo -rmr_recordsmanagementreport.type.rmr_holdReport.description=Informe de bloqueo de Records Management. +rmr_recordsmanagementreport.type.rmr_holdReport.title=Informe de retenci\u00f3n legal +rmr_recordsmanagementreport.type.rmr_holdReport.description=Informe de retenci\u00f3n legal de gesti\u00f3n de documentos de archivo. diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_nl.properties index 7a2b3731b0..7093e7c5cc 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_nl.properties @@ -9,5 +9,5 @@ rmr_recordsmanagementreport.type.rmr_destructionReport.description=Records Manag rmr_recordsmanagementreport.type.rmr_destructionReport.title=Vernietigingsrapport rmr_recordsmanagementreport.type.rmr_destructionReport.description=Records Management-vernietigingsrapport. -rmr_recordsmanagementreport.type.rmr_holdReport.title=Wachtstandrapport -rmr_recordsmanagementreport.type.rmr_holdReport.description=Records Management-wachtstandrapport +rmr_recordsmanagementreport.type.rmr_holdReport.title=Bewaringsrapport +rmr_recordsmanagementreport.type.rmr_holdReport.description=Records Management-bewaringsrapport diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_nl.properties index f1bf21b428..5f14525ece 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-events_nl.properties @@ -14,7 +14,7 @@ rmevent.superseded=Vervangen rmevent.versioned=Met versiebeheer rmevent.study_complete=Onderzoek afgerond rmevent.training_complete=Training afgerond -rmevent.related_record_trasfered_inactive_storage=Gerelateerde record overgezet naar inactieve opslag +rmevent.related_record_trasfered_inactive_storage=Gerelateerd archiefstuk overgezet naar inactieve opslag rmevent.obsolete=Verouderd rmevent.all_allowances_granted_are_terminated=Alle toegekende rechten zijn be\u00ebindigd rmevent.WGI_action_complete=WGI-actie afgerond diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties index 1dcc796ff0..4049bdf4ba 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_es.properties @@ -1,4 +1,4 @@ -rm.hold.name=Bloqueo +rm.hold.name=Retenci\u00f3n legal ## Default roles rm.role.extendedReaders=Lectores in situ @@ -21,5 +21,5 @@ rm.savedsearch.transferRecordsName=Documentos de archivo y carpetas de documento rm.savedsearch.transferRecordsDesc=Actualmente, todos los documentos y carpetas de documentos de archivo se pueden transferir. rm.savedsearch.destructionRecordsName=Documentos de archivo y carpetas de documentos de archivo que se pueden destruir rm.savedsearch.destructionRecordsDesc=Actualmente, todos los documentos de archivo se pueden destruir. -rm.savedsearch.frozenRecordsName=Documentos de archivo y carpetas de documentos de archivo en espera -rm.savedsearch.frozenRecordsDesc=Todos los documentos de archivo y carpetas de documentos de archivo est\u00e1n en espera. +rm.savedsearch.frozenRecordsName=Documentos de archivo y carpetas de documentos de archivo en retenci\u00f3n legal +rm.savedsearch.frozenRecordsDesc=Todos los documentos de archivo y carpetas de documentos de archivo est\u00e1n en retenci\u00f3n legal. diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_nl.properties index b028a66097..b35d2c2678 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_nl.properties @@ -1,4 +1,4 @@ -rm.hold.name=Wachtstand +rm.hold.name=Bewaring ## Default roles rm.role.extendedReaders=Ge\u00efntegreerde lezers @@ -11,15 +11,15 @@ rm.role.administrator=Beheerder Record Management rm.role.all=Alle rollen voor Record Management ## Default searches -rm.savedsearch.vitalRecordsName=Vitale records gereed voor revisie -rm.savedsearch.vitalRecordsDesc=Alle records die momenteel gereed zijn voor revisie. -rm.savedsearch.incompleteRecordsName=Niet-afgeronde records -rm.savedsearch.incompleteRecordsDesc=Alle niet-afgeronde records. -rm.savedsearch.cutoffRecordsName=Records en archiefmappen die in aanmerking komen voor afsluiten -rm.savedsearch.cutoffRecordsDesc=Alle records en archiefmappen die momenteel in aanmerking komen voor afsluiten -rm.savedsearch.transferRecordsName=Records en archiefmappen die in aanmerking komen voor overzetten -rm.savedsearch.transferRecordsDesc=Alle records en archiefmappen die momenteel in aanmerking komen voor overzetten. -rm.savedsearch.destructionRecordsName=Records en archiefmappen die in aanmerking komen voor vernietiging -rm.savedsearch.destructionRecordsDesc=Alle records die momenteel in aanmerking komen voor vernietiging. -rm.savedsearch.frozenRecordsName=Records en archiefmappen die in wachtstand zijn -rm.savedsearch.frozenRecordsDesc=Alle records en archiefmappen die momenteel in wachtstand zijn. +rm.savedsearch.vitalRecordsName=Vitale archiefstukken gereed voor revisie +rm.savedsearch.vitalRecordsDesc=Alle archiefstukken die momenteel gereed zijn voor revisie. +rm.savedsearch.incompleteRecordsName=Niet-afgeronde archiefstukken +rm.savedsearch.incompleteRecordsDesc=Alle niet-afgeronde archiefstukken. +rm.savedsearch.cutoffRecordsName=Archiefstukken en archiefmappen die in aanmerking komen voor afsluiten +rm.savedsearch.cutoffRecordsDesc=Alle archiefstukken en archiefmappen die momenteel in aanmerking komen voor afsluiten +rm.savedsearch.transferRecordsName=Archiefstukken en archiefmappen die in aanmerking komen voor overzetten +rm.savedsearch.transferRecordsDesc=Alle archiefstukken en archiefmappen die momenteel in aanmerking komen voor overzetten. +rm.savedsearch.destructionRecordsName=Archiefstukken en archiefmappen die in aanmerking komen voor vernietiging +rm.savedsearch.destructionRecordsDesc=Alle archiefstukken die momenteel in aanmerking komen voor vernietiging. +rm.savedsearch.frozenRecordsName=Archiefstukken en archiefmappen die in bewaring zijn +rm.savedsearch.frozenRecordsDesc=Alle archiefstukken en archiefmappen die momenteel in bewaring zijn. diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_es.properties index e8fa72eaf3..370973abea 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_es.properties @@ -18,10 +18,10 @@ file.report.record=Documento de archivo file.report.record.folder=Carpeta de documentos de archivo file.report.unique.folder.identifier=ID de carpeta \u00fanico file.report.unique.record.identifier=ID de documento de archivo \u00fanico -file.report.hold.report=Informe de bloqueo -file.report.hold.name=Nombre de bloqueo -file.report.hold.description=Descripci\u00f3n de bloqueo -file.report.hold.reason=Raz\u00f3n de bloqueo +file.report.hold.report=Informe de retenci\u00f3n legal +file.report.hold.name=Nombre de retenci\u00f3n legal +file.report.hold.description=Descripci\u00f3n de retenci\u00f3n legal +file.report.hold.reason=Raz\u00f3n de retenci\u00f3n legal file.report.hold.held=Bloqueado file.report.createdby=Creado por file.report.createdon=Creado diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties index facccb5d06..16470826ef 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_nl.properties @@ -4,7 +4,7 @@ file.report.date.format=EEE MMM dd UU:mm:ss zzz jjjj file.report.declared.by=gedeclareerd door file.report.declared.on=op file.report.destroyed=Vernietigd -file.report.destroyed.records=Vernietigde records +file.report.destroyed.records=Vernietigde archiefstukken file.report.destruction.report=Vernietigingsrapport file.report.disposition.authority=Retentieautoriteit file.report.disposition.instructions=Retentie-instructies @@ -14,14 +14,14 @@ file.report.transfer.location=Overzetlocatie file.report.transfer.report=Overzetrapport file.report.transferred.items=Overgezette onderdelen file.report.performed.by=Uitgevoerd door -file.report.record=Record +file.report.record=Archiefstuk file.report.record.folder=Archiefmap file.report.unique.folder.identifier=Unieke id archiefmap -file.report.unique.record.identifier=Unieke id record -file.report.hold.report=Rapport wachtstand -file.report.hold.name=Naam wachtstand -file.report.hold.description=Beschrijving wachtstand -file.report.hold.reason=Reden van wachtstand -file.report.hold.held=In wachtstand +file.report.unique.record.identifier=Unieke id archiefstuk +file.report.hold.report=Bewaringsrapport +file.report.hold.name=Naam bewaring +file.report.hold.description=Beschrijving bewaring +file.report.hold.reason=Reden van bewaring +file.report.hold.held=In bewaring file.report.createdby=Gemaakt door file.report.createdon=Gemaakt op diff --git a/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties b/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties index 9cd664136e..123ec56cb2 100755 --- a/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_nl.properties @@ -1,8 +1,8 @@ -activitiReviewPooled.workflow.info.requested=Informatie aangevraagd voor de record -activitiReviewPooled.workflow.info.provided=Informatie aangeleverd voor de record -activitiReviewPooled.workflow.email.subject=Informatie aangeleverd voor de record +activitiReviewPooled.workflow.info.requested=Informatie aangevraagd voor het archiefstuk +activitiReviewPooled.workflow.info.provided=Informatie aangeleverd voor het archiefstuk +activitiReviewPooled.workflow.email.subject=Informatie aangeleverd voor het archiefstuk activitiReviewPooled.workflow.email.body1=De gebruiker -activitiReviewPooled.workflow.email.body2=heeft de vereiste informatie voor de record aangeleverd. +activitiReviewPooled.workflow.email.body2=heeft de vereiste informatie voor het archiefstuk aangeleverd. rmwf_workflowmodel.type.rmwf_workflowTask.title=Workflowtaak rmwf_workflowmodel.type.rmwf_workflowTask.decription=Workflowtaak @@ -13,8 +13,8 @@ rmwf_workflowmodel.property.rmwf_message.decription=Bericht rmwf_workflowmodel.type.rmwf_submitRequestInfoTask.title=Informatie-aanvraagtaak rmwf_workflowmodel.type.rmwf_submitRequestInfoTask.description=Informatie-aanvraagtaak -rmwf_workflowmodel.association.rmwf_mixedAssignees.title=Uitvoerders -rmwf_workflowmodel.association.rmwf_mixedAssignees.description=Uitvoerders +rmwf_workflowmodel.association.rmwf_mixedAssignees.title=Toegewezen personen +rmwf_workflowmodel.association.rmwf_mixedAssignees.description=Toegewezen personen rmwf_workflowmodel.type.rmwf_requestInfoTask.title=Informatie-aanvraagtaak rmwf_workflowmodel.type.rmwf_requestInfoTask.description=Informatie-aanvraagtaak From 22760dbf5d9030b28a62a4a04afa7d70c5a9796f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 17 Aug 2020 22:29:40 +0300 Subject: [PATCH 21/75] Updated "Declare version as record" to "File version as record" --- .../module/org_alfresco_module_rm/messages/actions.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_de.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_es.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_fr.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_it.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_ja.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_nb.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_nl.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_pt_BR.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_ru.properties | 4 ++-- .../org_alfresco_module_rm/messages/actions_zh_CN.properties | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties index 34215766fe..ee2cf32e5f 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=File Plan create-record.hide-record.display-label=Hide Record create-record.path.display-label=Record Folder Location -# Declare As Version Record -declare-as-version-record.title=Declare Version as Record +# File Version Record +declare-as-version-record.title=File Version as Record declare-as-version-record.description=Declares this version of the file as a record and optionally files it declare-as-version-record.file-plan.display-label=File Plan declare-as-version-record.path.display-label=Record Folder Location diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties index 0182d1829c..ecd5c94c4f 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_de.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Ablageplan create-record.hide-record.display-label=Record ausblenden create-record.path.display-label=Ort f\u00fcr Record-Ordner -# Declare As Version Record -declare-as-version-record.title=Version als Record deklarieren +# File Version as Record +declare-as-version-record.title=Version als Record ablegen declare-as-version-record.description=Deklariert diese Version der Datei als Record und legt sie auf Wunsch ab declare-as-version-record.file-plan.display-label=Ablageplan declare-as-version-record.path.display-label=Ort f\u00fcr Record-Ordner diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties index c11b6d5160..1f0287aceb 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_es.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Cuadro de clasificaci\u00f3n create-record.hide-record.display-label=Ocultar documento de archivo create-record.path.display-label=Ubicaci\u00f3n de la carpeta de documentos de archivo -# Declare As Version Record -declare-as-version-record.title=Declarar la versi\u00f3n como documento de archivo +# File Version as Record +declare-as-version-record.title=Archivar versi\u00f3n como documento de archivo declare-as-version-record.description=Declara esta versi\u00f3n del fichero como un documento de archivo y opcionalmente lo archiva. declare-as-version-record.file-plan.display-label=Cuadro de clasificaci\u00f3n declare-as-version-record.path.display-label=Ubicaci\u00f3n de la carpeta de documentos de archivo diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties index 3c14adde40..72aac3b90d 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Plan de classement create-record.hide-record.display-label=Masquer le document d'archives create-record.path.display-label=Emplacement du dossier d'archives -# Declare As Version Record -declare-as-version-record.title=D\u00e9clarer la version comme document d'archives +# File Version as Record +declare-as-version-record.title=Classer la version comme document d'archives declare-as-version-record.description=D\u00e9clare cette version du fichier comme document d'archives et le classe, le cas \u00e9ch\u00e9ant declare-as-version-record.file-plan.display-label=Plan de classement declare-as-version-record.path.display-label=Emplacement du dossier d'archives diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties index 6f39a53e07..07ca80ed44 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_it.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Piano di fascicolazione create-record.hide-record.display-label=Nascondi record create-record.path.display-label=Posizione cartella di record -# Declare As Version Record -declare-as-version-record.title=Dichiara versione come record +# File Version as Record +declare-as-version-record.title=Archivia versione come record declare-as-version-record.description=Dichiara questa versione del file come record e opzionalmente lo archivia declare-as-version-record.file-plan.display-label=Piano di fascicolazione declare-as-version-record.path.display-label=Posizione cartella di record diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties index 2b80be56f9..a10257126d 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ja.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=\u6574\u7406\u4fdd\u7ba1\u30d7\u30e9\u30f3 create-record.hide-record.display-label=\u30ec\u30b3\u30fc\u30c9\u3092\u975e\u8868\u793a\u306b\u3059\u308b create-record.path.display-label=\u30ec\u30b3\u30fc\u30c9\u30d5\u30a9\u30eb\u30c0\u306e\u5834\u6240 -# Declare As Version Record -declare-as-version-record.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3059\u308b +# File Version as Record +declare-as-version-record.title=\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u6574\u7406\u4fdd\u7ba1 declare-as-version-record.description=\u30d5\u30a1\u30a4\u30eb\u306e\u3053\u306e\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u30ec\u30b3\u30fc\u30c9\u3068\u3057\u3066\u5ba3\u8a00\u3057\u3001\u5fc5\u8981\u306b\u5fdc\u3058\u3066\u6574\u7406\u4fdd\u7ba1\u3057\u307e\u3059 declare-as-version-record.file-plan.display-label=\u6574\u7406\u4fdd\u7ba1\u30d7\u30e9\u30f3 declare-as-version-record.path.display-label=\u30ec\u30b3\u30fc\u30c9\u30d5\u30a9\u30eb\u30c0\u306e\u5834\u6240 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties index 824b7e3486..f5be829b3b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nb.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Filplan create-record.hide-record.display-label=Skjul oppf\u00f8ring create-record.path.display-label=Plassering av oppf\u00f8ringsmappe -# Declare As Version Record -declare-as-version-record.title=Erkl\u00e6r versjonen som oppf\u00f8ring +# File Version as Record +declare-as-version-record.title=Arkiver versjonen som en oppf\u00f8ring declare-as-version-record.description=Erkl\u00e6rer filen som en oppf\u00f8ring og arkiverer den ved \u00f8nske declare-as-version-record.file-plan.display-label=Filplan declare-as-version-record.path.display-label=Plassering av oppf\u00f8ringsmappe diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties index d75f7fd6a4..caef7c3690 100755 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_nl.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Ordeningsplan create-record.hide-record.display-label=Record verbergen create-record.path.display-label=Locatie archiefmap -# Declare As Version Record -declare-as-version-record.title=Versie declareren als archiefstuk +# File Version as Record +declare-as-version-record.title=Versie archiveren als archiefstuk declare-as-version-record.description=Hiermee wordt deze versie van het bestand gedeclareerd als een archiefstuk en optioneel gearchiveerd declare-as-version-record.file-plan.display-label=Ordeningsplan declare-as-version-record.path.display-label=Locatie archiefmap diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties index dd0f333066..635b02d18b 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_pt_BR.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=Plano de arquivamento create-record.hide-record.display-label=Ocultar documento arquiv\u00edstico create-record.path.display-label=Local da pasta de documento arquiv\u00edstico -# Declare As Version Record -declare-as-version-record.title=Declarar vers\u00e3o como documento arquiv\u00edstico +# File Version as Record +declare-as-version-record.title=Arquivar vers\u00e3o como documento arquiv\u00edstico declare-as-version-record.description=Declara esta vers\u00e3o do arquivo como um documento arquiv\u00edstico e opcionalmente a arquiva declare-as-version-record.file-plan.display-label=Plano de arquivamento declare-as-version-record.path.display-label=Local da pasta de documento arquiv\u00edstico diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties index 1ccb6bdc8f..a5b5a6e13f 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_ru.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=\u041a\u043b\u0430\u0441\u0441\u0438\u0444 create-record.hide-record.display-label=\u0421\u043a\u0440\u044b\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c create-record.path.display-label=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 -# Declare As Version Record -declare-as-version-record.title=\u041e\u0431\u044a\u044f\u0432\u0438\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e \u0437\u0430\u043f\u0438\u0441\u044c\u044e +# File Version as Record +declare-as-version-record.title=\u0417\u0430\u0430\u0440\u0445\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u043b\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e \u0432 \u0444\u0430\u0439\u043b \u043a\u0430\u043a \u0437\u0430\u043f\u0438\u0441\u044c declare-as-version-record.description=\u041e\u0431\u044a\u044f\u0432\u043b\u044f\u0435\u0442 \u044d\u0442\u0443 \u0432\u0435\u0440\u0441\u0438\u044e \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u043f\u0438\u0441\u044c\u044e \u0438 (\u043d\u0435 \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e) \u0441\u043e\u0445\u0440\u0430\u043d\u044f\u0435\u0442 \u0435\u0435 \u0432 \u0444\u0430\u0439\u043b declare-as-version-record.file-plan.display-label=\u041a\u043b\u0430\u0441\u0441\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0441\u0445\u0435\u043c\u0430 declare-as-version-record.path.display-label=\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043f\u0430\u043f\u043a\u0438 \u0437\u0430\u043f\u0438\u0441\u0435\u0439 diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties index f6aaf69f00..eceb879c2d 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_zh_CN.properties @@ -53,8 +53,8 @@ create-record.file-plan.display-label=\u5f52\u7c7b\u65b9\u6848 create-record.hide-record.display-label=\u9690\u85cf\u8bb0\u5f55 create-record.path.display-label=\u8bb0\u5f55\u6587\u4ef6\u5939\u4f4d\u7f6e -# Declare As Version Record -declare-as-version-record.title=\u5c06\u7248\u672c\u58f0\u660e\u4e3a\u8bb0\u5f55 +# File Version as Record +declare-as-version-record.title=\u6587\u4ef6\u7248\u672c\u4f5c\u4e3a\u8bb0\u5f55 declare-as-version-record.description=\u5c06\u6b64\u6587\u4ef6\u7248\u672c\u58f0\u660e\u4e3a\u8bb0\u5f55\uff0c\u5e76\u53ef\u9009\u62e9\u5c06\u5176\u5f52\u6863 declare-as-version-record.file-plan.display-label=\u5f52\u7c7b\u65b9\u6848 declare-as-version-record.path.display-label=\u8bb0\u5f55\u6587\u4ef6\u5939\u4f4d\u7f6e From b16f49d1b706a0950ea8151448f19d8c3fce3ded Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 18 Aug 2020 12:55:30 +0300 Subject: [PATCH 22/75] APPS-261 changes to travis and worm test script --- .travis.yml | 2 +- scripts/worm-mb-tests.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43d099699c..61bdbc80d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: install: - source scripts/setUpMavenPhase.sh - bash scripts/create-worm-bucket.sh - before_script: + before_script: - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index bab453e535..af51b40af0 100755 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -echo "=========================== Starting Integration Tests Script ===========================" +echo "=========================== Starting Worm Tests Script ===========================" PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" @@ -25,4 +25,4 @@ mvn -B -U clean test \ popd set +vex -echo "=========================== Finishing Integration Tests Script ==========================" \ No newline at end of file +echo "=========================== Finishing Worm Tests Script ==========================" \ No newline at end of file From 4810da2eff16b2810610972f14444b55c606734f Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 18 Aug 2020 13:56:48 +0300 Subject: [PATCH 23/75] APPS-261 changes to travis file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61bdbc80d8..6878dbd9bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ jobs: before_script: - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - bash scripts/worm-mb-tests.sh # after_script: bash _ci/cleanup.sh From 4282377f9287c789ae0f080f10ec1389a4182259 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 18 Aug 2020 14:21:07 +0300 Subject: [PATCH 24/75] APPS-261 enable cleanup.sh script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6878dbd9bd..2b2ab9cccc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ jobs: script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - bash scripts/worm-mb-tests.sh - # after_script: bash _ci/cleanup.sh + after_script: bash _ci/cleanup.sh # - name: "Community Integrations Tests on MySQL" # stage: Tests From 6d9254b361f4a3183828c8c5c1a678302b507d44 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 18 Aug 2020 16:12:54 +0300 Subject: [PATCH 25/75] APPS-261 Put tags on the S3 test buckets --- .travis.yml | 2 +- scripts/cleanup.sh | 4 ++-- scripts/create-worm-bucket.sh | 3 +++ scripts/start-compose.sh | 12 ++++-------- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b2ab9cccc..d712c0e683 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ jobs: install: - source scripts/setUpMavenPhase.sh - bash scripts/create-worm-bucket.sh - before_script: + before_script: - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 3589dad2eb..ad63bed129 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -13,10 +13,10 @@ docker ps -a -q | xargs -l -r docker rm pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure -BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" +S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" -aws s3 ls | awk '{print $3}' | grep "^${BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force +aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force popd diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh index e6ae397ce4..f70edd8a39 100644 --- a/scripts/create-worm-bucket.sh +++ b/scripts/create-worm-bucket.sh @@ -21,6 +21,9 @@ aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' +aws s3api put-bucket-tagging --bucket "${S3_BUCKET2_NAME}" \ + --tagging="TagSet=[{Key=toDeleteAfterTests,Value=true}]" + popd set +vex echo "=========================== Finishing Create Worm Bucket Script ==========================" \ No newline at end of file diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh index 8845699d5d..827ae08c40 100644 --- a/scripts/start-compose.sh +++ b/scripts/start-compose.sh @@ -2,22 +2,19 @@ export DOCKER_COMPOSE_PATH=$1 -if [ -z "$DOCKER_COMPOSE_PATH" ] -then +if [ -z "$DOCKER_COMPOSE_PATH" ] ; then echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" exit 1 fi # Fix uppercase bucket name if set -if [ -n "${S3_BUCKET_NAME}" ] -then +if [ -n "${S3_BUCKET_NAME}" ] ; then export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" fi export DOCKER_COMPOSE_PATH=$1 -if [ -z "$DOCKER_COMPOSE_PATH" ] -then +if [ -z "$DOCKER_COMPOSE_PATH" ] ; then echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" exit 1 fi @@ -27,8 +24,7 @@ echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}" # .env files are picked up from project directory correctly on docker-compose 1.23.0+ docker-compose --file "${DOCKER_COMPOSE_PATH}" --project-directory $(dirname "${DOCKER_COMPOSE_PATH}") up -d -if [ $? -eq 0 ] -then +if [ $? -eq 0 ] ; then echo "Docker Compose started ok" else echo "Docker Compose failed to start" >&2 From d5adeb7aad8b780a644cff8cdacfe411811f85e3 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 18 Aug 2020 16:23:33 +0300 Subject: [PATCH 26/75] APPS-261 Add AWS lambda cleanup script (python) --- scripts/delete-test-buckets-lambda.py | 72 +++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 scripts/delete-test-buckets-lambda.py diff --git a/scripts/delete-test-buckets-lambda.py b/scripts/delete-test-buckets-lambda.py new file mode 100644 index 0000000000..5e5a56fa1c --- /dev/null +++ b/scripts/delete-test-buckets-lambda.py @@ -0,0 +1,72 @@ +import json +import boto3 +from botocore.exceptions import ClientError + + +# This python module is intended for use as a Python 3 AWS lambda function +# Tested in python 3.6 environment +# The AWS role used with this lambda function will need AmazonS3FullAccess and CloudWatchLogsFullAccess permissions +# Tested with role lambda_s3_execution_role in engineering account + +# Retrieve bucket's tag set +def get_tagset(bucket): + try: + return bucket.Tagging().tag_set + except ClientError as e: + return [] + +# Check if a bucket should be deleted +def tag_matches(bucket): + for tag in get_tagset(bucket): + if tag["Key"] == "toDeleteAfterTests" and tag["Value"] == "true" : + return True + return False + +def prefix_matches(bucket, prefix): + if not prefix: + return True + if bucket.name.startswith(prefix): + return True + return False + +# Get a list of buckets to delete +def get_buckets_to_delete(prefix): + s3 = boto3.resource('s3') + # Get all buckets matching bucket name prefix + prefixed_buckets = [bucket for bucket in s3.buckets.all() if prefix_matches(bucket, prefix)] + # Filter buckets on tag + tagged_buckets = [bucket for bucket in prefixed_buckets if tag_matches(bucket)] + return tagged_buckets + + +# Delete bucket +def delete_bucket(bucket): + try: + bucket.objects.all().delete() + bucket.delete() + print("Bucket " + bucket.name + " was deleted") + except ClientError as e: + print("Failed to delete bucket: " + bucket.name) + print(e) + +# Non-empty buckets are deleted (recursively); failed attempts will be logged. +# The buckets are filtered on the name prefix: "travis-ags-worm-" +def lambda_handler(event, context): + + # Retrieve bucket name prefix option + prefix = "travis-ags-worm-" + + # Get a list of buckets to delete + buckets_to_delete = get_buckets_to_delete(prefix) + + # Delete buckets + print ("Deleting buckets:") + for bucket in buckets_to_delete : + print (bucket.name) + delete_bucket(bucket) + + return { + 'statusCode': 200, + 'body': json.dumps('Done!') + } + From da96a6ba0ad9a0eac61f30f02a9aeeb371ffaaed Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 18 Aug 2020 17:16:49 +0300 Subject: [PATCH 27/75] APPS-261 Add travis_wait for WORM tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d712c0e683..64f962ba6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - bash scripts/worm-mb-tests.sh + - travis_wait 80 bash scripts/worm-mb-tests.sh after_script: bash _ci/cleanup.sh # - name: "Community Integrations Tests on MySQL" From e5f61a3be53c712b1c40873c4273f78a12f97fec Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 18 Aug 2020 17:39:36 +0300 Subject: [PATCH 28/75] APPS-261 Enable cleanup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 64f962ba6a..9f31caa187 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ jobs: script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - travis_wait 80 bash scripts/worm-mb-tests.sh - after_script: bash _ci/cleanup.sh + after_script: bash scripts/cleanup.sh # - name: "Community Integrations Tests on MySQL" # stage: Tests From ee0de21a720aa213d32bb57750ba3ca2d0db7907 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 18 Aug 2020 17:45:18 +0300 Subject: [PATCH 29/75] Trigger build From 0df301b023e021fddaad11e4fb49c81ccefbc32f Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 19 Aug 2020 09:06:34 +0300 Subject: [PATCH 30/75] APPS-261 changes to travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f31caa187..95378d49dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,8 +68,6 @@ jobs: install: - source scripts/setUpMavenPhase.sh - bash scripts/create-worm-bucket.sh - before_script: - - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am script: - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - travis_wait 80 bash scripts/worm-mb-tests.sh From 48ebc26d723555f2fc78d9d0b28eba0571913077 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 10:09:23 +0300 Subject: [PATCH 31/75] APPS-261 Update the WORM test setup --- .editorConfig | 2 +- .travis.yml | 13 ++++++------- scripts/worm-mb-tests.sh | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.editorConfig b/.editorConfig index 1808f3da08..b411073df8 100644 --- a/.editorConfig +++ b/.editorConfig @@ -7,7 +7,7 @@ root = true # All files should use spaces. [*] indent_style = space -end_of_line = crlf +end_of_line = lf trim_trailing_whitespace = true indent_size = 3 diff --git a/.travis.yml b/.travis.yml index 95378d49dc..6a5300bf79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,29 +48,28 @@ jobs: # - name: "Build AGS Enterprise" # stage: Build AGS - # before_script: source scripts/setUpMavenPhase.sh # install: # - travis_retry travis_wait 30 mvn -B deploy -N # - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # before_script: source scripts/setUpMavenPhase.sh # script: # - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn # - name: "Build AGS Benchmark" # stage: Build AGS - # before_script: source scripts/setUpMavenPhase.sh # install: # - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + # before_script: source scripts/setUpMavenPhase.sh # script: # - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Enterprise WORM Tests" stage: Tests install: - - source scripts/setUpMavenPhase.sh - - bash scripts/create-worm-bucket.sh - script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - travis_wait 80 bash scripts/worm-mb-tests.sh + - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl alfresco-governance-services-automation -am + before_script: bash scripts/create-worm-bucket.sh + script: travis_wait 80 bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh # - name: "Community Integrations Tests on MySQL" diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index af51b40af0..28065ba62e 100755 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -18,6 +18,8 @@ export S3_BUCKET2_PROTOCOL=s3vTest bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml" +cd rm-automation/rm-automation-enterprise-rest-api + # Run the WORM tests mvn -B -U clean test \ -DsuiteXmlFile=wormTestSuite.xml \ From 5066c85f7a971b565cb26ce3a2c4f4f7417c101d Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 10:26:03 +0300 Subject: [PATCH 32/75] APPS-261 Update the WORM test setup --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a5300bf79..3281776c86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ jobs: stage: Tests install: - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl alfresco-governance-services-automation -am + - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: bash scripts/create-worm-bucket.sh script: travis_wait 80 bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh From 465b34628e45233f3cf0bb5ddff9c8b8b72e40a0 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 11:21:34 +0300 Subject: [PATCH 33/75] APPS-261 Update the WORM test setup - use _short-syntax_ for object-lock-configuration --- scripts/create-worm-bucket.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh index f70edd8a39..8d531b3efe 100644 --- a/scripts/create-worm-bucket.sh +++ b/scripts/create-worm-bucket.sh @@ -19,11 +19,11 @@ export S3_BUCKET2_PROTOCOL=s3vTest aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ - --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}' + --object-lock-configuration 'ObjectLockEnabled=Enabled,Rule={DefaultRetention={Mode=COMPLIANCE,Days=1}}' aws s3api put-bucket-tagging --bucket "${S3_BUCKET2_NAME}" \ --tagging="TagSet=[{Key=toDeleteAfterTests,Value=true}]" popd set +vex -echo "=========================== Finishing Create Worm Bucket Script ==========================" \ No newline at end of file +echo "=========================== Finishing Create Worm Bucket Script ==========================" From c191009ecffe0c8db2021b89df89376be00f2616 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 11:33:26 +0300 Subject: [PATCH 34/75] APPS-261 Update the WORM test setup - set *skip.automationtests=false* for worm tests --- scripts/worm-mb-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 28065ba62e..767e5d46a5 100755 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -23,6 +23,7 @@ cd rm-automation/rm-automation-enterprise-rest-api # Run the WORM tests mvn -B -U clean test \ -DsuiteXmlFile=wormTestSuite.xml \ + -Dskip.automationtests=false \ -Dconnector.s3.bucketName=${S3_BUCKET2_NAME} popd From 0b65223cbaef48766c2c7bde5520577c3a52165b Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 14:01:03 +0300 Subject: [PATCH 35/75] APPS-261 Update the WORM test setup - temporarily remove the _travis_wait_ option --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3281776c86..afc4cd96a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: bash scripts/create-worm-bucket.sh - script: travis_wait 80 bash scripts/worm-mb-tests.sh + script: bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh # - name: "Community Integrations Tests on MySQL" From 8db663f6c8cf6a580f42a581939d0ef580a4a49b Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 14:53:22 +0300 Subject: [PATCH 36/75] Trigger build From 4efa20116670ec615bcdcc1097aba3a3fc01e837 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 15:33:18 +0300 Subject: [PATCH 37/75] APPS-261 Update the WORM test setup - print alfresco log (last 5000 lines) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index afc4cd96a3..c13bed1d67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,7 @@ jobs: before_script: bash scripts/create-worm-bucket.sh script: bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh + after_failure: docker ps -a | grep '_alfresco_1_' | awk '{print $1}' | xargs docker logs | tail -5000 # - name: "Community Integrations Tests on MySQL" # stage: Tests From 105d2e0e54223413d9355f400d189861800e2ab1 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Wed, 19 Aug 2020 16:19:08 +0300 Subject: [PATCH 38/75] APPS-261 Update the WORM test setup - add travis_wait 180 (3 hours) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c13bed1d67..8c3f9f8f03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: bash scripts/create-worm-bucket.sh - script: bash scripts/worm-mb-tests.sh + script: travis_wait 180 bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1_' | awk '{print $1}' | xargs docker logs | tail -5000 From bed95c3ad12842f2cb622e2a399d5077a1d32069 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Thu, 20 Aug 2020 11:43:49 +0300 Subject: [PATCH 39/75] APPS-261 Update the WORM test setup - remove travis_wait --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c3f9f8f03..c13bed1d67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ jobs: - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: bash scripts/create-worm-bucket.sh - script: travis_wait 180 bash scripts/worm-mb-tests.sh + script: bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1_' | awk '{print $1}' | xargs docker logs | tail -5000 From d408450e5fe23dfc6ba4ec0b11dee579f6d733bc Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Thu, 20 Aug 2020 12:43:00 +0300 Subject: [PATCH 40/75] APPS-261 Update the WORM test setup --- scripts/start-compose.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh index 827ae08c40..1ed30248d4 100644 --- a/scripts/start-compose.sh +++ b/scripts/start-compose.sh @@ -51,4 +51,7 @@ else echo "Waited $COUNTER seconds" echo "Alfresco Could not start in time." exit 1 -fi \ No newline at end of file +fi + +echo "Wait onther 30 seconds..." +sleep 30 From 76fbc2e71ede65c6dbe0d05ecedda7e277a6550d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 14:13:52 +0300 Subject: [PATCH 41/75] separate tests from starting env part --- .travis.yml | 7 +++++-- scripts/worm-mb-start-env.sh | 23 +++++++++++++++++++++++ scripts/worm-mb-tests.sh | 13 +------------ 3 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 scripts/worm-mb-start-env.sh diff --git a/.travis.yml b/.travis.yml index c13bed1d67..7677b40263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,8 +68,11 @@ jobs: install: - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am - before_script: bash scripts/create-worm-bucket.sh - script: bash scripts/worm-mb-tests.sh + before_script: + - bash scripts/create-worm-bucket.sh + - bash scripts/worm-mb-start-env.sh + script: + - bash scripts/worm-mb-tests.sh after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1_' | awk '{print $1}' | xargs docker logs | tail -5000 diff --git a/scripts/worm-mb-start-env.sh b/scripts/worm-mb-start-env.sh new file mode 100644 index 0000000000..8b7f5af8d1 --- /dev/null +++ b/scripts/worm-mb-start-env.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +echo "=========================== Starting MB Env Script ===========================" +PS4="\[\e[35m\]+ \[\e[m\]" +set -vex +pushd "$(dirname "${BASH_SOURCE[0]}")/../" + +docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} + +export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} +export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} + +export S3_BUCKET_REGION="eu-west-1" +export S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" +export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" +export S3_PROTOCOL=s3v2 +export S3_BUCKET2_PROTOCOL=s3vTest + +bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml" + +popd +set +vex +echo "=========================== Finishing MB Env Script ==========================" diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh index 767e5d46a5..0f9e49e124 100755 --- a/scripts/worm-mb-tests.sh +++ b/scripts/worm-mb-tests.sh @@ -5,18 +5,7 @@ PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" -docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} - -export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} -export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} - -export S3_BUCKET_REGION="eu-west-1" -export S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" -export S3_PROTOCOL=s3v2 -export S3_BUCKET2_PROTOCOL=s3vTest - -bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml" cd rm-automation/rm-automation-enterprise-rest-api @@ -28,4 +17,4 @@ mvn -B -U clean test \ popd set +vex -echo "=========================== Finishing Worm Tests Script ==========================" \ No newline at end of file +echo "=========================== Finishing Worm Tests Script ==========================" From 672efaf2d7f382599585175bfa36788f186ae782 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 16:54:37 +0300 Subject: [PATCH 42/75] change the way of executing tests --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7677b40263..b7577c7db0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,8 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/worm-mb-start-env.sh script: - - bash scripts/worm-mb-tests.sh + - cd $AUTOMATION_ENTERPRISE_PATH + - mvn -B -U test -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1_' | awk '{print $1}' | xargs docker logs | tail -5000 From 693e08b33a444b63b9474e7e168f3ca0e4076455 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 18:05:36 +0300 Subject: [PATCH 43/75] corrected the bucket region --- scripts/create-worm-bucket.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh index 8d531b3efe..e1238bde38 100644 --- a/scripts/create-worm-bucket.sh +++ b/scripts/create-worm-bucket.sh @@ -13,10 +13,8 @@ export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} export S3_BUCKET_REGION="eu-west-1" export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" -export S3_PROTOCOL=s3v2 -export S3_BUCKET2_PROTOCOL=s3vTest -aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket +aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region ${S3_BUCKET_REGION} --object-lock-enabled-for-bucket aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ --object-lock-configuration 'ObjectLockEnabled=Enabled,Rule={DefaultRetention={Mode=COMPLIANCE,Days=1}}' From 3426d82bd8b77a600a6b6e386bc45fc16d627b89 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 18:06:15 +0300 Subject: [PATCH 44/75] deleted script because it's not needed anymore --- scripts/worm-mb-tests.sh | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 scripts/worm-mb-tests.sh diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh deleted file mode 100755 index 0f9e49e124..0000000000 --- a/scripts/worm-mb-tests.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -echo "=========================== Starting Worm Tests Script ===========================" -PS4="\[\e[35m\]+ \[\e[m\]" -set -vex -pushd "$(dirname "${BASH_SOURCE[0]}")/../" - -export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" - -cd rm-automation/rm-automation-enterprise-rest-api - -# Run the WORM tests -mvn -B -U clean test \ - -DsuiteXmlFile=wormTestSuite.xml \ - -Dskip.automationtests=false \ - -Dconnector.s3.bucketName=${S3_BUCKET2_NAME} - -popd -set +vex -echo "=========================== Finishing Worm Tests Script ==========================" From 4f0b24fb4cad3155e1cc0f0b5ea0d7d79d739145 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 18:22:38 +0300 Subject: [PATCH 45/75] changed bucket region --- scripts/create-worm-bucket.sh | 2 +- scripts/worm-mb-start-env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh index e1238bde38..bb825d2f12 100644 --- a/scripts/create-worm-bucket.sh +++ b/scripts/create-worm-bucket.sh @@ -11,7 +11,7 @@ printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} -export S3_BUCKET_REGION="eu-west-1" +export S3_BUCKET_REGION="us-east-1" export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region ${S3_BUCKET_REGION} --object-lock-enabled-for-bucket diff --git a/scripts/worm-mb-start-env.sh b/scripts/worm-mb-start-env.sh index 8b7f5af8d1..3408d8e5f8 100644 --- a/scripts/worm-mb-start-env.sh +++ b/scripts/worm-mb-start-env.sh @@ -10,7 +10,7 @@ docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} -export S3_BUCKET_REGION="eu-west-1" +export S3_BUCKET_REGION="us-east-1" export S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" export S3_PROTOCOL=s3v2 From 1fb181635741cdda5220b9bd13706d85645c9bf6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 18:32:31 +0300 Subject: [PATCH 46/75] set env var globally --- scripts/create-worm-bucket.sh | 6 ------ scripts/worm-mb-start-env.sh | 12 +----------- travis-env-vars.yml | 5 +++++ 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh index bb825d2f12..c3b44792df 100644 --- a/scripts/create-worm-bucket.sh +++ b/scripts/create-worm-bucket.sh @@ -8,12 +8,6 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure -export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} -export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} - -export S3_BUCKET_REGION="us-east-1" -export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" - aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region ${S3_BUCKET_REGION} --object-lock-enabled-for-bucket aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ diff --git a/scripts/worm-mb-start-env.sh b/scripts/worm-mb-start-env.sh index 3408d8e5f8..b6d6f77eb5 100644 --- a/scripts/worm-mb-start-env.sh +++ b/scripts/worm-mb-start-env.sh @@ -5,18 +5,8 @@ PS4="\[\e[35m\]+ \[\e[m\]" set -vex pushd "$(dirname "${BASH_SOURCE[0]}")/../" -docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} -export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} -export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} - -export S3_BUCKET_REGION="us-east-1" -export S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" -export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" -export S3_PROTOCOL=s3v2 -export S3_BUCKET2_PROTOCOL=s3vTest - -bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml" +bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" popd set +vex diff --git a/travis-env-vars.yml b/travis-env-vars.yml index aa0e1f1190..5bf5599249 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -8,3 +8,8 @@ env: - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests' + - AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY} + - AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} + - S3_BUCKET_REGION="us-east-1" + - S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" + - S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" From 606d21d2c12d8fbf70066478c9d8205d46a8053c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Thu, 20 Aug 2020 18:46:46 +0300 Subject: [PATCH 47/75] delete duplicate code --- .travis.yml | 3 ++- scripts/start-compose.sh | 32 -------------------------------- scripts/worm-mb-start-env.sh | 13 ------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 scripts/worm-mb-start-env.sh diff --git a/.travis.yml b/.travis.yml index b7577c7db0..0fcb130bdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,7 +70,8 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: - bash scripts/create-worm-bucket.sh - - bash scripts/worm-mb-start-env.sh + - bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" + - bash scripts/waitForAlfrescoToStart.sh script: - cd $AUTOMATION_ENTERPRISE_PATH - mvn -B -U test -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh index 1ed30248d4..af3b2272b8 100644 --- a/scripts/start-compose.sh +++ b/scripts/start-compose.sh @@ -12,13 +12,6 @@ if [ -n "${S3_BUCKET_NAME}" ] ; then export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" fi -export DOCKER_COMPOSE_PATH=$1 - -if [ -z "$DOCKER_COMPOSE_PATH" ] ; then - echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" - exit 1 -fi - echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}" # .env files are picked up from project directory correctly on docker-compose 1.23.0+ @@ -30,28 +23,3 @@ else echo "Docker Compose failed to start" >&2 exit 1 fi - -WAIT_INTERVAL=1 -COUNTER=0 -TIMEOUT=300 -t0=`date +%s` - -echo "Waiting for alfresco to start" -until $(curl --output /dev/null --silent --head --fail http://localhost:8080/alfresco) || [ "$COUNTER" -eq "$TIMEOUT" ]; do - printf '.' - sleep $WAIT_INTERVAL - COUNTER=$(($COUNTER+$WAIT_INTERVAL)) -done - -if (("$COUNTER" < "$TIMEOUT")) ; then - t1=`date +%s` - delta=$((($t1 - $t0)/60)) - echo "Alfresco Started in $delta minutes" -else - echo "Waited $COUNTER seconds" - echo "Alfresco Could not start in time." - exit 1 -fi - -echo "Wait onther 30 seconds..." -sleep 30 diff --git a/scripts/worm-mb-start-env.sh b/scripts/worm-mb-start-env.sh deleted file mode 100644 index b6d6f77eb5..0000000000 --- a/scripts/worm-mb-start-env.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -echo "=========================== Starting MB Env Script ===========================" -PS4="\[\e[35m\]+ \[\e[m\]" -set -vex -pushd "$(dirname "${BASH_SOURCE[0]}")/../" - - -bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - -popd -set +vex -echo "=========================== Finishing MB Env Script ==========================" From dedae648397da7f4a4b7bac96d4fa1641bf74eb4 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Thu, 20 Aug 2020 21:58:28 +0300 Subject: [PATCH 48/75] APPS-261 Update the WORM test setup --- .travis.yml | 12 +++++------- scripts/start-compose.sh | 24 +++++++++++++++++++++++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0fcb130bdc..5ac5631437 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,17 +66,15 @@ jobs: - name: "Enterprise WORM Tests" stage: Tests install: - - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl :alfresco-governance-services-automation-enterprise-rest-api -am + - travis_retry travis_wait 90 mvn -B -U -q clean install ${MVN_SKIP} -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: - bash scripts/create-worm-bucket.sh - - bash scripts/start-compose.sh "${PWD}/${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" + - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: - - cd $AUTOMATION_ENTERPRISE_PATH - - mvn -B -U test -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + script: mvn -B -U clean test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false after_script: bash scripts/cleanup.sh - after_failure: docker ps -a | grep '_alfresco_1_' | awk '{print $1}' | xargs docker logs | tail -5000 + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 # - name: "Community Integrations Tests on MySQL" # stage: Tests diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh index af3b2272b8..9cc5bc5f78 100644 --- a/scripts/start-compose.sh +++ b/scripts/start-compose.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export DOCKER_COMPOSE_PATH=$1 +export DOCKER_COMPOSE_PATH="${1}" if [ -z "$DOCKER_COMPOSE_PATH" ] ; then echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" @@ -23,3 +23,25 @@ else echo "Docker Compose failed to start" >&2 exit 1 fi + +WAIT_INTERVAL=1 +COUNTER=0 +TIMEOUT=300 +t0=$(date +%s) + +echo "Waiting for alfresco to start" +until $(curl --output /dev/null --silent --head --fail http://localhost:8080/alfresco) || [ "$COUNTER" -eq "$TIMEOUT" ]; do + printf '.' + sleep ${WAIT_INTERVAL} + COUNTER=$(($COUNTER+$WAIT_INTERVAL)) +done + +if (("$COUNTER" < "$TIMEOUT")) ; then + t1=$(date +%s) + delta=$(( ($t1 - $t0)/60 )) + echo "Alfresco Started in $delta minutes" +else + echo "Waited ${COUNTER} seconds" + echo "Alfresco Could not start in time." + exit 1 +fi From 2bb977fb130684e77aacd5919bf8ecddccdb71c2 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Thu, 20 Aug 2020 22:18:45 +0300 Subject: [PATCH 49/75] APPS-261 Update the WORM test setup --- .editorConfig | 2 +- .travis.yml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.editorConfig b/.editorConfig index b411073df8..601e1b7372 100644 --- a/.editorConfig +++ b/.editorConfig @@ -9,7 +9,7 @@ root = true indent_style = space end_of_line = lf trim_trailing_whitespace = true -indent_size = 3 +indent_size = 2 [*.java] indent_size = 4 diff --git a/.travis.yml b/.travis.yml index 5ac5631437..a1b86d3e08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,14 @@ branches: cache: directories: - - $HOME/.m2 + - ${HOME}/.m2/repository # the cache can grow constantly before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* before_install: - - cp .travis.settings.xml ${HOME}/.m2/settings.xml + - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" + - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} - docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD} install: skip From ca4a1128340a1dbabe1799b7c0e83164ebe3987f Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Fri, 21 Aug 2020 00:54:35 +0300 Subject: [PATCH 50/75] APPS-261 Update the WORM test setup --- scripts/start-compose.sh | 29 +++-------------------------- scripts/waitForAlfrescoToStart.sh | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 30 deletions(-) mode change 100644 => 100755 scripts/start-compose.sh diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh old mode 100644 new mode 100755 index 9cc5bc5f78..c852466f04 --- a/scripts/start-compose.sh +++ b/scripts/start-compose.sh @@ -8,9 +8,8 @@ if [ -z "$DOCKER_COMPOSE_PATH" ] ; then fi # Fix uppercase bucket name if set -if [ -n "${S3_BUCKET_NAME}" ] ; then - export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" -fi +#export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" +#export S3_BUCKET2_NAME="${S3_BUCKET2_NAME,,}" echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}" @@ -22,26 +21,4 @@ if [ $? -eq 0 ] ; then else echo "Docker Compose failed to start" >&2 exit 1 -fi - -WAIT_INTERVAL=1 -COUNTER=0 -TIMEOUT=300 -t0=$(date +%s) - -echo "Waiting for alfresco to start" -until $(curl --output /dev/null --silent --head --fail http://localhost:8080/alfresco) || [ "$COUNTER" -eq "$TIMEOUT" ]; do - printf '.' - sleep ${WAIT_INTERVAL} - COUNTER=$(($COUNTER+$WAIT_INTERVAL)) -done - -if (("$COUNTER" < "$TIMEOUT")) ; then - t1=$(date +%s) - delta=$(( ($t1 - $t0)/60 )) - echo "Alfresco Started in $delta minutes" -else - echo "Waited ${COUNTER} seconds" - echo "Alfresco Could not start in time." - exit 1 -fi +fi \ No newline at end of file diff --git a/scripts/waitForAlfrescoToStart.sh b/scripts/waitForAlfrescoToStart.sh index 59c7e40733..9cc8b0fea6 100755 --- a/scripts/waitForAlfrescoToStart.sh +++ b/scripts/waitForAlfrescoToStart.sh @@ -1,23 +1,31 @@ #!/usr/bin/env bash +export ALFRESCO_URL="http://localhost:8080/alfresco" + WAIT_INTERVAL=1 COUNTER=0 TIMEOUT=300 -t0=`date +%s` +t0=$(date +%s) echo "Waiting for alfresco to start" -until $(curl --output /dev/null --silent --head --fail http://localhost:8080/alfresco) || [ "$COUNTER" -eq "$TIMEOUT" ]; do +until $(curl --output /dev/null --silent --head --fail ${ALFRESCO_URL}) || [ "$COUNTER" -eq "$TIMEOUT" ]; do printf '.' sleep $WAIT_INTERVAL COUNTER=$(($COUNTER+$WAIT_INTERVAL)) done if (("$COUNTER" < "$TIMEOUT")) ; then - t1=`date +%s` + t1=$(date +%s) delta=$((($t1 - $t0)/60)) echo "Alfresco Started in $delta minutes" else echo "Waited $COUNTER seconds" echo "Alfresco Could not start in time." + echo "All started containers:" + docker ps -a + ALFCONTAINER=$(docker ps -a | grep _alfresco_1 | awk '{ print $1 }') + echo "Last 200 lines from alfresco.log on container $ALFCONTAINER:" + docker logs --tail=200 ${ALFCONTAINER} exit 1 -fi \ No newline at end of file +fi + From 637c5911d87012f39d68451dea6bd4aa5704a4e8 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Fri, 21 Aug 2020 18:38:24 +0300 Subject: [PATCH 51/75] no need to do mvn clean again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a1b86d3e08..24a20bcbdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B -U clean test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 From bd6120f52b269e723ce3f1995b7b39e947d76281 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 22 Aug 2020 20:35:25 +0300 Subject: [PATCH 52/75] uncomment stages --- .travis.yml | 168 ++++++++++++++++++++++++++-------------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/.travis.yml b/.travis.yml index 24a20bcbdf..10c583cebc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,28 +41,28 @@ stages: jobs: include: - # - name: "Build AGS Community" - # stage: Build AGS - # before_script: source scripts/setUpMavenPhase.sh - # script: - # - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Community" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - # - name: "Build AGS Enterprise" - # stage: Build AGS - # install: - # - travis_retry travis_wait 30 mvn -B deploy -N - # - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - # before_script: source scripts/setUpMavenPhase.sh - # script: - # - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Enterprise" + stage: Build AGS + install: + - travis_retry travis_wait 30 mvn -B deploy -N + - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - # - name: "Build AGS Benchmark" - # stage: Build AGS - # install: - # - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - # before_script: source scripts/setUpMavenPhase.sh - # script: - # - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Benchmark" + stage: Build AGS + install: + - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Enterprise WORM Tests" stage: Tests @@ -77,70 +77,70 @@ jobs: after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - # - name: "Community Integrations Tests on MySQL" - # stage: Tests - # script: - # - echo "Community Integrations Tests on MySQL" - # - name: "Enterprise Integrations Tests on MySQL" - # stage: Tests - # script: - # - echo "Enterprise Integrations Tests on MySQL" - # - name: "Community Rest API Tests" - # stage: Tests - # install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am - # before_script: - # - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - # - bash scripts/waitForAlfrescoToStart.sh - # script: - # - echo "Community Rest API Tests" - # - name: "Enterprise Rest API Tests" - # stage: Tests - # install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - # before_script: - # - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - # - bash scripts/waitForAlfrescoToStart.sh - # script: - # - echo "Enterprise Rest API Tests" - # - name: "Community UI Tests ..." - # stage: Tests - # install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am - # before_script: - # - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - # - bash scripts/waitForAlfrescoToStart.sh - # script: - # - echo "Community UI Tests ..." - # - name: "Enterprise UI Tests ..." - # stage: Tests - # install: - # - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - # before_script: - # - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - # - bash scripts/waitForAlfrescoToStart.sh - # script: - # - echo "Enterprise UI Tests ..." + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am + before_script: + - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Community Rest API Tests" + - name: "Enterprise Rest API Tests" + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Enterprise Rest API Tests" + - name: "Community UI Tests ..." + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am + before_script: + - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Community UI Tests ..." + - name: "Enterprise UI Tests ..." + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Enterprise UI Tests ..." - # - name: "Source Clear Scan (SCA)" - # stage: Security Scans - # script: - # - echo "Source Clear Scan (SCA)" - # - name: "Static Analysis (SAST)" - # stage: Security Scans - # script: - # - echo "Static Analysis (SAST)" + - name: "Source Clear Scan (SCA)" + stage: Security Scans + script: + - echo "Source Clear Scan (SCA)" + - name: "Static Analysis (SAST)" + stage: Security Scans + script: + - echo "Static Analysis (SAST)" - # - name: "Community Release" - # stage: Release - # script: - # - echo "Community Release" - # - name: "Enterprise Release" - # stage: Release - # script: - # - echo "Enterprise Release" + - name: "Community Release" + stage: Release + script: + - echo "Community Release" + - name: "Enterprise Release" + stage: Release + script: + - echo "Enterprise Release" - # - name: "Copy to S3 Release Bucket" - # stage: Publish - # script: - # - echo "Copy to S3 Release Bucket" + - name: "Copy to S3 Release Bucket" + stage: Publish + script: + - echo "Copy to S3 Release Bucket" From eac2a043022763d2f5f81472725ca444a781bf58 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Sat, 22 Aug 2020 20:45:50 +0300 Subject: [PATCH 53/75] remove spaces --- .travis.yml | 168 ++++++++++++++++++++++++++-------------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10c583cebc..cd49c9e3d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,28 +41,28 @@ stages: jobs: include: - - name: "Build AGS Community" - stage: Build AGS - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Community" + stage: Build AGS + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Build AGS Enterprise" - stage: Build AGS - install: - - travis_retry travis_wait 30 mvn -B deploy -N - - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Enterprise" + stage: Build AGS + install: + - travis_retry travis_wait 30 mvn -B deploy -N + - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Build AGS Benchmark" - stage: Build AGS - install: - - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - before_script: source scripts/setUpMavenPhase.sh - script: - - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - name: "Build AGS Benchmark" + stage: Build AGS + install: + - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + before_script: source scripts/setUpMavenPhase.sh + script: + - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - name: "Enterprise WORM Tests" stage: Tests @@ -77,70 +77,70 @@ jobs: after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Community Integrations Tests on MySQL" - stage: Tests - script: - - echo "Community Integrations Tests on MySQL" - - name: "Enterprise Integrations Tests on MySQL" - stage: Tests - script: - - echo "Enterprise Integrations Tests on MySQL" - - name: "Community Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am - before_script: - - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community Rest API Tests" - - name: "Enterprise Rest API Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am - before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise Rest API Tests" - - name: "Community UI Tests ..." - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am - before_script: - - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Community UI Tests ..." - - name: "Enterprise UI Tests ..." - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - before_script: - - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH - - bash scripts/waitForAlfrescoToStart.sh - script: - - echo "Enterprise UI Tests ..." + - name: "Community Integrations Tests on MySQL" + stage: Tests + script: + - echo "Community Integrations Tests on MySQL" + - name: "Enterprise Integrations Tests on MySQL" + stage: Tests + script: + - echo "Enterprise Integrations Tests on MySQL" + - name: "Community Rest API Tests" + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo -am + before_script: + - bash scripts/startAlfresco.sh $COMMUNITY_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Community Rest API Tests" + - name: "Enterprise Rest API Tests" + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Enterprise Rest API Tests" + - name: "Community UI Tests ..." + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-community-repo,:alfresco-governance-services-community-share -am + before_script: + - bash scripts/startAlfresco.sh $COMMUNITY_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Community UI Tests ..." + - name: "Enterprise UI Tests ..." + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + before_script: + - bash scripts/startAlfresco.sh $ENTERPRISE_SHARE_PATH + - bash scripts/waitForAlfrescoToStart.sh + script: + - echo "Enterprise UI Tests ..." - - name: "Source Clear Scan (SCA)" - stage: Security Scans - script: - - echo "Source Clear Scan (SCA)" - - name: "Static Analysis (SAST)" - stage: Security Scans - script: - - echo "Static Analysis (SAST)" + - name: "Source Clear Scan (SCA)" + stage: Security Scans + script: + - echo "Source Clear Scan (SCA)" + - name: "Static Analysis (SAST)" + stage: Security Scans + script: + - echo "Static Analysis (SAST)" - - name: "Community Release" - stage: Release - script: - - echo "Community Release" - - name: "Enterprise Release" - stage: Release - script: - - echo "Enterprise Release" + - name: "Community Release" + stage: Release + script: + - echo "Community Release" + - name: "Enterprise Release" + stage: Release + script: + - echo "Enterprise Release" - - name: "Copy to S3 Release Bucket" - stage: Publish - script: - - echo "Copy to S3 Release Bucket" + - name: "Copy to S3 Release Bucket" + stage: Publish + script: + - echo "Copy to S3 Release Bucket" From 3fb4252dbf359eb9d6c8ca879cc41d7d1ded6160 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 24 Aug 2020 07:00:51 +0300 Subject: [PATCH 54/75] APPS-261 changes for PR --- scripts/cleanup.sh | 3 --- scripts/start-compose.sh | 4 ---- 2 files changed, 7 deletions(-) diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index ad63bed129..d7993ad92f 100644 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -13,9 +13,6 @@ docker ps -a -q | xargs -l -r docker rm pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure -S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" -S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" - aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force aws s3 ls | awk '{print $3}' | grep "^${S3_BUCKET2_NAME}" | xargs -l -r -I{} aws s3 rb "s3://{}" --force diff --git a/scripts/start-compose.sh b/scripts/start-compose.sh index c852466f04..a3b47dcb2e 100755 --- a/scripts/start-compose.sh +++ b/scripts/start-compose.sh @@ -7,10 +7,6 @@ if [ -z "$DOCKER_COMPOSE_PATH" ] ; then exit 1 fi -# Fix uppercase bucket name if set -#export S3_BUCKET_NAME="${S3_BUCKET_NAME,,}" -#export S3_BUCKET2_NAME="${S3_BUCKET2_NAME,,}" - echo "Starting AGS stack in ${DOCKER_COMPOSE_PATH}" # .env files are picked up from project directory correctly on docker-compose 1.23.0+ From bbd00cd16836fcb625f3cf9b862c6182a0af361c Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Mon, 24 Aug 2020 11:15:52 +0300 Subject: [PATCH 55/75] remove editorconfig changes --- .editorConfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.editorConfig b/.editorConfig index 601e1b7372..1808f3da08 100644 --- a/.editorConfig +++ b/.editorConfig @@ -7,9 +7,9 @@ root = true # All files should use spaces. [*] indent_style = space -end_of_line = lf +end_of_line = crlf trim_trailing_whitespace = true -indent_size = 2 +indent_size = 3 [*.java] indent_size = 4 From dfc5713bbd2532cb78c6881ec46552cc5f7c738b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 11:36:37 +0300 Subject: [PATCH 56/75] move and rename stage --- .travis.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd49c9e3d9..208b5c62ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,19 +64,6 @@ jobs: script: - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - - name: "Enterprise WORM Tests" - stage: Tests - install: - - travis_retry travis_wait 90 mvn -B -U -q clean install ${MVN_SKIP} -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am - before_script: - - bash scripts/create-worm-bucket.sh - - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false - after_script: bash scripts/cleanup.sh - after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 - - name: "Community Integrations Tests on MySQL" stage: Tests script: @@ -103,6 +90,20 @@ jobs: - bash scripts/waitForAlfrescoToStart.sh script: - echo "Enterprise Rest API Tests" + + - name: "Enterprise Rest API WORM Tests" + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -U -q clean install ${MVN_SKIP} -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am + before_script: + - bash scripts/create-worm-bucket.sh + - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" + - bash scripts/waitForAlfrescoToStart.sh + script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + after_script: bash scripts/cleanup.sh + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + - name: "Community UI Tests ..." stage: Tests install: From 63f57efe57591c67316df2e28fc09d4184c4e0de Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 11:41:42 +0300 Subject: [PATCH 57/75] added stage for running WORM UI tests --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 208b5c62ee..2a6f30047e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -123,6 +123,19 @@ jobs: script: - echo "Enterprise UI Tests ..." + - name: "Enterprise UI WORM Tests" + stage: Tests + install: + - travis_retry travis_wait 90 mvn -B -U -q clean install ${MVN_SKIP} -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am + before_script: + - bash scripts/create-worm-bucket.sh + - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" + - bash scripts/waitForAlfrescoToStart.sh + script: mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + after_script: bash scripts/cleanup.sh + after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 + - name: "Source Clear Scan (SCA)" stage: Security Scans script: From 37bc8ab8705fd32c50f01b5255fca622e7088348 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 13:06:35 +0300 Subject: [PATCH 58/75] added firefox addon --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2a6f30047e..d95fa9edb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,11 @@ language: java jdk: - openjdk11 +addons: + firefox: "42.0.0" + services: + - xvfb - docker branches: From d6cd434a4a7462ad90ad29ae72b70ab861e63b7f Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 14:04:25 +0300 Subject: [PATCH 59/75] execute UI tests --- .travis.yml | 2 +- scripts/waitForAlfrescoToStart.sh | 2 -- travis-env-vars.yml | 4 ++++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d95fa9edb0..d209869d22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -136,7 +136,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + script: mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.grid.url=${GRID_URL} -Dwebdriver.local.grid=false -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 diff --git a/scripts/waitForAlfrescoToStart.sh b/scripts/waitForAlfrescoToStart.sh index 9cc8b0fea6..065ae39544 100755 --- a/scripts/waitForAlfrescoToStart.sh +++ b/scripts/waitForAlfrescoToStart.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -export ALFRESCO_URL="http://localhost:8080/alfresco" - WAIT_INTERVAL=1 COUNTER=0 TIMEOUT=300 diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 5bf5599249..26b0fc2383 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -13,3 +13,7 @@ env: - S3_BUCKET_REGION="us-east-1" - S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" - S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" + - ALFRESCO_URL="http://localhost:8080/alfresco" + - SHARE_URL="http://localhost:8181/share" + - GRID_URL="http://127.0.0.1:4444/wd/hub" + - DISPLAY=:99.0 From 0960fac04db6198e34a872c45717f43179b877df Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 15:17:31 +0300 Subject: [PATCH 60/75] prefixed mvn test commands with travis_wait --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d209869d22..4a1f4e071d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + script: travis_wait mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 @@ -136,7 +136,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.grid.url=${GRID_URL} -Dwebdriver.local.grid=false -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 + script: travis_wait mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.grid.url=${GRID_URL} -Dwebdriver.local.grid=false -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 From 958e5d4472dbc1923244bb1af47ac585eb60a49c Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 16:19:28 +0300 Subject: [PATCH 61/75] added MAVEN_OPTS --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4a1f4e071d..7cf7d3de23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ cache: before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* before_install: + - echo "MAVEN_OPTS='-Xmx2g -XX:MaxPermSize=1024m -Xms256m'" > ~/.mavenrc - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} From 7ee5cb34cb74d35bcaccbbab82eb72407af7fb43 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 16:37:24 +0300 Subject: [PATCH 62/75] changed firefox version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7cf7d3de23..b0b7605543 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ jdk: - openjdk11 addons: - firefox: "42.0.0" + firefox: "43.0.1" services: - xvfb From 116b5b59053cf04ed7f483fd657ee8a753c5457e Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Mon, 24 Aug 2020 18:00:04 +0300 Subject: [PATCH 63/75] set webdriver local grid on true --- .travis.yml | 2 +- travis-env-vars.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0b7605543..25b3b1bf97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -137,7 +137,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: travis_wait mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.grid.url=${GRID_URL} -Dwebdriver.local.grid=false -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 + script: travis_wait mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 26b0fc2383..14b158b159 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -15,5 +15,4 @@ env: - S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8181/share" - - GRID_URL="http://127.0.0.1:4444/wd/hub" - DISPLAY=:99.0 From 95aac49e56a6bd3fe7e46e9230a7824a8d208cbf Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 25 Aug 2020 00:08:07 +0300 Subject: [PATCH 64/75] Update python lambda script --- scripts/delete-test-buckets-lambda.py | 41 ++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/scripts/delete-test-buckets-lambda.py b/scripts/delete-test-buckets-lambda.py index 5e5a56fa1c..974f1bb220 100644 --- a/scripts/delete-test-buckets-lambda.py +++ b/scripts/delete-test-buckets-lambda.py @@ -1,5 +1,6 @@ import json import boto3 +from datetime import datetime, timedelta, timezone from botocore.exceptions import ClientError @@ -22,6 +23,10 @@ def tag_matches(bucket): return True return False +def age_matches(bucket): + delta = datetime.now(timezone.utc) - bucket.creation_date + return delta.days > 0 + def prefix_matches(bucket, prefix): if not prefix: return True @@ -32,29 +37,56 @@ def prefix_matches(bucket, prefix): # Get a list of buckets to delete def get_buckets_to_delete(prefix): s3 = boto3.resource('s3') + # Get all buckets matching bucket name prefix prefixed_buckets = [bucket for bucket in s3.buckets.all() if prefix_matches(bucket, prefix)] - # Filter buckets on tag - tagged_buckets = [bucket for bucket in prefixed_buckets if tag_matches(bucket)] - return tagged_buckets + # Filter buckets on tag + # tagged_buckets = [bucket for bucket in prefixed_buckets if tag_matches(bucket)] + + # Filter buckets on age + old_buckets = [bucket for bucket in prefixed_buckets if age_matches(bucket)] + + return old_buckets # Delete bucket def delete_bucket(bucket): + try: + [object.delete for object in bucket.objects.all()] + except ClientError as e: + print("Failed to delete objects in bucket: " + bucket.name) + print(e) try: bucket.objects.all().delete() + except ClientError as e: + print("Failed to delete objects in bucket: " + bucket.name) + print(e) + + try: + [version.delete() for version in bucket.object_versions.all()] + except ClientError as e: + print("Failed to delete object_versions in bucket: " + bucket.name) + print(e) + try: + bucket.object_versions.delete() + except ClientError as e: + print("Failed to delete object_versions in bucket: " + bucket.name) + print(e) + + try: bucket.delete() print("Bucket " + bucket.name + " was deleted") except ClientError as e: print("Failed to delete bucket: " + bucket.name) print(e) + # Non-empty buckets are deleted (recursively); failed attempts will be logged. # The buckets are filtered on the name prefix: "travis-ags-worm-" def lambda_handler(event, context): # Retrieve bucket name prefix option - prefix = "travis-ags-worm-" + prefix = "travis-ags-" # Get a list of buckets to delete buckets_to_delete = get_buckets_to_delete(prefix) @@ -70,3 +102,4 @@ def lambda_handler(event, context): 'body': json.dumps('Done!') } +#lambda_handler(None, None) From 7829d4df57f620ff6b432f3bfe0df58483c79b12 Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 25 Aug 2020 00:22:19 +0300 Subject: [PATCH 65/75] Use same S3 WORM bucket for all builds --- scripts/create-worm-bucket.sh | 5 +++++ travis-env-vars.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh index c3b44792df..a3ff254ad6 100644 --- a/scripts/create-worm-bucket.sh +++ b/scripts/create-worm-bucket.sh @@ -8,6 +8,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" pip install awscli printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure +if aws s3 ls | awk '{print $3}' | grep -q "^${S3_BUCKET2_NAME}$" ; then + echo "Bucket ${S3_BUCKET2_NAME} already exists" + exit 0 +fi + aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region ${S3_BUCKET_REGION} --object-lock-enabled-for-bucket aws s3api put-object-lock-configuration \ --bucket "${S3_BUCKET2_NAME}" \ diff --git a/travis-env-vars.yml b/travis-env-vars.yml index 14b158b159..fe0aed8112 100644 --- a/travis-env-vars.yml +++ b/travis-env-vars.yml @@ -12,7 +12,7 @@ env: - AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY} - S3_BUCKET_REGION="us-east-1" - S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}" - - S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2" + - S3_BUCKET2_NAME="travis-ags-worm-b2" - ALFRESCO_URL="http://localhost:8080/alfresco" - SHARE_URL="http://localhost:8181/share" - DISPLAY=:99.0 From 4707e22179951ac351e01efe77d9b53a346c9fa6 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 08:57:50 +0300 Subject: [PATCH 66/75] removed MaxPermSize because it is ignored ("Ignoring option MaxPermSize; support was removed in 8.0") and increase heap size --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25b3b1bf97..670e099e21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ cache: before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* before_install: - - echo "MAVEN_OPTS='-Xmx2g -XX:MaxPermSize=1024m -Xms256m'" > ~/.mavenrc + - echo "MAVEN_OPTS='-Xmx4g -Xms512m'" > ~/.mavenrc - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} @@ -105,7 +105,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: travis_wait mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false + script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 @@ -137,7 +137,7 @@ jobs: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" - bash scripts/waitForAlfrescoToStart.sh - script: travis_wait mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 + script: mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 after_script: bash scripts/cleanup.sh after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000 From 386462609b4b25d1db5076ba6be36954879e5c0d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 10:35:55 +0300 Subject: [PATCH 67/75] remove language java because MAVEN_OPTS are ignored --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 670e099e21..b5d01e77cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ import: - source: travis-env-vars.yml os: linux dist: xenial -language: java jdk: - openjdk11 From 1c5eb159329aafdd65018142198cd5ab2d857734 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 11:52:53 +0300 Subject: [PATCH 68/75] updating failsafe plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b534bc1222..b5e6c207c0 100644 --- a/pom.xml +++ b/pom.xml @@ -983,7 +983,7 @@ maven-failsafe-plugin - 2.22.1 + 3.0.0-M5 --illegal-access=permit From d4b9bf80dc6e2af54707704ebb28c18f2f05a45d Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 14:31:07 +0300 Subject: [PATCH 69/75] Revert "remove language java because MAVEN_OPTS are ignored" This reverts commit 38646260 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b5d01e77cb..670e099e21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ import: - source: travis-env-vars.yml os: linux dist: xenial +language: java jdk: - openjdk11 From 2b090a1a28defadb8d90b3b342b941aeea3689b2 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 14:33:01 +0300 Subject: [PATCH 70/75] removed MAVEN_OPTS because "There is insufficient memory for the Java Runtime Environment to continue." --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 670e099e21..ff07b4c075 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,6 @@ cache: before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* before_install: - - echo "MAVEN_OPTS='-Xmx4g -Xms512m'" > ~/.mavenrc - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" - find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} From 54c0c14a316d95cce65038fe3575395af6c4658a Mon Sep 17 00:00:00 2001 From: "Cezar.Leahu" Date: Tue, 25 Aug 2020 14:39:10 +0300 Subject: [PATCH 71/75] Custom docker-compose for WORM UI tests --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff07b4c075..76146128ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ --- import: - source: travis-env-vars.yml -os: linux dist: xenial +sudo: required language: java -jdk: - - openjdk11 +jdk: openjdk11 addons: firefox: "43.0.1" @@ -14,6 +13,10 @@ services: - xvfb - docker +git: + depth: false + quiet: true + branches: only: - master @@ -26,7 +29,7 @@ cache: - ${HOME}/.m2/repository # the cache can grow constantly -before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* +# before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* before_install: - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" @@ -102,7 +105,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: - bash scripts/create-worm-bucket.sh - - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" + - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/docker-compose-worm-support-rest.yml" - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false after_script: bash scripts/cleanup.sh @@ -134,7 +137,7 @@ jobs: - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am before_script: - bash scripts/create-worm-bucket.sh - - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/worm-support-docker-compose.yml" + - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/docker-compose-worm-support-ui.yml" - bash scripts/waitForAlfrescoToStart.sh script: mvn -B test -pl :alfresco-governance-services-automation-ui -DsuiteXmlFile=wormTestSuite.xml -Dskip.automationtests=false -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} -Dwebdriver.local.grid=true -Dwebdriver.browser=RemoteFireFox -Dwebdriver.localGrid=false -Dwebdriver.element.wait.time=20000 -Dwebdriver.page.render.wait.time=60000 after_script: bash scripts/cleanup.sh From 498969d28b7759eaa8ec1b78a7f1c0a8a78fe746 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 18:26:17 +0300 Subject: [PATCH 72/75] removed duplicate docker login --- scripts/startAlfresco.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/startAlfresco.sh b/scripts/startAlfresco.sh index b161dbde05..4143c742d2 100644 --- a/scripts/startAlfresco.sh +++ b/scripts/startAlfresco.sh @@ -3,5 +3,4 @@ set -ev cd $1 -docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD} docker-compose up -d From d81587d341c5bac0ba499b63f49d23ba56599987 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Tue, 25 Aug 2020 18:26:57 +0300 Subject: [PATCH 73/75] uncommented before_cache --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 76146128ab..cc5cb4199c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ cache: - ${HOME}/.m2/repository # the cache can grow constantly -# before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* +before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services* before_install: - mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml" From 0e5bb2bc017f75affd62102e2c2711d95307c382 Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 09:19:29 +0300 Subject: [PATCH 74/75] corrected module --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc5cb4199c..4714b39982 100644 --- a/.travis.yml +++ b/.travis.yml @@ -134,7 +134,7 @@ jobs: stage: Tests install: - travis_retry travis_wait 90 mvn -B -U -q clean install ${MVN_SKIP} -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am - - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-enterprise-rest-api -am + - travis_retry travis_wait 30 mvn -B -U -q clean install ${MVN_SKIP} -pl :alfresco-governance-services-automation-ui -am before_script: - bash scripts/create-worm-bucket.sh - bash scripts/start-compose.sh "${ENTERPRISE_SHARE_PATH}/docker-compose-worm-support-ui.yml" From 40c78dc29865544c2da5b51a48d9c00f24e1229b Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 26 Aug 2020 09:20:03 +0300 Subject: [PATCH 75/75] delete unused script --- scripts/stop-compose.sh | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 scripts/stop-compose.sh diff --git a/scripts/stop-compose.sh b/scripts/stop-compose.sh deleted file mode 100644 index 6fe5738624..0000000000 --- a/scripts/stop-compose.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -export DOCKER_COMPOSE_PATH=$1 - -if [ -z "$DOCKER_COMPOSE_PATH" ] -then - echo "Please provide path to docker-compose.yml: \"${0##*/} /path/to/docker-compose.yml\"" - exit 1 -fi - -echo "Killing ACS stack in ${DOCKER_COMPOSE_PATH}" - -cd ${DOCKER_COMPOSE_PATH} - -docker-compose ps -# logs for debug -docker-compose logs --no-color -t alfresco -docker-compose kill -docker-compose rm -fv \ No newline at end of file