diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
index e377d386..189ba34c 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?><archetype>
-  <id>test</id>
+  <id>maven-alfresco-amp-archetype</id>
   <sources>
     <source>src/main/java/com/sourcesense/demoamp/Demo.java</source>
     <source>src/main/java/com/sourcesense/demoamp/DemoComponent.java</source>
   </sources>
   <resources>
-    <resource>src/main/config/context/service-context.xml</resource>
-    <resource>src/main/config/log4j.properties</resource>
-    <resource>src/main/config/module-context.xml</resource>
-    <resource>src/main/webapp/css/demoamp.css</resource>
-    <resource>src/main/webapp/images/sourcesense.gif</resource>
-    <resource>src/main/webapp/jsp/demoamp.jsp</resource>
-    <resource>src/main/webapp/licenses/README-licenses.txt</resource>
-    <resource>src/main/webapp/scripts/demoamp.js</resource>
-    <resource>module.properties</resource>
-    <resource>README.txt</resource>
-    <resource>TODO.txt</resource>
+    <resource filtered="false">src/main/config/context/service-context.xml</resource>
+    <resource filtered="false">src/main/config/log4j.properties</resource>
+    <resource filtered="false">src/main/config/module-context.xml</resource>
+    <resource filtered="false">src/main/webapp/css/demoamp.css</resource>
+    <resource filtered="false">src/main/webapp/images/sourcesense.gif</resource>
+    <resource filtered="false">src/main/webapp/jsp/demoamp.jsp</resource>
+    <resource filtered="false">src/main/webapp/licenses/README-licenses.txt</resource>
+    <resource filtered="false">src/main/webapp/scripts/demoamp.js</resource>
+    <resource filtered="false">module.properties</resource>
+    <resource filtered="false">README.txt</resource>
+    <resource filtered="false">TODO.txt</resource>
   </resources>
   <testResources>
-    <resource>src/test/properties/local/application.properties</resource>
-    <resource>src/test/resources/alfresco/extension/custom-repository-context.xml</resource>
-    <resource>src/test/resources/alfresco/extension/file-servers-custom.xml</resource>
-    <resource>src/test/resources/log4j.properties</resource>
+    <resource filtered="false">src/test/properties/local/application.properties</resource>
+    <resource filtered="false">src/test/resources/alfresco/extension/custom-repository-context.xml</resource>
+    <resource filtered="false">src/test/resources/alfresco/extension/file-servers-custom.xml</resource>
+    <resource filtered="false">src/test/resources/log4j.properties</resource>
   </testResources>
 </archetype>
\ No newline at end of file
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index c4133e37..3a0ef240 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -118,7 +118,7 @@
 			<plugin>
 				<groupId>org.alfresco.maven.plugin</groupId>
 				<artifactId>maven-amp-plugin</artifactId>
-				<version>1.0.0</version>
+				<version>2.0.0</version>
 				<extensions>true</extensions>
 				<configuration>
 					<archive>
@@ -154,7 +154,7 @@
 			<resource>
 				<filtering>true</filtering>
 				<directory>src/main/config</directory>
-				<targetPath>alfresco/modules/${groupId}.${artifactId}</targetPath>
+				<targetPath>alfresco/module/${groupId}.${artifactId}</targetPath>
 				<excludes>
 					<exclude>**README-*</exclude>
 				</excludes>
@@ -192,7 +192,7 @@
 							<dependency>
 								<groupId>org.alfresco.maven.plugin</groupId>
 								<artifactId>maven-amp-plugin</artifactId>
-								<version>1.0.0</version>
+								<version>2.0.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -244,7 +244,7 @@
 							<dependency>
 								<groupId>org.alfresco.maven.plugin</groupId>
 								<artifactId>maven-amp-plugin</artifactId>
-								<version>1.0.0</version>
+								<version>2.0.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
index af80bed8..9a634904 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
@@ -1,4 +1,4 @@
-<?xml version='${version}' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
 <!--
 	Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
