DEVPLAT-70, the share/src/test directory in the AIO artefact is not generated

This commit is contained in:
Martin Bergljung 2015-05-18 09:22:01 +01:00
parent d0fdd2fdfe
commit 8b48a63e0a
6 changed files with 24 additions and 12 deletions

View File

@ -117,6 +117,12 @@
<include>**</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="false" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**</include>
</includes>
</fileSet>
</fileSets>
</module>

View File

@ -12,17 +12,19 @@
<Resources className="org.apache.naming.resources.VirtualDirContext"
extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
<!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
<!-- Configure where the Share (share.war) web application can load classes, config, and test classes (in that order) -->
<!-- Setup the virtual class path like this:
1) target/classes
2) target/${project.build.finalName}/config
3) target/test-classes
1) share-amp/target/classes
2) share-amp/target/${project.build.finalName}/config
3) share-amp/target/test-classes
4) Add other AMP paths here....
5) share/target/test-classes (loads the share-config-custom.xml used during test runs)
This way mvn compile can be invoked and all changes will be picked up
-->
<Loader className="org.apache.catalina.loader.VirtualWebappLoader"
searchVirtualFirst="true"
virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes" />
virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share/target/test-classes" />
<!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
<JarScanner scanAllDirectories="true" />

View File

@ -23,9 +23,6 @@
Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
<app.amp.client.war.artifactId>share</app.amp.client.war.artifactId>
<!-- Used in share-config-custom.xml. By default points to standard location of Alfresco Repository -->
<alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
<!-- Defines the log level used in log4j.properties -->
<app.log.root.level>WARN</app.log.root.level>
</properties>

View File

@ -13,6 +13,12 @@
<version>${version}</version>
</parent>
<properties>
<!-- Used in share-config-custom.xml when testing.
By default points to standard location (local) of Alfresco Repository -->
<alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
</properties>
<dependencies>
<dependency>
<groupId>${alfresco.groupId}</groupId>

View File

@ -11,7 +11,7 @@
<Resources className="org.apache.naming.resources.VirtualDirContext"
extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
<!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
<!-- Setup the virtual class path like this:
1) target/classes
2) target/${project.build.finalName}/config

View File

@ -872,7 +872,10 @@
</build>
</profile>
<!--
Turn on webapp refresh for both Alfresco Repo (alfresco.war) and Alfresco Share (share.war)
if we find a module.properties file for an AMP extension.
-->
<profile>
<id>refresh-both</id>
<activation>
@ -900,8 +903,6 @@
</profile>
<!-- ====================================================================================================
ONE OFF/SETUP operations
==================================================================================================== -->