Commit 2b8fb752 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents be3e1c11 8ea2e3c1

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -2,3 +2,7 @@ 
pom.xml.versionsBackup

target



# Eclipse

.project

.classpath

.settings

pom.xml

+8 −0
Original line number Diff line number Diff line
@@ -12,11 +12,19 @@ 


	<name>A Maven Assembly Descriptor to assist with the creation of Alfresco Module Packages (AMPs)</name>



	<scm>

		<url>https://bitbucket.org/inteligr8/maven-assembly-amp-descriptor</url>

	</scm>

	<organization>

		<name>Inteligr8</name>

		<url>https://www.inteligr8.com</url>

	</organization>

	<developers>

		<developer>

			<id>brian.long</id>

			<name>Brian Long</name>

			<email>brian@inteligr8.com</email>

			<url>https://twitter.com/brianmlong</url>

		</developer>

	</developers>

src/assemblies/amp.xml

+5 −5
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
    <!-- required files -->

    <files>

        <file>

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

            <filtered>true</filtered>

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

            <filtered>false</filtered>

        </file>

    </files>
@@ -31,7 +31,7 @@ 
        

        <!-- Optional log4j mapping -->

        <fileSet>

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

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

            <filtered>false</filtered>

            <includes>

                <include>log4j.properties</include>
@@ -41,9 +41,9 @@ 


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

        <fileSet>

            <directory>target/web</directory>

            <outputDirectory>web</outputDirectory>

            <directory>${project.build.outputDirectory}/web</directory>

            <filtered>false</filtered>

            <outputDirectory>web</outputDirectory>

        </fileSet>

    </fileSets>