index e6a65964..2421dacb 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
@@ -1,4 +1,4 @@
-<?xml version='${version}' encoding='UTF-8'?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 	Licensed to the Apache Software Foundation (ASF) under one or more
 	contributor license agreements.  See the NOTICE file distributed with
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
index 5ab2ee3a..5a2b5dcd 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	contributor license agreements.  See the NOTICE file distributed with
+	this work for additional information regarding copyright ownership.
+	The ASF licenses this file to You under the Apache License, Version 2.0
+	(the "License"); you may not use this file except in compliance with
+	the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+	
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
@@ -25,49 +26,49 @@
 	<packaging>war</packaging>
 	<url></url>
 	<description>Alfresco extension</description>
-	<!--
-		|
-		| By default the project is overlayed to the alfresco war which depends upon and deployed as a WAR (local development and testing purposes)
-		| Available properties:
-		|
-		| -Denv - toggles src/main/properties/<env>/application.properties files (default: local)
-		| -DrestoreVersion=<restoreVersion> - toggles profile "restore" in order to include tools/export/<restoreVersion>/restore/*.acp files in 	
-		| alfresco/extension/restore (default: no restore)
-		| -Dcustomization.name=<customizationName> - name of the jar artifact containing classes and resources for this extension
-		| -Dwebapp.name=<extensionName> -   name of the WAR artifact to be built (default: ${artifactId}-{version}.jar )
-		| -Denterprise   - Includes LDAP configuration as defined in application.properties
-		 -->
-	
+	<!--
+		|
+		| By default the project is overlayed to the alfresco war which depends upon and deployed as a WAR (local development and testing purposes)
+		| Available properties:
+		|
+		| -Denv - toggles src/main/properties/<env>/application.properties files (default: local)
+		| -DrestoreVersion=<restoreVersion> - toggles profile "restore" in order to include tools/export/<restoreVersion>/restore/*.acp files in 	
+		| alfresco/extension/restore (default: no restore)
+		| -Dcustomization.name=<customizationName> - name of the jar artifact containing classes and resources for this extension
+		| -Dwebapp.name=<extensionName> -   name of the WAR artifact to be built (default: ${artifactId}-{version}.jar )
+		| -Denterprise   - Includes LDAP configuration as defined in application.properties
+	-->
+
 	<!-- Default properties -->
 	<properties>
 		<!-- src/main/properties/<env>/application.properties is loaded -->
 		<env>local</env>
 		<webapp.name>alfresco</webapp.name>
-		  <!-- 
-			  | 
-			  | By default the src/main/properties/local/application.properties uses the property "alfresco.data.location" to  specify where
-			  | alf_data gets created.
-			  | For local jetty:run deployment default creation dir is under project root folder (as location is specified relatively to run 			
-			  | dir). Please add alf_data_jetty in svn/cvs ignores in order not to commit that. You can also specified a different (out of the 	
-			  | sproject) folder
-			  | by editing the following properties.
-			  | DB is also configurable here. Of course keep in sync these two values otherwise you'll get integrity errors.
-			  | 
-			  | Empty log dir creates file alfresco.log in appserver default dir. You can also specify a meaningful log directory for the server
-			  | (add a trailing slash, e.g. '/var/log/alfresco/' ) 
-			  |
-			  | Jetty embedded run logs by default in target/alfresco.log 
-			   -->
+		<!-- 
+			| 
+			| By default the src/main/properties/local/application.properties uses the property "alfresco.data.location" to  specify where
+			| alf_data gets created.
+			| For local jetty:run deployment default creation dir is under project root folder (as location is specified relatively to run 			
+			| dir). Please add alf_data_jetty in svn/cvs ignores in order not to commit that. You can also specified a different (out of the 	
+			| sproject) folder
+			| by editing the following properties.
+			| DB is also configurable here. Of course keep in sync these two values otherwise you'll get integrity errors.
+			| 
+			| Empty log dir creates file alfresco.log in appserver default dir. You can also specify a meaningful log directory for the server
+			| (add a trailing slash, e.g. '/var/log/alfresco/' ) 
+			|
+			| Jetty embedded run logs by default in target/alfresco.log 
+		-->
 		<alfresco.data.location>./alf_data_jetty</alfresco.data.location>
 		<alfresco.db.name>alf_jetty</alfresco.db.name>
 		<log.dir>${project.build.directory}/</log.dir>
-		<!-- Uncomment this property together with the <scm> section downwards
-		<svn.url>
-	      https://mycompany.com/repos/my-test-project
-	    </svn.url>
+		<!-- Uncomment this property together with the <scm> section downwards
+			<svn.url>
+			https://mycompany.com/repos/my-test-project
+			</svn.url>
 		-->
-		<!-- Uncomment this property together with the maven-release-plugin <plugin><configuration><tagBase/></configuration></plugin> section downwards
-		<svn.tags.url>${svn.url}/tags</svn.tags.url>
+		<!-- Uncomment this property together with the maven-release-plugin <plugin><configuration><tagBase/></configuration></plugin> section downwards
+			<svn.tags.url>${svn.url}/tags</svn.tags.url>
 		-->
 		<!-- These redundancies are due to filtering issues of Maven. See here http://maven.apache.org/plugins/maven-site-plugin/usage.html -->
 		<site_pom_description>${pom.description}</site_pom_description>
@@ -78,9 +79,9 @@
 		<site_tags_url>${svn.tags.url}</site_tags_url>
 		<site_site_url>${site.url}</site_site_url>
 	</properties>
-	<!-- 
-		| Alfresco Community dependencies are generally available in ss-public repo. 
-		| FIXME: Alfresco enterprise dependencies are only available on SS repo ATM. Alfresco *needs* to deliver their artifacts on (at least) partner repos
+	<!-- 
+		| Alfresco Community dependencies are generally available in ss-public repo. 
+		| FIXME: Alfresco enterprise dependencies are only available on SS repo ATM. Alfresco *needs* to deliver their artifacts on (at least) partner repos
 		|-->
 	<repositories>
 		<repository>
@@ -89,36 +90,35 @@
 		</repository>
 	</repositories>
 	<pluginRepositories>
-		  <pluginRepository>
-		    <id>codehaus snapshot repository</id>
-		    <url>http://snapshots.repository.codehaus.org/</url>
-		    <releases>
-		      <enabled>true</enabled>
-		    </releases>
-		  </pluginRepository>
-			<pluginRepository>
-	      <id>Maven Snapshots</id>
-	      <url>http://snapshots.maven.codehaus.org/maven2/</url>
-	      <snapshots>
-	      </snapshots>
-	      <releases>
-	        <enabled>false</enabled>
-	      </releases>
-	    </pluginRepository>
-	  </pluginRepositories>
-	 <!-- Uncomment SCM definitions in order to have mvn release:perform to actually tag the code
-	 <scm>
-	    <developerConnection>scm:svn:${svn.url}</developerConnection>
-	    <url>${svn.url}</url>
-	  </scm>
+		<pluginRepository>
+			<id>codehaus snapshot repository</id>
+			<url>http://snapshots.repository.codehaus.org/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</pluginRepository>
+		<pluginRepository>
+			<id>Maven Snapshots</id>
+			<url>http://snapshots.maven.codehaus.org/maven2/</url>
+			<snapshots></snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</pluginRepository>
+	</pluginRepositories>
+	<!-- Uncomment SCM definitions in order to have mvn release:perform to actually tag the code
+		<scm>
+		<developerConnection>scm:svn:${svn.url}</developerConnection>
+		<url>${svn.url}</url>
+		</scm>
 	-->
-	
+
 	<!-- Alfresco dependencies -->
 	<dependencies>
-		<!-- Alfresco Dependencies
-			| NB: These files are not publicly available. Please vote for Alfresco to release them :)
-			| Jboss alfresco build (e.g. no log4j.properties and fix for myFaces) 
-			-->
+		<!-- Alfresco Dependencies
+			| NB: These files are not publicly available. Please vote for Alfresco to release them :)
+			| Jboss alfresco build (e.g. no log4j.properties and fix for myFaces) 
+		-->
 		<dependency>
 			<groupId>alfresco.community</groupId>
 			<artifactId>alfresco</artifactId>
@@ -159,91 +159,91 @@
 		</dependency>
 
 		<!-- Other provided dependencies. Uncomment for development/test -->
-		<!-- dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring</artifactId>
-			<version>2.0</version>
-			<scope>provided</scope>
-			</dependency>
-			<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-mock</artifactId>
-			<version>2.0</version>
-			<scope>test</scope>
-			</dependency>
-			-->
+		<!-- dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring</artifactId>
+			<version>2.0</version>
+			<scope>provided</scope>
+			</dependency>
+			<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-mock</artifactId>
+			<version>2.0</version>
+			<scope>test</scope>
+			</dependency>
+		-->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
-		<!-- 
-			The following dependencies are possibly obsolete. Please check inside alfresco WAR lib folder which version you need to depend upon in case you
-			have classNotFoundException at runtime or you miss static linking for mvn eclipse:eclipse command.
-			Alfresco should adhere to a strict library naming policy or better build with maven ;)
-			
-			<dependency>
-			<groupId>javax.j2ee</groupId>
-			<artifactId>j2ee</artifactId>
-			<version>1.4</version>
-			<scope>provided</scope>
-			</dependency>
-			<dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-			<version>2.7.0</version>
-			</dependency>
-			<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-ejb_2.1_spec</artifactId>
-			<version>1.1</version>
-			</dependency>
-			<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xmlParserAPIs</artifactId>
-			<version>2.6.2</version>
-			<scope>test</scope>
-			</dependency>
-			<dependency>
-			<groupId>myfaces</groupId>
-			<artifactId>myfaces-api</artifactId>
-			<version>1.1.1</version>
-			<scope>provided</scope>
-			</dependency>
-			<dependency>
-			<groupId>javax.jcr</groupId>
-			<artifactId>jcr</artifactId>
-			<version>1.0</version>
-			<scope>provided</scope>
-			</dependency>
-			<dependency>
-			<groupId>portlet-api</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			</dependency>
-			<dependency>
-			<groupId>jta</groupId>
-			<artifactId>jta</artifactId>
-			<version>1.0.1B</version>
-			</dependency>
-			<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging-api</artifactId>
-			<version>1.0.3</version>
-			<scope>provided</scope>
-			</dependency>
-			<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-			</dependency>
-			<dependency>
-			<groupId>commons-discovery</groupId>
-			<artifactId>commons-discovery</artifactId>
-			<version>20040218.194635</version>
-			<scope>provided</scope>
-			</dependency>
+		<!-- 
+			The following dependencies are possibly obsolete. Please check inside alfresco WAR lib folder which version you need to depend upon in case you
+			have classNotFoundException at runtime or you miss static linking for mvn eclipse:eclipse command.
+			Alfresco should adhere to a strict library naming policy or better build with maven ;)
+			
+			<dependency>
+			<groupId>javax.j2ee</groupId>
+			<artifactId>j2ee</artifactId>
+			<version>1.4</version>
+			<scope>provided</scope>
+			</dependency>
+			<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.0</version>
+			</dependency>
+			<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-ejb_2.1_spec</artifactId>
+			<version>1.1</version>
+			</dependency>
+			<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xmlParserAPIs</artifactId>
+			<version>2.6.2</version>
+			<scope>test</scope>
+			</dependency>
+			<dependency>
+			<groupId>myfaces</groupId>
+			<artifactId>myfaces-api</artifactId>
+			<version>1.1.1</version>
+			<scope>provided</scope>
+			</dependency>
+			<dependency>
+			<groupId>javax.jcr</groupId>
+			<artifactId>jcr</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+			</dependency>
+			<dependency>
+			<groupId>portlet-api</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			</dependency>
+			<dependency>
+			<groupId>jta</groupId>
+			<artifactId>jta</artifactId>
+			<version>1.0.1B</version>
+			</dependency>
+			<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging-api</artifactId>
+			<version>1.0.3</version>
+			<scope>provided</scope>
+			</dependency>
+			<dependency>
+			<groupId>dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+			<version>1.6.1</version>
+			</dependency>
+			<dependency>
+			<groupId>commons-discovery</groupId>
+			<artifactId>commons-discovery</artifactId>
+			<version>20040218.194635</version>
+			<scope>provided</scope>
+			</dependency>
 		-->
 	</dependencies>
 
@@ -333,14 +333,55 @@
 					<locales>en</locales>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<archiveClasses>false</archiveClasses>
-					<webappDirectory>target/${webapp.name}</webappDirectory>
-					<warSourceExcludes>**classes/tools</warSourceExcludes>
-				</configuration>
+			<plugin>
+				<groupId>org.alfresco.maven.plugin</groupId>
+				<artifactId>maven-amp-plugin</artifactId>
+				<version>1.0.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack-amps</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>unpack-dependencies</goal>
+						</goals>
+						<configuration>
+							<includeTypes>amp</includeTypes>
+							<outputDirectory>${build.directory}/${webapp.name}</outputDirectory>
+							<excludes>META*</excludes>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<!-- This is required to be re-defined explicitly at plugin level as otherwise the 'amp' extension
+						unArchiver won't be available to the maven-dependency-plugin  -->
+					<dependency>
+						<groupId>org.alfresco.maven.plugin</groupId>
+						<artifactId>maven-amp-plugin</artifactId>
+						<version>1.0.0</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>false</archiveClasses>
+					<webappDirectory>target/${webapp.name}</webappDirectory>
+					<warSourceExcludes>tools/**</warSourceExcludes>
+					<webResources>
+
+					</webResources>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.mortbay.jetty</groupId>
@@ -390,7 +431,7 @@
 						| Target books dir: within the site so it can be linked and deployed
 						| TODO: Use ${pom.target.dir} or so similar property instead of 
 						|		hard wiring 'target'
-						 -->
+					-->
 					<generatedDocs>target/site/books</generatedDocs>
 					<books>
 						<book>
@@ -436,11 +477,11 @@
 			<plugin>
 				<artifactId>maven-clover-plugin</artifactId>
 			</plugin>
-			<!-- Enable this plugin only after setting SCM connection, otherwise mvn site will fail
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>changelog-maven-plugin</artifactId>
-			</plugin>
+			<!-- Enable this plugin only after setting SCM connection, otherwise mvn site will fail
+				<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>changelog-maven-plugin</artifactId>
+				</plugin>
 			-->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -448,52 +489,52 @@
 			</plugin>
 		</plugins>
 	</reporting>
-	<!-- 
-		| Configured to deploy on SS public repository ATM.
-		| You'd need a valid uid/pwd in our repo
-		|
-		 -->
+	<!-- 
+		| Configured to deploy on SS public repository ATM.
+		| You'd need a valid uid/pwd in our repo
+		|
+	-->
 	<distributionManagement>
-		<!--
-			| 
-			| Enable this repo in case of publicly redistributable artifacts (Sourcesense public repositories via ssh + public key )
-			|
-		<repository>
-			<id>ss-public</id>
-			<url>scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2</url>
-		</repository>
-		  <distributionManagement>
-		<site>
+		<!--
+			| 
+			| Enable this repo in case of publicly redistributable artifacts (Sourcesense public repositories via ssh + public key )
+			|
+			<repository>
+			<id>ss-public</id>
+			<url>scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2</url>
+			</repository>
+			<distributionManagement>
+			<site>
 			<id>ss-site-public</id>
-		    <url>scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2-sites</url>
-		</site>
+			<url>scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2-sites</url>
+			</site>
+		-->
+		<!--
+			| 
+			| Enable this repo in case of non publicly redistributable artifacts (Sourcesense private repositories via webdav)
+			|
 		-->
-		<!--
-			| 
-			| Enable this repo in case of non publicly redistributable artifacts (Sourcesense private repositories via webdav)
-			|
-			-->
 		<repository>
 			<id>ss-private</id>
 			<url>dav:https://dev.sourcesense.com/repos/dev/maven2</url>
 		</repository>
 		<site>
-	      <id>ss-site-private</id>
-	      <url>dav:https://dev.sourcesense.com/cargo/maven2-sites</url>
-	    </site>
+			<id>ss-site-private</id>
+			<url>dav:https://dev.sourcesense.com/cargo/maven2-sites</url>
+		</site>
 	</distributionManagement>
 
-	<!-- 
-		| Build Profiles
-		 -->
+	<!-- 
+		| Build Profiles
+	-->
 	<profiles>
-		<!--
-			| Profile to automatically restore export files committed under
-			| "tools/export/<restoreVersion>/export_*.[acp,xml]" and the restore-context.xml.
-			| Gets automatically activated specifiying a value for the property
-			| restoreVersion which maps to the name of the folder.
-			| NB: In order this to work you *MUST* export your full repo with "export" package name
-			 -->
+		<!--
+			| Profile to automatically restore export files committed under
+			| "tools/export/<restoreVersion>/export_*.[acp,xml]" and the restore-context.xml.
+			| Gets automatically activated specifiying a value for the property
+			| restoreVersion which maps to the name of the folder.
+			| NB: In order this to work you *MUST* export your full repo with "export" package name
+		-->
 		<profile>
 			<id>restore</id>
 			<activation>
@@ -520,10 +561,10 @@
 				</resources>
 			</build>
 		</profile>
-		<!--
-			| Profile to automatically include ldap configuration files
-			| (not included by default build)
-			 -->
+		<!--
+			| Profile to automatically include ldap configuration files
+			| (not included by default build)
+		-->
 		<profile>
 			<id>ldap</id>
 			<activation>
@@ -543,38 +584,38 @@
 				</resources>
 			</build>
 		</profile>
-		<!-- Profile for deploying (only locally , due to http://jira.codehaus.org/browse/CARGO-416) on jboss. 
-			|
-			| FIXME: Add <dependencies> override in order to have jboss specific alfresco-*-jboss.war (e.g no log4j.properties and log4j jar) 
-			| being substituted as a depenendency, and avoid log4j classCasts
-			|
-			-->	
+		<!-- Profile for deploying (only locally , due to http://jira.codehaus.org/browse/CARGO-416) on jboss. 
+			|
+			| FIXME: Add <dependencies> override in order to have jboss specific alfresco-*-jboss.war (e.g no log4j.properties and log4j jar) 
+			| being substituted as a depenendency, and avoid log4j classCasts
+			|
+		-->
 		<profile>
-		  <id>jboss</id>
-		  <!--  
-			  | By default the src/main/properties/local/application.properties uses the property "alfresco.data.location" to  specify where
-			  | alf_data gets created and "alfresco.db.name" for the database name.
-			  | For local jboss deployment default creation dir (alf_data) is under appserver $JBOSS_HOME/bin directory (as location is specified relatively to 
-			  | run dir)
-			  | 
-			  | Empty log dir creates file alfresco.log in appserver default dir. You can also specify a meaningful log directory for the server
-			  | (add a trailing slash, e.g. '/var/log/alfresco/' ) 
-			  |
-			  | NB: Remember to grant appropriate permissions on database you specify here by running the script found in tools/mysql/[jetty/tomcat/jboss]
-			  | sql scripts (after editing them), or run those you find in target/classes/tools/[db_remove,db_setup].sql which are already filtered according to
-			  | ' alfresco.db.name ' property.
-			  | 
-			   -->
-		  <properties>	
-	        <alfresco.data.location>./alf_data</alfresco.data.location>
-			<alfresco.db.name>alf_jboss</alfresco.db.name>
-			<log.dir></log.dir>
-	      </properties>
-	      <build>
-	        <defaultGoal>cargo:deploy</defaultGoal>
-			<resources>
-				<resource>
-					<directory>src/main/resources</directory>
+			<id>jboss</id>
+			<!--  
+				| By default the src/main/properties/local/application.properties uses the property "alfresco.data.location" to  specify where
+				| alf_data gets created and "alfresco.db.name" for the database name.
+				| For local jboss deployment default creation dir (alf_data) is under appserver $JBOSS_HOME/bin directory (as location is specified relatively to 
+				| run dir)
+				| 
+				| Empty log dir creates file alfresco.log in appserver default dir. You can also specify a meaningful log directory for the server
+				| (add a trailing slash, e.g. '/var/log/alfresco/' ) 
+				|
+				| NB: Remember to grant appropriate permissions on database you specify here by running the script found in tools/mysql/[jetty/tomcat/jboss]
+				| sql scripts (after editing them), or run those you find in target/classes/tools/[db_remove,db_setup].sql which are already filtered according to
+				| ' alfresco.db.name ' property.
+				| 
+			-->
+			<properties>
+				<alfresco.data.location>./alf_data</alfresco.data.location>
+				<alfresco.db.name>alf_jboss</alfresco.db.name>
+				<log.dir></log.dir>
+			</properties>
+			<build>
+				<defaultGoal>cargo:deploy</defaultGoal>
+				<resources>
+					<resource>
+						<directory>src/main/resources</directory>
 						<excludes>
 							<exclude>**/restore-context.xml</exclude>
 							<exclude>**/ldap-*.xml</exclude>
