From a5fde50bc0dafd208cc4cb066d878ddcf07977e6 Mon Sep 17 00:00:00 2001 From: mindthegab Date: Wed, 6 Nov 2013 00:53:02 +0000 Subject: [PATCH] added run integration testing for the archetypes; fixed all-in-one missing archetype resources git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@722 04253f4f-3451-0410-a141-5562f1e59037 --- .../resources/projects/run-4.2.e/archetype.properties | 6 ++++++ .../src/test/resources/projects/run-4.2.e/goal.txt | 1 + .../resources/META-INF/maven/archetype-metadata.xml | 2 +- .../resources/projects/run-basic/archetype.properties | 11 +++++++++++ .../src/test/resources/projects/run-basic/goal.txt | 1 + modules/alfresco-rad/pom.xml | 2 +- poms/alfresco-sdk-parent/pom.xml | 3 +-- 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties create mode 100644 archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/goal.txt create mode 100644 archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties create mode 100644 archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/goal.txt diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties new file mode 100644 index 00000000..1fa289f5 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties @@ -0,0 +1,6 @@ +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +artifactId=allInOneTest +alfresco_target_groupId=org.alfresco +alfresco_target_version=4.2.e diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/goal.txt new file mode 100644 index 00000000..5ce9626e --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/goal.txt @@ -0,0 +1 @@ +verify -Prun -Dmaven.tomcat.fork=true 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 35adf0ee..1c83bdda 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 @@ -61,7 +61,7 @@ - src/test/resources + src/test/properties **/* diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties new file mode 100644 index 00000000..8892a4eb --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties @@ -0,0 +1,11 @@ +#Tue Oct 30 14:23:01 CET 2012 +package=it.pkg +version=0.1-SNAPSHOT +groupId=archetype.it +alfresco_target_version=4.2.e +$=cat archetype.properties +alfresco_target_groupId=org.alfresco +alfresco_target_amp_client_war=alfresco +alfresco_target_amp_client_war_groupId=org.alfresco +alfresco_target_amp_client_war_version=4.2.e +artifactId=basic diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/goal.txt b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/goal.txt new file mode 100644 index 00000000..fb8d393c --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/goal.txt @@ -0,0 +1 @@ +verify -Pamp-to-war -Dmaven.tomcat.fork=true diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 57297dcb..89c6d592 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -6,7 +6,7 @@ jar alfresco-rad - + SDK module for Rapid Deveopment support org.alfresco.maven alfresco-lifecycle-aggregator diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index e3f6d9fa..b02849ae 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -669,8 +669,7 @@ - - +