Commit bd9c5705 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents ea2a62d5 754558ad

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		<resources>

			<resource>

				<directory>src</directory>

				<filtering>true</filtering>

				<filtering>false</filtering>

			</resource>

		</resources>

		<plugins>

src/assemblies/amp.xml

+21 −41
Original line number Diff line number Diff line
@@ -4,66 +4,46 @@ 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

        xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">



    <id>build-amp</id>

    <id>amp</id>

    <formats>

        <format>amp</format>

    </formats>

    <includeBaseDirectory>false</includeBaseDirectory>



    <!-- required files -->

    <files>

        <file>

            <source>src/main/resources/alfresco/module/${project.artifactId}/module.properties</source>

            <source>${project.build.outputDirectory}/alfresco/module/${project.artifactId}/module.properties</source>

            <filtered>true</filtered>

        </file>



        <!-- Rarely used, but optional file mapping -->

        <file>

            <source>src/main/assembly/file-mapping.properties</source>

            <filtered>false</filtered>

        </file>



        <!-- Search for log4j.properties in a couple different spots; preferring the in reverse order -->

        <file>

            <source>src/main/resources/log4j.properties</source>

            <filtered>false</filtered>

        </file>

        <file>

            <source>src/main/resources/alfresco/module/${project.artifactId}/log4j.properties</source>

            <filtered>false</filtered>

        </file>

    </files>



    <fileSets>

        <!-- Rarely used, but optional file mapping -->

        <fileSet>

            <directory>src/main/web</directory>

            <outputDirectory>web</outputDirectory>

            <filtered>true</filtered>

            <excludes>

                <exclude>README.md</exclude>

            </excludes>

        </fileSet>

        <fileSet>

            <directory>target/web</directory>

            <outputDirectory>web</outputDirectory>

            <directory>src/main/assembly</directory>

            <filtered>false</filtered>

            <includes>

                <include>file-mapping.properties</include>

            </includes>

            <outputDirectory></outputDirectory>

        </fileSet>

        <!-- For compatability with the Alfresco SDK -->

        

        <!-- Optional log4j mapping -->

        <fileSet>

            <directory>src/main/assembly/web</directory>

            <outputDirectory>web</outputDirectory>

            <filtered>true</filtered>

            <excludes>

                <exclude>README.md</exclude>

            </excludes>

            <directory>${project.build.outputDirectory}/alfresco/module/${project.artifactId}</directory>

            <filtered>false</filtered>

            <includes>

                <include>log4j.properties</include>

            </includes>

            <outputDirectory></outputDirectory>

        </fileSet>

        <!-- For compatability with older versions of the Alfresco SDK -->



        <!-- A bunch of possible web resource locations -->

        <fileSet>

            <directory>src/main/webapp</directory>

            <directory>target/web</directory>

            <outputDirectory>web</outputDirectory>

            <filtered>true</filtered>

            <excludes>

                <exclude>README.md</exclude>

            </excludes>

            <filtered>false</filtered>

        </fileSet>

    </fileSets>