@@ -588,108 +629,108 @@
 						<filtering>true</filtering>
 					</resource>
 				</resources>
-	        <plugins>
-	          <plugin>
-	            <groupId>org.codehaus.cargo</groupId>
-	            <artifactId>cargo-maven2-plugin</artifactId>
-	            <configuration>
-	              <container>
-	                <containerId>jboss4x</containerId>
-	                <type>remote</type>
-	              </container>
-	              <configuration>
-	                <type>runtime</type>
-	                <properties>
-	                  <cargo.servlet.port>8080</cargo.servlet.port>
-	                </properties>
-	              </configuration>
-	              <deployer>
-	                <type>remote</type>
-	                <deployables>
-	                  <deployable>
-	                    <groupId>${pom.groupId}</groupId>
-	                    <artifactId>${pom.artifactId}</artifactId>
-	                    <type>war</type>
-	                  </deployable>
-	                </deployables>
-	              </deployer>
-	            </configuration>
-	          </plugin>
-			  <!-- log4j.properties is excluded from source and dependencies -->
-			  <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-						<archiveClasses>false</archiveClasses>
-						<webappDirectory>target/${webapp.name}</webappDirectory>
-						<dependentWarExcludes >**/log4j.properties,**/lib/log4j*.jar,log4j.properties</dependentWarExcludes >
-						<warSourceExcludes>**/log4j.properties,WEB-INF/classes/tools</warSourceExcludes>
-				</configuration>
-			</plugin>	
-	        </plugins>
-	      </build>
-	    </profile>	
-		<!-- 
-			| Profile for deploying on tomcat 5.x
-			|
-			|
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.cargo</groupId>
+						<artifactId>cargo-maven2-plugin</artifactId>
+						<configuration>
+							<container>
+								<containerId>jboss4x</containerId>
+								<type>remote</type>
+							</container>
+							<configuration>
+								<type>runtime</type>
+								<properties>
+									<cargo.servlet.port>8080</cargo.servlet.port>
+								</properties>
+							</configuration>
+							<deployer>
+								<type>remote</type>
+								<deployables>
+									<deployable>
+										<groupId>${pom.groupId}</groupId>
+										<artifactId>${pom.artifactId}</artifactId>
+										<type>war</type>
+									</deployable>
+								</deployables>
+							</deployer>
+						</configuration>
+					</plugin>
+					<!-- log4j.properties is excluded from source and dependencies -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-war-plugin</artifactId>
+						<configuration>
+							<archiveClasses>false</archiveClasses>
+							<webappDirectory>target/${webapp.name}</webappDirectory>
+							<dependentWarExcludes>**/log4j.properties,**/lib/log4j*.jar,log4j.properties</dependentWarExcludes>
+							<warSourceExcludes>**/log4j.properties,WEB-INF/classes/tools</warSourceExcludes>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<!-- 
+			| Profile for deploying on tomcat 5.x
+			|
+			|
+		-->
+		<profile>
+			<id>tomcat</id>
+			<!--  
+				| By default the src/main/properties/local/application.properties uses the property "alfresco.data.location" to  specify where
+				| alf_data gets created.
+				| For tomcat deployment default creation dir (alf_data) is under appserver $CATALINA_HOME/bin directory (as location is specified relatively to 
+				| run dir) and db is configurable likewhise.
+				| Empty log dir creates file alfresco.log in appserver default dir. You can also specify a meaningful log directory for the server
+				| (add a trailing slash, e.g. '/var/log/alfresco/' ) 
+				|
+				| NB: Remember to grant appropriate permissions on database you specify here by running the script found in tools/mysql/[jetty/tomcat/jboss]
+				| mysql scripts (properly edited) or those you find in target/tools/[db_remove,db_setup].sql which are already filtered according to
+				| ' alfresco.db.name ' property 
+				|  
 			-->
