Commit dad090fc authored by mindthegab's avatar mindthegab
Browse files

-- 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
parent ec26fef0

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

+8 −0
Original line number Diff line number Diff line
@@ -163,4 +163,12 @@ 
        </fileSets>

    </module>

  </modules>

  <fileSets>

    <fileSet>

        <directory></directory>

        <includes>

           <include>run.sh</include>

        </includes>

    </fileSet>

  </fileSets>

</archetype-descriptor>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    <artifactId>${artifactId}</artifactId>

    <name>Alfresco Repository AMP Module</name>

    <packaging>amp</packaging>

    <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR module</description>

    <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR aggregator</description>



    <parent>

        <groupId>${groupId}</groupId>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
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

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh

+9 −2
Original line number Diff line number Diff line 
#!/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

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

    <modelVersion>4.0.0</modelVersion>

    <artifactId>${artifactId}</artifactId>

    <name>Alfresco Repository and Explorer Module</name>

    <name>Alfresco Repository WAR Aggregator</name>

    <packaging>war</packaging>

    <description>Alfresco Repository and Explorer Module, installs your AMPs in the Alfresco WAR for aggregation purposes</description>

    <description>Alfresco Repository aggregator, installs your repository AMPs in the Alfresco WAR for aggregation and easy deployment purposes</description>



    <parent>

        <groupId>${groupId}</groupId>