From 60dac34448cb3cf9b1db58403e7c25a7b878165d Mon Sep 17 00:00:00 2001 From: Igor Blanco Date: Mon, 3 Aug 2015 15:50:41 +0200 Subject: [PATCH 01/38] fix issue #317 --- .../archetype-resources/runner/tomcat/context-solr.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-solr.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-solr.xml index 77af260c..123a0616 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-solr.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-solr.xml @@ -1,8 +1,8 @@ - - - + + + - 2.1.1-SNAPSHOT + 2.1.1-beta-2 @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-SNAPSHOT + 2.1.1-beta-2 From 8d06e0e791986a43553f9da9ca44f645a15b9cda Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 28 Sep 2015 13:12:09 +0100 Subject: [PATCH 03/38] [maven-release-plugin] prepare for next development iteration --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 3cdf1160..faada6c7 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 - 2.1.1-beta-2 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index d22e8de0..a6a3e0c7 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-2 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index b243802b..e69f4c41 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-2 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index bad92427..67a40e1f 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-2 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 9399c457..eea1bae5 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 - 2.1.1-beta-2 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index a75e6104..39950699 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-2 + 2.1.1-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-2.1.1-beta-2 + alfresco-sdk-aggregator-2.1.0-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 0157112c..afa94b02 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-2 + 2.1.1-SNAPSHOT ../../pom.xml - 2.1.1-beta-2 + 2.1.1-SNAPSHOT @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-beta-2 + 2.1.1-SNAPSHOT From eeb5e7304f6aeda24e8204ab1ef86ab2398d3bea Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Fri, 2 Oct 2015 09:20:45 +0100 Subject: [PATCH 04/38] DEVPLAT-108, Repo-amp contains unwanted libs after running amp-to-war --- .../resources/archetype-resources/pom.xml | 4 +-- poms/alfresco-sdk-parent/pom.xml | 26 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml index d24cf640..06fe24bf 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -88,7 +88,7 @@ TODO: TO INVESTIGATE: This dependency is already defined in the parent SDK pom in the 'amp-to-war' profile but this does not work, it is not include... - --> + amp-to-war @@ -98,6 +98,6 @@ ${maven.alfresco.version} - + --> diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index afa94b02..3fd39028 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -507,7 +507,7 @@ - + org.apache.maven.plugins maven-dependency-plugin @@ -532,7 +532,8 @@ - + org.alfresco.maven.plugin alfresco-maven-plugin @@ -546,11 +547,13 @@ - + false - + + org.alfresco.maven + alfresco-rad + ${maven.alfresco.version} + + - - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - - From 0958c63b44925a176e2dcc7e67026907fcf25f86 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Mon, 5 Oct 2015 13:47:14 +0100 Subject: [PATCH 05/38] DEVPLAT-337, AIO/share-amp share-config-custom.xml changes are not loaded, #299 --- .../src/main/resources/archetype-resources/run.bat | 2 +- .../src/main/resources/archetype-resources/run.sh | 2 +- .../src/main/resources/archetype-resources/runner/pom.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) 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 0edea6d8..8a555722 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 @@ -11,5 +11,5 @@ if not exist %springloadedfile% ( set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G -mvn install -Prun -nsu +mvn clean install -Prun -nsu :: mvn install -Prun 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 b7b330c5..24269d5f 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 @@ -6,4 +6,4 @@ springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloade if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn install -Prun \ No newline at end of file +MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 3ab7b89f..ff425980 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -21,6 +21,7 @@ ${project.parent.basedir}/${alfresco.data.location}/solr4 ${alfresco.solr.dir}/config + ${alfresco.solr.dir}/data From 6c57d9ede06da87981be711ed23243e3d5b814fc Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Wed, 7 Oct 2015 10:45:51 +0100 Subject: [PATCH 06/38] DEVPLAT-338, Incorrect naming of AIO AMPs, #311 --- .../META-INF/maven/archetype-metadata.xml | 6 +++--- .../pom.xml | 0 .../templates/webscripts/helloworld.get.desc.xml | 0 .../templates/webscripts/helloworld.get.html.ftl | 0 .../templates/webscripts/helloworld.get.js | 0 .../__artifactId__/alfresco-global.properties | 0 .../__artifactId__/context/bootstrap-context.xml | 0 .../__artifactId__/context/service-context.xml | 0 .../__artifactId__/context/webscript-context.xml | 0 .../__artifactId__/model/content-model.xml | 0 .../__artifactId__/model/workflow-model.xml | 0 .../module/__artifactId__/module-context.xml | 0 .../src/main/amp/module.properties | 0 .../src/main/amp/web/css/demoamp.css | 0 .../src/main/amp/web/jsp/demoamp.jsp | 0 .../main/amp/web/licenses/README-licenses.txt | 0 .../src/main/amp/web/scripts/demoamp.js | 0 .../src/main/java/demoamp/Demo.java | 0 .../src/main/java/demoamp/DemoComponent.java | 0 .../main/java/demoamp/HelloWorldWebScript.java | 0 .../java/demoamp/test/DemoComponentTest.java | 0 .../properties/local/alfresco-global.properties | 0 .../disable-webscript-caching-context.xml | 0 .../src/test/resources/test-log4j.properties | 0 .../pom.xml | 0 ...rtifactId__-slingshot-application-context.xml | 0 .../messages/__artifactId__.properties | 0 .../__artifactId__-example-widgets.xml | 0 .../com/example/pages/simple-page.get.desc.xml | 0 .../com/example/pages/simple-page.get.html.ftl | 0 .../com/example/pages/simple-page.get.js | 0 .../site-webscripts/org/alfresco/README.md | 0 .../src/main/amp/file-mapping.properties | 0 .../src/main/amp/module.properties | 0 .../amp/web/js/example/widgets/TemplateWidget.js | 0 .../js/example/widgets/css/TemplateWidget.css | 0 .../widgets/i18n/TemplateWidget.properties | 0 .../widgets/templates/TemplateWidget.html | 0 .../META-INF/share-config-custom.xml.sample | 0 .../src/test/java/demoamp/DemoPageTestIT.java | 0 .../src/test/java/demoamp/po/DemoPage.java | 0 .../src/test/resources/testng.xml | 0 .../resources/archetype-resources/repo/pom.xml | 4 ++-- .../resources/archetype-resources/runner/pom.xml | 4 ++-- .../runner/tomcat/context-repo.xml | 8 ++++---- .../runner/tomcat/context-share.xml | 16 ++++++++-------- .../resources/archetype-resources/share/pom.xml | 4 ++-- .../src/site/apt/usage.apt.vm | 10 +++++----- 48 files changed, 26 insertions(+), 26 deletions(-) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/pom.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/module.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/css/demoamp.css (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/jsp/demoamp.jsp (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/licenses/README-licenses.txt (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/scripts/demoamp.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/java/demoamp/Demo.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/java/demoamp/DemoComponent.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/java/demoamp/HelloWorldWebScript.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/java/demoamp/test/DemoComponentTest.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/properties/local/alfresco-global.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/resources/test-log4j.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/pom.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/file-mapping.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/module.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/TemplateWidget.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/css/TemplateWidget.css (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/resources/META-INF/share-config-custom.xml.sample (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/test/java/demoamp/DemoPageTestIT.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/test/java/demoamp/po/DemoPage.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/test/resources/testng.xml (100%) 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 43b41d58..749b1fcd 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,7 +10,7 @@ - + src/main/java @@ -54,7 +54,7 @@ - + src/main/java @@ -153,7 +153,7 @@ - + tomcat ** diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/css/demoamp.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/css/demoamp.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/jsp/demoamp.jsp b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/jsp/demoamp.jsp rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/licenses/README-licenses.txt b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/licenses/README-licenses.txt rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/scripts/demoamp.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/scripts/demoamp.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/Demo.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/Demo.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/DemoComponent.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/DemoComponent.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/DemoComponent.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/DemoComponent.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/HelloWorldWebScript.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/HelloWorldWebScript.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/HelloWorldWebScript.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/HelloWorldWebScript.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/demoamp/test/DemoComponentTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/demoamp/test/DemoComponentTest.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/properties/local/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/properties/local/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/test-log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/test-log4j.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/file-mapping.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/file-mapping.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/file-mapping.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/file-mapping.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/resources/META-INF/share-config-custom.xml.sample similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/resources/META-INF/share-config-custom.xml.sample diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml index c7b08ce4..092c78d8 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml @@ -42,7 +42,7 @@ ${project.groupId} - repo-amp + ${rootArtifactId}-repo-amp ${project.version} amp @@ -91,7 +91,7 @@ ${project.groupId} - repo-amp + ${rootArtifactId}-repo-amp amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index ff425980..e4fcdd3e 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -307,9 +307,9 @@ 2.18.1 - ${project.parent.basedir}/share-amp/target/test-classes/testng.xml + ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes/testng.xml - ${project.parent.basedir}/share-amp/target/test-classes + ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes ${share.client.url} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml index 81b8d873..2acc8488 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml @@ -13,7 +13,7 @@ + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-repo-amp/target/${rootArtifactId}-repo-amp/web" /> + virtualClasspath="${project.parent.basedir}/${rootArtifactId}-repo-amp/target/classes; + ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/${rootArtifactId}-repo-amp/config; + ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/test-classes" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml index 99aca96e..a0abd1cc 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml @@ -10,18 +10,18 @@ + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/${rootArtifactId}-share-amp/web" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml index 65ea050f..ae91a0c5 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml @@ -29,7 +29,7 @@ ${project.groupId} - share-amp + ${rootArtifactId}-share-amp ${project.version} amp @@ -69,7 +69,7 @@ ${project.groupId} - share-amp + ${rootArtifactId}-share-amp amp diff --git a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm index 0041ca4e..8f69ad84 100644 --- a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm +++ b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm @@ -16,9 +16,9 @@ Project layout +---+ pom.xml - |-> repo-amp + |-> rootArtifactid-repo-amp + |-> rootArtifactid-share-amp |-> repo - |-> share-amp |-> share |-> solr |-> runner (a Tomcat embedded runner / integration test runner) @@ -28,14 +28,14 @@ Project layout The All-in-One Alfresco project is composed by the following modules: - * <<>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading + * <<>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading * <<>>: An <<>> Repository Extension, overlaying the Alfresco WAR with custom resources / classes and depending on the <<>> project - * <<>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading + * <<>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading - * <<>>: A <<>> extension, overlaying the Share WAR with the custom developed <<>> + * <<>>: A <<>> extension, overlaying the Share WAR with the custom developed <<>> * <<>>: An Alfresco <<>> overlay / customization to configure {{{http://solr.apache.org}Apache Solr}} cores properties From f3d85a19ceaf89b6c75d34dff9f9bb4bba12ae26 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Wed, 7 Oct 2015 13:01:54 +0100 Subject: [PATCH 07/38] DEVPLAT-342, Define argLine property rather than setting it in surefire, to ease integration with other plugins, #298 --- poms/alfresco-sdk-parent/pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 3fd39028..9e65b01f 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -111,7 +111,6 @@ as it may break SDK functionalities --> true - -Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en 1.4.185 + + + -Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en + /absolute/path/to/alf_data_dev --> - ${project.parent.basedir}/${alfresco.data.location}/solr4 + ${alfresco.data.location}/solr4 ${alfresco.solr.dir}/config ${alfresco.solr.dir}/data diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml index 530d1a6b..6069668a 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr-config/pom.xml @@ -21,7 +21,7 @@ run - ${project.parent.basedir}/${alfresco.data.location}/solr4 + ${alfresco.data.location}/solr4 ${alfresco.solr.dir}/config ${alfresco.solr.dir}/data diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml index 06fe24bf..d4779ddc 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -24,7 +24,7 @@ + /absolute/path/to/alf_data_dev --> - alf_data_dev + (best practice is absolute path to this folder, here we use session.executionRootDirectory + property to get correct path to alf_data when running in AIO and Repo AMP) --> + ${session.executionRootDirectory}/alf_data_dev WARN - ${project.build.directory}/ + ${project.build.directory}/ - alf_data_dev + ${project.basedir}/alf_data_dev local From b2afebed09befcbbe1214d056b6f976da5303968 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 9 Oct 2015 13:48:22 +0200 Subject: [PATCH 09/38] Revert "DEVPLAT-338, Incorrect naming of AIO AMPs, #311" This reverts commit 6c57d9ede06da87981be711ed23243e3d5b814fc. We can't put this commit in a SP release, so we have to revert the revert when we need it back --- .../META-INF/maven/archetype-metadata.xml | 6 +++--- .../pom.xml | 0 .../templates/webscripts/helloworld.get.desc.xml | 0 .../templates/webscripts/helloworld.get.html.ftl | 0 .../templates/webscripts/helloworld.get.js | 0 .../__artifactId__/alfresco-global.properties | 0 .../__artifactId__/context/bootstrap-context.xml | 0 .../__artifactId__/context/service-context.xml | 0 .../__artifactId__/context/webscript-context.xml | 0 .../__artifactId__/model/content-model.xml | 0 .../__artifactId__/model/workflow-model.xml | 0 .../module/__artifactId__/module-context.xml | 0 .../src/main/amp/module.properties | 0 .../src/main/amp/web/css/demoamp.css | 0 .../src/main/amp/web/jsp/demoamp.jsp | 0 .../main/amp/web/licenses/README-licenses.txt | 0 .../src/main/amp/web/scripts/demoamp.js | 0 .../src/main/java/demoamp/Demo.java | 0 .../src/main/java/demoamp/DemoComponent.java | 0 .../main/java/demoamp/HelloWorldWebScript.java | 0 .../java/demoamp/test/DemoComponentTest.java | 0 .../properties/local/alfresco-global.properties | 0 .../disable-webscript-caching-context.xml | 0 .../src/test/resources/test-log4j.properties | 0 .../resources/archetype-resources/repo/pom.xml | 4 ++-- .../resources/archetype-resources/runner/pom.xml | 4 ++-- .../runner/tomcat/context-repo.xml | 8 ++++---- .../runner/tomcat/context-share.xml | 16 ++++++++-------- .../pom.xml | 0 ...rtifactId__-slingshot-application-context.xml | 0 .../messages/__artifactId__.properties | 0 .../__artifactId__-example-widgets.xml | 0 .../com/example/pages/simple-page.get.desc.xml | 0 .../com/example/pages/simple-page.get.html.ftl | 0 .../com/example/pages/simple-page.get.js | 0 .../site-webscripts/org/alfresco/README.md | 0 .../src/main/amp/file-mapping.properties | 0 .../src/main/amp/module.properties | 0 .../amp/web/js/example/widgets/TemplateWidget.js | 0 .../js/example/widgets/css/TemplateWidget.css | 0 .../widgets/i18n/TemplateWidget.properties | 0 .../widgets/templates/TemplateWidget.html | 0 .../META-INF/share-config-custom.xml.sample | 0 .../src/test/java/demoamp/DemoPageTestIT.java | 0 .../src/test/java/demoamp/po/DemoPage.java | 0 .../src/test/resources/testng.xml | 0 .../resources/archetype-resources/share/pom.xml | 4 ++-- .../src/site/apt/usage.apt.vm | 10 +++++----- 48 files changed, 26 insertions(+), 26 deletions(-) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/pom.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/module.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/web/css/demoamp.css (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/web/jsp/demoamp.jsp (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/web/licenses/README-licenses.txt (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/amp/web/scripts/demoamp.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/java/demoamp/Demo.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/java/demoamp/DemoComponent.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/main/java/demoamp/HelloWorldWebScript.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/test/java/demoamp/test/DemoComponentTest.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/test/properties/local/alfresco-global.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-repo-amp => repo-amp}/src/test/resources/test-log4j.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/pom.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/file-mapping.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/module.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/web/js/example/widgets/TemplateWidget.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/web/js/example/widgets/css/TemplateWidget.css (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/main/resources/META-INF/share-config-custom.xml.sample (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/test/java/demoamp/DemoPageTestIT.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/test/java/demoamp/po/DemoPage.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{__rootArtifactId__-share-amp => share-amp}/src/test/resources/testng.xml (100%) 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 749b1fcd..43b41d58 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,7 +10,7 @@ - + src/main/java @@ -54,7 +54,7 @@ - + src/main/java @@ -153,7 +153,7 @@ - + tomcat ** diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/css/demoamp.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/css/demoamp.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/jsp/demoamp.jsp similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/jsp/demoamp.jsp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/licenses/README-licenses.txt similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/licenses/README-licenses.txt diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/scripts/demoamp.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/scripts/demoamp.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/Demo.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/Demo.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/DemoComponent.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/DemoComponent.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/DemoComponent.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/DemoComponent.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/HelloWorldWebScript.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/HelloWorldWebScript.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/HelloWorldWebScript.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/HelloWorldWebScript.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/demoamp/test/DemoComponentTest.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/demoamp/test/DemoComponentTest.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/properties/local/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/test-log4j.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/test-log4j.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml index 092c78d8..c7b08ce4 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml @@ -42,7 +42,7 @@ ${project.groupId} - ${rootArtifactId}-repo-amp + repo-amp ${project.version} amp @@ -91,7 +91,7 @@ ${project.groupId} - ${rootArtifactId}-repo-amp + repo-amp amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 743a5cd4..6eec4af5 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -307,9 +307,9 @@ 2.18.1 - ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes/testng.xml + ${project.parent.basedir}/share-amp/target/test-classes/testng.xml - ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes + ${project.parent.basedir}/share-amp/target/test-classes ${share.client.url} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml index 2acc8488..81b8d873 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml @@ -13,7 +13,7 @@ + extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" /> + virtualClasspath="${project.parent.basedir}/repo-amp/target/classes; + ${project.parent.basedir}/repo-amp/target/repo-amp/config; + ${project.parent.basedir}/repo-amp/target/test-classes" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml index a0abd1cc..99aca96e 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml @@ -10,18 +10,18 @@ + extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/file-mapping.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/file-mapping.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/file-mapping.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/file-mapping.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/resources/META-INF/share-config-custom.xml.sample rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml index ae91a0c5..65ea050f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml @@ -29,7 +29,7 @@ ${project.groupId} - ${rootArtifactId}-share-amp + share-amp ${project.version} amp @@ -69,7 +69,7 @@ ${project.groupId} - ${rootArtifactId}-share-amp + share-amp amp diff --git a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm index 8f69ad84..0041ca4e 100644 --- a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm +++ b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm @@ -16,9 +16,9 @@ Project layout +---+ pom.xml - |-> rootArtifactid-repo-amp - |-> rootArtifactid-share-amp + |-> repo-amp |-> repo + |-> share-amp |-> share |-> solr |-> runner (a Tomcat embedded runner / integration test runner) @@ -28,14 +28,14 @@ Project layout The All-in-One Alfresco project is composed by the following modules: - * <<>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading + * <<>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading * <<>>: An <<>> Repository Extension, overlaying the Alfresco WAR with custom resources / classes and depending on the <<>> project - * <<>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading + * <<>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading - * <<>>: A <<>> extension, overlaying the Share WAR with the custom developed <<>> + * <<>>: A <<>> extension, overlaying the Share WAR with the custom developed <<>> * <<>>: An Alfresco <<>> overlay / customization to configure {{{http://solr.apache.org}Apache Solr}} cores properties From 3b579596db46a0fbca52fc44820d9d2539273304 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 9 Oct 2015 14:19:39 +0100 Subject: [PATCH 10/38] [maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-1 --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index faada6c7..9d6289b4 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 - 2.1.1-SNAPSHOT + 2.1.1-beta-1 ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index a6a3e0c7..08c53974 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-1 ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index e69f4c41..dada6693 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-1 ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 67a40e1f..e02f9b64 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-1 ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index eea1bae5..a676f341 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 - 2.1.1-SNAPSHOT + 2.1.1-beta-1 ../../pom.xml diff --git a/pom.xml b/pom.xml index 39950699..fbcf5310 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-1 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-2.1.0-beta-1 + alfresco-sdk-aggregator-2.1.1-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index bafc26e5..25a7ab8c 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-1 ../../pom.xml - 2.1.1-SNAPSHOT + 2.1.1-beta-1 @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-SNAPSHOT + 2.1.1-beta-1 From 8cf04fc98d2c4256062cff3095749a0788ac3944 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 9 Oct 2015 15:55:24 +0200 Subject: [PATCH 11/38] Revert "[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-1" This reverts commit 3b579596db46a0fbca52fc44820d9d2539273304. --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 9d6289b4..faada6c7 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 - 2.1.1-beta-1 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index 08c53974..a6a3e0c7 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-1 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index dada6693..e69f4c41 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-1 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index e02f9b64..67a40e1f 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-1 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index a676f341..eea1bae5 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 - 2.1.1-beta-1 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index fbcf5310..39950699 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-1 + 2.1.1-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-2.1.1-beta-1 + alfresco-sdk-aggregator-2.1.0-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 25a7ab8c..bafc26e5 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-1 + 2.1.1-SNAPSHOT ../../pom.xml - 2.1.1-beta-1 + 2.1.1-SNAPSHOT @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-beta-1 + 2.1.1-SNAPSHOT From cda786187c3f8ff70e2f753434dbf8f5f8dbf542 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 9 Oct 2015 15:33:54 +0100 Subject: [PATCH 12/38] [maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-3 --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index faada6c7..2ed13a1e 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 - 2.1.1-SNAPSHOT + 2.1.1-beta-3 ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index a6a3e0c7..cceb9d23 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-3 ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index e69f4c41..ee7eec09 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-3 ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 67a40e1f..34779cd2 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-3 ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index eea1bae5..6e9aa8a0 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 - 2.1.1-SNAPSHOT + 2.1.1-beta-3 ../../pom.xml diff --git a/pom.xml b/pom.xml index 39950699..a59ebbc6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-3 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-2.1.0-beta-1 + alfresco-sdk-aggregator-2.1.1-beta-3 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index bafc26e5..2ee60daf 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1-beta-3 ../../pom.xml - 2.1.1-SNAPSHOT + 2.1.1-beta-3 @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-SNAPSHOT + 2.1.1-beta-3 From d2e9b897208a17f48e363f8f1308be71b31f0912 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Fri, 9 Oct 2015 15:34:00 +0100 Subject: [PATCH 13/38] [maven-release-plugin] prepare for next development iteration --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 2ed13a1e..faada6c7 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 - 2.1.1-beta-3 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index cceb9d23..a6a3e0c7 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-3 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index ee7eec09..e69f4c41 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-3 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 34779cd2..67a40e1f 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-3 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 6e9aa8a0..eea1bae5 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 - 2.1.1-beta-3 + 2.1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index a59ebbc6..39950699 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-3 + 2.1.1-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-2.1.1-beta-3 + alfresco-sdk-aggregator-2.1.0-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 2ee60daf..bafc26e5 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-beta-3 + 2.1.1-SNAPSHOT ../../pom.xml - 2.1.1-beta-3 + 2.1.1-SNAPSHOT @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-beta-3 + 2.1.1-SNAPSHOT From 4431863500b9c652092b7de9c7ac2eafacfa8ca7 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 19 Oct 2015 11:20:15 +0100 Subject: [PATCH 14/38] [maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1 --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index faada6c7..f506d44a 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 - 2.1.1-SNAPSHOT + 2.1.1 ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index a6a3e0c7..a7132fbc 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1 ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index e69f4c41..c850ce63 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1 ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 67a40e1f..39d7b6bc 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1 ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index eea1bae5..a5436123 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 - 2.1.1-SNAPSHOT + 2.1.1 ../../pom.xml diff --git a/pom.xml b/pom.xml index 39950699..6975fa14 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1 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-2.1.0-beta-1 + alfresco-sdk-aggregator-2.1.1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index bafc26e5..b5e88f1b 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.1.1 ../../pom.xml - 2.1.1-SNAPSHOT + 2.1.1 @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1-SNAPSHOT + 2.1.1 From d53184196bbd1f9efc0ef4305ca425b948a614c6 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 19 Oct 2015 11:20:20 +0100 Subject: [PATCH 15/38] [maven-release-plugin] prepare for next development iteration --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index f506d44a..aa320d7e 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 - 2.1.1 + 2.1.2-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index a7132fbc..8fa3fbe8 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1 + 2.1.2-SNAPSHOT ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index c850ce63..cecb952e 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1 + 2.1.2-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 39d7b6bc..ba1a1f03 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -9,7 +9,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1 + 2.1.2-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index a5436123..4d67ac54 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 - 2.1.1 + 2.1.2-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 6975fa14..990488ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.1 + 2.1.2-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-2.1.1 + alfresco-sdk-aggregator-2.1.0-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index b5e88f1b..7e0070ff 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1 + 2.1.2-SNAPSHOT ../../pom.xml - 2.1.1 + 2.1.2-SNAPSHOT @@ -150,7 +150,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module (alfresco-rad) --> - 2.1.1 + 2.1.2-SNAPSHOT From 87af573673fe26182ca7042088314cfcf479d585 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Mon, 19 Oct 2015 17:15:50 +0200 Subject: [PATCH 16/38] Updated README with 2.1.1 information --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 365429fd..597f3f78 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section. ## News + +- 2015-10-19: SDK 2.1.1 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html) - 2015-05-20: SDK 2.1.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html) - 2014-12-23: SDK 2.0.0 release to Maven Central. [Docs](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html), [Release Notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/archive/2.0.0/github-report.htm) - 2014-08-22: First SNAPSHOT of SDK 2.0.0 in the [OSS Sonatype Repository](https://oss.sonatype.org/content/repositories/snapshots/org/alfresco/maven/alfresco-sdk-parent/2.0.0-SNAPSHOT/)! @@ -14,7 +16,7 @@ This project is released under the [Apache License, Version 2.0](http://www.apac ## User Getting Started ### Latest Documentation -To get started with Alfresco SDK 2.1 (latest) visit the offical Alfresco Documentation for: +To get started with Alfresco SDK 2.1.1 (latest) visit the offical Alfresco Documentation for: - [Alfresco Community 5.0.d and above](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html) - [Alfresco Enterprise 5.0.1 and above](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html) From 8f29244d99737aa8bda6106a9b8a7973a6a3dcb0 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Mon, 19 Oct 2015 17:55:01 +0200 Subject: [PATCH 17/38] Changed my info for future reference. I no longer work with Magenta --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 990488ee..b8cbe38e 100644 --- a/pom.xml +++ b/pom.xml @@ -64,10 +64,10 @@ ohej Ole Hejlskov - ole@magenta-aps.dk + ole@phpfreak.dk http://ohej.dk/ - Magenta - http://magenta.dk + Alfresco + http://www.alfresco.com +1 Developer From 27bcaa3daf658bd51c13f41251a55a1e1afee869 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 6 Nov 2015 21:16:57 +0100 Subject: [PATCH 18/38] Revert "Revert "DEVPLAT-338, Incorrect naming of AIO AMPs, #311"" This reverts commit b2afebed09befcbbe1214d056b6f976da5303968. --- .../META-INF/maven/archetype-metadata.xml | 6 +++--- .../pom.xml | 0 .../templates/webscripts/helloworld.get.desc.xml | 0 .../templates/webscripts/helloworld.get.html.ftl | 0 .../templates/webscripts/helloworld.get.js | 0 .../__artifactId__/alfresco-global.properties | 0 .../__artifactId__/context/bootstrap-context.xml | 0 .../__artifactId__/context/service-context.xml | 0 .../__artifactId__/context/webscript-context.xml | 0 .../__artifactId__/model/content-model.xml | 0 .../__artifactId__/model/workflow-model.xml | 0 .../module/__artifactId__/module-context.xml | 0 .../src/main/amp/module.properties | 0 .../src/main/amp/web/css/demoamp.css | 0 .../src/main/amp/web/jsp/demoamp.jsp | 0 .../main/amp/web/licenses/README-licenses.txt | 0 .../src/main/amp/web/scripts/demoamp.js | 0 .../src/main/java/demoamp/Demo.java | 0 .../src/main/java/demoamp/DemoComponent.java | 0 .../main/java/demoamp/HelloWorldWebScript.java | 0 .../java/demoamp/test/DemoComponentTest.java | 0 .../properties/local/alfresco-global.properties | 0 .../disable-webscript-caching-context.xml | 0 .../src/test/resources/test-log4j.properties | 0 .../pom.xml | 0 ...rtifactId__-slingshot-application-context.xml | 0 .../messages/__artifactId__.properties | 0 .../__artifactId__-example-widgets.xml | 0 .../com/example/pages/simple-page.get.desc.xml | 0 .../com/example/pages/simple-page.get.html.ftl | 0 .../com/example/pages/simple-page.get.js | 0 .../site-webscripts/org/alfresco/README.md | 0 .../src/main/amp/file-mapping.properties | 0 .../src/main/amp/module.properties | 0 .../amp/web/js/example/widgets/TemplateWidget.js | 0 .../js/example/widgets/css/TemplateWidget.css | 0 .../widgets/i18n/TemplateWidget.properties | 0 .../widgets/templates/TemplateWidget.html | 0 .../META-INF/share-config-custom.xml.sample | 0 .../src/test/java/demoamp/DemoPageTestIT.java | 0 .../src/test/java/demoamp/po/DemoPage.java | 0 .../src/test/resources/testng.xml | 0 .../resources/archetype-resources/repo/pom.xml | 4 ++-- .../resources/archetype-resources/runner/pom.xml | 4 ++-- .../runner/tomcat/context-repo.xml | 8 ++++---- .../runner/tomcat/context-share.xml | 16 ++++++++-------- .../resources/archetype-resources/share/pom.xml | 4 ++-- .../src/site/apt/usage.apt.vm | 10 +++++----- 48 files changed, 26 insertions(+), 26 deletions(-) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/pom.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/module.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/css/demoamp.css (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/jsp/demoamp.jsp (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/licenses/README-licenses.txt (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/amp/web/scripts/demoamp.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/java/demoamp/Demo.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/java/demoamp/DemoComponent.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/main/java/demoamp/HelloWorldWebScript.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/java/demoamp/test/DemoComponentTest.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/properties/local/alfresco-global.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{repo-amp => __rootArtifactId__-repo-amp}/src/test/resources/test-log4j.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/pom.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/file-mapping.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/module.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/TemplateWidget.js (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/css/TemplateWidget.css (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/main/resources/META-INF/share-config-custom.xml.sample (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/test/java/demoamp/DemoPageTestIT.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/test/java/demoamp/po/DemoPage.java (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/{share-amp => __rootArtifactId__-share-amp}/src/test/resources/testng.xml (100%) 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 43b41d58..749b1fcd 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,7 +10,7 @@ - + src/main/java @@ -54,7 +54,7 @@ - + src/main/java @@ -153,7 +153,7 @@ - + tomcat ** diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/css/demoamp.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/css/demoamp.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/css/demoamp.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/jsp/demoamp.jsp b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/jsp/demoamp.jsp rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/jsp/demoamp.jsp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/licenses/README-licenses.txt b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/licenses/README-licenses.txt rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/licenses/README-licenses.txt diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/scripts/demoamp.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/web/scripts/demoamp.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/web/scripts/demoamp.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/Demo.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/Demo.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/DemoComponent.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/DemoComponent.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/DemoComponent.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/DemoComponent.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/HelloWorldWebScript.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/HelloWorldWebScript.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/HelloWorldWebScript.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/java/demoamp/HelloWorldWebScript.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/demoamp/test/DemoComponentTest.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/demoamp/test/DemoComponentTest.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/java/demoamp/test/DemoComponentTest.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/properties/local/alfresco-global.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/properties/local/alfresco-global.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/test-log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/resources/test-log4j.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/test/resources/test-log4j.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/messages/__artifactId__.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/__artifactId__-example-widgets.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/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/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/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/share-amp/src/main/amp/config/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-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/file-mapping.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/file-mapping.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/file-mapping.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/file-mapping.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/module.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/TemplateWidget.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/css/TemplateWidget.css diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/i18n/TemplateWidget.properties diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/web/js/example/widgets/templates/TemplateWidget.html diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/resources/META-INF/share-config-custom.xml.sample similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/resources/META-INF/share-config-custom.xml.sample diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/resources/testng.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml index c7b08ce4..092c78d8 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml @@ -42,7 +42,7 @@ ${project.groupId} - repo-amp + ${rootArtifactId}-repo-amp ${project.version} amp @@ -91,7 +91,7 @@ ${project.groupId} - repo-amp + ${rootArtifactId}-repo-amp amp diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 6eec4af5..743a5cd4 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -307,9 +307,9 @@ 2.18.1 - ${project.parent.basedir}/share-amp/target/test-classes/testng.xml + ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes/testng.xml - ${project.parent.basedir}/share-amp/target/test-classes + ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes ${share.client.url} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml index 81b8d873..2acc8488 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml @@ -13,7 +13,7 @@ + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-repo-amp/target/${rootArtifactId}-repo-amp/web" /> + virtualClasspath="${project.parent.basedir}/${rootArtifactId}-repo-amp/target/classes; + ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/${rootArtifactId}-repo-amp/config; + ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/test-classes" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml index 99aca96e..a0abd1cc 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml @@ -10,18 +10,18 @@ + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/${rootArtifactId}-share-amp/web" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml index 65ea050f..ae91a0c5 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml @@ -29,7 +29,7 @@ ${project.groupId} - share-amp + ${rootArtifactId}-share-amp ${project.version} amp @@ -69,7 +69,7 @@ ${project.groupId} - share-amp + ${rootArtifactId}-share-amp amp diff --git a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm index 0041ca4e..8f69ad84 100644 --- a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm +++ b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm @@ -16,9 +16,9 @@ Project layout +---+ pom.xml - |-> repo-amp + |-> rootArtifactid-repo-amp + |-> rootArtifactid-share-amp |-> repo - |-> share-amp |-> share |-> solr |-> runner (a Tomcat embedded runner / integration test runner) @@ -28,14 +28,14 @@ Project layout The All-in-One Alfresco project is composed by the following modules: - * <<>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading + * <<>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading * <<>>: An <<>> Repository Extension, overlaying the Alfresco WAR with custom resources / classes and depending on the <<>> project - * <<>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading + * <<>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading - * <<>>: A <<>> extension, overlaying the Share WAR with the custom developed <<>> + * <<>>: A <<>> extension, overlaying the Share WAR with the custom developed <<>> * <<>>: An Alfresco <<>> overlay / customization to configure {{{http://solr.apache.org}Apache Solr}} cores properties From 9dd9f530bb714fb4045b7899543d9d0cab6cbcdd Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Tue, 12 Jan 2016 15:14:53 +0000 Subject: [PATCH 19/38] DEVPLAT-333, DEVPLAT-435, DEVPLAT-436, DEVPLAT-437, DEVPLAT-438, DEVPLAT-439, DEVPLAT-447 --- .../src/test/java/demoamp/DemoPageTestIT.java | 22 ++--- .../src/test/java/demoamp/po/DemoPage.java | 32 +++---- .../resources/archetype-resources/pom.xml | 18 ++++ .../archetype-resources/repo/pom.xml | 3 +- .../resources/archetype-resources/run.bat | 5 +- .../main/resources/archetype-resources/run.sh | 4 +- .../archetype-resources/runner/pom.xml | 23 +++++ .../archetype-resources/share/pom.xml | 31 ++++++- .../resources/archetype-resources/pom.xml | 34 ++++--- .../resources/archetype-resources/run.bat | 6 +- .../main/resources/archetype-resources/run.sh | 4 +- .../resources/archetype-resources/pom.xml | 18 ---- .../resources/archetype-resources/run.bat | 5 +- .../main/resources/archetype-resources/run.sh | 4 +- modules/alfresco-rad/pom.xml | 91 +------------------ pom.xml | 4 +- poms/alfresco-sdk-parent/pom.xml | 65 ++++++++++--- 17 files changed, 191 insertions(+), 178 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java index 7f1b3d71..0b6e543c 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java @@ -2,7 +2,7 @@ #set($symbol_dollar='$') #set($symbol_escape='\' ) /* - * Copyright (C) 2005-2015 Alfresco Software Limited. + * Copyright (C) 2005-2016 Alfresco Software Limited. * This file is part of Alfresco * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -18,8 +18,8 @@ package ${package}.demoamp; import ${package}.demoamp.po.DemoPage; -import org.alfresco.po.share.AbstractTest; -import org.alfresco.po.share.LoginPage; +import org.alfresco.po.AbstractTest; +//import org.alfresco.po.share.LoginPage; import org.alfresco.po.share.PeopleFinderPage; import org.testng.Assert; import org.testng.annotations.BeforeClass; @@ -42,17 +42,17 @@ public class DemoPageTestIT extends AbstractTest { @BeforeClass(groups = {"alfresco-one"}) public void prepare() throws Exception { // Navigate to share - drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page"); +// drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page"); // Reuse Alfresco Share login page object from share-po lib. - LoginPage loginPage = new LoginPage(drone); - loginPage.loginAs(username, password); + // LoginPage loginPage = new LoginPage(drone); + // loginPage.loginAs(username, password); } @BeforeMethod public void loadPage() { // Goto demo page - drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page"); - page = new DemoPage(drone); + // drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page"); + // page = new DemoPage(drone); } @Test @@ -63,9 +63,9 @@ public class DemoPageTestIT extends AbstractTest { @Test public void messageIsDisplayed() { page.render(); - String msg = page.getMessage(); - Assert.assertNotNull(msg); - Assert.assertEquals("Hello from i18n!", msg); + // String msg = page.getMessage(); + // Assert.assertNotNull(msg); + //Assert.assertEquals("Hello from i18n!", msg); } /** diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java index cd08dc3e..8e871bf4 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java @@ -2,7 +2,7 @@ #set($symbol_dollar='$') #set($symbol_escape='\' ) /* - * Copyright (C) 2005-2015 Alfresco Software Limited. + * Copyright (C) 2005-2016 Alfresco Software Limited. * This file is part of Alfresco * Alfresco is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -18,8 +18,8 @@ package ${package}.demoamp.po; import org.alfresco.po.share.SharePage; -import org.alfresco.webdrone.RenderTime; -import org.alfresco.webdrone.WebDrone; +import org.alfresco.po.RenderTime; +//import org.alfresco.webdrone.WebDrone; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; @@ -33,9 +33,9 @@ public class DemoPage extends SharePage { private By SIMPLE_DEMO_LOGO = By.id("DEMO_SIMPLE_LOGO"); private By SIMPLE_DEMO_MESSAGE = By.id("DEMO_SIMPLE_MSG"); - public DemoPage(WebDrone drone) { - super(drone); - } + // public DemoPage(WebDrone drone) { + // super(drone); + //} @SuppressWarnings("unchecked") @Override @@ -60,15 +60,15 @@ public class DemoPage extends SharePage { return this; } - @SuppressWarnings("unchecked") - @Override - public DemoPage render(long time) { - return render(new RenderTime(time)); - } + + //@Override + //public DemoPage render(long time) { + // return render(new RenderTime(time)); + //} public boolean isSimpleLogoDisplayed() { try { - return drone.find(SIMPLE_DEMO_LOGO).isDisplayed(); + // return drone.find(SIMPLE_DEMO_LOGO).isDisplayed(); } catch (NoSuchElementException se) { } return false; @@ -76,13 +76,13 @@ public class DemoPage extends SharePage { public boolean isMessageDisplayed() { try { - return drone.find(SIMPLE_DEMO_MESSAGE).isDisplayed(); + // return drone.find(SIMPLE_DEMO_MESSAGE).isDisplayed(); } catch (NoSuchElementException se) { } return false; } - public String getMessage() { - return drone.find(SIMPLE_DEMO_MESSAGE).getText(); - } + //public String getMessage() { + // return drone.find(SIMPLE_DEMO_MESSAGE).getText(); + // } } \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 65d4a5b0..3b64361a 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -41,6 +41,24 @@ http://localhost:8080/share + + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + test + + + * + * + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml index 092c78d8..71346b66 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml @@ -56,7 +56,7 @@ --> - org.alfresco.maven alfresco-rad 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 8a555722..42473a19 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 @@ -9,7 +9,8 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) -set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G +:: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart +:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G +set MAVEN_OPTS=-noverify -Xms256m -Xmx2G mvn clean install -Prun -nsu -:: mvn install -Prun 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 24269d5f..86bca498 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 @@ -6,4 +6,6 @@ springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloade if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun \ No newline at end of file +# Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart +#MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun +MAVEN_OPTS="-noverify -Xms256m -Xmx2G" mvn clean install -Prun \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 743a5cd4..f773b26a 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -57,6 +57,29 @@ org.apache.tomcat.maven tomcat7-maven-plugin + + + + org.alfresco + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + + + + org.codehaus.plexus + plexus-archiver + 2.3 + + run-wars diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml index ae91a0c5..9718a4c9 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml @@ -34,7 +34,7 @@ amp - + maven-dependency-plugin + + + unpack + generate-sources + + unpack-dependencies + + + war + org.alfresco + share + META-INF/MANIFEST.MF + + + + maven-war-plugin + + + false + ${project.build.directory}/dependency/META-INF/MANIFEST.MF + - + diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml index d4779ddc..a1d3d21e 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -63,6 +63,22 @@ ${alfresco.groupId} alfresco-repository + + + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + test + + + * + * + + + @@ -81,23 +97,5 @@ - - diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat index 82079dac..6aeeb0d9 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat @@ -13,7 +13,9 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) -set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G +:: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart +::set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G +set MAVEN_OPTS=-noverify -Xms256m -Xmx2G mvn integration-test -Pamp-to-war -nsu -:: mvn integration-test -Pamp-to-war + diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh index b885425c..160bf9ed 100755 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh @@ -8,4 +8,6 @@ if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war +# Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart +#MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war +MAVEN_OPTS="-noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war \ No newline at end of file diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml index 470561bc..8e82dff7 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -89,22 +89,4 @@ - - - - - enterprise - - - ${alfresco.groupId} - share-enterprise - ${alfresco.version} - classes - provided - - - - \ No newline at end of file diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat index e2451a65..9a43e90b 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat @@ -14,7 +14,8 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) -set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify +:: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart +:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify +set MAVEN_OPTS=-noverify mvn integration-test -Pamp-to-war -nsu -:: mvn integration-test -Pamp-to-war diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh index 2146adfd..c4138090 100755 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh @@ -7,4 +7,6 @@ if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi -MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war +# Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart +# MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war +MAVEN_OPTS="-noverify" mvn integration-test -Pamp-to-war diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index ba1a1f03..a3b80229 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -5,7 +5,8 @@ jar Rapid Application Development Support - SDK module for Rapid Development support + SDK module for Rapid Development support - Remote JUnit + org.alfresco.maven alfresco-sdk-aggregator @@ -13,9 +14,6 @@ ../../pom.xml - - ${project.build.directory}/pg-dialect-tmp - @@ -30,6 +28,7 @@ + org.springframework @@ -38,89 +37,5 @@ jar - - - - - - maven-dependency-plugin - - - extract-postgres-dialect - generate-test-resources - - unpack - - - - - org.alfresco - alfresco-repository - ${alfresco.community.default.version} - alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/dbscripts/upgrade/*/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/* - ${pgsql.dialect.folder} - - - - - - - - maven-resources-plugin - - - generate-h2-dialect - generate-test-resources - - copy-resources - - - ${project.build.outputDirectory} - - - ${pgsql.dialect.folder}/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect - - * - - alfresco/dbscripts/create/org.hibernate.dialect.H2Dialect - - - ${pgsql.dialect.folder}/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect - - * - - alfresco/ibatis/org.hibernate.dialect.H2Dialect - - - - - - - - - - diff --git a/pom.xml b/pom.xml index b8cbe38e..e3c5a249 100644 --- a/pom.xml +++ b/pom.xml @@ -136,8 +136,8 @@ 2.2 ${project.version} */*-enterprise/* - 5.0.d - 5.0.1 + 5.1.d-EA + 5.1-EA-3 2.3 1.2.3.RELEASE https://github.com/Alfresco/alfresco-sdk diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 7e0070ff..a8593909 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -6,7 +6,7 @@ The Maven Alfresco SDK Parent POM exposes the developer features of the Maven Alfresco SDK. Declare this POM as parent for your project and select the Alfresco version/edition by defining - the alfresco.groupId and alfresco.version in your POM. + the alfresco.groupId, alfresco.version, and share.version in your POM. pom @@ -480,7 +480,10 @@ ${alfresco.enterprise.default.version} alfresco-enterprise - share-enterprise + + share provided @@ -489,7 +492,22 @@ alfresco-private-repository https://artifacts.alfresco.com/nexus/content/groups/private + + + + alfresco-ea-enterprise-repository + https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA + + + + + alfresco-ea-enterprise-repository + Alfresco Early Access Enterprise + https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA/ + + + + + org.alfresco + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + + + + org.codehaus.plexus + plexus-archiver + 2.3 + + + + org.alfresco.maven + alfresco-rad + ${maven.alfresco.version} + + run-embedded @@ -583,14 +630,6 @@ - - - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - - @@ -839,10 +878,10 @@ alfresco.version - The SDK 2.1.x is supported only for Alfresco 5.0.d Community and above or - Alfresco Enterprise 5.0.1 and above + The SDK 2.2.x is supported only for Alfresco 5.1.x Community and above or + Alfresco Enterprise 5.1 and above - ^(5\.(0\.[d-z1-9]|[1-9])|6\.).*$ + ^(5\.(1\.[a-z1-9]|[1-9])|6\.).*$ From 2e546a1caec147e49e26d8ac3d8975a820f16545 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Wed, 20 Jan 2016 10:18:04 +0000 Subject: [PATCH 20/38] DEVPLAT-445 --- .../runner/tomcat/context-repo.xml | 8 ++++---- .../runner/tomcat/context-share.xml | 8 ++++---- .../archetype-resources/tomcat/context.xml | 8 ++++---- .../archetype-resources/tomcat/context.xml | 6 +++--- .../org/alfresco/maven/plugin/AmpMojo.java | 2 +- .../alfresco/maven/plugin/InstallMojo.java | 8 ++++---- poms/alfresco-sdk-parent/pom.xml | 19 +++++++++++++------ 7 files changed, 33 insertions(+), 26 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml index 2acc8488..50026201 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml @@ -13,17 +13,17 @@ + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-repo-amp/target/amp/web" /> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml index a0abd1cc..3e3ac247 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml @@ -10,17 +10,17 @@ + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/amp/web" /> - + virtualClasspath="${project.build.outputDirectory};${project.build.directory}/amp/config;${project.build.testOutputDirectory}" /> diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml index 58a995fa..ba92f6ba 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml @@ -9,19 +9,19 @@ + extraResourcePaths="/=${project.build.directory}/amp/web" /> + virtualClasspath="${project.build.outputDirectory};${project.build.directory}/amp/config;${project.build.testOutputDirectory}" /> diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java index 150a6500..d45d5d22 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java @@ -49,7 +49,7 @@ public class AmpMojo extends AbstractMojo { /** * Target folder used to aggregate content then packaged into the AMP * - * @parameter property="maven.alfresco.ampBuildDirectory" default-value="${project.build.directory}/${project.build.finalName}" + * @parameter property="maven.alfresco.ampBuildDirectory" default-value="${app.amp.output.folder}" * @required * */ diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java index 12e5a3b7..7523b015 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java @@ -29,7 +29,7 @@ public class InstallMojo extends AbstractMojo { /** * The location of the AMP file(s) to be installed. If this location is a * folder all AMPs contained in the folder are installed, if it's a file it - * get direclty installed on the ${warLocation} + * get directly installed on the ${warLocation} * * @parameter property="maven.alfresco.ampLocation" default-value="${project.build.directory}/${project.build.finalName}.amp" */ @@ -37,9 +37,9 @@ public class InstallMojo extends AbstractMojo { /** * The WAR file or exploded dir to install the AMPs in. If specified - * Defaults to "${project.build.directory}/${project.build.finalName}-war - * - * @parameter property="maven.alfresco.warLocation" default-value="${project.build.directory}/${project.build.finalName}-war" + * Defaults to "${app.amp.client.war.folder} + * + * @parameter property="maven.alfresco.warLocation" default-value="${app.amp.client.war.folder}" */ private File warLocation; diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index a8593909..6f47cc3e 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -66,10 +66,14 @@ - src/main/amp - ../${project.build.finalName} - - + + src/main/amp + + ${project.build.directory}/amp + + + + - ${project.build.directory}/${project.build.finalName}-war + ${project.build.directory}/amp-war ${alfresco.repo.artifactId} @@ -398,7 +402,10 @@ **/*.lib.js **/*.css - src/main/resources/META-INF + src/main/amp + ${project.build.directory}/amp + + true false From b3955a1b4fe70b8131d0530e03b1f0d6e928711a Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Wed, 20 Jan 2016 10:41:06 +0000 Subject: [PATCH 21/38] DEVPLAT-443 --- .../config/alfresco/module/__artifactId__/module-context.xml | 5 ++++- .../config/alfresco/module/__artifactId__/module-context.xml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml index 4e111409..4e33fab5 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml @@ -21,8 +21,11 @@ + + - diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml index 6e8c6b69..992cb76f 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml @@ -19,8 +19,11 @@ + + - From 9a1b97e64d7dfd1744ae36314d31a7cc05cbd178 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Thu, 21 Jan 2016 10:34:36 +0000 Subject: [PATCH 22/38] DEVPLAT-442 --- .../archetype-resources/repo/pom.xml | 2 +- .../archetype-resources/tomcat/context.xml | 23 ++++++++++++------- .../archetype-resources/tomcat/context.xml | 18 +++++++++++---- modules/alfresco-rad/pom.xml | 2 +- poms/alfresco-sdk-parent/pom.xml | 8 +++---- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml index 71346b66..967e00af 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml @@ -173,7 +173,7 @@ - + org.alfresco.maven alfresco-rad diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml index 539e53a8..6ef60daf 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml @@ -4,15 +4,22 @@ it is never released with the Alfresco.war =================================================================================================================--> - - + + + - - + + + extraResourcePaths="/=${project.build.directory}/amp/web,${app.amp.client.war.folder}" /> 2.1.2-SNAPSHOT @@ -611,7 +611,7 @@ plexus-archiver 2.3 - + org.alfresco.maven alfresco-rad @@ -742,8 +742,8 @@ junit test - + org.alfresco.maven alfresco-rad From 5c01e8127cd315a2c7234bf7634e36dfc7a718a6 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 21 Jan 2016 11:20:35 +0000 Subject: [PATCH 23/38] Change of temporary Maven Repo hosting 5.1-EA, to fix CI --- poms/alfresco-sdk-parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 63c52563..20ebb806 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -502,14 +502,14 @@ - alfresco-ea-enterprise-repository + alfresco-internal-releases https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA - alfresco-ea-enterprise-repository + alfresco-internal-releases Alfresco Early Access Enterprise https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA/ From bbe3de2abbdb89d29b80ce39bdf39f86ce40a1aa Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Thu, 21 Jan 2016 11:25:59 +0000 Subject: [PATCH 24/38] DEVPLAT-444 --- .../module/__artifactId__/context/bootstrap-context.xml | 2 +- .../module/__artifactId__/context/service-context.xml | 4 ++-- .../__artifactId__-slingshot-application-context.xml | 2 +- .../module/__artifactId__/context/bootstrap-context.xml | 2 +- .../module/__artifactId__/context/service-context.xml | 4 ++-- .../__artifactId__-slingshot-application-context.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml index 0060701c..cddf7707 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml @@ -12,7 +12,7 @@ - + alfresco/module/${project.artifactId}/model/content-model.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml index fd8a4806..1e3c5cf9 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml @@ -22,13 +22,13 @@ - + - + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml index 2ed294d9..bbf979cf 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml @@ -17,7 +17,7 @@ --> - diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml index 96b136c4..31e14f25 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml @@ -12,7 +12,7 @@ - + alfresco/module/${project.artifactId}/model/content-model.xml diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml index 78363d59..c56de017 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml @@ -22,13 +22,13 @@ - + - + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml index e17b9f32..2cbbf20d 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/__artifactId__-slingshot-application-context.xml @@ -17,7 +17,7 @@ --> - From 9bf50267dd73b00a2afe1de56e8b65832a46a260 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 21 Jan 2016 12:22:51 +0000 Subject: [PATCH 25/38] Housekeeping: upgrading versions of dependencies and Maven plugins --- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 18 +++++++++--------- pom.xml | 14 +++++++------- poms/alfresco-sdk-parent/pom.xml | 27 +++++++++++++-------------- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 6ba90bfe..1f2d1dbc 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -33,7 +33,7 @@ org.springframework spring-test - 3.0.6.RELEASE + 3.2.14.RELEASE jar diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 4d67ac54..41c845a3 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -17,7 +17,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.2 + 3.4 generated-helpmojo @@ -73,7 +73,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.2 + 3.4 provided @@ -81,7 +81,7 @@ org.apache.maven maven-archiver - 2.5 + 2.6 maven-core @@ -92,7 +92,7 @@ org.codehaus.plexus plexus-archiver - 2.3 + 2.10.3 org.apache.maven @@ -107,17 +107,17 @@ org.apache.httpcomponents httpclient - 4.3 + 4.5.1 commons-net commons-net - 3.3 + 3.4 commons-io commons-io - 2.1 + 2.4 org.alfresco @@ -127,7 +127,7 @@ org.alfrescolabs.alfresco-technical-validation org.alfrescolabs.alfresco-technical-validation - 0.4.0 + 0.6.0 @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.3 + 3.4 diff --git a/pom.xml b/pom.xml index e3c5a249..e5a512cb 100644 --- a/pom.xml +++ b/pom.xml @@ -133,13 +133,13 @@ UTF-8 1.7 1.7 - 2.2 + 2.4 ${project.version} */*-enterprise/* 5.1.d-EA 5.1-EA-3 2.3 - 1.2.3.RELEASE + 1.2.5.RELEASE https://github.com/Alfresco/alfresco-sdk @@ -165,7 +165,7 @@ org.apache.maven.wagon wagon-webdav-jackrabbit - 2.2 + 2.10 @@ -217,10 +217,10 @@ sdk-release https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest - 2.5.2 + 2.5.3 deploy site-deploy 3.4 - 2.10 + 2.11 @@ -240,7 +240,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.1 + 2.10.3 attach-javadocs @@ -258,7 +258,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 1.6 sign-artifacts diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 20ebb806..d9893f23 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -125,25 +125,25 @@ runtime - 1.5.11 + 1.7.13 UTF-8 - 3.2 + 3.5 1.7 1.7 - 2.6.1 - 2.9 - 1.4 + 3.0.0 + 2.10 + 1.4.1 2.7 - 2.18 + 2.19.1 2.5.2 - 2.5 - 2.5 - 1.7 - 2.5.1 - 1.9.1 + 2.6 + 2.6 + 1.8 + 2.5.3 + 1.10 1.5.3 2.2 @@ -160,9 +160,8 @@ it can be accessed from the Groovy scripts and other places --> 8080 - - 1.4.185 + + 1.4.190 -Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en From 7275ba32e8b3c53f5551c2e6b21c968bee2e218c Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Fri, 22 Jan 2016 08:25:56 +0000 Subject: [PATCH 26/38] DEVPLAT-452 --- .../__rootArtifactId__-repo-amp/src/main/amp/module.properties | 2 +- .../__rootArtifactId__-share-amp/src/main/amp/module.properties | 2 +- .../archetype-resources/src/main/amp/module.properties | 2 +- .../archetype-resources/src/main/amp/module.properties | 2 +- poms/alfresco-sdk-parent/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties index ff42da63..57c8ac86 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-repo-amp/src/main/amp/module.properties @@ -23,7 +23,7 @@ module.id=${project.artifactId} #module.aliases=myModule-123, my-module module.title=${project.name} module.description=${project.description} -module.version=${noSnapshotVersion} +module.version=${project.version} # The following optional properties can be used to prevent the module from being added # to inappropriate versions of the WAR file. diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties index 0e5c045a..158500f6 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/main/amp/module.properties @@ -24,7 +24,7 @@ module.id=${project.artifactId} #module.aliases=myModule-123, my-module module.title=${project.name} module.description=${project.description} -module.version=${noSnapshotVersion} +module.version=${project.version} # The following optional properties can be used to prevent the module from being added # to inappropriate versions of the WAR file. diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties index 0e5c045a..158500f6 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties @@ -24,7 +24,7 @@ module.id=${project.artifactId} #module.aliases=myModule-123, my-module module.title=${project.name} module.description=${project.description} -module.version=${noSnapshotVersion} +module.version=${project.version} # The following optional properties can be used to prevent the module from being added # to inappropriate versions of the WAR file. diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties index 0e5c045a..158500f6 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/module.properties @@ -24,7 +24,7 @@ module.id=${project.artifactId} #module.aliases=myModule-123, my-module module.title=${project.name} module.description=${project.description} -module.version=${noSnapshotVersion} +module.version=${project.version} # The following optional properties can be used to prevent the module from being added # to inappropriate versions of the WAR file. diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index d9893f23..ba061969 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -225,7 +225,7 @@ - ${project.artifactId} + ${project.artifactId}-${project.version} From 2ad03e3f5cb57c8b5f58065154da200566212d37 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 22 Jan 2016 16:05:37 +0100 Subject: [PATCH 27/38] Bump version to 2.2.0-SNAPSHOT --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 2 +- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index aa320d7e..e2013b4c 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 - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index 8fa3fbe8..5c67e609 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index cecb952e..9d013c46 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 1f2d1dbc..4ba07688 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -10,7 +10,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 41c845a3..ce5f6623 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 - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index e5a512cb..1f3d8207 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT Alfresco SDK This aggregator Project builds all modules required for the Alfresco SDK pom diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index ba061969..c9d97626 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT @@ -154,7 +154,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module that starts remote JUnit runner and enables remote unit testing alfresco-rad) --> - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT From f031c76a41962c0fa605813ae0d1f0bd828b9a2f Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 22 Jan 2016 16:12:30 +0100 Subject: [PATCH 28/38] Add JS to the nonFilteredFileExtension list. See #254 for more info --- poms/alfresco-sdk-parent/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index c9d97626..6fb067a3 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -275,6 +275,7 @@ css ico psd + js From 641aa6bb8eebddf9bdefdb27b6dd6bc0fbd2c236 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Mon, 25 Jan 2016 14:37:25 +0000 Subject: [PATCH 29/38] DEVPLAT-440 --- .../__rootArtifactId__-share-amp/pom.xml | 20 +-- .../src/test/java/demoamp/DemoPageTestIT.java | 30 ++-- .../src/test/java/demoamp/po/DemoPage.java | 46 ++--- .../archetype-resources/runner/pom.xml | 164 ++++++++++-------- .../runner/test-ng/testng-alfresco-share.xml | 2 - 5 files changed, 126 insertions(+), 136 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml index 148ad21d..027fbdb1 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/pom.xml @@ -46,12 +46,13 @@ + The following dependencies are needed to be able to compile the + custom functional tests that are based on Page Objects (PO) + ===============================================================--> + It contains page objects such as LoginPage and it also brings + in selenium-grid and selenium. --> ${alfresco.groupId} share-po @@ -67,8 +68,7 @@ tests test - + org.seleniumhq.selenium @@ -80,13 +80,6 @@ - - - org.seleniumhq.selenium - selenium-java - 2.45.0-alfresco - test - @@ -101,7 +94,6 @@ - diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java index 0b6e543c..c16f9314 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/DemoPageTestIT.java @@ -18,8 +18,8 @@ package ${package}.demoamp; import ${package}.demoamp.po.DemoPage; +import org.alfresco.po.share.LoginPage; import org.alfresco.po.AbstractTest; -//import org.alfresco.po.share.LoginPage; import org.alfresco.po.share.PeopleFinderPage; import org.testng.Assert; import org.testng.annotations.BeforeClass; @@ -41,18 +41,22 @@ public class DemoPageTestIT extends AbstractTest { @BeforeClass(groups = {"alfresco-one"}) public void prepare() throws Exception { - // Navigate to share -// drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page"); - // Reuse Alfresco Share login page object from share-po lib. - // LoginPage loginPage = new LoginPage(drone); - // loginPage.loginAs(username, password); + // Navigate to share, which will redirect to Login page + driver.navigate().to(shareUrl + "/page"); + + // Resolve/Bind current page to LoginPage object + LoginPage loginPage = resolvePage(driver).render(); + loginPage.loginAs(username, password); } @BeforeMethod public void loadPage() { // Goto demo page - // drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page"); - // page = new DemoPage(drone); + driver.navigate().to(shareUrl + "/page/hdp/ws/simple-page"); + + // We need to instantiate the page like this as it is not yet in + // the factory known list of pages + page = factoryPage.instantiatePage(driver, DemoPage.class); } @Test @@ -63,9 +67,9 @@ public class DemoPageTestIT extends AbstractTest { @Test public void messageIsDisplayed() { page.render(); - // String msg = page.getMessage(); - // Assert.assertNotNull(msg); - //Assert.assertEquals("Hello from i18n!", msg); + String msg = page.getMessage(); + Assert.assertNotNull(msg); + Assert.assertEquals("Hello from i18n!", msg); } /** @@ -86,7 +90,7 @@ public class DemoPageTestIT extends AbstractTest { @Test public void navigate() { Assert.assertNotNull(page.getNav()); - PeopleFinderPage peoppleFinderPage = page.getNav().selectPeople().render(); - Assert.assertNotNull(peoppleFinderPage); + PeopleFinderPage peopleFinderPage = page.getNav().selectPeople().render(); + Assert.assertNotNull(peopleFinderPage); } } \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java index 8e871bf4..217cae9f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share-amp/src/test/java/demoamp/po/DemoPage.java @@ -19,9 +19,9 @@ package ${package}.demoamp.po; import org.alfresco.po.share.SharePage; import org.alfresco.po.RenderTime; -//import org.alfresco.webdrone.WebDrone; -import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; /** * Demo of simple share page object that encapsulates the demo of simple page. @@ -30,22 +30,17 @@ import org.openqa.selenium.NoSuchElementException; * @since 2.0.1 */ public class DemoPage extends SharePage { - private By SIMPLE_DEMO_LOGO = By.id("DEMO_SIMPLE_LOGO"); - private By SIMPLE_DEMO_MESSAGE = By.id("DEMO_SIMPLE_MSG"); + @FindBy(id="DEMO_SIMPLE_LOGO") + WebElement logo; - // public DemoPage(WebDrone drone) { - // super(drone); - //} - - @SuppressWarnings("unchecked") - @Override - public DemoPage render() { - return render(new RenderTime(maxPageLoadingTime)); - } + @FindBy(id="DEMO_SIMPLE_MSG") + WebElement msg; @SuppressWarnings("unchecked") @Override public DemoPage render(RenderTime timer) { + + // Wait for logo and message to display, then consider page rendered while (true) { timer.start(); try { @@ -57,32 +52,19 @@ public class DemoPage extends SharePage { timer.end(); } } + return this; } - - //@Override - //public DemoPage render(long time) { - // return render(new RenderTime(time)); - //} - public boolean isSimpleLogoDisplayed() { - try { - // return drone.find(SIMPLE_DEMO_LOGO).isDisplayed(); - } catch (NoSuchElementException se) { - } - return false; + return isDisplayed(logo); } public boolean isMessageDisplayed() { - try { - // return drone.find(SIMPLE_DEMO_MESSAGE).isDisplayed(); - } catch (NoSuchElementException se) { - } - return false; + return isDisplayed(msg); } - //public String getMessage() { - // return drone.find(SIMPLE_DEMO_MESSAGE).getText(); - // } + public String getMessage() { + return msg.getText(); + } } \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index f773b26a..2da8f660 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -12,6 +12,11 @@ ${version} + + + 4.1.6.RELEASE + + run @@ -229,28 +234,17 @@ - + ${alfresco.groupId} share-po ${alfresco.version} test - - - - - org.seleniumhq.selenium - selenium-java - - - org.seleniumhq.selenium - selenium-server - - - + ${alfresco.groupId} share-po @@ -258,8 +252,7 @@ tests test - + org.seleniumhq.selenium @@ -271,25 +264,6 @@ - - - - org.seleniumhq.selenium - selenium-java - 2.45.0-alfresco - - - org.seleniumhq.selenium - selenium-server - 2.45.0-alfresco - - - org.mortbay.jetty - servlet-api-2.5 - - - - @@ -304,6 +278,43 @@ + + + + org.springframework + spring-core + ${spring.version} + provided + + + org.springframework + spring-beans + ${spring.version} + provided + + + org.springframework + spring-context + ${spring.version} + provided + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + @@ -360,30 +371,16 @@ + It contains page objects such as LoginPage and it also brings + in selenium-grid and selenium. --> ${alfresco.groupId} share-po ${alfresco.version} test - - - - - org.seleniumhq.selenium - selenium-java - - - org.seleniumhq.selenium - selenium-server - - - + the org.alfresco.po.share.AbstractTest class that our custom tests extend. --> ${alfresco.groupId} share-po @@ -391,8 +388,7 @@ tests test - + org.seleniumhq.selenium @@ -404,25 +400,6 @@ - - - - org.seleniumhq.selenium - selenium-java - 2.45.0-alfresco - - - org.seleniumhq.selenium - selenium-server - 2.45.0-alfresco - - - org.mortbay.jetty - servlet-api-2.5 - - - - @@ -437,6 +414,43 @@ + + + + org.springframework + spring-core + ${spring.version} + provided + + + org.springframework + spring-beans + ${spring.version} + provided + + + org.springframework + spring-context + ${spring.version} + provided + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml index bf3a1b02..d70b604b 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml @@ -38,13 +38,11 @@ - From 30bfc1442202d796646339cccecc7fedd6aeb2a3 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Fri, 29 Jan 2016 10:57:27 +0100 Subject: [PATCH 30/38] Fix escaping --- plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm b/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm index eaab0bd9..1a0e441c 100644 --- a/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm +++ b/plugins/alfresco-maven-plugin/src/site/apt/index.apt.vm @@ -18,7 +18,7 @@ Introduction *{{{./install-mojo.html}alfresco:install}} Installs one or multiple AMPs into an Alfresco WAR / exploded WAR folder embedding {{{http://wiki.alfresco.com/wiki/Module_Management_Tool} Alfresco MMT}} - *{{{./set-version-mojo.html}alfresco:version}} Parses ${project.version} removing literals (for AMP compatibility) and making the <<<$\{noSnapshotVersion\}>>> property available in the POM + *{{{./set-version-mojo.html}alfresco:version}} Parses <<<$\{project.version\}>>> removing literals (for AMP compatibility) and making the <<<$\{noSnapshotVersion\}>>> property available in the POM Full information is available at the {{{./plugin-info.html}goals page}}. From d99539c9b0f180de0cb16fd3d6e39ee612055230 Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Wed, 3 Feb 2016 11:37:34 -0700 Subject: [PATCH 31/38] change activation of enforce-sdk-rules so it's *really* on by default, as intended --- poms/alfresco-sdk-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 6fb067a3..3986613a 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -866,7 +866,7 @@ enforce-sdk-rules - true + does-not-exist.tmp From 78d14662205e5476b8a0eadaafe382ab6fedbefd Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Wed, 3 Feb 2016 12:00:13 -0700 Subject: [PATCH 32/38] make run.sh executable during the "validation" phase of the build --- .../resources/archetype-resources/pom.xml | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 3b64361a..d7e22bea 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -104,5 +104,35 @@ false + + + + chmod + unix + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + false + + + chmod + validate + exec + + + + chmod + + +x + ${basedir}/run.sh + + + + + + From 181951ed9979edb87aa702b1e8f60c216501fe12 Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Thu, 4 Feb 2016 10:50:21 +0100 Subject: [PATCH 33/38] Add MAVEN_OPTS that are compatible with JDK7 but comment out by default. See DEVPLAT-456 for more info --- .../src/main/resources/archetype-resources/run.bat | 3 +++ .../src/main/resources/archetype-resources/run.sh | 4 ++++ .../src/main/resources/archetype-resources/run.bat | 3 +++ .../src/main/resources/archetype-resources/run.sh | 3 +++ 4 files changed, 13 insertions(+) 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 42473a19..46ae7212 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 @@ -9,6 +9,9 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) +:: Use these settings if you're using JDK7 +:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G -XX:PermSize=300m + :: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart :: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G set MAVEN_OPTS=-noverify -Xms256m -Xmx2G 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 86bca498..a1208196 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 @@ -6,6 +6,10 @@ springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloade if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi + +# Use these settings if you're using JDK7 +# MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn install -Prun + # Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart #MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun MAVEN_OPTS="-noverify -Xms256m -Xmx2G" mvn clean install -Prun \ No newline at end of file diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat index 6aeeb0d9..12e2ab44 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat @@ -13,6 +13,9 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) +:: Use these settings if you're using JDK7 +:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G -XX:PermSize=300m + :: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart ::set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G set MAVEN_OPTS=-noverify -Xms256m -Xmx2G diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh index 160bf9ed..c6af523a 100755 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh @@ -8,6 +8,9 @@ if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi +# Use these settings if you're using JDK7 +# MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn install -Prun + # Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart #MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war MAVEN_OPTS="-noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war \ No newline at end of file From f2f5698a3b344a071cb738b080acfee1687df98c Mon Sep 17 00:00:00 2001 From: Ole Hejlskov Date: Thu, 4 Feb 2016 11:00:46 +0100 Subject: [PATCH 34/38] Remove double activation tag from pull request #352 --- poms/alfresco-sdk-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 3986613a..4fb28fc1 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -866,7 +866,7 @@ enforce-sdk-rules - does-not-exist.tmp + does-not-exist.tmp From 14cd4be39cbaa997b70df94cecfa7b44a0db54a1 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 4 Feb 2016 10:41:50 +0000 Subject: [PATCH 35/38] [maven-release-plugin] prepare release alfresco-sdk-aggregator-2.2.0-beta-1 --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index e2013b4c..88762beb 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 - 2.2.0-SNAPSHOT + 2.2.0-beta-1 ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index 5c67e609..d0fd6e52 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-SNAPSHOT + 2.2.0-beta-1 ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index 9d013c46..168f3f71 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-SNAPSHOT + 2.2.0-beta-1 ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 4ba07688..114ae4aa 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -10,7 +10,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-SNAPSHOT + 2.2.0-beta-1 ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index ce5f6623..5d85ee15 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 - 2.2.0-SNAPSHOT + 2.2.0-beta-1 ../../pom.xml diff --git a/pom.xml b/pom.xml index 1f3d8207..b75b92eb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-SNAPSHOT + 2.2.0-beta-1 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-2.1.0-beta-1 + alfresco-sdk-aggregator-2.2.0-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 4fb28fc1..f3757b30 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-SNAPSHOT + 2.2.0-beta-1 ../../pom.xml - 2.2.0-SNAPSHOT + 2.2.0-beta-1 @@ -154,7 +154,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module that starts remote JUnit runner and enables remote unit testing alfresco-rad) --> - 2.2.0-SNAPSHOT + 2.2.0-beta-1 From 8415da72b05fae60c59e748c403165a394378ea4 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Thu, 4 Feb 2016 10:41:55 +0000 Subject: [PATCH 36/38] [maven-release-plugin] prepare for next development iteration --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- archetypes/share-amp-archetype/pom.xml | 2 +- modules/alfresco-rad/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- poms/alfresco-sdk-parent/pom.xml | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 88762beb..e2013b4c 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 - 2.2.0-beta-1 + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index d0fd6e52..5c67e609 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-beta-1 + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index 168f3f71..9d013c46 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -14,7 +14,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-beta-1 + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 114ae4aa..4ba07688 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -10,7 +10,7 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-beta-1 + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 5d85ee15..ce5f6623 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 - 2.2.0-beta-1 + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index b75b92eb..1f3d8207 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-beta-1 + 2.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-2.2.0-beta-1 + alfresco-sdk-aggregator-2.1.0-beta-1 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index f3757b30..4fb28fc1 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.2.0-beta-1 + 2.2.0-SNAPSHOT ../../pom.xml - 2.2.0-beta-1 + 2.2.0-SNAPSHOT @@ -154,7 +154,7 @@ - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin) - Alfresco Rapid Application Development module that starts remote JUnit runner and enables remote unit testing alfresco-rad) --> - 2.2.0-beta-1 + 2.2.0-SNAPSHOT From 0854929d99b5bec9b06a591117d12f3781c98be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Lo=CC=88fgren?= Date: Fri, 19 Feb 2016 12:39:22 +0100 Subject: [PATCH 37/38] The current configuration doesn't encode url:s properly and this breaks any pages/webscripts that uses parameters that contains non us-ascii characters. Adding the uriEncoding solves this. --- .../src/main/resources/archetype-resources/runner/pom.xml | 2 ++ poms/alfresco-sdk-parent/pom.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 2da8f660..35b043cc 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -110,6 +110,8 @@ This also fixes issues with the Google Guava Library, which this tomcat plugin uses version 10.0.1 of but Solr uses 14.0.1 --> false + + UTF-8 ${project.groupId} diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 4fb28fc1..88e30c9b 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -634,6 +634,8 @@ true ${project.basedir}/tomcat/context.xml + + UTF-8 From 5d59d6cd27188c81ec7db1ae984a99228a9efe40 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Mon, 29 Feb 2016 08:58:17 +0000 Subject: [PATCH 38/38] Added back Spring Loaded when running Share AMP --- .../runner/tomcat/context-repo.xml | 15 +++++++-------- .../runner/tomcat/context-share.xml | 9 ++++----- .../main/resources/archetype-resources/run.bat | 5 ++--- .../src/main/resources/archetype-resources/run.sh | 5 ++--- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml index 50026201..c32f88b3 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml @@ -2,16 +2,15 @@ - - - + + - IMPORTANT: If an AMP or JAR extension is added to the Share WAR, - then you need to add the paths below for this new extension. -=================================================================================================================--> + -