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 94ca3dce..8587d484 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,22 @@
 <?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"
+<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>
@@ -25,69 +25,71 @@
 	<name>Alfresco extension</name>
 	<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
+	<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
 	-->
-	<repositories>
-		<repository>
-			<id>ss-public</id>
-			<url>http://repository.sourcesense.com/maven2</url>
-		</repository>
+	<repositories>
+		<repository>
+			<id>ss-public</id>
+			<url>http://repository.sourcesense.com/maven2</url>
+		</repository>
 	</repositories>
 	<!-- 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>
+		<alfresco.db.username>alfresco</alfresco.db.username>
+		<alfresco.db.password>alfresco</alfresco.db.password>
 		<log.dir></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>
-		-->
-		<!-- 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>
-		<site_pom_url>${pom.organization.url}</site_pom_url>
-		<site_pom_groupId>${pom.groupId}</site_pom_groupId>
-		<site_pom_artifactId>${pom.artifactId}</site_pom_artifactId>
-		<site_pom_version>${pom.version}</site_pom_version>
-		<site_tags_url>${svn.tags.url}</site_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>
+		<site_pom_url>${pom.organization.url}</site_pom_url>
+		<site_pom_groupId>${pom.groupId}</site_pom_groupId>
+		<site_pom_artifactId>${pom.artifactId}</site_pom_artifactId>
+		<site_pom_version>${pom.version}</site_pom_version>
+		<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
+		|-->
 	<pluginRepositories>
 		<pluginRepository>
 			<id>codehaus snapshot repository</id>
@@ -103,24 +105,24 @@
 			<releases>
 				<enabled>false</enabled>
 			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>ss-public</id>
-			<url>http://repository.sourcesense.com/maven2</url>
-		</pluginRepository>
+		</pluginRepository>
+		<pluginRepository>
+			<id>ss-public</id>
+			<url>http://repository.sourcesense.com/maven2</url>
+		</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>
+	<!-- 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>
@@ -152,19 +154,19 @@
 			<artifactId>alfresco-remote-api</artifactId>
 			<version>2.1.0</version>
 			<scope>provided</scope>
-		</dependency>
-
-		<!-- Sample of AMP dependency that will be properly uncompressed in the Alfresco WAR (no more need for AMP): 
-			this can be either an AMP built with maven-amp-plugin and deployed on an accessible
-			maven repo or a generally available AMP previously deployed to a repo using mvn deploy:deploy-file
-			
-			<dependency>
-			<scope>runtime</scope>
-			<type>amp</type>
-			<artifactId>recordsmanagement</artifactId>
-			<version>2.1.0</version>
-			<groupId>org.alfresco.community</groupId>
-			</dependency>
+		</dependency>
+
+		<!-- Sample of AMP dependency that will be properly uncompressed in the Alfresco WAR (no more need for AMP): 
+			this can be either an AMP built with maven-amp-plugin and deployed on an accessible
+			maven repo or a generally available AMP previously deployed to a repo using mvn deploy:deploy-file
+			
+			<dependency>
+			<scope>runtime</scope>
+			<type>amp</type>
+			<artifactId>recordsmanagement</artifactId>
+			<version>2.1.0</version>
+			<groupId>org.alfresco.community</groupId>
+			</dependency>
 		-->
 
 		<!-- Comment if you're not using mysql -->
@@ -206,9 +208,9 @@
 					<exclude>**/ldap-*.xml</exclude>
 				</excludes>
 			</resource>
-			<!-- 
-				| Include application properties file in classpath: this allows Spring contexts to have customization properties available at 
-				| classpath:alfresco/extension/application.properties
+			<!-- 
+				| Include application properties file in classpath: this allows Spring contexts to have customization properties available at 
+				| classpath:alfresco/extension/application.properties
 			-->
 			<resource>
 				<directory>src/main/properties/${env}</directory>
@@ -250,10 +252,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<!--
-					<configuration>
-					<downloadSources>true</downloadSources>
-					</configuration>
+				<!--
+					<configuration>
+					<downloadSources>true</downloadSources>
+					</configuration>
 				-->
 			</plugin>
 			<!-- Add documentation locales here -->
@@ -262,70 +264,70 @@
 				<configuration>
 					<locales>en</locales>
 				</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>2.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>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<executions>
