mirror of
https://github.com/Alfresco/alfresco-sdk.git
synced 2025-05-19 17:15:24 +00:00
-- 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
This commit is contained in:
parent
ec26fef087
commit
dad090fc73
@ -163,4 +163,12 @@
|
|||||||
</fileSets>
|
</fileSets>
|
||||||
</module>
|
</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
<fileSets>
|
||||||
|
<fileSet>
|
||||||
|
<directory></directory>
|
||||||
|
<includes>
|
||||||
|
<include>run.sh</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
|
</fileSets>
|
||||||
</archetype-descriptor>
|
</archetype-descriptor>
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
<artifactId>${artifactId}</artifactId>
|
<artifactId>${artifactId}</artifactId>
|
||||||
<name>Alfresco Repository AMP Module</name>
|
<name>Alfresco Repository AMP Module</name>
|
||||||
<packaging>amp</packaging>
|
<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>
|
<parent>
|
||||||
<groupId>${groupId}</groupId>
|
<groupId>${groupId}</groupId>
|
||||||
|
@ -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
|
|
@ -1,2 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
MAVEN_OPTS="-Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Pamp-to-war
|
# 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
|
@ -14,9 +14,9 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>${artifactId}</artifactId>
|
<artifactId>${artifactId}</artifactId>
|
||||||
<name>Alfresco Repository and Explorer Module</name>
|
<name>Alfresco Repository WAR Aggregator</name>
|
||||||
<packaging>war</packaging>
|
<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>
|
<parent>
|
||||||
<groupId>${groupId}</groupId>
|
<groupId>${groupId}</groupId>
|
||||||
|
@ -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
|
@ -1 +0,0 @@
|
|||||||
mvn integration-test -Pamp-to-war
|
|
@ -1,2 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
mvn integration-test -Pamp-to-war
|
# 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
|
@ -3,9 +3,9 @@
|
|||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>${artifactId}</artifactId>
|
<artifactId>${artifactId}</artifactId>
|
||||||
<name>Alfresco Share Module</name>
|
<name>Alfresco Share WAR Aggregator</name>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<description>Alfresco Share Module</description>
|
<description>Alfresco Share aggregator, installs your Share AMPs in the Share WAR for aggregation and easy deployment purposes</description>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>${groupId}</groupId>
|
<groupId>${groupId}</groupId>
|
||||||
|
@ -62,5 +62,11 @@
|
|||||||
<include>**/*.xml</include>
|
<include>**/*.xml</include>
|
||||||
</includes>
|
</includes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory></directory>
|
||||||
|
<includes>
|
||||||
|
<include>run.sh</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
</fileSets>
|
</fileSets>
|
||||||
</archetype-descriptor>
|
</archetype-descriptor>
|
||||||
|
@ -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
|
@ -95,5 +95,11 @@
|
|||||||
<include>**/*.xml</include>
|
<include>**/*.xml</include>
|
||||||
</includes>
|
</includes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory></directory>
|
||||||
|
<includes>
|
||||||
|
<include>run.sh</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
</fileSets>
|
</fileSets>
|
||||||
</archetype-descriptor>
|
</archetype-descriptor>
|
||||||
|
@ -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
|
1
pom.xml
1
pom.xml
@ -121,6 +121,7 @@
|
|||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<maven.archetype.version>2.2</maven.archetype.version>
|
<maven.archetype.version>2.2</maven.archetype.version>
|
||||||
<alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
|
<alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
|
||||||
|
<springloaded.version>1.2.0.RELEASE</springloaded.version>
|
||||||
<scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
|
<scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
|
||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
|
@ -324,13 +324,6 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.alfresco.maven.plugin</groupId>
|
|
||||||
<artifactId>alfresco-maven-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
|
|
||||||
<resources>
|
<resources>
|
||||||
<resource>
|
<resource>
|
||||||
<directory>src/main/resources</directory>
|
<directory>src/main/resources</directory>
|
||||||
@ -760,5 +753,31 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
<!-- Does any SDK dev environment preparation (e.g. spring-loaded download) -->
|
||||||
|
<profile>
|
||||||
|
<id>setup</id>
|
||||||
|
<activation>
|
||||||
|
<activeByDefault>false</activeByDefault>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<!-- This simply downloads the spring-loaded jar to ~/.m2/repository/org/springframework/spring-loaded/${springloaded.version}/spring-loaded-${springloaded.version}.jar -->
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>get-spring-loaded</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals><goal>get</goal></goals>
|
||||||
|
<configuration>
|
||||||
|
<artifact>org.springframework:springloaded:${springloaded.version}</artifact>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
@ -26,6 +26,8 @@ SDK Available Profiles
|
|||||||
*-----------*--------------*-------------*-------------*-------------+
|
*-----------*--------------*-------------*-------------*-------------+
|
||||||
| all-in-one | rm | Adds Records Management runtime and compile time dependencies | Manual: <<<-Prm>>> | package |
|
| 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 |
|
| amp, share-amp | atv | (Experimental) Invokes the {{{https://github.com/AlfrescoLabs/technical-validation/}Alfresco Technical Validation tool}} | Manual: <<<-Patv>>> | validate |
|
||||||
*-----------+--------------+-------------+-------------+-------------+
|
*-----------+--------------+-------------+-------------+-------------+
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user