[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.0.0

- temporarily we'll use buildonly, later we need to find a better
solution 
- documented options in comments

README.md

@@ -1,10 +1,20 @@
-# [![Maven Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Maven Alfresco SDK
+# [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK
 
-Maven Alfresco SDK for Alfresco Development and Customizations based on Apache Maven. 
+SDK for Alfresco Development, Testing, packaging and custom project lifecycle management based on Apache Maven. 
 
-Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. For a teaser of the SDK potential check out this video:
+Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. 
 
-[![Alfresco SDK 2.x teaser](http://img.youtube.com/vi/vgbY9i4w0YU/0.jpg)](https://www.youtube.com/watch?v=vgbY9i4w0YU)
+## SDK 2.0.0 release candidate now in staging!
+
+We are approaching the final 2.0.0 release of the SDK (compatible with Alfresco Community 5.0.c and Enterprise 5.0). If you want early access to the release candidate build and want to participate to the testing process check [this page](https://github.com/Alfresco/alfresco-sdk/wiki/SDK-Supported-Features-and-Test-plan) and report issues [here](https://github.com/Alfresco/alfresco-sdk/issues).
+
+Once the vote is closed the SDK will be available in Maven Central. 
+
+# Check the SDK out!
+
+For an overview of the SDK potential check out this video:
+
+[![Alfresco SDK 2.x howto](http://img.youtube.com/vi/utYZaVe9Nd0/0.jpg)](https://www.youtube.com/watch?v=utYZaVe9Nd0)
 
 The SDK is composed of:
 
@@ -20,15 +30,15 @@ The SDK is composed of:
 
 ### Developer Documentation
 
-**SDK 2.x**: Full documentation is available at the [Maven Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html).
+**SDK 2.x**: Full documentation is available at the [Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html).
 
 ### Alfresco Official Documentation
 
-Additional documentation for Alfresco Community and Enterprise, tutorials and examples is available in the [Alfresco Documentation](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html).
+Additional documentation for Alfresco Community and Enterprise, tutorials and examples is available in the [Alfresco Documentation](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html).
 
 ### Samples 
 
-Advanced sample projects are maintained by @ohej in the [Maven Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
+Advanced sample projects are maintained by @ohej in the [Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
 
 
 ### Contribute
@@ -37,7 +47,7 @@ Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/
 
 ## Maven Repositories
 
-The Maven Alfresco SDK is released in Maven Central as of version 2.0-beta-1. 
+The Alfresco SDK is released in Maven Central as of version 2.0-beta-1. 
 
 Alfresco (Community and Enterprise) artifacts are instead hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/nexus/). 
 
@@ -46,10 +56,11 @@ Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publ
 for Enterprise and Premiere licensed software access you need to get credential via the Alfresco Enterprise Support. See [public docs](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html) or [this KB (login required)](https://myalfresco.force.com/support/articles/en_US/Technical_Article/Where-can-I-find-the-repository-for-Enterprise-Maven-artifacts) for more details.
 
 ## License and Support
-This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). It's a community driven project which is supported for Alfresco Development (please refere to the official [Alfresco Documentation](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html) for supported features.
+This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). It's a community driven project which is supported for Alfresco Development (please refere to the official [Alfresco Documentation](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html) for supported features.
 
 ## News
-
+- 2014-12-20: SDK 2.0.0 in staging. If you want early access to the release candidate build and want to participate to the testing process check [this page](https://github.com/Alfresco/alfresco-sdk/wiki/SDK-Supported-Features-and-Test-plan) and report issues [here](https://github.com/Alfresco/alfresco-sdk/issues).
+- 2014-09-10: SDK 2.0.0-beta-4 released to Maven Central and in the [Archetype Catalog](http://repo1.maven.org/maven2/archetype-catalog.xml)!
 - 2014-09-09: SDK 2.0.0-beta-3 released to Maven Central
 - 2014-08-30: SDK 2.0.0-beta-1 and 2.0.0-beta-2 available in [Maven Central](http://search.maven.org/#search|ga|1|org.alfresco.maven)
 - 2014-08-22: First SNAPSHOT of SDK 2.0.0 in the [OSS Sonatype Repository](https://oss.sonatype.org/content/repositories/snapshots/org/alfresco/maven/alfresco-sdk-parent/2.0.0-SNAPSHOT/)!

archetypes/alfresco-allinone-archetype/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-3</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   
@@ -22,6 +22,7 @@
             <includes>
                 <include>archetype-resources/pom.xml</include>
                 <include>archetype-resources/run.sh</include>
+                <include>archetype-resources/runner/src/main/webapp/index.html</include>
             </includes>
             <filtering>true</filtering>
         </resource>
@@ -30,6 +31,7 @@
             <excludes>
                 <exclude>archetype-resources/pom.xml</exclude>
                 <exclude>archetype-resources/run.sh</exclude>
+                <exclude>archetype-resources/runner/src/main/webapp/index.html</exclude>
             </excludes>
             <filtering>false</filtering>
         </resource>
@@ -37,7 +39,7 @@
      <plugins>
         <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="quickstart-allinone-archetype"
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="All In One Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded of Alfresco Repo, Share and Solr"
     xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <requiredProperties>
@@ -10,7 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>5.0.a</defaultValue>
+      <defaultValue>5.0.c</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>
@@ -25,6 +25,12 @@
             <include>**/*.java</include>
           </includes>
         </fileSet>
+        <fileSet filtered="false" packaged="false" encoding="UTF-8">
+          <directory>src/test/java</directory>
+          <includes>
+            <include>**/*.java</include>
+          </includes>
+        </fileSet>
         <fileSet encoding="UTF-8" filtered="false">
           <directory>src/main/amp</directory>
           <includes>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

@@ -21,13 +21,13 @@
     <properties>
         <!-- 
             | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
-            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
+            | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
         -->
-        <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
+        <!-- <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId> -->
         <!-- Defines the Alfresco version to work against.
              Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0) 
         -->
-        <alfresco.version>${alfresco_target_version}</alfresco.version>
+        <!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
         <!-- This control the root logging level for all apps -->
         <app.log.root.level>WARN</app.log.root.level>
         <!-- This controls the default data location for dir.root -->

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml

@@ -11,6 +11,12 @@
         <artifactId>${rootArtifactId}</artifactId>
         <version>${version}</version>
     </parent>
+    
+    <properties>
+        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
+        .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your custom corporate Alfresco WAR -->
+        <alfresco.client.war>alfresco</alfresco.client.war>
+    </properties>
 
     <!--
     Following dependencies are needed for compiling Java code in src/main/java; <scope>provided</scope>
@@ -25,11 +31,6 @@
         </dependency>
     </dependencies>
     
-    <properties>
-        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
-        .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your custom corporate Alfresco WAR -->
-        <alfresco.client.war>alfresco</alfresco.client.war>
-    </properties>
     <profiles>
         <!-- RM profile, manually activated, automatically adds support for RM development (dependencies) and install the RM amps in the WARs -->
         <profile>
@@ -43,6 +44,25 @@
                     <classifier>classes</classifier>
                 </dependency>
             </dependencies>
+        </profile>
+		<!-- Enterprise profile, manually activated, automatically adds support for Enterprise edition development (dependencies) -->
+        <profile>
+            <id>enterprise</id>
+            <dependencies>
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>alfresco-enterprise-repository</artifactId>
+                    <version>${alfresco.version}</version>
+                    <type>jar</type>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>run</id>
+            <properties>
+            	<skipTests>true</skipTests>
+            </properties>
         </profile>
     </profiles>
 </project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/service-context.xml

@@ -29,6 +29,8 @@
         <property name="description" value="A demonstration component" />
         <property name="sinceVersion" value="2.0" />
         <property name="appliesFromVersion" value="2.0" />
+        <property name="nodeService" ref="NodeService" />
+        <property name="nodeLocatorService" ref="nodeLocatorService" />
     </bean>
     
 </beans>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/DemoComponent.java

@@ -1,26 +1,83 @@
+/*
+    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.
+ */
 package org.alfresco.demoamp;
 
-import java.util.logging.Logger;
-
 import org.alfresco.repo.module.AbstractModuleComponent;
+import org.alfresco.repo.nodelocator.NodeLocatorService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
  * A basic component that will be started for this module.
- * This is a sample taken from Maven Alfresco SDK
+ * Uses the NodeLocatorService to easily find nodes and the 
+ * NodeService to display them
  * 
- * @author Derek Hulley
+ * @author Gabriele Columbro
+ * @author Maurizio Pillitu
  */
 public class DemoComponent extends AbstractModuleComponent
 {
-	Log log = LogFactory.getLog(DemoComponent.class);
-	
+    Log log = LogFactory.getLog(DemoComponent.class);
+    
+    private NodeService nodeService;
+    
+    private NodeLocatorService nodeLocatorService;
+
+    public void setNodeService(NodeService nodeService) {
+        this.nodeService = nodeService;
+    }
+    
+    public void setNodeLocatorService(NodeLocatorService nodeLocatorService) {
+        this.nodeLocatorService = nodeLocatorService;
+    }
+
+    /**
+     * Bogus component execution 
+     */
     @Override
     protected void executeInternal() throws Throwable
     {
         System.out.println("DemoComponent has been executed");
-        log.debug("Test debug logging is working");
-        log.info("This should not be outputted by default");
+        log.debug("Test debug logging. Congratulation your AMP is working");
+        log.info("This is only for information purposed. Better remove me from the log in Production");
+    }
+    
+    /**
+     * This is a demo service interaction with Alfresco Foundation API.
+     * This sample method returns the number of child nodes of a certain type 
+     * under a certain node.
+     * 
+     * @return
+     */
+    public int childNodesCount(NodeRef nodeRef)
+    {
+        return nodeService.countChildAssocs(nodeRef, true);
+    }
+    
+    /**
+     * Returns the NodeRef of "Company Home"
+     * 
+     * @return
+     */
+    public NodeRef getCompanyHome()
+
+    {
+        return nodeLocatorService.getNode("companyhome", null, null);
     }
 }

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/java/org/alfresco/demoamp/test/DemoComponentTest.java

@@ -0,0 +1,86 @@
+package org.alfresco.demoamp.test;
+
+
+import static org.junit.Assert.assertEquals;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.alfresco.demoamp.DemoComponent;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.apache.log4j.Logger;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.tradeshift.test.remote.Remote;
+import com.tradeshift.test.remote.RemoteTestRunner;
+
+/**
+ * A simple class demonstrating how to run out-of-container tests 
+ * loading Alfresco application context.
+ * 
+ * This class uses the RemoteTestRunner to try and connect to 
+ * localhost:4578 and send the test name and method to be executed on 
+ * a running Alfresco. One or more hostnames can be configured in the @Remote
+ * annotation.
+ * 
+ * If there is no available remote server to run the test, it falls 
+ * back on local running of JUnits.
+ * 
+ * For proper functioning the test class file must match exactly 
+ * the one deployed in the webapp (either via JRebel or static deployment)
+ * otherwise "incompatible magic value XXXXX" class error loading issues will arise.  
+ * 
+ * @author Gabriele Columbro 
+ * @author Maurizio Pillitu
+ *
+ */
+
+@RunWith(RemoteTestRunner.class)
+@Remote(runnerClass=SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:alfresco/application-context.xml")
+public class DemoComponentTest {
+    
+    private static final String ADMIN_USER_NAME = "admin";
+
+    static Logger log = Logger.getLogger(DemoComponentTest.class);
+
+    @Autowired
+    protected DemoComponent demoComponent;
+    
+    @Autowired
+    @Qualifier("NodeService")
+    protected NodeService nodeService;
+    
+    @Test
+    public void testWiring() {
+        assertNotNull(demoComponent);
+    }
+    
+    @Test
+    public void testGetCompanyHome() {
+    	AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER_NAME);
+        NodeRef companyHome = demoComponent.getCompanyHome();
+        assertNotNull(companyHome);
+        String companyHomeName = (String) nodeService.getProperty(companyHome, ContentModel.PROP_NAME);
+        assertNotNull(companyHomeName);
+        assertEquals("Company Home", companyHomeName);
+    }
+    
+    @Test
+    public void testChildNodesCount() {
+    	AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER_NAME);
+        NodeRef companyHome = demoComponent.getCompanyHome();
+        int childNodeCount = demoComponent.childNodesCount(companyHome);
+        assertNotNull(childNodeCount);
+        // There are 7 folders by default under Company Home
+        assertEquals(7, childNodeCount);
+    }
+
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml

@@ -27,7 +27,8 @@
     <dependencies>
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco</artifactId>
+            <artifactId>${alfresco.repo.artifactId}</artifactId>
+            <version>${alfresco.version}</version>
             <type>war</type>
         </dependency>
         <!-- Demonstrating the dependency / installation of the repo AMP developed in the 'repo-amp' module -->
@@ -38,12 +39,14 @@
             <type>amp</type>
         </dependency>
         <!-- Demonstrating the usage of a well known GA AMP (SharePoint Protocol Support) -->
+        <!--
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-spp</artifactId>
             <version>${alfresco.version}</version>
             <type>amp</type>
         </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -63,7 +66,7 @@
                         <!-- The Alfresco WAR -->
                         <overlay>
                             <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>alfresco</artifactId>
+                            <artifactId>${alfresco.repo.artifactId}</artifactId>
                             <type>war</type>
                             <!-- To allow inclusion of META-INF -->
                             <excludes/>
@@ -74,11 +77,13 @@
                             <artifactId>repo-amp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        <!--
                         <overlay>
                             <groupId>${alfresco.groupId}</groupId>
                             <artifactId>alfresco-spp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        -->
                     </overlays>
                 </configuration>
             </plugin>
@@ -140,15 +145,15 @@
                     </plugin>
                 </plugins>
             </build>
-            <!-- Needed to fix http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=150 -->
             <dependencies>
                 <dependency>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                    <version>1.5.11</version>
+                    <groupId>org.alfresco.maven</groupId>
+                    <artifactId>alfresco-rad</artifactId>
+                    <version>${maven.alfresco.version}</version>
                 </dependency>
             </dependencies>
         </profile>
+        <!-- Installs the needed runtime artifact for an RM (Records Management) project -->
         <profile>
             <id>rm</id>
              <properties>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml

@@ -59,7 +59,7 @@
                                 <solr.solr.home>${project.parent.basedir}/solr/solr_home</solr.solr.home>
                             </systemProperties>
                             <webapps>
-								<webapp>
+                              <webapp>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>solr</artifactId>
                                     <version>${project.version}</version>
@@ -92,6 +92,112 @@
                 </plugins>
             </build>
         </profile>
+        <!-- Runs regression tests using Alfresco Share PO (Page Object) vanilla Selenium / Webdrone driven functional test, during integration-test phase. 
+             NOTE: Assumes an already running Alfresco + Share at the default location ${app.share.url} (e.g. by invoking -Prun,regression) -->
+        <profile>
+            <id>regression</id>
+            <properties>
+                <maven.tomcat.fork>true</maven.tomcat.fork>
+                <!-- The URL Under Test -->
+                <app.share.url>http://localhost:8080/share</app.share.url>
+            </properties>
+            <build>
+                <plugins>
+                    <!-- Workaround for classloading issue in share-po (need to unpack it) -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>prepare-regression-test-resources</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifact>${alfresco.groupId}:share-po:${alfresco.version}:jar:tests</artifact>
+                                    <outputDirectory>${project.build.directory}/testng-resources</outputDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.17</version>
+                        <executions>
+                            <execution>
+                                <id>run-regression-tests</id>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <phase>integration-test</phase>
+                                <configuration>
+                                    <systemProperties>
+                                        <share.target>${app.share.url}</share.target>
+                                    </systemProperties>
+                                    <dependenciesToScan>
+                                        <dependency>${alfresco.groupId}:share-po</dependency>
+                                    </dependenciesToScan>
+                                    <additionalClasspathElements>
+                                        <additionalClasspathElement>${project.build.directory}/testng-resources</additionalClasspathElement>
+                                    </additionalClasspathElements>
+                                    <suiteXmlFiles>
+                                        <suiteXmlFile>${project.build.directory}/testng-resources/testng.xml</suiteXmlFile>
+                                    </suiteXmlFiles>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-po</artifactId>
+                    <version>${alfresco.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-po</artifactId>
+                    <version>${alfresco.version}</version>
+                    <classifier>tests</classifier>
+                </dependency>
+                <dependency>
+                    <groupId>commons-cli</groupId>
+                    <artifactId>commons-cli</artifactId>
+                    <version>1.2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                    <version>3.1.1.RELEASE</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                    <version>3.1.1.RELEASE</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                    <version>6.8.8</version>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.hamcrest</groupId>
+                            <artifactId>hamcrest-core</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        
     </profiles>
     
 </project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/log4j.properties

@@ -1,3 +0,0 @@
-# Define here logging properties for your AMP specific classes
-# This will end up in alfresco.war/WEB-INF/classes/alfresco/module/log4j.properties 
-# and loaded as per http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#log4j.properties

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml

@@ -5,6 +5,7 @@
                <autowire>
                    <mode>development</mode>
                </autowire>
+               <disable-resource-caching>true</disable-resource-caching>
            </web-framework>
        </config>
 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml

@@ -16,7 +16,8 @@
     <dependencies>
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
-            <artifactId>share</artifactId>
+            <artifactId>${alfresco.share.artifactId}</artifactId>
+            <version>${alfresco.version}</version>
             <type>war</type>
         </dependency>
         <!-- Demonstrating the dependency / installation of the share AMP developed in the 'share-amp' module -->
@@ -44,7 +45,7 @@
                         <!-- The Share WAR -->
                         <overlay>
                             <groupId>${alfresco.groupId}</groupId>
-                            <artifactId>share</artifactId>
+                            <artifactId>${alfresco.share.artifactId}</artifactId>
                             <type>war</type>
                             <!-- To allow inclusion of META-INF -->
                             <excludes/>
@@ -61,6 +62,7 @@
         </plugins>
     </build>
     <profiles>
+    	<!-- Installs the needed runtime component for an Alfresco RM (Records Management) project -->
         <profile>
             <id>rm</id>
              <properties>

archetypes/alfresco-allinone-archetype/src/site/apt/advanced-usage.apt.vm

@@ -9,7 +9,7 @@
 
 All-in-One Archetype properties
 
-    In each of the modules of the archetype (as in the whole Maven Alfresco SDK\x99) properties are configurable at many levels:
+    In each of the modules of the archetype (as in the whole Alfresco SDK\x99) properties are configurable at many levels:
     
     * as POM properties
     
@@ -36,4 +36,4 @@ Parent POM and behavior customization
     To customize the behavior of your project, check out full set of the properties and plugin configurations defined in the 
     {{{./poms/alfresco-sdk-parent/index.html}single entry point parent POM}}. 
     
-    One quick way to do that is to use the <<<maven-help-plugin:effective-pom>>> to analyze your POM at runtime. 
+    One quick way to do that is to use the <<<maven-help-plugin:effective-pom>>> to analyze your POM at runtime. 

archetypes/alfresco-allinone-archetype/src/site/apt/index.apt.vm

@@ -9,7 +9,7 @@
 Introduction
 
   The Alfresco All-in-One Archetype is a multi-module project,
-  leveraging Maven Alfresco SDK\x99 powerful capabilities to customize and run the full Alfresco platform embedded and all it's components.
+  leveraging Alfresco SDK\x99 powerful capabilities to customize and run the full Alfresco platform embedded and all it's components.
   The archetype does not require additional download and provides a perfect starting point for full-blown Alfresco projects.
 
 * Features
@@ -31,22 +31,22 @@ How to create a project:
   As of version 2.0-beta-3, you can create a project with the latest released archetype with the following command directly from Maven Central:
   
 +---+
-mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog=http://repo1.maven.org/maven2/archetype-catalog.xml
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:alfresco-allinone-archetype
 +---+
   
   For previous versions, you need to use the Alfresco Artifacts repository:
   
 +---+
-mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:alfresco-allinone-archetype -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml
 +---+
   
   You should then:
   
-  [[1]] Select the <<<alfresco-allinone-archetype>>> option
+  [[1]] Select the <<<alfresco-allinone-archetype>>> version
   
   [[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
   
-  [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
+  [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.c)
   
  You can find new Alfresco All-in-One project ready to go in the <<<artifactId>>> folder.
 

archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties

@@ -3,4 +3,4 @@ version=0.1-SNAPSHOT
 groupId=archetype.it
 artifactId=allInOneTest
 alfresco_target_groupId=org.alfresco
-alfresco_target_version=5.0.a
+alfresco_target_version=5.0.c

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties

@@ -0,0 +1,6 @@
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=allInOneTest
+alfresco_target_groupId=org.alfresco
+alfresco_target_version=5.0

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt

@@ -0,0 +1 @@
+verify -Prun -Penterprise -Dmaven.tomcat.fork=true

archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties

@@ -3,4 +3,4 @@ version=0.1-SNAPSHOT
 groupId=archetype.it
 artifactId=allInOneTest
 alfresco_target_groupId=org.alfresco
-alfresco_target_version=5.0.a
+alfresco_target_version=5.0.c

archetypes/alfresco-amp-archetype/.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

archetypes/alfresco-amp-archetype/.project

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>alfresco-amp-archetype</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

archetypes/alfresco-amp-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-3</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -38,7 +38,7 @@
       <plugins>
         <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="quickstart-amp-archetype"
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="AMP Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded an Alfresco Repo AMP"
     xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <requiredProperties>
@@ -10,16 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>5.0.a</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war">
-      <defaultValue>alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war_groupId">
-      <defaultValue>org.alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war_version">
-      <defaultValue>5.0.a</defaultValue>
+      <defaultValue>5.0.c</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

@@ -25,22 +25,27 @@
             | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco
             | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details
         -->
-        <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId>
+        <!-- <alfresco.groupId>${alfresco_target_groupId}</alfresco.groupId> -->
         <!-- Defines the Alfresco version to work against.
              Community versions are typically identified by major.minor.character (4.2.a) while Enterprise versions are identified by major.minor.digit (4.2.0)  -->
-        <alfresco.version>${alfresco_target_version}</alfresco.version>
+        <!-- <alfresco.version>${alfresco_target_version}</alfresco.version>-->
         <app.log.root.level>WARN</app.log.root.level>
         <alfresco.data.location>alf_data_dev</alfresco.data.location>
-        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
-        .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your foundation WAR -->
-        <alfresco.client.war>${alfresco_target_amp_client_war}</alfresco.client.war>
-        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war switch
-        .    | Could be org.alfresco or your corporate groupId -->
-        <alfresco.client.war.groupId>${alfresco_target_amp_client_war_groupId}</alfresco.client.war.groupId>
-        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
-        <alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>
         <!-- This controls which properties will be picked in src/test/properties for embedded run -->
         <env>local</env>
+        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war profile
+             | Defaults to a vanilla repository AMP, but could point to your foundation / aggregator WAR 
+        .    | Allowed values for Community: alfresco | share
+             | Allowed values for Enterprise: alfresco-enterprise | share-enterprise
+             <alfresco.client.war>${alfresco.repo.artifactId}</alfresco.client.war> -->
+        <!-- Context path to run alfresco on -->
+        <alfresco.client.contextPath>/alfresco</alfresco.client.contextPath>
+        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war switch
+        .    | Could be org.alfresco or your corporate groupId -->
+        <!-- <alfresco.client.war.groupId>${alfresco.groupId}</alfresco.client.war.groupId> -->
+        
+        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
+        <!-- <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version>-->
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform 
@@ -69,5 +74,18 @@
             <artifactId>alfresco-repository</artifactId>
         </dependency>
     </dependencies>
-  
+    <profiles>
+    	<!-- Enterprise profile, manually activated, automatically adds support for Enterprise edition development (dependencies) -->
+        <profile>
+            <id>enterprise</id>
+            <dependencies>
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>alfresco-enterprise-repository</artifactId>
+                    <version>${alfresco.version}</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh

@@ -6,4 +6,4 @@ if [ ! -f $springloadedfile ]; then
 mvn validate -Psetup
 fi
 
-MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Prun
+MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Pamp-to-war

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/log4j.properties

@@ -1,4 +0,0 @@
-# Define here logging properties for your AMP specific classes
-# This will end up in alfresco.war/WEB-INF/classes/alfresco/module/log4j.properties 
-# and loaded as per http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#log4j.properties
-log4j.logger.org.alfresco.demoamp=DEBUG

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties

@@ -20,12 +20,17 @@
 
 # Sample custom content and index data location
 # This will create alf_data Relative to appserver run folder
-# In this default file we take the property from the POM (for compatbility with local tomcat and jboss deployments) but it can also be edited here.
+# In this default file we take the property from the POM (for compatibility with local tomcat and jboss deployments) but it can also be edited here.
 dir.root=${alfresco.data.location}
 # Allowed values are: NONE, AUTO, FULL
 index.recovery.mode=NONE
 # As we run embedded, we set Lucene
-index.subsystem.name=lucene
+# TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon
+#index.subsystem.name=noindex
+#index.subsystem.name=solr
+#index.subsystem.name=solr4
+index.subsystem.name=buildonly
+
 
 #dir.keystore=.
 #keystore.password=storepassword
@@ -50,4 +55,4 @@ cifs.enabled=false
 
 ftp.enabled=false
 ftp.port=1121
-ftp.authenticator=alfresco
+ftp.authenticator=alfresco

archetypes/alfresco-amp-archetype/src/site/apt/index.apt.vm

@@ -36,18 +36,18 @@ How to create a project:
   As of version 2.0-beta-3, you can create a project with the latest released archetype with the following command directly from Maven Central:
   
 +---+
-mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog=http://repo1.maven.org/maven2/archetype-catalog.xml
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:alfresco-amp-archetype
 +---+
   
   For previous versions, you need to use the Alfresco Artifacts repository:
   
 +---+
-mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:alfresco-amp-archetype -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml
 +---+
   
   You should then:
   
-  [[1]] Select the <<<alfresco-amp-archetype>>> option
+  [[1]] Select the <<<alfresco-amp-archetype>>> version
   
   [[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
   
@@ -62,7 +62,7 @@ Quickstart
    * Enter the project folder and run <<<./run.sh>>> (you might need to <<<chmod u+x run.sh>>> to make it executable). 
      This will setup the SDK and the Alfresco repository (not Share or Solr).  
     
-   * Wait for the startup of the webapp and then go <<<http://localhost:8080/alfresco0>>>.
+   * Wait for the startup of the webapp and then go <<<http://localhost:8080/alfresco>>>.
   
    * Import the project in your favorite IDE (with Maven integration) and start developing right away.
    

archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties

@@ -2,10 +2,10 @@
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.a
+alfresco_target_version=5.0.c
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
 alfresco_target_amp_client_war=alfresco
 alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.a
+alfresco_target_amp_client_war_version=5.0.c
 artifactId=basic

archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties

@@ -2,10 +2,10 @@
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.a
+alfresco_target_version=5.0.c
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
 alfresco_target_amp_client_war=alfresco
 alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.a
+alfresco_target_amp_client_war_version=5.0.c
 artifactId=basic

archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties

@@ -0,0 +1,8 @@
+#Tue Oct 30 14:23:01 CET 2012
+groupId=archetype.it
+artifactId=enterprise
+version=0.1-SNAPSHOT
+package=it.pkg
+$=cat archetype.properties
+alfresco_target_groupId=org.alfresco
+alfresco_target_version=5.0

archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt

@@ -0,0 +1 @@
+verify -Pamp-to-war -Penterprise -Dmaven.tomcat.fork=true

archetypes/share-amp-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-3</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -38,7 +38,7 @@
       <plugins>
         <plugin>
             <artifactId>maven-resources-plugin</artifactId>
-            <version>2.6</version>
+            <version>2.7</version>
             <configuration>
                 <useDefaultDelimiters>false</useDefaultDelimiters>
                 <delimiters>

archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="quickstart-amp-archetype"
+<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="Share AMP Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded an Alfresco Share AMP"
     xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <requiredProperties>
@@ -10,16 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>5.0.a</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war">
-      <defaultValue>share</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war_groupId">
-      <defaultValue>org.alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war_version">
-      <defaultValue>5.0.a</defaultValue>
+      <defaultValue>5.0.c</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>

archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml

@@ -23,8 +23,8 @@
     <properties>
         <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
         | Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
-        <alfresco.client.war>share</alfresco.client.war>
-
+        <alfresco.client.war>${alfresco.share.artifactId}</alfresco.client.war>
+        <alfresco.client.contextPath>/share</alfresco.client.contextPath>
         <!-- Since Alfresco is already running on port 8080, we run Share on port 8081 -->
         <maven.tomcat.port>8081</maven.tomcat.port>
 
@@ -35,7 +35,8 @@
              Community versions are typically identified by major.minor.character (4.2.a), 
              while Enterprise versions are identified by major.minor.digit (4.2.0)
         -->
-        <alfresco.version>${alfresco_target_version}</alfresco.version>
+		<!--<alfresco.version>${alfresco_target_version}</alfresco.version>-->
+        
         <!-- Defines the log level used in log4j.properties -->
         <app.log.root.level>WARN</app.log.root.level>
         
@@ -58,21 +59,35 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <!-- Following dependencies are needed for compiling Java code in src/main/java; 
-         <scope>provided</scope> is inherited for each of the following; 
-         for more info, please refer to alfresco-platform-distribution POM -->
+    <!-- Following dependencies are needed for compiling Java code in src/main/java;  -->
     <dependencies>
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-repository</artifactId>
+            <artifactId>share</artifactId>
+            <version>${alfresco.version}</version>
+            <classifier>classes</classifier>
+            <scope>provided</scope>
         </dependency>
-
         <dependency>
           <groupId>org.springframework.extensions.surf</groupId>
           <artifactId>spring-surf-api</artifactId>
           <scope>provided</scope>
-        </dependency>
-        
+        </dependency>        
     </dependencies>
-    
+
+    <profiles>
+    	<!-- Enterprise profile, manually activated, automatically adds support for Enterprise edition development (dependencies) -->
+        <profile>
+            <id>enterprise</id>
+            <dependencies>
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-enterprise</artifactId>
+                    <version>${alfresco.version}</version>
+                    <classifier>classes</classifier>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/log4j.properties

@@ -1,3 +0,0 @@
-# Define here logging properties for your AMP specific classes
-# This will end up in alfresco.war/WEB-INF/classes/alfresco/module/log4j.properties 
-# and loaded as per http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#log4j.properties

archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample

@@ -1,4 +1,4 @@
-<!-- Alfresco 5.0.a share-config-custom.xml sample --> 
+<!-- Alfresco 5.0.c share-config-custom.xml sample --> 
 <alfresco-config>
 
    <!-- Global config section -->
@@ -420,4 +420,4 @@
    </config>
    -->
    
-</alfresco-config>
+</alfresco-config>

archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/advanced-usage.apt.vm

@@ -16,7 +16,7 @@ AMP Unit Testing
 
 Share AMP Archetype properties
 
-    In the AMP archetype (as in the whole Part of the Maven Alfresco SDK\x99) properties are configurable at many levels:
+    In the AMP archetype (as in the whole Part of the Alfresco SDK\x99) properties are configurable at many levels:
     
     * as POM properties
     
@@ -59,4 +59,4 @@ Parent POM and behavior customization
     {{{../../poms/alfresco-sdk-parent/index.html}single entry point parent POM}}.
     
     One quick way to do that is to use the <<<maven-help-plugin:effective-pom>>> to analyze your POM at runtime.
-    
+    

archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm

@@ -42,7 +42,7 @@ mvn archetype:generate -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/c
   
   [[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
   
-  [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
+  [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.c)
   
  You can find new Share AMP project ready to go in the <<<artifactId>>> folder.
 

archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml

@@ -5,6 +5,7 @@
                <autowire>
                    <mode>development</mode>
                </autowire>
+               <disable-resource-caching>true</disable-resource-caching>
            </web-framework>
        </config>
 

archetypes/share-amp-archetype/src/site/apt/index.apt.vm

@@ -32,21 +32,21 @@ How to create a project:
   As of version 2.0-beta-3, you can create a project with the latest released archetype with the following command directly from Maven Central:
   
 +---+
-mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog=http://repo1.maven.org/maven2/archetype-catalog.xml
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:share-amp-archetype
 +---+
   
   For previous versions, you need to use the Alfresco Artifacts repository:
   
 +---+
-mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:share-amp-archetype -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml
 +---+ 
   You should then:
   
-  [[1]] Select the <<<share-amp-archetype>>> option
+  [[1]] Select the <<<share-amp-archetype>>> version
   
   [[2]] Specify the <<<groupId>>> and <<<artifactId>>> for the project you want to create
   
-  [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
+  [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.c)
   
  You can find new Share AMP project ready to go in the <<<artifactId>>> folder.
 

archetypes/share-amp-archetype/src/test/resources/projects/basic/archetype.properties

@@ -2,10 +2,10 @@
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.a
+alfresco_target_version=5.0.c
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
 alfresco_target_amp_client_war=share
 alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.a
+alfresco_target_amp_client_war_version=5.0.c
 artifactId=basic

archetypes/share-amp-archetype/src/test/resources/projects/run-basic/archetype.properties

@@ -2,10 +2,10 @@
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.a
+alfresco_target_version=5.0.c
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
 alfresco_target_amp_client_war=share
 alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.a
+alfresco_target_amp_client_war_version=5.0.c
 artifactId=basic

archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties

@@ -0,0 +1,8 @@
+#Tue Oct 30 14:23:01 CET 2012
+groupId=archetype.it
+artifactId=basic
+version=0.1-SNAPSHOT
+$=cat archetype.properties
+package=it.pkg
+alfresco_target_groupId=org.alfresco
+alfresco_target_version=5.0

archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt

@@ -0,0 +1 @@
+verify -Pamp-to-war -Penterprise -Dmaven.tomcat.fork=true

modules/alfresco-rad/pom.xml

@@ -9,7 +9,7 @@
   <parent>
       <groupId>org.alfresco.maven</groupId>
       <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.0.0-beta-3</version>
+      <version>2.0.0</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

modules/alfresco-rad/src/main/java/org/alfresco/maven/rad/RemoteRunnerWrapper.java

@@ -8,7 +8,7 @@ public class RemoteRunnerWrapper implements Runnable {
 		try {
 	        RemoteServer.main(new String []{});
         } catch (Exception e) {
-	        System.out.println("Could not start JUnit remoteServer");
+	        System.out.println("Could not start JUnit remoteServer because of: " + e.getMessage());
         }
 
 	}

plugins/alfresco-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
   <parent>
       <groupId>org.alfresco.maven</groupId>
       <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.0.0-beta-3</version>
+      <version>2.0.0</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -17,10 +17,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
+        <version>3.2</version>
         <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <source>1.7</source>
+            <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
@@ -37,6 +37,40 @@
         </executions>
       </plugin>
     </plugins>
+    <pluginManagement>
+    	<plugins>
+    		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+    		<plugin>
+    			<groupId>org.eclipse.m2e</groupId>
+    			<artifactId>lifecycle-mapping</artifactId>
+    			<version>1.0.0</version>
+    			<configuration>
+    				<lifecycleMappingMetadata>
+    					<pluginExecutions>
+    						<pluginExecution>
+    							<pluginExecutionFilter>
+    								<groupId>
+    									org.apache.maven.plugins
+    								</groupId>
+    								<artifactId>
+    									maven-plugin-plugin
+    								</artifactId>
+    								<versionRange>[3.2,)</versionRange>
+    								<goals>
+    									<goal>helpmojo</goal>
+    									<goal>descriptor</goal>
+    								</goals>
+    							</pluginExecutionFilter>
+    							<action>
+    								<ignore />
+    							</action>
+    						</pluginExecution>
+    					</pluginExecutions>
+    				</lifecycleMappingMetadata>
+    			</configuration>
+    		</plugin>
+    	</plugins>
+    </pluginManagement>
   </build>
 
   <dependencies>
@@ -79,7 +113,7 @@
     <dependency>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-mmt</artifactId>
-      <version>5.0.a</version>
+      <version>5.0.c</version>
     </dependency>
     <dependency>
         <groupId>org.alfrescolabs.alfresco-technical-validation</groupId>
@@ -93,7 +127,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.3</version>
       </plugin>
     </plugins>
   </reporting>

plugins/alfresco-maven-plugin/src/site/apt/usage.apt.vm

@@ -10,13 +10,13 @@ How to use this plugin?
 
   There are fundamentally 3 methods to use this plugin:
   
-  [[1]] Using Archetypes provided in the Maven Alfresco SDK
+  [[1]] Using Archetypes provided in the Alfresco SDK
     
-  [[2]] By using the Maven Alfresco SDK Parent POM
+  [[2]] By using the Alfresco SDK Parent POM
   
   [[3]] Via direct configuration in your POM
   
-* Method 1 - Using Maven Alfresco SDK Archetypes
+* Method 1 - Using Alfresco SDK Archetypes
 
   Two sample archetypes already use the plugin and provide best practice example on how to use it:
   
@@ -27,9 +27,9 @@ How to use this plugin?
   
  This is the <<recommended>> and less error-prone way of using the plugin.
  
-* Method 2 - Using Maven Alfresco SDK Parent POM
+* Method 2 - Using Alfresco SDK Parent POM
 
-  The {{{../../poms/alfresco-sdk-parent/index.html}Maven Alfresco SDK Parent POM}} provides a single entry point for all SDK features.
+  The {{{../../poms/alfresco-sdk-parent/index.html}Alfresco SDK Parent POM}} provides a single entry point for all SDK features.
   
   By using it as parent as follows:
   
@@ -96,4 +96,4 @@ How to use this plugin?
   </build>
   [...]
 </project>
-+---+ 
++---+ 

pom.xml

@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-3</version>
-    <name>Maven Alfresco SDK</name>
-    <description>This aggregator Project builds all modules required for
-        the Maven Alfresco SDK</description>
+    <version>2.0.0</version>
+    <name>Alfresco SDK</name>
+    <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>
 
     <url>${maven.site.url}</url>
@@ -31,7 +30,7 @@
         <connection>scm:git:${scm.url.base}.git</connection>
         <developerConnection>scm:git:${scm.url.base}</developerConnection>
         <url>${scm.url.base}</url>
-      <tag>alfresco-sdk-aggregator-2.0.0-beta-3</tag>
+      <tag>alfresco-sdk-aggregator-2.0.0</tag>
   </scm>
 
     <developers>
@@ -103,7 +102,7 @@
         </contributor>
     </contributors>
 
-    <!-- All the modules of the Maven Alfresco SDK -->
+    <!-- All the modules of the Alfresco SDK -->
     <modules>
         <!-- Modules -->
         <module>modules/alfresco-rad</module>
@@ -131,6 +130,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-archetype-plugin</artifactId>
                     <version>${maven.archetype.version}</version>
+                    <configuration>
+                        <skip>${skipTests}</skip>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -170,7 +172,7 @@
             <id>sdk-release</id>
             <properties>
                 <maven.site.url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest</maven.site.url>
-                <maven.release.version>2.5</maven.release.version>
+                <maven.release.version>2.5.1</maven.release.version>
                 <maven.release.goals>deploy site-deploy</maven.release.goals>
                 <maven.site.version>3.4</maven.site.version>
                 <maven.changes.version>2.10</maven.changes.version>
@@ -180,7 +182,7 @@
                      <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
+                        <version>2.4</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -193,7 +195,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
+                        <version>2.10.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -273,6 +275,39 @@
                 </site>
             </distributionManagement>
         </profile>
+        <!-- Attempt (failed) to retain run.sh permissions. Zip files are bad at this, full stop.
+        <profile>
+            <id>set-executables-permissions</id>
+            <activation>
+                <file>
+                    <exists>src/main/resources/archetype-resources/run.sh</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>set-executable-resources</id>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>process-resources</phase>
+                                <configuration>
+                                    <target>
+                                        <chmod file="${project.build.outputDirectory}/archetype-resources/run.sh" perm="755" />
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>                
+                </plugins>
+            </build>
+        </profile>
+         -->
     </profiles>
 
 </project>

poms/alfresco-sdk-parent/pom.xml

@@ -14,12 +14,12 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-3</version>
+    <version>2.0.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <!-- This defines the version of the SDK in terms of features -->
-  <version>2.0.0-beta-3</version>
+  <version>2.0.0</version>
 
   <prerequisites>
     <maven>3.2.2</maven>
@@ -29,24 +29,26 @@
     <!--  Default Alfresco version this SDK version has been tested with:
         |
         | alfresco.groupId can be
-        | org.alfresco ==> Alfresco community
-        | org.alfresco.enterprise ==> Alfresco Enterprise
+        | org.alfresco ==> Alfresco Community/Enterprise (post alfresco 4.2)
+        | org.alfresco.enterprise ==> Alfresco Enterprise (pre Alfresco 4.2)
         |
         | NOTE: You can / should override these properties in you POM to select the proper version
         |
         | For available versions please search on https://artifacts.alfresco.com/nexus/index.html
         -->
     <alfresco.groupId>org.alfresco</alfresco.groupId>
-    <alfresco.version>5.0.a</alfresco.version>
+    <alfresco.version>5.0.c</alfresco.version>
+    <!-- By default uses community artifacts (alfresco|share). Overridden in the 'enterprise' profile, with 'alfresco-enterprise' and 'share-enterprise' -->
+    <alfresco.repo.artifactId>alfresco</alfresco.repo.artifactId>
+    <alfresco.share.artifactId>share</alfresco.share.artifactId>
 
     <!--  Values can be "alfresco" or "share". Default value is 'alfresco' assuming you are developing a repository AMP, change to share for share AMPs
         | This impact (in AMP projects) the choice of the WAR project for embedded run
          -->
-    <alfresco.client.war>alfresco</alfresco.client.war>
+    <alfresco.client.war>${alfresco.repo.artifactId}</alfresco.client.war>
     <alfresco.client.war.groupId>${alfresco.groupId}</alfresco.client.war.groupId>
     <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version>
-    <alfresco.client.contextPath>/${alfresco.client.war}</alfresco.client.contextPath>
-
+    
     <!-- IMPORTANT! Override this only if you know what you're doing; it could break amp-to-war overlay -->
     <alfresco.client.war.folder>${project.build.directory}/${project.build.finalName}-war</alfresco.client.war.folder>
 
@@ -96,30 +98,35 @@
          -->
     <app.log.dir>${project.build.directory}/</app.log.dir>
     <app.log.root.level>WARN</app.log.root.level>
+    
+    <!-- Needed for community to avoid weird logging exceptions -->
+    <app.slf4j.scope>runtime</app.slf4j.scope>
+    <app.slf4j.version>1.5.11</app.slf4j.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Maven Plugins Versions used by the SDK -->
-    <maven.compiler.version>3.1</maven.compiler.version>
-    <maven.clean.version>2.5</maven.clean.version>
-    <maven.dependency.version>2.8</maven.dependency.version>
+    <maven.compiler.version>3.2</maven.compiler.version>
+    <maven.clean.version>2.6.1</maven.clean.version>
+    <maven.dependency.version>2.9</maven.dependency.version>
     <maven.enforcer.plugin>1.3.1</maven.enforcer.plugin>
-    <maven.resources.version>2.6</maven.resources.version>
-    <maven.surefire.version>2.16</maven.surefire.version>
-    <maven.install.version>2.5.1</maven.install.version>
-    <maven.jar.version>2.4</maven.jar.version>
-    <maven.war.version>2.4</maven.war.version>
-    <maven.release.version>2.4.2</maven.release.version>
-    <maven.buildhelper.version>1.8</maven.buildhelper.version>
+    <maven.resources.version>2.7</maven.resources.version>
+    <maven.surefire.version>2.18</maven.surefire.version>
+    <maven.install.version>2.5.2</maven.install.version>
+    <maven.jar.version>2.5</maven.jar.version>
+    <maven.war.version>2.5</maven.war.version>
+    <maven.antrun.version>1.7</maven.antrun.version>
+    <maven.release.version>2.5.1</maven.release.version>
+    <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
     <maven.replacer.version>1.5.3</maven.replacer.version>
-    <maven.tomcat.version>2.1</maven.tomcat.version>
+    <maven.tomcat.version>2.2</maven.tomcat.version>
     <!-- This is used for the site deployment procedure (override in your POM as needed) -->
     <stagingDirectory>../../target/staging/poms/alfresco-sdk-parent</stagingDirectory>
     <!-- Maven Alfresco plugin in use throughout the SDK -->
-    <maven.alfresco.version>2.0.0-beta-3</maven.alfresco.version>
-    <h2.version>1.3.174</h2.version>
-    <h2-support.version>1.5</h2-support.version>
+    <maven.alfresco.version>2.0.0</maven.alfresco.version>
+    <h2.version>1.4.182</h2.version>
     <junit.version>4.11</junit.version>
+    <maven.jetty.version>7.4.0.v20110414</maven.jetty.version>
   </properties>
 
   <!-- This repository is only needed to retrieve Alfresco parent POM. 
@@ -131,6 +138,17 @@
         if you are a Enterprise customer or Partner  
         -->
     <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <name>Sonatype Snapshot Repo</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
         <repository>
             <id>alfresco-public</id>
             <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
@@ -146,6 +164,14 @@
     </repositories>
 
   <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+      </snapshots>
+    </pluginRepository>
     <pluginRepository>
       <id>alfresco-plugin-public</id>
       <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
@@ -194,6 +220,7 @@
               <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
               <nonFilteredFileExtension>png</nonFilteredFileExtension>
               <nonFilteredFileExtension>gif</nonFilteredFileExtension>
+              <nonFilteredFileExtension>svg</nonFilteredFileExtension>
               <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
               <nonFilteredFileExtension>doc</nonFilteredFileExtension>
               <nonFilteredFileExtension>docx</nonFilteredFileExtension>
@@ -206,6 +233,11 @@
               <nonFilteredFileExtension>swf</nonFilteredFileExtension>
               <nonFilteredFileExtension>zip</nonFilteredFileExtension>
               <nonFilteredFileExtension>msg</nonFilteredFileExtension>
+              <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+              <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+              <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+              <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+              <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
             </nonFilteredFileExtensions>
           </configuration>
         </plugin>
@@ -259,6 +291,11 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>${maven.jar.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>${maven.antrun.version}</version>
+        </plugin>
         <plugin>
           <groupId>com.google.code.maven-replacer-plugin</groupId>
           <artifactId>replacer</artifactId>
@@ -278,11 +315,6 @@
                     <artifactId>h2</artifactId>
                     <version>${h2.version}</version>
                 </dependency>
-                <dependency>
-                    <groupId>tk.skuro.alfresco</groupId>
-                    <artifactId>h2-support</artifactId>
-                    <version>${h2-support.version}</version>
-                </dependency>
                 <!-- Major performance improvement,
                 see http://mindthegab.com/2013/06/20/maven-is-not-so-evil-plexus-archives-2-3-is-a-life-saver-for-the-speed-of-your-war-development-with-maven/ -->
                 <dependency>
@@ -343,6 +375,7 @@
     </testResources>
   </build>
 
+
   <!-- Feature / behavioral profiles -->
   <profiles>
     <!-- Enable environment properties filtering based on the env property -->
@@ -508,29 +541,6 @@
                   <version>${maven.alfresco.version}</version>
                   <scope>test</scope>
               </dependency>
-              <!--
-              |    Requires this explicit test dependency, for a Spring 3.0.5 bug
-              |    See https://jira.springsource.org/browse/SPR-8527
-              -->
-              <dependency>
-                  <groupId>org.springframework</groupId>
-                  <artifactId>spring-context</artifactId>
-                  <version>3.0.6.RELEASE</version>
-                  <scope>provided</scope>
-              </dependency>
-              <!-- SDK AMP Testing Dependencies -->
-              <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-                <scope>test</scope>
-              </dependency>
-              <dependency>
-                <groupId>tk.skuro.alfresco</groupId>
-                <artifactId>h2-support</artifactId>
-                <version>${h2-support.version}</version>
-                <scope>test</scope>
-              </dependency>
     	</dependencies>
     </profile>
 
@@ -665,22 +675,18 @@
         </plugins>
       </build>
       <dependencies>
-        <!-- Needed to fix http://code.google.com/p/maven-alfresco-archetypes/issues/detail?id=150 -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.5.11</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.5.11</version>
-        </dependency>
+
 		<dependency>
 			<groupId>org.alfresco.maven</groupId>
 			<artifactId>alfresco-rad</artifactId>
 			<version>${maven.alfresco.version}</version>
 		</dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${maven.jetty.version}</version>
+        </dependency>
+
       </dependencies>
     </profile>
 
@@ -779,5 +785,198 @@
             </plugins>
        </build>
     </profile>
+    
+    <!--
+    	 Enables working with Alfresco Enterprise latest version. You can then manually override the alfresco.version in your pom.xml 
+    -->
+    <profile>
+        <id>enterprise</id>
+        <properties>
+            <alfresco.version>5.0</alfresco.version>
+            <alfresco.repo.artifactId>alfresco-enterprise</alfresco.repo.artifactId>
+            <alfresco.share.artifactId>share-enterprise</alfresco.share.artifactId>
+            <!-- Not needed in the webapp for enterprise -->
+			<app.slf4j.scope>provided</app.slf4j.scope>                        
+        </properties>
+        <repositories>
+            <repository>
+                <id>alfresco-internal</id>
+                <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
+            </repository>
+        </repositories>
+    </profile>
+    <!-- EXPERIMENTAL: Invokes the Alfresco Technical Validation tool at https://github.com/AlfrescoLabs/technical-validation -->
+    <profile>
+        <id>atv</id>
+        <properties>
+            <maven.alfresco.validation.skip>false</maven.alfresco.validation.skip>
+            <maven.alfresco.validation.sourceLocation>${project.build.directory}/${project.build.finalName}-src</maven.alfresco.validation.sourceLocation>
+        </properties>
+        <build>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>isolate-project-src</id>
+                            <phase>generate-resources</phase>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${maven.alfresco.validation.sourceLocation}</outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>${project.basedir}</directory>
+                                        <excludes>
+                                            <exclude>target</exclude>
+                                        </excludes>
+                                        <filtering>${app.filtering.enabled}</filtering>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.alfresco.maven.plugin</groupId>
+                    <artifactId>alfresco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>run-atv</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>validate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>de.herschke</groupId>
+                    <artifactId>neo4j-maven-plugin</artifactId>
+                    <version>2.0.2-20140827</version>
+                    <executions>
+                        <execution>
+                            <id>start-neo4j-server</id>
+                            <phase>post-integration-test</phase>
+                            <goals>
+                                <goal>start-server</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>stop-neo4j-server</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>stop-server</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <port>7474</port>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+    <!-- Configures automatic embedded H2 database support for repository amps (if a test alfresco-global.properties is found) -->
+    <!-- TODO: Improve this, either by producing this dialect upstream or consolidating behavior in a parent pom (current only activation clause changes) -->
+    <profile>
+        <id>config-h2-support</id>
+        <activation>
+            <file>
+                <exists>src/test/properties/local/alfresco-global.properties</exists>
+            </file>
+        </activation>
+        <build>
+            <plugins>
+                <!-- Copied PostgreSQL dialect files to generate H2 dialect files on-the-fly -->
+                <plugin>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>extract-postgres-dialect</id>
+                            <phase>generate-test-resources</phase>
+                            <goals>
+                                <goal>unpack</goal>
+                            </goals>
+                            <configuration>
+                                <artifactItems>
+                                    <artifactItem>
+                                        <groupId>${alfresco.groupId}</groupId>
+                                        <artifactId>alfresco-repository</artifactId>
+                                        <version>${alfresco.version}</version>
+                                        <includes>alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/dbscripts/upgrade/*/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/*</includes>
+                                        <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                                    </artifactItem>
+                                </artifactItems>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>generate-h2-dialect</id>
+                            <phase>generate-test-resources</phase>
+                            <goals>
+                                <goal>copy-resources</goal>
+                            </goals>
+                            <configuration>
+                                <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+                                <resources>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/create/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/ibatis/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                    <!-- Upgrade scripts -->
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                </resources>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>  
+        </build>
+        <dependencies>
+              <!-- h2 Dependency -->
+              <dependency>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>${h2.version}</version>
+                <scope>test</scope>
+              </dependency>
+        </dependencies>
+    </profile>
   </profiles>
 </project>

poms/alfresco-sdk-parent/src/site/apt/index.apt.vm

@@ -8,14 +8,14 @@
 
 Introduction
 
-  The Maven Alfresco SDK Parent POM ${project.version} is the <<<single entry point>>> for all Maven Alfresco SDK\x99 features.
+  The Alfresco SDK Parent POM ${project.version} is the <<<single entry point>>> for all Alfresco SDK\x99 features.
   It aggregates plugin configurations and dependencies to provide a set of profiles and properties to manage the full Alfresco projects Lifecycle on Maven.
   
-  The current version of the POM in use in the Maven Alfresco SDK\x99 ${project.version} is available {{{https://oss.sonatype.org/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}on Maven Central}}.
+  The current version of the POM in use in the Alfresco SDK\x99 ${project.version} is available {{{https://oss.sonatype.org/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}on Maven Central}}.
     
 Usage
   
-  You can reference Maven Alfresco SDK POM in your POM adding the following snippet:
+  You can reference Alfresco SDK POM in your POM adding the following snippet:
 
 +---+
 <project>
@@ -29,7 +29,7 @@ Usage
 </project>
 +---+
 
-  This will reference the Maven Alfresco SDK project as <<<parent>>> project, allowing you to inherit all SDK features.
+  This will reference the Alfresco SDK project as <<<parent>>> project, allowing you to inherit all SDK features.
   Full dependency information for other build systems can be found in the {{{./dependency-info.html} Dependency Info page}}.
   
   Features are provided in terms of {{{./sdk-profiles.html} Maven profiles}}, and high configurability is provided with 
@@ -38,4 +38,4 @@ Usage
 * Examples / archetypes
 
   To kickstart your SDK experience and to provide examples on how to use it, archetypes are available already using this POM.
-  Check the menu item <SDK Components> for more samples.
+  Check the menu item <SDK Components> for more samples.

poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm

@@ -1,38 +1,44 @@
   ------
-  Maven Alfresco SDK\x99 Profiles
+  Alfresco SDK\x99 Profiles
   ------
   Gabriele Columbro
   ------
-  Nov 2012
+  Aug 2014
   ------
    
 SDK Available Profiles
 
-    The Maven Alfresco SDK\x99 defines common features required by different Alfresco projects.
+    The Alfresco SDK\x99 defines common features required by different Alfresco projects.
     While the <<<recommended>>> way is to use full working examples of usage of these profiles (e.g. the
-    {{{../../archetypes/alfresco-amp-archetype/index.html}AMP}} and {{{../../archetypes/alfresco-allinone-archetype/index.html}All-in-One}} archetypes),
+    {{{../../archetypes/alfresco-amp-archetype/index.html}Repo AMP}},     {{{../../archetypes/share-amp-archetype/index.html}Share AMP} and {{{../../archetypes/alfresco-allinone-archetype/index.html}All-in-One}} archetypes),
     you can also directly use this POM as a parent in your custom project.
     
     Here goes the list of common used profiles (with their activation conditions):     
 
+
 *-----------+--------------+-------------+-------------+-------------+
 || Archetypes || Profile  || Description || Activation || Phase      |
 *-----------+--------------+-------------+-------------+-------------+
 | amp, share-amp | amp-to-war         |  Allows AMP projects to be run embedded on a WAR and in rapid dev mode    |  Manual: <<<-Pamp-to-war>>>       | pre-integration-test |
 *-----------*--------------*-------------*-------------*-------------+
-| any |purge              |  Cleans all alf_data and logs from Alfresco runs      |  Manual: <<<-Ppurge>>>            | clean |
-*-----------*--------------*-------------*-------------*-------------+
 | all-in-one |  run | Runs embedded Alfresco + Share + Solr in rapid dev mode                           | Manual: <<<-Prun>>>   | pre-integration-test |
 *-----------*--------------*-------------*-------------*-------------+
-| all-in-one | rm   |  Adds Records Management runtime and compile time dependencies                              |  Manual: <<<-Prm>>>   | package |
+| any | purge              |  Cleans all alf_data and logs from Alfresco runs      |  Manual: <<<-Ppurge>>>            | clean |
+*-----------*--------------*-------------*-------------*-------------+
+| any | enterprise   |Configures your build to use Alfresco Enterprise. Obtain your credentials with {{{https://support.alfresco.com}Alfresco Support}}| Manual: <<<-Penterprise>>>   | N/A |
 *-----------+--------------+-------------+-------------+-------------+
 | any | setup   | Sets up the sdk, e.g. grabs springloaded. | Manual: <<<-Psetup>>> (automated in the run.sh)   | initialize |
 *-----------+--------------+-------------+-------------+-------------+
-| amp, share-amp | atv   |  (Experimental) Invokes the {{{https://github.com/AlfrescoLabs/technical-validation/}Alfresco Technical Validation tool}} | Manual: <<<-Patv>>>   | validate |
+| all-in-one | rm   |  Adds Records Management runtime and compile time dependencies                              |  Manual: <<<-Prm>>>   | package |
 *-----------+--------------+-------------+-------------+-------------+
-    
+| all-in-one | regression   | (Experimental) Invokes the Alfresco {{{https://github.com/AlfrescoLabs/technical-validation/}Share PO}} Webdrone / Selenium based regression tests| Manual: <<<-Pregression>>>   | integration-test |
+*-----------+--------------+-------------+-------------+-------------+
+| amp, share-amp | atv   | (Experimental) Invokes the {{{https://github.com/AlfrescoLabs/technical-validation/}Alfresco Technical Validation tool}} | Manual: <<<-Patv>>>   | validate |
+*-----------+--------------+-------------+-------------+-------------+
+
+
     The full list of available profiles (with their activation conditions) can be instead found in the <<<profiles>>> section of the
-    {{{https://artifacts.alfresco.com/nexus/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}Maven Alfresco SDK POM}}.
+    {{{https://artifacts.alfresco.com/nexus/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}Alfresco SDK POM}}.
 
 Full SDK properties reference 
 
@@ -41,4 +47,4 @@ Full SDK properties reference
     Check the {{{https://artifacts.alfresco.com/nexus/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}current POM version}} for this.
     
     While in certain cases it might be useful to override defaults, make sure you know what you're doing, 
-    as you might be <<breaking>> SDK conventions and therefore <<your build>>
+    as you might be <<breaking>> SDK conventions and therefore <<your build>>

poms/alfresco-sdk-parent/src/site/apt/sdk-properties.apt.vm

@@ -1,5 +1,5 @@
   ------
-  Maven Alfresco SDK Properties
+  Alfresco SDK Properties
   ------
   Gabriele Columbro
   ------
@@ -20,7 +20,7 @@ Common SDK properties
        -->
     <properties>
         <alfresco.groupId>org.alfresco</alfresco.groupId>
-        <alfresco.version>4.2.b</alfresco.version>
+        <alfresco.version>5.0.c</alfresco.version>
         <!-- Defines root logger log level for testing and embedded run -->
         <app.log.root.level>WARN</app.log.root.level>
         <!-- Logging dir. Note the trailing slash is required -->

poms/alfresco-sdk-parent/src/site/site.xml

@@ -2,7 +2,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </skin>
     
     <custom>

src/site/apt/index.apt.vm

@@ -1,5 +1,5 @@
   ------
-  Maven Alfresco SDK\x99
+  Alfresco SDK\x99
   ------
   Gabriele Columbro
   ------
@@ -8,24 +8,24 @@
 
 Introduction
 
-  The (Maven) Maven Alfresco SDK\x99  - formerly {{{https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/maven-alfresco-lifecycle/latest/index.html} Alfresco Lifecycle 3.9.1}} -
+  The Alfresco SDK\x99  - formerly Maven Alfresco SDK\x99, formerly {{{https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/maven-alfresco-lifecycle/latest/index.html} Alfresco Lifecycle 3.9.1}} -
   provides a fully fledged Maven support for {{{http://www.alfresco.com}Alfresco ECM}} WAR and {{{https://wiki.alfresco.com/wiki/AMP_Files}AMP}} project development.
   Being fully integrated with Maven it allows to both leverage the vast number of Maven plugins for your Alfresco project as well as integrated your
   project easily in Open Source and Enterprise development processes.
 
-  The Maven Alfresco SDK\x99 is fully documented in the single components websites (see menu above).
+  The Alfresco SDK\x99 is fully documented in the single components websites (see menu above).
   For official (Enterprise) support of this SDK please refer to the features and tutorials documented in {{{http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html}the Official Alfresco Documentation}}.
  
 How to Use the SDK
 
   The easiest way to use the SDK is to create a sample project using one of the available <<archetypes>> (Repo AMP, Share AMP, All in One).
   
-  You can also use the Maven Alfresco SDK Parent POM directly in your Maven project to inherit Alfresco behaviors and configurations.
+  You can also use the Alfresco SDK Parent POM directly in your Maven project to inherit Alfresco behaviors and configurations.
   
   
 SDK Versions 
   
-  As of version 2.0, releases for the Maven Alfresco SDK are available in Maven Central.
+  As of version 2.0, releases for the Alfresco SDK are available in Maven Central.
   
   Maven Alfresco SDK 1.x versions rely on the {{{https://artifacts.alfresco.com/nexus/content/groups/public/}Alfresco Artifacts Repository}}.
   For documentation on the Maven Alfresco SDK\x99 1.x please refer to {{{https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-lifecycle-aggregator/latest/index.html} Maven Alfresco SDK 1.x}}
@@ -35,14 +35,20 @@ SDK Alfresco Compatibility
   Please refer to the {{{http://docs.alfresco.com/community/concepts/alfresco-sdk-compatibility.html}official Alfresco docs}} for details of SDK / Alfresco compatibility.  
   
   
-Maven Alfresco SDK\x99 components
+Alfresco SDK\x99 components
 
-  The Maven Alfresco SDK relies on a number of components:
+  The Alfresco SDK relies on a number of components:
 
   * {{{./poms/alfresco-sdk-parent/index.html}The SDK parent POM}} providing full Alfresco project lifecycle feature, to be added as a <<<<parent>>>> in your projects
 
-  * Archetypes like the {{{./archetypes/alfresco-amp-archetype/index.html}Repo AMP}}, {{{./archetypes/share-amp-archetype/index.html}Share AMP}} or {{{./archetypes/alfresco-allinone-archetype/index.html}All-in-One}} providing sample project to kickstart your Alfresco development and boost it with best practices
-  
+  * Archetypes providing sample project to kickstart your Alfresco development and boost it with best practices
+
+      * the {{{./archetypes/alfresco-amp-archetype/index.html}Repo AMP}}, a single project that customizes Alfresco Repository
+
+      * the {{{./archetypes/share-amp-archetype/index.html}Share AMP}}, a single project that customizes Alfresco Share 
+
+      * the {{{./archetypes/alfresco-allinone-archetype/index.html}All-in-One}}, a multi-module project to customize and run all components
+
   * The {{{./plugins/alfresco-maven-plugin/index.html} Maven Alfresco Plugin}} to manage AMP packaging and dependencies
   
   * {{{https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest}Alfresco Platform Distribution POM}} can (optionally) be used to provide centralized <<<<dependencyManagement>>>> on a particular Alfresco version / edition (Community / Enterprise)  
@@ -79,4 +85,4 @@ Project History
 
   * The new Maven Alfresco SDK 1.0 is released and presented on Tuesday 7 November at {{{http://devcon.alfresco.com/}Alfresco DevCon}} in Berlin.
   
-  * The new Maven Alfresco SDK 2.0 is released and presented on late 2014 November and released on Maven Central
+  * The new Alfresco SDK 2.0 is released and presented on late 2014 November and released on Maven Central

src/site/apt/prerequisites.apt.vm

@@ -1,5 +1,5 @@
   ------
-  Maven Alfresco SDK Prerequisites
+  Alfresco SDK Prerequisites
   ------
   Gabriele Columbro
   ------
@@ -7,10 +7,10 @@
   ------
 
 
-Maven Alfresco SDK\x99 Pre-Requisites
+Alfresco SDK\x99 Pre-Requisites
 
 
-    The only real prerequisite of the Maven Alfresco SDK\x99 Apache Maven 3.0.4 installed (and properly configured) on your machine;
+    The only real prerequisite of the Alfresco SDK\x99 Apache Maven 3.0.4 installed (and properly configured) on your machine;
     neither <<an IDE>> nor <<web container or database>> are required.
     
     Additional tips:
@@ -27,6 +27,8 @@ Maven Alfresco SDK\x99 Pre-Requisites
      Alfresco platform is retrieved automatically from {{{https://artifacts.alfresco.com} the Alfresco Artifacts Repository}}
      based on the <<<alfresco.groupId>>> and <<<alfresco.version>>> POM properties 
 
+    * If you're an Alfresco customer, you can setup a ~/.m2/settings.xml as documented on {{{http://docs.alfresco.com/4.2/tasks/dev-extensions-maven-sdk-tutorials-configure-maven-enterprise.html} Alfresco Docs page}} and specify <<<-Penterprise>>> on your Maven build command to use the latest Alfresco Enterprise version
+
 
 Enable hot class reload with spring-loaded
 
@@ -44,7 +46,7 @@ H2 Embedded Support Pre-Requisites
     the open source effort {{{https://github.com/skuro/alfresco-h2-support} Alfresco H2 Support}}. This bridge allows to emulate
     Alfresco expected DB behavior and is therefore very specific to every Alfresco version.
     
-    Maven Alfresco SDK\x99 ${project.version} uses version 1.5 of the Alfresco H2 Support. In case you experience
+    Alfresco SDK\x99 ${project.version} uses version 1.5 of the Alfresco H2 Support. In case you experience
     issues with the embedded DB support, please check the {{{https://github.com/skuro/alfresco-h2-support/wiki/H2-Database-support-for-Alfresco} H2 Support Compatibility matrix}}.
 
     Alternatively, you can easily setup your DB access by defining {{{./poms/alfresco-sdk-parent/sdk-properties.html}POM properties}}

src/site/apt/why.apt.vm

@@ -8,14 +8,14 @@
 
 Rationale
 
-  The Maven Alfresco SDK introduces a new way of conceiving software development, deployment and release of Alfresco related projects and artifacts.
+  The Alfresco SDK introduces a new way of conceiving software development, deployment and release of Alfresco related projects and artifacts.
   In contrast to the manual (and error prone) deployment approach based on an installer / Alfresco WAR distribution(s) and the <infamous> <<<${extensionRoot}>>>,
-  the Maven Alfresco SDK provides a unified access to fine grained Artifacts (jar,war,pom files),] that can be easily integrated
+  the Alfresco SDK provides a unified access to fine grained Artifacts (jar,war,pom files),] that can be easily integrated
   in your project by the means of Alfresco-specific Maven components and configurations. The main goal of this SDK is to 
   enable rapid development and prototyping of Alfresco projects, while enabling agile development practices (i.e. TDD, FDD)
   and fostering process reuse due to standardization
   
-Why would you use the Maven Alfresco SDK\x99?
+Why would you use the Alfresco SDK\x99?
 
   As a standard de facto, Maven allows you projects to be inherently more reusable and enables <process reuse> of your development practices,
   and, in certain successful cases, Application Lifecycle Management process at large.
@@ -43,4 +43,4 @@ Why would you use the Maven Alfresco SDK\x99?
     
     * One mvn command to generate, one mvn command to run embedded, this is all you need to do to have a local Alfresco running on an empty laptop
 
-    * Supports community and enterprise seamlessly, allowing to switch one between versions / edition easily. 
+    * Supports community and enterprise seamlessly, allowing to switch one between versions / edition easily. 

src/site/site.xml

@@ -2,7 +2,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
     </skin>
     <custom>
         <fluidoSkin>
@@ -46,24 +46,24 @@
             
             </script>
         </head>
-        <menu name="Maven Alfresco SDK">
+        <menu name="Alfresco SDK">
             <item name="Introduction" href="index.html"/>
-            <item name="Maven Alfresco SDK Prerequisites" href="prerequisites.html" />
+            <item name="Alfresco SDK Prerequisites" href="prerequisites.html" />
             <item name="Why using SDK?" href="./why.html" />
         </menu>
 
         <menu name="SDK components">
-            <item name="Maven Alfresco SDK" href="./index.html" />
+            <item name="Alfresco SDK" href="./index.html" />
             <item name="Alfresco AMP Archetype" href="./archetypes/alfresco-amp-archetype/index.html" />
             <item name="Share AMP Archetype" href="./archetypes/alfresco-amp-archetype/index.html" />
             <item name="Alfresco All-in-One Archetype" href="./archetypes/alfresco-allinone-archetype/index.html" />
-            <item name="Maven Alfresco SDK Parent POM" href="./poms/alfresco-sdk-parent/index.html" />
+            <item name="Alfresco SDK Parent POM" href="./poms/alfresco-sdk-parent/index.html" />
             <item name="Alfresco Platform Distribution POM" href="https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest/index.html" />
             <item name="Maven Alfresco Plugin" href="./plugins/alfresco-maven-plugin/index.html" />
         </menu>
 
         <menu name="Community Documentation">
-            <item name="Official Maven Alfresco SDK Documnetation" href="http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html" />
+            <item name="Official Alfresco SDK Documentation" href="http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html" />
             <item name="Maven Alfresco Wiki Documentation" href="http://wiki.alfresco.com/wiki/Maven_Alfresco_SDK" />
             <item name="Alfresco with Maven for Dummies" href="https://wiki.alfresco.com/wiki/Maven_For_Dummies" />
             <item name="Developer Access (Google Code)" href="http://code.google.com/p/maven-alfresco-archetypes/" />