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 4774a364..d76717bd 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 @@ -10,9 +10,9 @@ - + src/main/assembly @@ -50,9 +50,9 @@ - + src/main/assembly @@ -97,7 +97,9 @@ - + src/main/java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml similarity index 97% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml index fb31e65c..78ecd3e9 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml @@ -22,7 +22,7 @@ that is generated for the AIO project --> ${groupId} - ${rootArtifactId}-platform-jar + ${rootArtifactId}-platform ${version} test diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/CustomContentModelIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/CustomContentModelIT.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/CustomContentModelIT.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/CustomContentModelIT.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/DemoComponentIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/DemoComponentIT.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/DemoComponentIT.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/DemoComponentIT.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/HelloWorldWebScriptIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/HelloWorldWebScriptIT.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/integration-tests/src/test/java/platformsample/HelloWorldWebScriptIT.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/src/test/java/platformsample/HelloWorldWebScriptIT.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/pom.xml index 70240b92..3ec2b55f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/pom.xml @@ -19,7 +19,7 @@ ${groupId} - ${rootArtifactId}-platform-jar + ${rootArtifactId}-platform ${version} @@ -50,7 +50,7 @@ ${groupId} - integration-tests + ${rootArtifactId}-integration-tests ${version} tests false diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/hotswap-agent.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/hotswap-agent.properties index d94563e7..2bd471fc 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/hotswap-agent.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/hotswap-agent.properties @@ -26,12 +26,12 @@ disabledPlugins=Hibernate,Spring # # Load web application resources (such as HTML, JSP, CSS, ...) from this directory prior to default processing. # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp). -extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform-jar/target/classes/META-INF/resources; +extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform/target/classes/META-INF/resources; # Load static web resources from different directory. # # This setting is dependent on application server plugin(Jetty, Tomcat, JBoss, ...) -webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform-jar/target/classes/META-INF/resources; +webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-platform/target/classes/META-INF/resources; # Watch for changes in a directory (resources only). # diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/amp.xml similarity index 97% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/amp.xml index 447a6458..097775f0 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/amp.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/amp.xml @@ -10,7 +10,7 @@ ${project.groupId} - some-platform-jar + some-platform ${project.version} amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/file-mapping.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/file-mapping.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/file-mapping.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/file-mapping.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/web/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/web/README.md similarity index 93% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/web/README.md rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/web/README.md index d1c01571..e3b1a7ce 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/assembly/web/README.md +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/assembly/web/README.md @@ -10,7 +10,7 @@ any existing web resources in the Alfresco.WAR. ` ${project.groupId} - some-platform-jar + some-platform ${project.version} amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/Demo.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/Demo.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/Demo.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/Demo.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/DemoComponent.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/DemoComponent.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/DemoComponent.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/DemoComponent.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/HelloWorldWebScript.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/HelloWorldWebScript.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/java/platformsample/HelloWorldWebScript.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/HelloWorldWebScript.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/META-INF/resources/test.html b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/META-INF/resources/test.html similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/META-INF/resources/test.html rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/META-INF/resources/test.html diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.desc.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.desc.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.html.ftl diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/extension/templates/webscripts/alfresco/tutorials/helloworld.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/bootstrap-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/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 similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/webscript-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/webscript-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/webscript-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/context/webscript-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/log4j.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/log4j.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/log4j.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/messages/content-model.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/messages/content-model.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/messages/content-model.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/messages/content-model.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/model/content-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/model/content-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/model/content-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/model/workflow-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/model/workflow-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/model/workflow-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/module-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/module-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/resources/alfresco/module/__artifactId__/workflow/sample-process.bpmn20.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/test/java/platformsample/HelloWorldWebScriptControllerTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/HelloWorldWebScriptControllerTest.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/test/java/platformsample/HelloWorldWebScriptControllerTest.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/test/java/platformsample/HelloWorldWebScriptControllerTest.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/pom.xml index bc324070..b4fd0b8f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/pom.xml @@ -19,7 +19,7 @@ ${groupId} - ${rootArtifactId}-share-jar + ${rootArtifactId}-share ${version} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/hotswap-agent.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/hotswap-agent.properties index 40073d4b..f48216fb 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/hotswap-agent.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-docker/src/main/docker/hotswap-agent.properties @@ -27,12 +27,12 @@ disabledPlugins=Hibernate,Spring # # Load web application resources (such as HTML, JSP, CSS, ...) from this directory prior to default processing. # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp). -extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share-jar/target/classes/META-INF/resources; +extraWebappContext=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share/target/classes/META-INF/resources; # Load static web resources from different directory. # # This setting is dependent on application server plugin(Jetty, Tomcat, JBoss, ...) -webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share-jar/target/classes/META-INF/resources; +webappDir=/usr/local/tomcat/hotswap-agent/${rootArtifactId}-share/target/classes/META-INF/resources; # Watch for changes in a directory (resources only). # diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/amp.xml similarity index 97% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/amp.xml index b8bef443..9917d7ba 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/amp.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/amp.xml @@ -10,7 +10,7 @@ ${project.groupId} - some-share-jar + some-share ${project.version} amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/file-mapping.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/file-mapping.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/file-mapping.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/file-mapping.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/web/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/web/README.md similarity index 94% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/web/README.md rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/web/README.md index 44f75971..09019112 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/assembly/web/README.md +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/assembly/web/README.md @@ -10,7 +10,7 @@ any existing web resources in the Share.WAR. ` ${project.groupId} - some-share-jar + some-share ${project.version} amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/TemplateWidget.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/TemplateWidget.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/TemplateWidget.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/TemplateWidget.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/css/TemplateWidget.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/css/TemplateWidget.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/css/TemplateWidget.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/css/TemplateWidget.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/i18n/TemplateWidget.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/i18n/TemplateWidget.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/i18n/TemplateWidget.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/i18n/TemplateWidget.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/templates/TemplateWidget.html b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/templates/TemplateWidget.html similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/resources/__rootArtifactId__-share-jar/js/tutorials/widgets/templates/TemplateWidget.html rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/resources/__artifactId__/js/tutorials/widgets/templates/TemplateWidget.html diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/share-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/share-config-custom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/META-INF/share-config-custom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/META-INF/share-config-custom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/log4j.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/log4j.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/log4j.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/module/__rootArtifactId__-share-jar/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/module/__artifactId__/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/__artifactId__-slingshot-application-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/messages/__artifactId__.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/messages/__artifactId__.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/messages/__artifactId__.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/messages/__artifactId__.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/README.md similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-jar/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/README.md rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/README.md 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 435d20fa..c1b02a04 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 @@ -93,12 +93,12 @@ EXIT /B 0 :build_share docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share - call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share-jar + call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share EXIT /B 0 :build_acs docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs - call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform-jar + call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform EXIT /B 0 :tail docker-compose -f "%COMPOSE_FILE_PATH%" logs -f @@ -107,7 +107,7 @@ EXIT /B 0 docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all" EXIT /B 0 :test - call %MVN_EXEC% verify -pl integration-tests + call %MVN_EXEC% verify -pl ${rootArtifactId}-integration-tests EXIT /B 0 :purge docker volume rm -f ${rootArtifactId}-acs-volume 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 0bcc6423..4eedc441 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 @@ -43,13 +43,13 @@ build() { build_share() { docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share - ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar,${rootArtifactId}-share-docker + ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker } build_acs() { docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-acs yes | docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-acs - ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar,${rootArtifactId}-platform-docker + ${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-platform-docker } tail() { @@ -61,7 +61,7 @@ tail_all() { } test() { - ${symbol_dollar}MVN_EXEC verify -pl integration-tests + ${symbol_dollar}MVN_EXEC verify -pl ${rootArtifactId}-integration-tests } case "${symbol_dollar}1" in diff --git a/docs/advanced-topics/amps.md b/docs/advanced-topics/amps.md index be771ae3..ba0009c4 100644 --- a/docs/advanced-topics/amps.md +++ b/docs/advanced-topics/amps.md @@ -66,7 +66,7 @@ do is modify the `pom.xml` file of the corresponding docker module / project in org.alfresco - sample-module-platform-jar + sample-module-platform 1.0-SNAPSHOT amp @@ -91,7 +91,7 @@ do is modify the `pom.xml` file of the corresponding docker module / project in org.alfresco - sample-module-platform-jar + sample-module-platform 1.0-SNAPSHOT false ${project.build.directory}/extensions @@ -180,7 +180,7 @@ Here is an example of how to install Florian Maul's Javascript Console. org.alfresco - sample-module-platform-jar + sample-module-platform 1.0-SNAPSHOT diff --git a/docs/advanced-topics/hot-reloading/hotswap-agent.md b/docs/advanced-topics/hot-reloading/hotswap-agent.md index 113a19e9..7bfe7ffd 100644 --- a/docs/advanced-topics/hot-reloading/hotswap-agent.md +++ b/docs/advanced-topics/hot-reloading/hotswap-agent.md @@ -100,8 +100,8 @@ the hot reloading tools fail): - "${acs.debug.port}:8888" volumes: - alf-acs-volume:/usr/local/tomcat/alf_data - - ../../../sample-project-platform-jar/target/classes:/usr/local/tomcat/hotswap-agent/sample-project-platform-jar/target/classes - - ../../../integration-tests/target/test-classes:/usr/local/tomcat/hotswap-agent/integration-tests/target/test-classes + - ../../../sample-project-platform/target/classes:/usr/local/tomcat/hotswap-agent/sample-project-platform/target/classes + - ../../../sample-project-integration-tests/target/test-classes:/usr/local/tomcat/hotswap-agent/sample-project-integration-tests/target/test-classes ... ``` @@ -177,8 +177,8 @@ the hot reloading tools fail): - "${acs.debug.port}:8888" volumes: - alf-acs-volume:/usr/local/tomcat/alf_data - - ../../../sample-project-platform-jar/target/classes:/usr/local/tomcat/hotswap-agent/sample-project-platform-jar/target/classes - - ../../../integration-tests/target/test-classes:/usr/local/tomcat/hotswap-agent/integration-tests/target/test-classes + - ../../../sample-project-platform/target/classes:/usr/local/tomcat/hotswap-agent/sample-project-platform/target/classes + - ../../../sample-project-integration-tests/target/test-classes:/usr/local/tomcat/hotswap-agent/sample-project-integration-tests/target/test-classes ... ``` @@ -268,7 +268,7 @@ model.put(“fromJava”,”HelloFromMe”); A number of log messages appear in the Alfresco project terminal, for example: ``` - HOTSWAP AGENT: 14:10:29.887 DEBUG (org.hotswap.agent.watch.nio.WatcherNIO2) - Watch event 'ENTRY_MODIFY' on '/usr/local/tomcat/hotswap-agent/sample-project-platform-jar/target/classes/com/example/platformsample/HelloWorldWebScript.class' --> HelloWorldWebScript.class + HOTSWAP AGENT: 14:10:29.887 DEBUG (org.hotswap.agent.watch.nio.WatcherNIO2) - Watch event 'ENTRY_MODIFY' on '/usr/local/tomcat/hotswap-agent/sample-project-platform/target/classes/com/example/platformsample/HelloWorldWebScript.class' --> HelloWorldWebScript.class HOTSWAP AGENT: 14:10:30.319 DEBUG (org.hotswap.agent.command.impl.SchedulerImpl) - Executing pluginManager.hotswap([class com.example.platformsample.HelloWorldWebScript]) HOTSWAP AGENT: 14:10:30.368 RELOAD (org.hotswap.agent.config.PluginManager) - Reloading classes [com.example.platformsample.HelloWorldWebScript] (autoHotswap) HOTSWAP AGENT: 14:10:30.387 DEBUG (org.hotswap.agent.plugin.jdk.JdkPlugin) - Flushing com.example.platformsample.HelloWorldWebScript from introspector diff --git a/docs/advanced-topics/hot-reloading/jrebel.md b/docs/advanced-topics/hot-reloading/jrebel.md index 069aac53..78aa58d3 100644 --- a/docs/advanced-topics/hot-reloading/jrebel.md +++ b/docs/advanced-topics/hot-reloading/jrebel.md @@ -42,7 +42,7 @@ _Note that a license is required. In this step you will be able to request a tri ![Alt text](../../docassets/images/sdk-jrebel-eclipse-servers.png "Eclipse JRebel remote servers synchronization") 8. Select `Help > JRebel > Configuration > Projects` and select the checkbox to enable JRebel and the remote server support for required projects (the complete -project in case of the Platform Jar archetype or the `PROJECT_ARTIFACT_ID-platform-jar` and `integration-tests` modules in case of the All-In-One archetype). +project in case of the Platform Jar archetype or the `PROJECT_ARTIFACT_ID-platform` and `PROJECT_ARTEFACTID-integration-tests` modules in case of the All-In-One archetype). ![Alt text](../../docassets/images/sdk-jrebel-eclipse-projects.png "Eclipse JRebel projects configuration") @@ -65,7 +65,7 @@ _Note that a license is required. In this step you will be able to request a tri ![Alt text](../../docassets/images/sdk-jrebel-intellij-servers.png "Eclipse JRebel remote server configuration") 8. Open the JRebel Panel and select the checkbox to enable JRebel and the remote server support for required projects (the complete project in case of the -Platform Jar archetype or the `PROJECT_ARTIFACT_ID-platform-jar` and `integration-tests` modules in case of the All-In-One archetype). +Platform Jar archetype or the `PROJECT_ARTIFACT_ID-platform` and `PROJECT_ARTEFACTID-integration-tests` modules in case of the All-In-One archetype). ![Alt text](../../docassets/images/sdk-jrebel-intellij-projects.png "Eclipse JRebel projects configuration") diff --git a/docs/advanced-topics/integration-testing/it-working.md b/docs/advanced-topics/integration-testing/it-working.md index 695b4456..c8f1a19c 100644 --- a/docs/advanced-topics/integration-testing/it-working.md +++ b/docs/advanced-topics/integration-testing/it-working.md @@ -67,7 +67,7 @@ module using the `maven-dependency-plugin`. The configuration is done in the fil org.alfresco - integration-tests + PROJECT_ARTEFACTID-integration-tests 1.0-SNAPSHOT tests false @@ -149,7 +149,7 @@ the environment. This integration test verifies the existence of the `DemoComponent` component deployed in the Alfresco Content Services instance. You can find the definition of the `DemoComponent` as a custom component of a project created with the All-In-One archetype. For more details, see the class definition in -`PROJECT_ARTEFACTID-platform-jar/src/main/java/com/example/platformsample/DemoComponent.java`. +`PROJECT_ARTEFACTID-platform/src/main/java/com/example/platformsample/DemoComponent.java`. The integration test retrieves the `DemoComponent` bean from the Alfresco Content Services instance (see `testGetCompanyHome()`), and requests the Company Home component. In addition, some Java assertions check if Company Home is identified correctly and has seven children stored in it. diff --git a/docs/getting-started.md b/docs/getting-started.md index b7de9b66..cb3ba482 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -172,9 +172,9 @@ If everything has been configured correctly, you should see something similar to [INFO] Parameter: groupId, Value: com.acme [INFO] Parameter: artifactId, Value: my-all-in-one [INFO] Parameter: version, Value: 1.0-SNAPSHOT -[INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-platform-jar/pom.xml -[INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-share-jar/pom.xml -[INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/integration-tests/pom.xml +[INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-platform/pom.xml +[INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-share/pom.xml +[INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-integration-tests/pom.xml [INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-platform-docker/pom.xml [INFO] Parent element not overwritten in /Users/Alfresco/my-all-in-one/my-all-in-one-share-docker/pom.xml [INFO] Executing META-INF/archetype-post-generate.groovy post-generation script diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 96c13a31..3f52be5c 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -20,7 +20,7 @@ The ACS container is not starting properly and it is showing Java compatibility ``` org.springframework.beans.factory.CannotLoadBeanClassException: Error loading class [com.example.platformsample.Demo] for bean with name 'com.example.Demo' defined in class path resource -[alfresco/module/sample-project-platform-jar/context/service-context.xml]: +[alfresco/module/sample-project-platform/context/service-context.xml]: problem with class file or dependent class; nested exception is java.lang.UnsupportedClassVersionError: com/example/platformsample/Demo has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 (unable to load class [com.example.platformsample.Demo]) diff --git a/docs/working-with-generated-projects/structure-aio.md b/docs/working-with-generated-projects/structure-aio.md index 2a40a6b7..444a0ac9 100644 --- a/docs/working-with-generated-projects/structure-aio.md +++ b/docs/working-with-generated-projects/structure-aio.md @@ -20,7 +20,7 @@ my-all-in-one-project ├── run.sh ├── docker | └── docker-compose.yml -├── integration-tests +├── my-all-in-one-project-integration-tests | ├── pom.xml │ └── src │ ├── main @@ -47,7 +47,7 @@ my-all-in-one-project │ ├── hotswap-agent.properties │ └── license │ └── README.md -├── my-all-in-one-project-platform-jar +├── my-all-in-one-project-platform │ ├── pom.xml │ └── src │ ├── main @@ -74,7 +74,7 @@ my-all-in-one-project │ │ │ │ ├── helloworld.get.html.ftl │ │ │ │ └── helloworld.get.js │ │ │ └── module -│ │ │ └── my-all-in-one-project-platform-jar +│ │ │ └── my-all-in-one-project-platform │ │ │ ├── alfresco-global.properties │ │ │ ├── context │ │ │ │ ├── bootstrap-context.xml @@ -107,7 +107,7 @@ my-all-in-one-project │ ├── hotswap-agent.properties │ ├── log4j.properties │ └── share-config-custom.xml -└── my-all-in-one-project-share-jar +└── my-all-in-one-project-share ├── pom.xml └── src ├── main @@ -120,15 +120,15 @@ my-all-in-one-project │ │ └── com │ ├── alfresco │ │ ├── module - │ │ │ └── my-all-in-one-project-share-jar + │ │ │ └── my-all-in-one-project-share │ │ │ └── module.properties │ │ └── web-extension │ │ ├── messages - │ │ │ └── my-all-in-one-project-share-jar.properties - │ │ ├── my-all-in-one-project-share-jar-slingshot-application-context.xml + │ │ │ └── my-all-in-one-project-share.properties + │ │ ├── my-all-in-one-project-share-slingshot-application-context.xml │ │ ├── site-data │ │ │ └── extensions - │ │ │ └── my-all-in-one-project-share-jar-example-widgets.xml + │ │ │ └── my-all-in-one-project-share-example-widgets.xml │ │ └── site-webscripts │ │ ├── com │ │ │ └── example @@ -141,7 +141,7 @@ my-all-in-one-project │ │ └── README.md │ └── META-INF │ ├── resources - │ │ └── my-all-in-one-project-share-jar + │ │ └── my-all-in-one-project-share │ │ └── js │ │ └── tutorials │ │ └── widgets @@ -165,14 +165,14 @@ From a high level standpoint, we can describe the content of the project as foll hosting service like GitHub, SVN, CVS, etc. * The files stored into the root of the project are mainly related to actions and commands (running, debugging, etc.), technical configuration (`pom.xml`), and documentation (`README.md`). -* `integration-tests` contains a sub-project entirely dedicated to integration tests. +* `my-all-in-one-project-integration-tests` (typically named ``) contains a sub-project entirely dedicated to integration tests. * `my-all-in-one-project-platform-docker` (typically named ``) contains a sub-project dedicated to the configuration of a custom -Docker image with the Alfresco Content Services Repository and the customization module `my-all-in-one-project-platform-jar` installed. -* `my-all-in-one-project-platform-jar` (typically named ``) contains a sub-project entirely dedicated to the customization of the +Docker image with the Alfresco Content Services Repository and the customization module `my-all-in-one-project-platform` installed. +* `my-all-in-one-project-platform` (typically named ``) contains a sub-project entirely dedicated to the customization of the Alfresco Content Services Repository. * `my-all-in-one-project-share-docker` (typically named ``) contains a sub-project dedicated to the configuration of a custom -Docker image with the Alfresco Share client and the customization module `my-all-in-one-project-share-jar` installed. -* `my-all-in-one-project-share-jar` (typically named ``) contains a sub-project entirely dedicated to the customization of the +Docker image with the Alfresco Share client and the customization module `my-all-in-one-project-share` installed. +* `my-all-in-one-project-share` (typically named ``) contains a sub-project entirely dedicated to the customization of the Alfresco Share client. After this brief introduction of the All-In-One project, let’s focus on the content of the folders. @@ -187,9 +187,9 @@ File | Description `pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. You can define all the configurations, parameters, and settings in this file for projects as well as for sub-projects. `README.md` | File in Markdown format containing the documentation for the project. -## my-all-in-one-project-platform-jar +## my-all-in-one-project-platform -Below is a description of the content in the `my-all-in-one-project-platform-jar` (typically named ``) sub-project. This sub-project +Below is a description of the content in the `my-all-in-one-project-platform` (typically named ``) sub-project. This sub-project contains the source code entirely dedicated to the customizing the Alfresco Content Services Repository. Content | Description @@ -206,18 +206,18 @@ Content | Description Below is a description of the content in the `my-all-in-one-project-platform-docker` (typically named ``) sub-project. This sub-project contains the resources required to define a custom Docker image with the Alfresco Content Services Repository and the customization module -`my-all-in-one-project-platform-jar` installed. +`my-all-in-one-project-platform` installed. Content | Description --- | --- -`pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. It adds the dependency to the `my-all-in-one-project-platform-jar` module and configures the `maven-dependency-plugin` to copy all the artifacts required in the Docker image into the folder `${project.build.directory}/extensions`. +`pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. It adds the dependency to the `my-all-in-one-project-platform` module and configures the `maven-dependency-plugin` to copy all the artifacts required in the Docker image into the folder `${project.build.directory}/extensions`. `src/main/docker` | In this folder you can find everything that's needed to fully configure the custom ACS Docker image. `src/main/docker/Dockerfile` | This is the file that define the custom ACS Docker image. The default configuration installs all the existing JARs and AMPs under `${project.build.directory}/extensions` folder and adds custom configuration and license files. `src/main/docker/license` | This folder contains the licenses required for running an Enterprise project. -## my-all-in-one-project-share-jar +## my-all-in-one-project-share -Below is a description of the content in the `my-all-in-one-project-share-jar` (typically named ``) sub-project. This sub-project +Below is a description of the content in the `my-all-in-one-project-share` (typically named ``) sub-project. This sub-project contains the source code entirely dedicated to the customizing the Alfresco Share client. Content | Description @@ -235,17 +235,17 @@ Content | Description Below is a description of the content in the `my-all-in-one-project-share-docker` (typically named ``) sub-project. This sub-project contains the resources required to define a custom Docker image with the Alfresco Share Client and the customization module -`my-all-in-one-project-share-jar` installed. +`my-all-in-one-project-share` installed. Content | Description --- | --- -`pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. It adds the dependency to the `my-all-in-one-project-share-jar` module and configures the `maven-dependency-plugin` to copy all the artifacts required in the Docker image into the folder `${project.build.directory}/extensions`. +`pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. It adds the dependency to the `my-all-in-one-project-share` module and configures the `maven-dependency-plugin` to copy all the artifacts required in the Docker image into the folder `${project.build.directory}/extensions`. `src/main/docker` | In this folder you can find everything that's needed to fully configure the custom Alfresco Share Docker image. `src/main/docker/Dockerfile` | This is the file that define the custom Alfresco Share Docker image. The default configuration installs all the existing JARs and AMPs under `${project.build.directory}/extensions` folder and adds custom configuration files. -## integration-tests +## my-all-in-one-project-integration-tests -Below is a description of the content in the `integration-tests` sub-project. This sub-project contains all the source code and resources needed to run the integration tests. +Below is a description of the content in the `my-all-in-one-project-integration-tests` (typically named ``) sub-project. This sub-project contains all the source code and resources needed to run the integration tests. Content | Description --- | ---