From 84266f03797ba9ea24fb13204cae229c0369d9ed Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 18 Dec 2019 14:40:29 +0000 Subject: [PATCH 01/11] [maven-release-plugin] prepare release alfresco-sdk-aggregator-4.1.0 --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-platform-jar-archetype/pom.xml | 2 +- archetypes/alfresco-share-jar-archetype/pom.xml | 2 +- archetypes/archetypes-it/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index b377024a..4a94994e 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -11,7 +11,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 ../../pom.xml diff --git a/archetypes/alfresco-platform-jar-archetype/pom.xml b/archetypes/alfresco-platform-jar-archetype/pom.xml index 36f43b70..45154a84 100644 --- a/archetypes/alfresco-platform-jar-archetype/pom.xml +++ b/archetypes/alfresco-platform-jar-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 ../../pom.xml diff --git a/archetypes/alfresco-share-jar-archetype/pom.xml b/archetypes/alfresco-share-jar-archetype/pom.xml index cccb1984..c8cb6cbc 100644 --- a/archetypes/alfresco-share-jar-archetype/pom.xml +++ b/archetypes/alfresco-share-jar-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 ../../pom.xml diff --git a/archetypes/archetypes-it/pom.xml b/archetypes/archetypes-it/pom.xml index cabb92ca..aa711b03 100644 --- a/archetypes/archetypes-it/pom.xml +++ b/archetypes/archetypes-it/pom.xml @@ -17,7 +17,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index bf44c08d..9e156f2b 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -10,7 +10,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 27fb2fee..ce305d35 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index 86140bb7..3e709d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 4.1.0-SNAPSHOT + 4.1.0 Alfresco SDK This aggregator Project builds all modules required for the Alfresco SDK pom @@ -30,7 +30,7 @@ scm:git:${scm.url.base}.git scm:git:${scm.url.base} ${scm.url.base} - alfresco-sdk-aggregator-4.1.0-SNAPSHOT + alfresco-sdk-aggregator-4.1.0 From 36dbb24ce94b927d564faec5c5b89b1ce71e89a6 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Wed, 18 Dec 2019 14:40:36 +0000 Subject: [PATCH 02/11] [maven-release-plugin] prepare for next development iteration --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-platform-jar-archetype/pom.xml | 2 +- archetypes/alfresco-share-jar-archetype/pom.xml | 2 +- archetypes/archetypes-it/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 4a94994e..f03b12e1 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -11,7 +11,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-platform-jar-archetype/pom.xml b/archetypes/alfresco-platform-jar-archetype/pom.xml index 45154a84..9319398f 100644 --- a/archetypes/alfresco-platform-jar-archetype/pom.xml +++ b/archetypes/alfresco-platform-jar-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-share-jar-archetype/pom.xml b/archetypes/alfresco-share-jar-archetype/pom.xml index c8cb6cbc..ddb981d7 100644 --- a/archetypes/alfresco-share-jar-archetype/pom.xml +++ b/archetypes/alfresco-share-jar-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/archetypes-it/pom.xml b/archetypes/archetypes-it/pom.xml index aa711b03..0f7be0b6 100644 --- a/archetypes/archetypes-it/pom.xml +++ b/archetypes/archetypes-it/pom.xml @@ -17,7 +17,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 9e156f2b..f8a9fca0 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -10,7 +10,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index ce305d35..da71dba3 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 3e709d4f..9202f7f4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 4.1.0 + 4.2.0-SNAPSHOT Alfresco SDK This aggregator Project builds all modules required for the Alfresco SDK pom @@ -30,7 +30,7 @@ scm:git:${scm.url.base}.git scm:git:${scm.url.base} ${scm.url.base} - alfresco-sdk-aggregator-4.1.0 + alfresco-sdk-aggregator-4.1.0-SNAPSHOT From 44b0ef5b1fdfb658b7748de041afb6142b0dcc49 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Fri, 13 Mar 2020 20:13:15 +0100 Subject: [PATCH 03/11] integration with mock project --- .../META-INF/maven/archetype-metadata.xml | 6 ++ .../java/platformsample/SimpleMockTest.java | 92 +++++++++++++++++++ .../__artifactId__/alfresco-global.properties | 1 + .../test/resources/test-module-context.xml | 7 ++ .../java/platformsample/BackupAction.java | 59 ++++++++++++ .../context/service-context.xml | 7 ++ .../java/platformsample/SimpleMockTest.java | 92 +++++++++++++++++++ .../__artifactId__/alfresco-global.properties | 1 + .../test/resources/test-module-context.xml | 7 ++ .../META-INF/maven/archetype-metadata.xml | 6 ++ .../java/platformsample/BackupAction.java | 59 ++++++++++++ .../context/service-context.xml | 7 ++ .../java/platformsample/SimpleMockTest.java | 92 +++++++++++++++++++ .../__artifactId__/alfresco-global.properties | 1 + .../test/resources/test-module-context.xml | 7 ++ .../structure-aio.md | 1 + .../structure-platform.md | 1 + modules/alfresco-rad/pom.xml | 6 ++ 18 files changed, 452 insertions(+) create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/test-module-context.xml create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/test-module-context.xml create mode 100644 archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/BackupAction.java create mode 100644 archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java create mode 100644 archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties create mode 100644 archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/test-module-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index d76717bd..7f941a3a 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -47,6 +47,12 @@ **/*-context.xml + + src/test/resources + + **/* + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java new file mode 100644 index 00000000..d64eadcb --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java @@ -0,0 +1,92 @@ +#set($symbol_pound='#') +#set($symbol_dollar='$') +#set($symbol_escape='\' ) +/** + * Copyright (C) 2017 Alfresco Software Limited. + *