-	    <profile>
-	      <id>tomcat</id>
-		  <!--  
-			  | By default the src/main/properties/local/application.properties uses the property "alfresco.data.location" to  specify where
-			  | alf_data gets created.
-			  | For tomcat deployment default creation dir (alf_data) is under appserver $CATALINA_HOME/bin directory (as location is specified relatively to 
-			  | run dir) and db is configurable likewhise.
-			  | Empty log dir creates file alfresco.log in appserver default dir. You can also specify a meaningful log directory for the server
-			  | (add a trailing slash, e.g. '/var/log/alfresco/' ) 
-			  |
-			  | NB: Remember to grant appropriate permissions on database you specify here by running the script found in tools/mysql/[jetty/tomcat/jboss]
-			  | mysql scripts (properly edited) or those you find in target/tools/[db_remove,db_setup].sql which are already filtered according to
-			  | ' alfresco.db.name ' property 
-			  |  
-			   -->
-		  <properties>	
-	        <alfresco.data.location>./alf_data</alfresco.data.location>
-			<alfresco.db.name>alf_tomcat</alfresco.db.name> 
-			<log.dir></log.dir>
-	      </properties>
-	      <build>
-	        <defaultGoal>package</defaultGoal>
-	        <plugins>
-	          <plugin>
-	            <groupId>org.codehaus.cargo</groupId>
-	            <artifactId>cargo-maven2-plugin</artifactId>
-	            <configuration>
-	              <container>
-	                <containerId>tomcat5x</containerId>
-	                <type>remote</type>
-	              </container>
-				  <!-- Configure here your Tomcat server manager credentials -->
-	              <configuration>
-	                <type>runtime</type>
-	                <properties>
-	                  <cargo.remote.username>tomcat</cargo.remote.username>
-	                  <cargo.remote.password>tomcat</cargo.remote.password>
-	                  <cargo.servlet.port>8080</cargo.servlet.port>
-	                </properties>
-	              </configuration>
-	              <deployer>
-	                <type>remote</type>
-	                <deployables>
-	                  <deployable>
-	                    <artifactId>${pom.artifactId}</artifactId>
-	                    <type>war</type>
-	                    <properties>
-	                      <context>/${webapp.name}</context>
-	                    </properties>
-	                  </deployable>
-	                </deployables>
-	              </deployer>
-	            </configuration>
-	          </plugin>
-	        </plugins>
-		  </build>
+			<properties>
+				<alfresco.data.location>./alf_data</alfresco.data.location>
+				<alfresco.db.name>alf_tomcat</alfresco.db.name>
+				<log.dir></log.dir>
+			</properties>
+			<build>
+				<defaultGoal>package</defaultGoal>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.cargo</groupId>
+						<artifactId>cargo-maven2-plugin</artifactId>
+						<configuration>
+							<container>
+								<containerId>tomcat5x</containerId>
+								<type>remote</type>
+							</container>
+							<!-- Configure here your Tomcat server manager credentials -->
+							<configuration>
+								<type>runtime</type>
+								<properties>
+									<cargo.remote.username>tomcat</cargo.remote.username>
+									<cargo.remote.password>tomcat</cargo.remote.password>
+									<cargo.servlet.port>8080</cargo.servlet.port>
+								</properties>
+							</configuration>
+							<deployer>
+								<type>remote</type>
+								<deployables>
+									<deployable>
+										<artifactId>${pom.artifactId}</artifactId>
+										<type>war</type>
+										<properties>
+											<context>/${webapp.name}</context>
+										</properties>
+									</deployable>
+								</deployables>
+							</deployer>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
 	</profiles>
 </project>
