From dad090fc73bf96128226f2383d6470ab8658af00 Mon Sep 17 00:00:00 2001 From: mindthegab Date: Sat, 6 Sep 2014 12:09:21 -0400 Subject: [PATCH] -- issue #214 - Refining pull request #209 to only make default use of spring loaded in run.sh and automatically download it - added -Psetup profile (and documented) to automatically download springloaded in the initialize phase - embedded conditional call to download springloaded (if lib doesn't exist already) in the run.sh scripts - added run.sh scripts in each archetype - Refined naming - fixes issue #196 - removed double declaration of the alfresco-maven-plugin --- .../META-INF/maven/archetype-metadata.xml | 8 +++++ .../archetype-resources/repo-amp/pom.xml | 2 +- .../repo-amp/run-spring-loaded.sh | 1 - .../archetype-resources/repo-amp/run.sh | 11 +++++-- .../archetype-resources/repo/pom.xml | 4 +-- .../main/resources/archetype-resources/run.sh | 9 +++++ .../share-amp/run-spring-loaded.sh | 1 - .../archetype-resources/share-amp/run.sh | 11 +++++-- .../archetype-resources/share/pom.xml | 4 +-- .../META-INF/maven/archetype-metadata.xml | 6 ++++ .../main/resources/archetype-resources/run.sh | 9 +++++ .../META-INF/maven/archetype-metadata.xml | 6 ++++ .../main/resources/archetype-resources/run.sh | 9 +++++ pom.xml | 1 + poms/alfresco-sdk-parent/pom.xml | 33 +++++++++++++++---- .../src/site/apt/sdk-profiles.apt.vm | 2 ++ 16 files changed, 99 insertions(+), 18 deletions(-) delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh create mode 100644 archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh create mode 100644 archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh 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 e2f6562e..166cf735 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 @@ -163,4 +163,12 @@ + + + + + run.sh + + + 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/repo-amp/pom.xml index 7f885400..8e4b1a6c 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml @@ -4,7 +4,7 @@ ${artifactId} Alfresco Repository AMP Module amp - This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR module + This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR aggregator ${groupId} diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh deleted file mode 100644 index c536a941..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh +++ /dev/null @@ -1 +0,0 @@ -MAVEN_OPTS="-javaagent:./lib/springloaded-1.2.0.RELEASE.jar -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Pamp-to-war \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh index e5929027..fc86774c 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh @@ -1,2 +1,9 @@ -#!/bin/sh -MAVEN_OPTS="-Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Pamp-to-war +#!/bin/bash +# Downloads the spring-loaded lib if not existing and runs the repository AMP +springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar + +if [ ! -f $springloadedfile ]; then +mvn validate -Psetup +fi + +MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Prun \ No newline at end of file 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 786e6303..26b8922f 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 @@ -14,9 +14,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 ${artifactId} - Alfresco Repository and Explorer Module + Alfresco Repository WAR Aggregator war - Alfresco Repository and Explorer Module, installs your AMPs in the Alfresco WAR for aggregation purposes + Alfresco Repository aggregator, installs your repository AMPs in the Alfresco WAR for aggregation and easy deployment purposes ${groupId} 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 new file mode 100644 index 00000000..fe130dab --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Downloads the spring-loaded lib if not existing and runs the full all-in-one +# (Alfresco + Share + Solr) using the runner project +springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar + +if [ ! -f $springloadedfile ]; then +mvn validate -Psetup +fi +MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn install -Prun \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh deleted file mode 100644 index 10bc9f6a..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh +++ /dev/null @@ -1 +0,0 @@ -mvn integration-test -Pamp-to-war \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh index 1ae1aec1..ab528413 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh @@ -1,2 +1,9 @@ -#!/bin/sh -mvn integration-test -Pamp-to-war +#!/bin/bash +# Downloads the spring-loaded lib if not existing and runs the share AMP +springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar + +if [ ! -f $springloadedfile ]; then +mvn validate -Psetup +fi + +MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war \ No newline at end of file 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 30e888cf..f8208aeb 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 @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 ${artifactId} - Alfresco Share Module + Alfresco Share WAR Aggregator war - Alfresco Share Module + Alfresco Share aggregator, installs your Share AMPs in the Share WAR for aggregation and easy deployment purposes ${groupId} diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index f38333c1..f511a4ef 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -62,5 +62,11 @@ **/*.xml + + + + run.sh + + 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 new file mode 100644 index 00000000..fc86774c --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Downloads the spring-loaded lib if not existing and runs the repository AMP +springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar + +if [ ! -f $springloadedfile ]; then +mvn validate -Psetup +fi + +MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Prun \ No newline at end of file diff --git a/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 732f65c6..cf061911 100644 --- a/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -95,5 +95,11 @@ **/*.xml + + + + run.sh + + 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 new file mode 100644 index 00000000..ab528413 --- /dev/null +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# Downloads the spring-loaded lib if not existing and runs the share AMP +springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar + +if [ ! -f $springloadedfile ]; then +mvn validate -Psetup +fi + +MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0667f325..695274be 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ UTF-8 2.2 ${project.version} + 1.2.0.RELEASE https://github.com/Alfresco/alfresco-sdk diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index f797ebba..c4a90eec 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -324,13 +324,6 @@ - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - src/main/resources @@ -760,5 +753,31 @@ + + + setup + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + get-spring-loaded + validate + get + + org.springframework:springloaded:${springloaded.version} + + + + + + + diff --git a/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm b/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm index e0b8434b..27202e1a 100644 --- a/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm +++ b/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm @@ -26,6 +26,8 @@ SDK Available Profiles *-----------*--------------*-------------*-------------*-------------+ | all-in-one | rm | Adds Records Management runtime and compile time dependencies | Manual: <<<-Prm>>> | package | *-----------+--------------+-------------+-------------+-------------+ +| any | setup | Sets up the sdk, e.g. grabs springloaded. | Manual: <<<-Psetup>>> (automated in the run.sh) | initialize | +*-----------+--------------+-------------+-------------+-------------+ | amp, share-amp | atv | (Experimental) Invokes the {{{https://github.com/AlfrescoLabs/technical-validation/}Alfresco Technical Validation tool}} | Manual: <<<-Patv>>> | validate | *-----------+--------------+-------------+-------------+-------------+