v1.0.1 pom

.gitignore

@@ -2,7 +2,3 @@
 pom.xml.versionsBackup
 target
 
-# Eclipse
-.project
-.classpath
-.settings

pom.xml

@@ -7,24 +7,16 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>maven-assembly-amp-descriptor</artifactId>
-	<version>1.0-SNAPSHOT</version>
+	<version>1.0.1</version>
 	<packaging>jar</packaging>
 
 	<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>
 
@@ -36,7 +28,7 @@
 		<resources>
 			<resource>
 				<directory>src</directory>
-				<filtering>false</filtering>
+				<filtering>true</filtering>
 			</resource>
 		</resources>
 		<plugins>

src/assemblies/amp.xml

@@ -4,46 +4,66 @@
         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>amp</id>
+    <id>build-amp</id>
     <formats>
         <format>amp</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
 
-    <!-- required files -->
     <files>
         <file>
-            <source>${project.build.outputDirectory}/alfresco/module/${project.groupId}.${project.artifactId}/module.properties</source>
+            <source>src/main/resources/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/assembly</directory>
+            <directory>src/main/web</directory>
-            <filtered>false</filtered>
-            <includes>
-                <include>file-mapping.properties</include>
-            </includes>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-        
-        <!-- Optional log4j mapping -->
-        <fileSet>
-            <directory>${project.build.outputDirectory}/alfresco/module/${project.groupId}.${project.artifactId}</directory>
-            <filtered>false</filtered>
-            <includes>
-                <include>log4j.properties</include>
-            </includes>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-
-        <!-- A bunch of possible web resource locations -->
-        <fileSet>
-            <directory>${project.build.outputDirectory}/web</directory>
-            <filtered>false</filtered>
             <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>target/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>false</filtered>
+        </fileSet>
+        <!-- For compatability with the Alfresco SDK -->
+        <fileSet>
+            <directory>src/main/assembly/web</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
+        </fileSet>
+        <!-- For compatability with older versions of the Alfresco SDK -->
+        <fileSet>
+            <directory>src/main/webapp</directory>
+            <outputDirectory>web</outputDirectory>
+            <filtered>true</filtered>
+            <excludes>
+                <exclude>README.md</exclude>
+            </excludes>
         </fileSet>
     </fileSets>