diff --git a/maven-alfresco-archetypes/pom.xml b/maven-alfresco-archetypes/pom.xml
index 9fc88593..3d885cf3 100644
--- a/maven-alfresco-archetypes/pom.xml
+++ b/maven-alfresco-archetypes/pom.xml
@@ -108,12 +108,6 @@
 						</goals>
 						<id>announcement-mail</id>
 					</execution>
-					<execution>
-						<goals>
-							<goal>jira-report</goal>
-						</goals>
-						<id>jira-report</id>
-					</execution>
 				</executions>
 				<!--  Automatically notifies the list when release is done. Please supply username and password in the command line -->
 				<configuration>
@@ -194,6 +188,10 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</reporting>
 	<distributionManagement>
diff --git a/maven-alfresco-archetypes/src/site/site.xml b/maven-alfresco-archetypes/src/site/site.xml
index ac7c9d86..9e044dee 100644
--- a/maven-alfresco-archetypes/src/site/site.xml
+++ b/maven-alfresco-archetypes/src/site/site.xml
@@ -19,6 +19,7 @@
       <item name="Maven" href="http://maven.apache.org/"/>
       <item name="Apache" href="http://www.apache.org/"/>
     </links>
+	
 
     <menu name="Modules">
 	  <item name="Maven Alfresco AMP Archetype" href="../maven-alfresco-amp-archetype"/>