+ * This file is part of the Alfresco SDK project. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package ${package}.platformsample; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import org.alfresco.mock.test.AbstractForm; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.action.ActionImpl; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.cmr.search.ResultSet; +import org.alfresco.service.cmr.search.SearchService; +import org.alfresco.service.namespace.QName; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.tradeshift.test.remote.Remote; +import com.tradeshift.test.remote.RemoteTestRunner; + +import ${package}.platformsample.BackupAction; + +@RunWith(RemoteTestRunner.class) +@Remote(runnerClass = SpringJUnit4ClassRunner.class) +@ContextConfiguration("classpath:test-module-context.xml") +public class SimpleMockTest extends AbstractForm { + + @Autowired + private BackupAction myAction; + + private String documentName = "VALID.pdf"; + + @Before + public void init() { + super.init(); + + // insert a document + Map properties = new HashMap(); + properties.put(ContentModel.PROP_NAME, documentName); + properties.put(ContentModel.PROP_DESCRIPTION, documentName); + String content = new String(com.adobe.xmp.impl.Base64.encode(documentName)); + insertDocument(workspace, documentName, content, properties); + + // verify the document is created + ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + "\""); + Assert.assertEquals("A document is created", 1, docs.length()); + Assert.assertTrue("VALID.pdf is created", docs.getNodeRefs().get(0).getId().equals(documentName)); + } + + @Test + public void execute() { + + // execute the injected action + Map parameterValues = new HashMap(); + parameterValues.put(BackupAction.DOCUMENT_NAME, documentName); + Action action = new ActionImpl(null, null, null, parameterValues); + myAction.executeImpl(action, workspace); + + // verify the document is created + ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + ".bak\""); + Assert.assertEquals("A backup document is created", 1, docs.length()); + Assert.assertTrue("VALID.pdf.bak is created", docs.getNodeRefs().get(0).getId().equals(documentName + ".bak")); + + } +} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties new file mode 100644 index 00000000..cac9209c --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties @@ -0,0 +1 @@ +backup.extension=bak \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/test-module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/test-module-context.xml new file mode 100644 index 00000000..f91da734 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/resources/test-module-context.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java new file mode 100644 index 00000000..c29cab4c --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java @@ -0,0 +1,59 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/** + * Copyright (C) 2017 Alfresco Software Limited. + *

+ * This file is part of the Alfresco SDK project. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package ${package}.platformsample; + +import java.util.List; + +import org.alfresco.model.ContentModel; +import org.alfresco.repo.action.executer.ActionExecuterAbstractBase; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.action.ParameterDefinition; +import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.repository.NodeRef; +import org.springframework.beans.factory.annotation.Autowired; + +public class BackupAction extends ActionExecuterAbstractBase { + + public static String DOCUMENT_NAME = "documentName"; + + @Autowired + private FileFolderService fileFolderService; + + private String extension; + + @Override + public void executeImpl(Action action, NodeRef actionedUponNodeRef) { + String documentName = (String) action.getParameterValue(DOCUMENT_NAME); + fileFolderService.create(actionedUponNodeRef, documentName + "." + extension, ContentModel.TYPE_CONTENT); + + } + + @Override + protected void addParameterDefinitions(List paramList) { + // TODO Auto-generated method stub + + } + + public void setExtension(String extension) { + this.extension = extension; + } + +} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml index a3c12c4d..d7025d76 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml @@ -39,6 +39,13 @@ + + + + ${backup.extension} + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java new file mode 100644 index 00000000..d64eadcb --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java @@ -0,0 +1,92 @@ +#set($symbol_pound='#') +#set($symbol_dollar='$') +#set($symbol_escape='\' ) +/** + * Copyright (C) 2017 Alfresco Software Limited. + *

+ * This file is part of the Alfresco SDK project. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package ${package}.platformsample; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import org.alfresco.mock.test.AbstractForm; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.action.ActionImpl; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.cmr.search.ResultSet; +import org.alfresco.service.cmr.search.SearchService; +import org.alfresco.service.namespace.QName; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.tradeshift.test.remote.Remote; +import com.tradeshift.test.remote.RemoteTestRunner; + +import ${package}.platformsample.BackupAction; + +@RunWith(RemoteTestRunner.class) +@Remote(runnerClass = SpringJUnit4ClassRunner.class) +@ContextConfiguration("classpath:test-module-context.xml") +public class SimpleMockTest extends AbstractForm { + + @Autowired + private BackupAction myAction; + + private String documentName = "VALID.pdf"; + + @Before + public void init() { + super.init(); + + // insert a document + Map properties = new HashMap(); + properties.put(ContentModel.PROP_NAME, documentName); + properties.put(ContentModel.PROP_DESCRIPTION, documentName); + String content = new String(com.adobe.xmp.impl.Base64.encode(documentName)); + insertDocument(workspace, documentName, content, properties); + + // verify the document is created + ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + "\""); + Assert.assertEquals("A document is created", 1, docs.length()); + Assert.assertTrue("VALID.pdf is created", docs.getNodeRefs().get(0).getId().equals(documentName)); + } + + @Test + public void execute() { + + // execute the injected action + Map parameterValues = new HashMap(); + parameterValues.put(BackupAction.DOCUMENT_NAME, documentName); + Action action = new ActionImpl(null, null, null, parameterValues); + myAction.executeImpl(action, workspace); + + // verify the document is created + ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + ".bak\""); + Assert.assertEquals("A backup document is created", 1, docs.length()); + Assert.assertTrue("VALID.pdf.bak is created", docs.getNodeRefs().get(0).getId().equals(documentName + ".bak")); + + } +} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties new file mode 100644 index 00000000..cac9209c --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties @@ -0,0 +1 @@ +backup.extension=bak \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/test-module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/test-module-context.xml new file mode 100644 index 00000000..f91da734 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/resources/test-module-context.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index e4f4ad8b..3241666e 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -72,6 +72,12 @@ **/*-context.xml + + src/test/resources + + **/* + + diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/BackupAction.java b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/BackupAction.java new file mode 100644 index 00000000..c29cab4c --- /dev/null +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/BackupAction.java @@ -0,0 +1,59 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/** + * Copyright (C) 2017 Alfresco Software Limited. + *

+ * This file is part of the Alfresco SDK project. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package ${package}.platformsample; + +import java.util.List; + +import org.alfresco.model.ContentModel; +import org.alfresco.repo.action.executer.ActionExecuterAbstractBase; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.action.ParameterDefinition; +import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.repository.NodeRef; +import org.springframework.beans.factory.annotation.Autowired; + +public class BackupAction extends ActionExecuterAbstractBase { + + public static String DOCUMENT_NAME = "documentName"; + + @Autowired + private FileFolderService fileFolderService; + + private String extension; + + @Override + public void executeImpl(Action action, NodeRef actionedUponNodeRef) { + String documentName = (String) action.getParameterValue(DOCUMENT_NAME); + fileFolderService.create(actionedUponNodeRef, documentName + "." + extension, ContentModel.TYPE_CONTENT); + + } + + @Override + protected void addParameterDefinitions(List paramList) { + // TODO Auto-generated method stub + + } + + public void setExtension(String extension) { + this.extension = extension; + } + +} diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml index a3c12c4d..d7025d76 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml @@ -39,6 +39,13 @@ + + + + ${backup.extension} + + diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java new file mode 100644 index 00000000..d64eadcb --- /dev/null +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java @@ -0,0 +1,92 @@ +#set($symbol_pound='#') +#set($symbol_dollar='$') +#set($symbol_escape='\' ) +/** + * Copyright (C) 2017 Alfresco Software Limited. + *

+ * This file is part of the Alfresco SDK project. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package ${package}.platformsample; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import org.alfresco.mock.test.AbstractForm; +import org.alfresco.model.ContentModel; +import org.alfresco.repo.action.ActionImpl; +import org.alfresco.service.cmr.action.Action; +import org.alfresco.service.cmr.repository.StoreRef; +import org.alfresco.service.cmr.search.ResultSet; +import org.alfresco.service.cmr.search.SearchService; +import org.alfresco.service.namespace.QName; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.tradeshift.test.remote.Remote; +import com.tradeshift.test.remote.RemoteTestRunner; + +import ${package}.platformsample.BackupAction; + +@RunWith(RemoteTestRunner.class) +@Remote(runnerClass = SpringJUnit4ClassRunner.class) +@ContextConfiguration("classpath:test-module-context.xml") +public class SimpleMockTest extends AbstractForm { + + @Autowired + private BackupAction myAction; + + private String documentName = "VALID.pdf"; + + @Before + public void init() { + super.init(); + + // insert a document + Map properties = new HashMap(); + properties.put(ContentModel.PROP_NAME, documentName); + properties.put(ContentModel.PROP_DESCRIPTION, documentName); + String content = new String(com.adobe.xmp.impl.Base64.encode(documentName)); + insertDocument(workspace, documentName, content, properties); + + // verify the document is created + ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + "\""); + Assert.assertEquals("A document is created", 1, docs.length()); + Assert.assertTrue("VALID.pdf is created", docs.getNodeRefs().get(0).getId().equals(documentName)); + } + + @Test + public void execute() { + + // execute the injected action + Map parameterValues = new HashMap(); + parameterValues.put(BackupAction.DOCUMENT_NAME, documentName); + Action action = new ActionImpl(null, null, null, parameterValues); + myAction.executeImpl(action, workspace); + + // verify the document is created + ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + ".bak\""); + Assert.assertEquals("A backup document is created", 1, docs.length()); + Assert.assertTrue("VALID.pdf.bak is created", docs.getNodeRefs().get(0).getId().equals(documentName + ".bak")); + + } +} diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties new file mode 100644 index 00000000..cac9209c --- /dev/null +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/module/__artifactId__/alfresco-global.properties @@ -0,0 +1 @@ +backup.extension=bak \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/test-module-context.xml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/test-module-context.xml new file mode 100644 index 00000000..f91da734 --- /dev/null +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/resources/test-module-context.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/docs/working-with-generated-projects/structure-aio.md b/docs/working-with-generated-projects/structure-aio.md index 724f661a..5bc34462 100644 --- a/docs/working-with-generated-projects/structure-aio.md +++ b/docs/working-with-generated-projects/structure-aio.md @@ -98,6 +98,7 @@ my-all-in-one-project │ └── com │ └── example │ └── platformsample +│ │ │ ├── SimpleMockTest.java │ └── HelloWorldWebScriptControllerTest.java ├── my-all-in-one-project-share-docker | ├── pom.xml diff --git a/docs/working-with-generated-projects/structure-platform.md b/docs/working-with-generated-projects/structure-platform.md index 1c404b2d..9f965b3f 100644 --- a/docs/working-with-generated-projects/structure-platform.md +++ b/docs/working-with-generated-projects/structure-platform.md @@ -80,6 +80,7 @@ my-platform-jar-project └── platformsample ├── CustomContentModelIT.java ├── DemoComponentIT.java + ├── SimpleMockTest.java ├── HelloWorldWebScriptControllerTest.java └── HelloWorldWebScriptIT.java ``` diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index f8a9fca0..aaed94e9 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -40,6 +40,12 @@ spring-context 3.2.17.RELEASE + + + it.vige + alfresco-tests + ${alfresco.platform.version}.1 + From 623d4bc4668b2c3df9fe9f6f31c92ac98c11429a Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Fri, 13 Mar 2020 22:51:56 +0100 Subject: [PATCH 04/11] documentation --- .../src/main/java/platformsample/BackupAction.java | 7 +++++++ .../src/test/java/platformsample/SimpleMockTest.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java index c29cab4c..8c2c305f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/BackupAction.java @@ -30,6 +30,13 @@ import org.alfresco.service.cmr.repository.NodeRef; import org.springframework.beans.factory.annotation.Autowired; +/** + * A basic component that will create a backup of a content. + * Only choose the extension for the backup in your + * alfresco-global.properties + * + * @author Luca Stancapiano + */ public class BackupAction extends ActionExecuterAbstractBase { public static String DOCUMENT_NAME = "documentName"; diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java index d64eadcb..d055aa89 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java @@ -45,6 +45,12 @@ import ${package}.platformsample.BackupAction; +/** + * Unit testing the mock system + * through the backup action + * + * @author Luca Stancapiano + */ @RunWith(RemoteTestRunner.class) @Remote(runnerClass = SpringJUnit4ClassRunner.class) @ContextConfiguration("classpath:test-module-context.xml") From 1a22654280b4e8f632189ff68a21a415ed589f83 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Sat, 18 Apr 2020 14:03:25 +0200 Subject: [PATCH 05/11] new version with activiti support --- .../java/platformsample/SimpleMockTest.java | 92 ------------------- .../java/platformsample/SimpleMockTest.java | 8 +- .../java/platformsample/SimpleMockTest.java | 8 +- modules/alfresco-rad/pom.xml | 2 +- 4 files changed, 9 insertions(+), 101 deletions(-) delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java deleted file mode 100644 index d64eadcb..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/SimpleMockTest.java +++ /dev/null @@ -1,92 +0,0 @@ -#set($symbol_pound='#') -#set($symbol_dollar='$') -#set($symbol_escape='\' ) -/** - * Copyright (C) 2017 Alfresco Software Limited. - *

- * This file is part of the Alfresco SDK project. - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package ${package}.platformsample; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -import org.alfresco.mock.test.AbstractForm; -import org.alfresco.model.ContentModel; -import org.alfresco.repo.action.ActionImpl; -import org.alfresco.service.cmr.action.Action; -import org.alfresco.service.cmr.repository.StoreRef; -import org.alfresco.service.cmr.search.ResultSet; -import org.alfresco.service.cmr.search.SearchService; -import org.alfresco.service.namespace.QName; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.tradeshift.test.remote.Remote; -import com.tradeshift.test.remote.RemoteTestRunner; - -import ${package}.platformsample.BackupAction; - -@RunWith(RemoteTestRunner.class) -@Remote(runnerClass = SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:test-module-context.xml") -public class SimpleMockTest extends AbstractForm { - - @Autowired - private BackupAction myAction; - - private String documentName = "VALID.pdf"; - - @Before - public void init() { - super.init(); - - // insert a document - Map properties = new HashMap(); - properties.put(ContentModel.PROP_NAME, documentName); - properties.put(ContentModel.PROP_DESCRIPTION, documentName); - String content = new String(com.adobe.xmp.impl.Base64.encode(documentName)); - insertDocument(workspace, documentName, content, properties); - - // verify the document is created - ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, - SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + "\""); - Assert.assertEquals("A document is created", 1, docs.length()); - Assert.assertTrue("VALID.pdf is created", docs.getNodeRefs().get(0).getId().equals(documentName)); - } - - @Test - public void execute() { - - // execute the injected action - Map parameterValues = new HashMap(); - parameterValues.put(BackupAction.DOCUMENT_NAME, documentName); - Action action = new ActionImpl(null, null, null, parameterValues); - myAction.executeImpl(action, workspace); - - // verify the document is created - ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, - SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + ".bak\""); - Assert.assertEquals("A backup document is created", 1, docs.length()); - Assert.assertTrue("VALID.pdf.bak is created", docs.getNodeRefs().get(0).getId().equals(documentName + ".bak")); - - } -} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java index d055aa89..4d942422 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/SimpleMockTest.java @@ -73,8 +73,8 @@ public void init() { insertDocument(workspace, documentName, content, properties); // verify the document is created - ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, - SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + "\""); + ResultSet docs = serviceRegistry.getSearchService().query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "PATH:\"/" + documentName + "\""); Assert.assertEquals("A document is created", 1, docs.length()); Assert.assertTrue("VALID.pdf is created", docs.getNodeRefs().get(0).getId().equals(documentName)); } @@ -89,8 +89,8 @@ public void execute() { myAction.executeImpl(action, workspace); // verify the document is created - ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, - SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + ".bak\""); + ResultSet docs = serviceRegistry.getSearchService().query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "PATH:\"/" + documentName + ".bak\""); Assert.assertEquals("A backup document is created", 1, docs.length()); Assert.assertTrue("VALID.pdf.bak is created", docs.getNodeRefs().get(0).getId().equals(documentName + ".bak")); diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java index d64eadcb..99a00ded 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/test/java/platformsample/SimpleMockTest.java @@ -67,8 +67,8 @@ public void init() { insertDocument(workspace, documentName, content, properties); // verify the document is created - ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, - SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + "\""); + ResultSet docs = serviceRegistry.getSearchService().getSearchService().query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "PATH:\"/" + documentName + "\""); Assert.assertEquals("A document is created", 1, docs.length()); Assert.assertTrue("VALID.pdf is created", docs.getNodeRefs().get(0).getId().equals(documentName)); } @@ -83,8 +83,8 @@ public void execute() { myAction.executeImpl(action, workspace); // verify the document is created - ResultSet docs = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, - SearchService.LANGUAGE_FTS_ALFRESCO, "\"/" + documentName + ".bak\""); + ResultSet docs = serviceRegistry.getSearchService().getSearchService().query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, + SearchService.LANGUAGE_FTS_ALFRESCO, "PATH:\"/" + documentName + ".bak\""); Assert.assertEquals("A backup document is created", 1, docs.length()); Assert.assertTrue("VALID.pdf.bak is created", docs.getNodeRefs().get(0).getId().equals(documentName + ".bak")); diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index aaed94e9..854cbcfd 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -44,7 +44,7 @@ it.vige alfresco-tests - ${alfresco.platform.version}.1 + ${alfresco.platform.version}.2 From 110b89651cc46624ecc1332759a8c3b929464992 Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Thu, 30 Apr 2020 12:18:13 +0200 Subject: [PATCH 06/11] Archetypes - Rename Alfresco Search Service --- .../src/main/docker/alfresco-global.properties | 2 +- .../docker/docker-compose.yml | 10 +++++----- .../main/resources/archetype-resources/run.bat | 4 ++-- .../main/resources/archetype-resources/run.sh | 4 ++-- .../docker/docker-compose.yml | 10 +++++----- .../main/resources/archetype-resources/run.bat | 4 ++-- .../main/resources/archetype-resources/run.sh | 4 ++-- .../src/main/docker/alfresco-global.properties | 2 +- .../docker/docker-compose.yml | 12 ++++++------ .../main/resources/archetype-resources/run.bat | 4 ++-- .../main/resources/archetype-resources/run.sh | 4 ++-- .../working-with-aio.md | 10 +++++----- .../working-with-platform.md | 18 +++++++++--------- .../working-with-share.md | 10 +++++----- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties index a382d0db..52855d6d 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties @@ -60,7 +60,7 @@ db.driver=org.postgresql.Driver # alfresco/tomcat/shared/classes/alfresco-global.properties. # index.subsystem.name=solr6 -solr.host=${rootArtifactId}-ass +solr.host=${rootArtifactId}-search solr.port=8983 solr.secureComms=none diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index e771e082..f5bc3a64 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -38,23 +38,23 @@ services: - "${symbol_dollar}{postgres.port}:5432" volumes: - ${rootArtifactId}-db-volume:/var/lib/postgresql/data - ${rootArtifactId}-ass: + ${rootArtifactId}-search: image: alfresco/alfresco-search-services:1.2.0 environment: SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs SOLR_ALFRESCO_PORT: 8080 - SOLR_SOLR_HOST: ${rootArtifactId}-ass + SOLR_SOLR_HOST: ${rootArtifactId}-search SOLR_SOLR_PORT: 8983 SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive ports: - "8983:8983" volumes: - - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore - - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data + - ${rootArtifactId}-search-volume:/opt/alfresco-search-services/contentstore + - ${rootArtifactId}-search-volume:/opt/alfresco-search-services/data volumes: ${rootArtifactId}-acs-volume: external: true ${rootArtifactId}-db-volume: external: true - ${rootArtifactId}-ass-volume: + ${rootArtifactId}-search-volume: external: true \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat index e5b85657..5ed5b04b 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat @@ -82,7 +82,7 @@ EXIT /B %ERRORLEVEL% :start docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume - docker volume create ${rootArtifactId}-ass-volume + docker volume create ${rootArtifactId}-search-volume docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :start_share @@ -124,5 +124,5 @@ EXIT /B 0 :purge docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-db-volume - docker volume rm -f ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-search-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh index d11437eb..25df0654 100755 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh @@ -12,7 +12,7 @@ fi start() { docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume - docker volume create ${rootArtifactId}-ass-volume + docker volume create ${rootArtifactId}-search-volume docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d } @@ -33,7 +33,7 @@ down() { purge() { docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-db-volume - docker volume rm -f ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-search-volume } build() { diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 7ac0fe2d..6399a388 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -34,23 +34,23 @@ services: - "${symbol_dollar}{postgres.port}:5432" volumes: - ${rootArtifactId}-db-volume:/var/lib/postgresql/data - ${rootArtifactId}-ass: + ${rootArtifactId}-search: image: alfresco/alfresco-search-services:1.2.0 environment: SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs SOLR_ALFRESCO_PORT: 8080 - SOLR_SOLR_HOST: ${rootArtifactId}-ass + SOLR_SOLR_HOST: ${rootArtifactId}-search SOLR_SOLR_PORT: 8983 SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive ports: - "8983:8983" volumes: - - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore - - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data + - ${rootArtifactId}-search-volume:/opt/alfresco-search-services/contentstore + - ${rootArtifactId}-search-volume:/opt/alfresco-search-services/data volumes: ${rootArtifactId}-acs-volume: external: true ${rootArtifactId}-db-volume: external: true - ${rootArtifactId}-ass-volume: + ${rootArtifactId}-search-volume: external: true \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat index e735564a..9fa0b6f2 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat @@ -70,7 +70,7 @@ EXIT /B %ERRORLEVEL% :start docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume - docker volume create ${rootArtifactId}-ass-volume + docker volume create ${rootArtifactId}-search-volume docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :down @@ -96,5 +96,5 @@ EXIT /B 0 :purge docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-db-volume - docker volume rm -f ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-search-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh index 9def3b95..9d5f33c6 100755 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -12,7 +12,7 @@ fi start() { docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume - docker volume create ${rootArtifactId}-ass-volume + docker volume create ${rootArtifactId}-search-volume docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d } @@ -25,7 +25,7 @@ down() { purge() { docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-db-volume - docker volume rm -f ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-search-volume } build() { diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties index 45954bcf..d5c06789 100644 --- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties +++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties @@ -60,7 +60,7 @@ db.driver=org.postgresql.Driver # alfresco/tomcat/shared/classes/alfresco-global.properties. # index.subsystem.name=solr6 -solr.host=${rootArtifactId}-ass +solr.host=${rootArtifactId}-search solr.port=8983 solr.secureComms=none diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml index 05cfbe37..2054abe7 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml @@ -22,7 +22,7 @@ services: # -Ddb.username=alfresco # -Ddb.password=alfresco # -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco -# -Dsolr.host=${rootArtifactId}-ass +# -Dsolr.host=${rootArtifactId}-search # -Dsolr.port=8983 # -Dsolr.secureComms=none # -Dsolr.base.url=/solr @@ -50,23 +50,23 @@ services: # - "${symbol_dollar}{postgres.port}:5432" # volumes: # - ${rootArtifactId}-db-volume:/var/lib/postgresql/data -# ${rootArtifactId}-ass: +# ${rootArtifactId}-search: # image: alfresco/alfresco-search-services:1.2.0 # environment: # SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs # SOLR_ALFRESCO_PORT: 8080 -# SOLR_SOLR_HOST: ${rootArtifactId}-ass +# SOLR_SOLR_HOST: ${rootArtifactId}-search # SOLR_SOLR_PORT: 8983 # SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive # ports: # - "8983:8983" # volumes: -# - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore -# - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data +# - ${rootArtifactId}-search-volume:/opt/alfresco-search-services/contentstore +# - ${rootArtifactId}-search-volume:/opt/alfresco-search-services/data #volumes: # ${rootArtifactId}-acs-volume: # external: true # ${rootArtifactId}-db-volume: # external: true -# ${rootArtifactId}-ass-volume: +# ${rootArtifactId}-search-volume: # external: true \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat index aba062fb..796caf26 100644 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat @@ -54,7 +54,7 @@ EXIT /B %ERRORLEVEL% :start docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume - docker volume create ${rootArtifactId}-ass-volume + docker volume create ${rootArtifactId}-search-volume docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d EXIT /B 0 :start_share @@ -82,5 +82,5 @@ EXIT /B 0 :purge docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-db-volume - docker volume rm -f ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-search-volume EXIT /B 0 \ No newline at end of file diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh index 493a5146..18268cdc 100755 --- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh @@ -12,7 +12,7 @@ fi start() { docker volume create ${rootArtifactId}-acs-volume docker volume create ${rootArtifactId}-db-volume - docker volume create ${rootArtifactId}-ass-volume + docker volume create ${rootArtifactId}-search-volume docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d } @@ -29,7 +29,7 @@ down() { purge() { docker volume rm -f ${rootArtifactId}-acs-volume docker volume rm -f ${rootArtifactId}-db-volume - docker volume rm -f ${rootArtifactId}-ass-volume + docker volume rm -f ${rootArtifactId}-search-volume } build() { diff --git a/docs/working-with-generated-projects/working-with-aio.md b/docs/working-with-generated-projects/working-with-aio.md index ee288e30..97701721 100644 --- a/docs/working-with-generated-projects/working-with-aio.md +++ b/docs/working-with-generated-projects/working-with-aio.md @@ -100,7 +100,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start ... my-all-in-one-project-acs-volume my-all-in-one-project-db-volume -my-all-in-one-project-ass-volume +my-all-in-one-project-search-volume ... Building my-all-in-one-project-share Step 1/8 : FROM alfresco/alfresco-share:6.1.0-RC3 @@ -176,7 +176,7 @@ Then check the name of the ACS Repository container: $ docker container ls CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 733867a70117 alfresco-content-services-my-all-in-one-project:development "catalina.sh run -se…" 5 minutes ago Up 5 minutes 0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp docker_my-all-in-one-project-acs_1 -1f197e52b4f2 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 5 minutes ago Up 5 minutes 0.0.0.0:8983->8983/tcp docker_my-all-in-one-project-ass_1 +1f197e52b4f2 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 5 minutes ago Up 5 minutes 0.0.0.0:8983->8983/tcp docker_my-all-in-one-project-search_1 4eff0cc9cc25 alfresco-share-my-all-in-one-project:development "/usr/local/tomcat/s…" 5 minutes ago Up 5 minutes 8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp docker_my-all-in-one-project-share_1 a7854ff16d72 postgres:9.6 "docker-entrypoint.s…" 5 minutes ago Up 5 minutes 0.0.0.0:5555->5432/tcp docker_my-all-in-one-project-postgres_1 ``` @@ -233,7 +233,7 @@ $ docker container ls CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 49015432f1b2 alfresco-content-services-my-all-in-one-project:development "catalina.sh run -se…" 20 minutes ago Up 20 minutes 0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp docker_my-all-in-one-project-acs_1 edb9ea129a5d postgres:9.6 "docker-entrypoint.s…" 20 minutes ago Up 20 minutes 0.0.0.0:5555->5432/tcp docker_my-all-in-one-project-postgres_1 -6992d183986f alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 20 minutes ago Up 20 minutes 0.0.0.0:8983->8983/tcp docker_my-all-in-one-project-ass_1 +6992d183986f alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 20 minutes ago Up 20 minutes 0.0.0.0:8983->8983/tcp docker_my-all-in-one-project-search_1 107d00733efd alfresco-share-my-all-in-one-project:development "/usr/local/tomcat/s…" 20 minutes ago Up 20 minutes 8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp docker_my-all-in-one-project-share_1 ``` @@ -243,11 +243,11 @@ Now, standing in the directory where the `run.sh` script is located execute the my-all-in-one-project mbergljung$ ./run.sh stop Stopping docker_my-all-in-one-project-acs_1 ... done Stopping docker_my-all-in-one-project-postgres_1 ... done -Stopping docker_my-all-in-one-project-ass_1 ... done +Stopping docker_my-all-in-one-project-search_1 ... done Stopping docker_my-all-in-one-project-share_1 ... done Removing docker_my-all-in-one-project-acs_1 ... done Removing docker_my-all-in-one-project-postgres_1 ... done -Removing docker_my-all-in-one-project-ass_1 ... done +Removing docker_my-all-in-one-project-search_1 ... done Removing docker_my-all-in-one-project-share_1 ... done Removing network docker_default ``` diff --git a/docs/working-with-generated-projects/working-with-platform.md b/docs/working-with-generated-projects/working-with-platform.md index e99b4117..2c08374b 100644 --- a/docs/working-with-generated-projects/working-with-platform.md +++ b/docs/working-with-generated-projects/working-with-platform.md @@ -83,15 +83,15 @@ MBP512-MBERGLJUNG-0917:my-platform-project mbergljung$ ./run.sh build_start [INFO] ------------------------------------------------------------------------ my-platform-project-acs-volume my-platform-project-db-volume -my-platform-project-ass-volume +my-platform-project-search-volume Creating network "docker_default" with the default driver Building my-platform-project-acs ... Successfully tagged alfresco-content-services-my-platform-project:development Creating docker_my-platform-project-postgres_1 ... done -Creating docker_my-platform-project-ass_1 ... done +Creating docker_my-platform-project-search_1 ... done Creating docker_my-platform-project-acs_1 ... done -Attaching to docker_my-platform-project-acs_1, docker_my-platform-project-ass_1, docker_my-platform-project-postgres_1 +Attaching to docker_my-platform-project-acs_1, docker_my-platform-project-search_1, docker_my-platform-project-postgres_1 ... my-platform-project-acs_1 | 27-Mar-2019 09:25:12.923 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"] my-platform-project-acs_1 | 27-Mar-2019 09:25:12.947 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["ajp-nio-8009"] @@ -150,7 +150,7 @@ Then check the name of the ACS Repository container: $ docker container ls CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES ba90b1648470 alfresco-content-services-my-platform-project:development "catalina.sh run -se…" 8 minutes ago Up 8 minutes 0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp docker_my-platform-project-acs_1 -0435b09e687c alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 8 minutes ago Up 8 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-ass_1 +0435b09e687c alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 8 minutes ago Up 8 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-search_1 c9145e7cdb20 postgres:9.6 "docker-entrypoint.s…" 8 minutes ago Up 8 minutes 0.0.0.0:5555->5432/tcp docker_my-platform-project-postgres_1 ``` @@ -186,10 +186,10 @@ Then stop the project: ``` my-platform-project mbergljung$ ./run.sh stop Stopping docker_my-platform-project-acs_1 ... done -Stopping docker_my-platform-project-ass_1 ... done +Stopping docker_my-platform-project-search_1 ... done Stopping docker_my-platform-project-postgres_1 ... done Removing docker_my-platform-project-acs_1 ... done -Removing docker_my-platform-project-ass_1 ... done +Removing docker_my-platform-project-search_1 ... done Removing docker_my-platform-project-postgres_1 ... done Removing network docker_default ``` @@ -220,7 +220,7 @@ as they run in daemon mode in the background. Check this by executing the follow $ docker container ls CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 61de829092f3 alfresco-content-services-my-platform-project:development "catalina.sh run -se…" 3 minutes ago Up 3 minutes 0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp docker_my-platform-project-acs_1 -07300ddb6714 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 3 minutes ago Up 3 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-ass_1 +07300ddb6714 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 3 minutes ago Up 3 minutes 0.0.0.0:8983->8983/tcp docker_my-platform-project-search_1 09922ce36d90 postgres:9.6 "docker-entrypoint.s…" 3 minutes ago Up 3 minutes 0.0.0.0:5555->5432/tcp docker_my-platform-project-postgres_1 ``` @@ -229,10 +229,10 @@ Now, standing in the directory where the `run.sh` script is located execute the ``` my-platform-project mbergljung$ ./run.sh stop Stopping docker_my-platform-project-acs_1 ... done -Stopping docker_my-platform-project-ass_1 ... done +Stopping docker_my-platform-project-search_1 ... done Stopping docker_my-platform-project-postgres_1 ... done Removing docker_my-platform-project-acs_1 ... done -Removing docker_my-platform-project-ass_1 ... done +Removing docker_my-platform-project-search_1 ... done Removing docker_my-platform-project-postgres_1 ... done Removing network docker_default ``` diff --git a/docs/working-with-generated-projects/working-with-share.md b/docs/working-with-generated-projects/working-with-share.md index 59ba7a1f..4b1ce2ab 100644 --- a/docs/working-with-generated-projects/working-with-share.md +++ b/docs/working-with-generated-projects/working-with-share.md @@ -88,7 +88,7 @@ my-share-project mbergljung$ ./run.sh build_start [INFO] ------------------------------------------------------------------------ my-share-project-acs-volume my-share-project-db-volume -my-share-project-ass-volume +my-share-project-search-volume Creating network "docker_default" with the default driver Building my-share-project-share ... @@ -153,7 +153,7 @@ CONTAINER ID IMAGE CO dda89172506c alfresco/alfresco-content-repository-community:6.1.2-ga "catalina.sh run -se…" 6 minutes ago Up 6 minutes 0.0.0.0:8080->8080/tcp docker_my-share-project-acs_1 2b4fa4b4a3f6 alfresco-share-my-share-project:development "/usr/local/tomcat/s…" 6 minutes ago Up 6 minutes 8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp docker_my-share-project-share_1 ad8857f3574b postgres:9.6 "docker-entrypoint.s…" 6 minutes ago Up 6 minutes 0.0.0.0:5555->5432/tcp docker_my-share-project-postgres_1 -92902d7ae624 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 6 minutes ago Up 6 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-ass_1 +92902d7ae624 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 6 minutes ago Up 6 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-search_1 ``` Then open up a shell into the Alfresco Share container: @@ -237,7 +237,7 @@ CONTAINER ID IMAGE CO 59f02060955a alfresco-share-my-share-project:development "/usr/local/tomcat/s…" 4 minutes ago Up 4 minutes 8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp docker_my-share-project-share_1 dda89172506c alfresco/alfresco-content-repository-community:6.1.2-ga "catalina.sh run -se…" 16 minutes ago Up 16 minutes 0.0.0.0:8080->8080/tcp docker_my-share-project-acs_1 ad8857f3574b postgres:9.6 "docker-entrypoint.s…" 16 minutes ago Up 16 minutes 0.0.0.0:5555->5432/tcp docker_my-share-project-postgres_1 -92902d7ae624 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 16 minutes ago Up 16 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-ass_1 +92902d7ae624 alfresco/alfresco-search-services:1.2.0 "/bin/sh -c '$DIST_D…" 16 minutes ago Up 16 minutes 0.0.0.0:8983->8983/tcp docker_my-share-project-search_1 ``` Now, standing in the directory where the `run.sh` script is located execute the following command to stop and remove the containers: @@ -247,11 +247,11 @@ my-share-project mbergljung$ ./run.sh stop Stopping docker_my-share-project-share_1 ... done Stopping docker_my-share-project-acs_1 ... done Stopping docker_my-share-project-postgres_1 ... done -Stopping docker_my-share-project-ass_1 ... done +Stopping docker_my-share-project-search_1 ... done Removing docker_my-share-project-share_1 ... done Removing docker_my-share-project-acs_1 ... done Removing docker_my-share-project-postgres_1 ... done -Removing docker_my-share-project-ass_1 ... done +Removing docker_my-share-project-search_1 ... done Removing network docker_default ``` From ffe9b864a481ed6275d6401a168adf6b3c8a1001 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Sun, 3 May 2020 10:06:44 +0200 Subject: [PATCH 07/11] alfresco tests upgrade to 6.2.0-ea.3 version --- modules/alfresco-rad/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 854cbcfd..a0a57d0e 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -44,7 +44,7 @@ it.vige alfresco-tests - ${alfresco.platform.version}.2 + ${alfresco.platform.version}.3 From 85b100e6aea099c651f4d8fb8a03651e8d4fe1a0 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Tue, 1 Sep 2020 13:25:17 +0200 Subject: [PATCH 08/11] alfresco-tests update --- modules/alfresco-rad/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index a0a57d0e..3209b1ef 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -44,7 +44,7 @@ it.vige alfresco-tests - ${alfresco.platform.version}.3 + ${alfresco.platform.version}.4 From f58002678382d26464ac452bb99e16b1f74407a0 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Wed, 11 Nov 2020 22:00:36 +0100 Subject: [PATCH 09/11] alfresco-tests upgrade --- modules/alfresco-rad/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 3209b1ef..d6ed2095 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -44,7 +44,7 @@ it.vige alfresco-tests - ${alfresco.platform.version}.4 + ${alfresco.platform.version}.6 From e611bacc3640157926d54a72b4327c46e33234c9 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Tue, 24 Nov 2020 23:27:27 +0100 Subject: [PATCH 10/11] alfresco-tests upgrade --- modules/alfresco-rad/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index d6ed2095..65a19ef3 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -44,7 +44,7 @@ it.vige alfresco-tests - ${alfresco.platform.version}.6 + ${alfresco.platform.version}.7 From bdef31928e240b866d14232cfb07f7b934fbaa74 Mon Sep 17 00:00:00 2001 From: Luca Stancapiano Date: Tue, 9 Feb 2021 15:14:59 +0100 Subject: [PATCH 11/11] alfresco-tests update --- modules/alfresco-rad/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 65a19ef3..d60d5443 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -44,7 +44,7 @@ it.vige alfresco-tests - ${alfresco.platform.version}.7 + ${alfresco.platform.version}.8