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) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index faada6c7..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.1-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 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 85% 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 index 0060701c..cddf7707 100644 --- 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 @@ -12,7 +12,7 @@ - + alfresco/module/${project.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__/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 88% 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 index fd8a4806..1e3c5cf9 100644 --- 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 @@ -22,13 +22,13 @@ - + - + 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 79% 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 index 4e111409..4e33fab5 100644 --- 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 @@ -21,8 +21,11 @@ + + - 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 95% 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 index ff42da63..57c8ac86 100644 --- 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 @@ -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/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 99% 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 index 92a689e5..439701a8 100644 --- 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 @@ -20,7 +20,6 @@ # This will create the alf_data_dev directory relative to Tomcat run folder. # Property values from the POM but it can also be edited here. ######################################################################################################################## - dir.root=${alfresco.data.location} # Use Solr4 as that is used by default with Alfresco 5 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 82% 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 index 148ad21d..027fbdb1 100644 --- 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 @@ -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/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 95% 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 index 2ed294d9..bbf979cf 100644 --- 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 @@ -17,7 +17,7 @@ --> - 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 95% 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 index 0e5c045a..158500f6 100644 --- 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 @@ -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-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 78% 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 index 7f1b3d71..c16f9314 100644 --- 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 @@ -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.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); + // 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 @@ -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/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 61% 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 index cd08dc3e..217cae9f 100644 --- 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 @@ -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,10 +18,10 @@ package ${package}.demoamp.po; import org.alfresco.po.share.SharePage; -import org.alfresco.webdrone.RenderTime; -import org.alfresco.webdrone.WebDrone; -import org.openqa.selenium.By; +import org.alfresco.po.RenderTime; 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; } - @SuppressWarnings("unchecked") - @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(); + return msg.getText(); } } \ No newline at end of file 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/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 6fe28fea..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 @@ -26,7 +26,7 @@ Uncomment if you need to change (Note. current default version for Enterprise edition is @@alfresco.enterprise.default.version@@) @@alfresco.community.default.version@@ @@alfresco.rm.version@@ - alf_data_dev --> + /absolute/path/to/alf_data_dev --> + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + test + + + * + * + + + + + @@ -86,5 +104,35 @@ false + + + + chmod + unix + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + false + + + chmod + validate + exec + + + + chmod + + +x + ${basedir}/run.sh + + + + + + 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..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 @@ -42,7 +42,7 @@ ${project.groupId} - repo-amp + ${rootArtifactId}-repo-amp ${project.version} amp @@ -56,7 +56,7 @@ --> - ${project.groupId} - repo-amp + ${rootArtifactId}-repo-amp amp @@ -173,6 +173,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 0edea6d8..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,7 +9,11 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) -set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G +:: 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 -mvn install -Prun -nsu -:: mvn install -Prun +mvn clean install -Prun -nsu 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..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,4 +6,10 @@ 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 + +# 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-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..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 @@ -12,6 +12,11 @@ ${version} + + + 4.1.6.RELEASE + + run @@ -19,8 +24,9 @@ - ${project.parent.basedir}/${alfresco.data.location}/solr4 + ${alfresco.data.location}/solr4 ${alfresco.solr.dir}/config + ${alfresco.solr.dir}/data @@ -56,6 +62,29 @@ org.apache.tomcat.maven tomcat7-maven-plugin + + + + org.alfresco + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + + + + org.codehaus.plexus + plexus-archiver + 2.3 + + run-wars @@ -81,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} @@ -205,28 +236,17 @@ - + ${alfresco.groupId} share-po ${alfresco.version} test - - - - - org.seleniumhq.selenium - selenium-java - - - org.seleniumhq.selenium - selenium-server - - - + ${alfresco.groupId} share-po @@ -234,8 +254,7 @@ tests test - + org.seleniumhq.selenium @@ -247,25 +266,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 - - - - @@ -280,6 +280,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} + @@ -306,9 +343,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} @@ -336,30 +373,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 @@ -367,8 +390,7 @@ tests test - + org.seleniumhq.selenium @@ -380,25 +402,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 - - - - @@ -413,6 +416,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 @@ - 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..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,37 +2,36 @@ - - - + + + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-repo-amp/target/amp/web" /> + virtualClasspath="${project.parent.basedir}/${rootArtifactId}-repo-amp/target/classes; + ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/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..ea16d112 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 @@ -2,26 +2,25 @@ - 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. -=================================================================================================================--> + - + extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/amp/web" /> 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 @@ - - - + + + ${project.groupId} - share-amp + ${rootArtifactId}-share-amp ${project.version} 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 + - + @@ -69,7 +96,7 @@ ${project.groupId} - share-amp + ${rootArtifactId}-share-amp amp 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-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 diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index a6a3e0c7..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.1-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml 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..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 @@ -24,7 +24,7 @@ + /absolute/path/to/alf_data_dev --> + + ${alfresco.groupId} + alfresco-repository + ${alfresco.version} + h2scripts + test + + + * + * + + + @@ -81,23 +97,5 @@ - - - - amp-to-war - - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - - - 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..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,7 +13,12 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) -set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G +:: 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 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..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,4 +8,9 @@ if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war +# 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 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/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 @@ + + - 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/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 3a6aef29..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,26 +4,33 @@ it is never released with the Alfresco.war =================================================================================================================--> - - + + + + virtualClasspath="${project.build.outputDirectory};${project.build.directory}/amp/config;${project.build.testOutputDirectory}" /> diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index e69f4c41..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.1-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml 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..fddf454f 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,7 @@ if not exist %springloadedfile% ( mvn validate -Psetup ) +:: Spring loaded can be used with the Share AMP project set MAVEN_OPTS=-javaagent:"%springloadedfile%" -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..8810f45f 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,5 @@ if [ ! -f $springloadedfile ]; then mvn validate -Psetup fi +# Spring loaded can be used with the Share AMP project MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war 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 @@ --> - 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/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..59a02205 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 @@ -4,24 +4,34 @@ it is never released with the Alfresco.war =================================================================================================================--> - - + + + extraResourcePaths="/=${project.build.directory}/amp/web,${app.amp.client.war.folder}" /> + virtualClasspath="${project.build.outputDirectory};${project.build.directory}/amp/config;${project.build.testOutputDirectory}" /> diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 67a40e1f..4ba07688 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -5,17 +5,15 @@ jar Rapid Application Development Support - SDK module for Rapid Development support + SDK module for Rapid Development support - allows remote unit testing and starts remote JUnit runner + org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml - - ${project.build.directory}/pg-dialect-tmp - @@ -30,97 +28,14 @@ + org.springframework spring-test - 3.0.6.RELEASE + 3.2.14.RELEASE 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/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index eea1bae5..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.1-SNAPSHOT + 2.2.0-SNAPSHOT ../../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/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/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}}. diff --git a/pom.xml b/pom.xml index 39950699..1f3d8207 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.2.0-SNAPSHOT Alfresco SDK This aggregator Project builds all modules required for the Alfresco SDK pom @@ -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 @@ -133,13 +133,13 @@ UTF-8 1.7 1.7 - 2.2 + 2.4 ${project.version} */*-enterprise/* - 5.0.d - 5.0.1 + 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 c3da25c9..b5bfd773 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 @@ -14,12 +14,12 @@ org.alfresco.maven alfresco-sdk-aggregator - 2.1.1-SNAPSHOT + 2.2.0-SNAPSHOT ../../pom.xml - 2.1.1-SNAPSHOT + 2.2.0-SNAPSHOT @@ -44,8 +44,9 @@ - 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 - 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} @@ -123,25 +128,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 @@ -150,9 +155,9 @@ - 2.1.1-SNAPSHOT + 2.2.0-SNAPSHOT @@ -160,7 +165,7 @@ - 1.4.185 + 1.4.190 + true false @@ -448,7 +457,7 @@ - ${project.basedir}/${alfresco.data.location} + ${alfresco.data.location} ${project.basedir} @@ -479,7 +488,10 @@ ${alfresco.enterprise.default.version} alfresco-enterprise - share-enterprise + + share provided @@ -488,7 +500,22 @@ alfresco-private-repository https://artifacts.alfresco.com/nexus/content/groups/private + + + + alfresco-internal-releases + https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA + + + + + alfresco-internal-releases + Alfresco Early Access Enterprise + https://artifacts.alfresco.com/nexus/content/repositories/5.1-EA/ + + + + org.apache.maven.plugins maven-dependency-plugin @@ -534,7 +561,8 @@ - + org.alfresco.maven.plugin alfresco-maven-plugin @@ -548,11 +576,13 @@ - + false - + + org.alfresco + alfresco-repository + ${alfresco.version} + h2scripts + + + * + * + + + + + + org.codehaus.plexus + plexus-archiver + 2.3 + + + + org.alfresco.maven + alfresco-rad + ${maven.alfresco.version} + + run-embedded @@ -576,19 +635,14 @@ true ${project.basedir}/tomcat/context.xml + + UTF-8 - - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - - @@ -691,8 +745,8 @@ junit test - + org.alfresco.maven alfresco-rad @@ -815,7 +869,7 @@ enforce-sdk-rules - true + does-not-exist.tmp @@ -834,10 +888,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\.).*$ diff --git a/poms/alfresco-sdk-parent/src/site/apt/sdk-properties.apt.vm b/poms/alfresco-sdk-parent/src/site/apt/sdk-properties.apt.vm index 33565eab..b4b78ee1 100644 --- a/poms/alfresco-sdk-parent/src/site/apt/sdk-properties.apt.vm +++ b/poms/alfresco-sdk-parent/src/site/apt/sdk-properties.apt.vm @@ -24,9 +24,9 @@ Common SDK properties WARN - ${project.build.directory}/ + ${project.build.directory}/ - alf_data_dev + ${project.basedir}/alf_data_dev local