-					<!-- Runs jetty when 'integration-test' phase is called -->
-					<execution>
-						<id>it</id>
-						<phase>integration-test</phase>
-						<goals>
-							<goal>run-exploded</goal>
-						</goals>
-						<configuration>
-							<contextPath>/${webapp.name}</contextPath>
-							<webApp>${pom.build.directory}/${webapp.name}</webApp>
-							<scanIntervalSeconds>10</scanIntervalSeconds>
-							<connectors>
-								<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-									<port>8080</port>
-									<maxIdleTime>60000</maxIdleTime>
-								</connector>
-							</connectors>
-						</configuration>
-					</execution>
-				</executions>
+			<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>2.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>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<executions>
+					<!-- Runs jetty when 'integration-test' phase is called -->
+					<execution>
+						<id>it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>run-exploded</goal>
+						</goals>
+						<configuration>
+							<contextPath>/${webapp.name}</contextPath>
+							<webApp>${pom.build.directory}/${webapp.name}</webApp>
+							<scanIntervalSeconds>10</scanIntervalSeconds>
+							<connectors>
+								<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+									<port>8080</port>
+									<maxIdleTime>60000</maxIdleTime>
+								</connector>
+							</connectors>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.cargo</groupId>
@@ -342,46 +344,46 @@
 					<goals>install deploy cargo:undeploy cargo:deploy site:deploy</goals>
 					<!-- <tagBase>${svn.tags.url}</tagBase> -->
 				</configuration>
-			</plugin>
-			<!-- Adds support for books PDF and RTF generation for single sourced documentation -->
-			<plugin>
-				<groupId>org.apache.maven.doxia</groupId>
-				<artifactId>doxia-maven-plugin</artifactId>
-				<version>1.0-alpha-10</version>
-				<executions>
-					<execution>
-						<phase>pre-site</phase>
-						<goals>
-							<goal>render-books</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<!-- 
-						| 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>
-							<directory>src/site</directory>
-							<descriptor>src/books/manual.xml</descriptor>
-							<formats>
-								<format>
-									<id>xdoc</id>
-								</format>
-								<format>
-									<id>pdf</id>
-								</format>
-								<format>
-									<id>rtf</id>
-								</format>
-							</formats>
-						</book>
-					</books>
-				</configuration>
-			</plugin>
+			</plugin>
+			<!-- Adds support for books PDF and RTF generation for single sourced documentation -->
+			<plugin>
+				<groupId>org.apache.maven.doxia</groupId>
+				<artifactId>doxia-maven-plugin</artifactId>
+				<version>1.0-alpha-10</version>
+				<executions>
+					<execution>
+						<phase>pre-site</phase>
+						<goals>
+							<goal>render-books</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<!-- 
+						| 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>
+							<directory>src/site</directory>
+							<descriptor>src/books/manual.xml</descriptor>
+							<formats>
+								<format>
+									<id>xdoc</id>
+								</format>
+								<format>
+									<id>pdf</id>
+								</format>
+								<format>
+									<id>rtf</id>
+								</format>
+							</formats>
+						</book>
+					</books>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<reporting>
@@ -406,12 +408,12 @@
 			</plugin>
 			<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>
+			</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>
@@ -419,30 +421,30 @@
 			</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>
-			<id>ss-site-public</id>
-			<url>scp://repository.sourcesense.com/var/www/demo.sourcesense.com/maven2-sites</url>
-			</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>
 		-->
-		<!--
-			| 
-			| 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>
@@ -454,16 +456,16 @@
 		</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>
@@ -491,9 +493,9 @@
 				</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>
@@ -514,27 +516,27 @@
 				</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.
-				| 
+			<!--  
+				| 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>
@@ -600,25 +602,25 @@
 				</plugins>
 			</build>
 		</profile>
-		<!-- 
-			| Profile for deploying on tomcat 5.x
-			|
-			|
+		<!-- 
+			| 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 
-				|  
+			<!--  
+				| 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>
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties
index 56f9e5ae..303f4776 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/src/main/properties/local/application.properties
@@ -43,8 +43,8 @@ integrity.failOnError=true
 
 db.driver=org.gjt.mm.mysql.Driver
 db.url=jdbc:mysql://localhost/${alfresco.db.name}
-db.username=alfresco
-db.password=alfresco
+db.username=${alfresco.db.username}
+db.password=${alfresco.db.password}
 db.pool.initial=10
 db.pool.max=100