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

Alfresco 5.0.1 supports Java 8, but Maven Compiler settings are hardcode...

README.md

@@ -1,28 +1,61 @@
-# [![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
 
-The Alfresco SDK based on Apache Maven, includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. 
+SDK for Alfresco Development, Testing, packaging and custom project lifecycle management based on Apache Maven. 
 
-It is composed of:
+Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. 
+
+## SDK 2.0.0 available in Maven Central
+
+The SDK 2.0.0 is finally [released in Maven Central](http://search.maven.org/#search|ga|1|alfresco%20sdk). 
+
+- *To create a new Alfresco project*: Run a 
+
+```bash
+mvn archetype:generate -Dfilter=org.alfresco:
+```
+
+and use one of the available archetypes (AMP, Share AMP, All in One)
+
+- *To use the SDK in your project:*  Add the below parent reference snippet to the existing project (*NOTE*: you might need folder layout changes) to inherit features from Alfresco SDK POM:
+
+```xml
+<parent>
+   <groupId>org.alfresco.maven</groupId>
+   <artifactId>alfresco-sdk-parent</artifactId>
+   <version>2.0.0</version>
+</parent>
+
+```
+## Resources 
+
+### Alfresco Official Docs
+
+- Documentation for the SDK on Alfresco Community (latest) is available [here](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
+
+- Documentation for the SDK on Alfresco Enterprise (5.0) is available [here](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
+
+### Developer Documentation
+
+**SDK 2.x**: Full developer (Maven) documentation is available at the [Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html).
+
+
+
+# Check the SDK in action!
+
+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:
 
 - An [SDK Parent POM](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/poms/alfresco-sdk-parent/index.html) which you can use in your projects to enable rapid Alfresco development features
 - An [Alfresco Platform Distribution POM](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-platform-distribution/latest/index.html) which pre-configures versions of Alfresco and common 3rd party dependency libraries, for stability purposes
-- An Alfresco [Maven Plugin](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/plugins/alfresco-maven-plugin/index.html) which provides AMP packaging and installation facitilites (a la MMT) and other common goals for Alfresco development
+- A [Maven Alfresco Plugin](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/plugins/alfresco-maven-plugin/index.html) which provides AMP packaging and installation facilities (a la MMT) and other common goals for Alfresco development
 - A number of *Maven Archetypes* (sample projects) including:
 	1. [Alfresco Repository AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-amp-archetype/index.html)
 	2. [Alfresco Share AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/share-amp-archetype/index.html)
 	3. [Alfresco All-in-One Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-allinone-archetype/index.html)
 
-## Resources 
-
-### Developer docs
-
-**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 1.x**: Full documentation is available at the [Maven Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/index.html).
-
-### Alfresco Official docs
-
-Additional documentation for Alfresco Community and Enterprise, tutorials and examples is available in the [Alfresco Docs](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html).
 
 ### Samples 
 
@@ -31,21 +64,26 @@ Advanced sample projects are maintained by @ohej in the [Alfresco SDK Samples pr
 
 ### Contribute
 
-Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open). You can also join the [Maven Alfresco list on Google Groups](https://groups.google.com/forum/#!forum/maven-alfresco).
+Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open). You can also join the [Alfresco list on Google Groups](https://groups.google.com/forum/#!forum/maven-alfresco).
 
 ## Maven Repositories
 
-The Alfresco Maven 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/). 
+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/). 
 
 Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available. 
 
 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 Docs](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/)!
-- 2014-07: Project fully migrated from [Google Code](https://code.google.com/p/maven-alfresco-archetypes), including tags, branches, issues. Allow a little time for a full cleanup of issue labels and to sort repository permissions. Please update obsolete references and bear with us as we update Alfresco Docs to this change.
+- 2014-07: Project fully migrated from [Google Code](https://code.google.com/p/maven-alfresco-archetypes), including tags, branches, issues. Allow a little time for a full cleanup of issue labels and to sort repository permissions. Please update obsolete references and bear with us as we update Alfresco Documentation to this change.
 

archetypes/alfresco-allinone-archetype/pom.xml

@@ -5,13 +5,13 @@
   <groupId>org.alfresco.maven.archetype</groupId>
   <artifactId>alfresco-allinone-archetype</artifactId>
   <packaging>maven-archetype</packaging>
-  <name>All-in-One Archetype from Maven Alfresco SDK</name>
+  <name>Maven Alfresco SDK - All-in-One Archetype</name>
   <description>Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository WAR overlay, Repository AMP, Share WAR overlay, Solr configuration, and embedded Tomcat runner</description>
   
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-2</version>
+    <version>2.1.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   
@@ -21,6 +21,10 @@
             <directory>src/main/resources</directory>
             <includes>
                 <include>archetype-resources/pom.xml</include>
+                <include>archetype-resources/run.sh</include>
+                <include>archetype-resources/run.bat</include>
+                <include>archetype-resources/runner/src/main/webapp/index.html</include>
+                <include>META-INF/maven/archetype-metadata.xml</include>
             </includes>
             <filtering>true</filtering>
         </resource>
@@ -28,14 +32,19 @@
             <directory>src/main/resources</directory>
             <excludes>
                 <exclude>archetype-resources/pom.xml</exclude>
+                <exclude>archetype-resources/run.sh</exclude>
+                <exclude>archetype-resources/run.bat</exclude>
+                <exclude>archetype-resources/runner/src/main/webapp/index.html</exclude>
+                <exclude>META-INF/maven/archetype-metadata.xml</exclude>
             </excludes>
             <filtering>false</filtering>
         </resource>
     </resources>
+
      <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,166 +1,168 @@
 <?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"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <requiredProperties>
-    <requiredProperty key="version">
-      <defaultValue>1.0-SNAPSHOT</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_groupId">
-      <defaultValue>org.alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_version">
-      <defaultValue>5.0.a</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="package">
-      <defaultValue>(not used)</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
-  <modules>
-    <module id="repo-amp" dir="repo-amp" name="repo-amp">
-      <fileSets>
-        <fileSet filtered="false" packaged="false" encoding="UTF-8">
-          <directory>src/main/java</directory>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/amp</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/amp/config/alfresco/extension/templates/webscripts</directory>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/test/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/test/properties</directory>
-          <includes>
-            <include>**/*.properties</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>tomcat</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-    </module>
-    <module id="share-amp" dir="share-amp" name="share-amp">
-      <fileSets>
-        <fileSet filtered="false" packaged="false" encoding="UTF-8">
-          <directory>src/main/java</directory>
-          <includes>
-            <include>**/*.java</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/amp</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/test/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/test/properties</directory>
-          <includes>
-            <include>**/*.properties</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>tomcat</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-    </module>
-    
-    <module id="repo" dir="repo" name="repo">
-      <fileSets>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/properties</directory>
-          <includes>
-            <include>**/*.properties</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-    </module>
-    
-    <module id="solr" dir="solr" name="solr" filtered="false">
-      <fileSets>
+<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>
+        <requiredProperty key="version">
+            <defaultValue>1.0-SNAPSHOT</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
+    <modules>
+        <module id="repo-amp" dir="repo-amp" name="repo-amp">
+            <fileSets>
+                <fileSet filtered="true" packaged="true" encoding="UTF-8">
+                    <directory>src/main/java</directory>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="true" 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>
+                        <include>**</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/*-context.xml</exclude>
+                    </excludes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="true" packaged="false">
+                    <directory>src/main/amp</directory>
+                    <includes>
+                        <include>**/*-context.xml</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/test/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/test/properties</directory>
+                    <includes>
+                        <include>**/*.properties</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
+
+        <module id="share-amp" dir="share-amp" name="share-amp">
+            <fileSets>
+                <fileSet filtered="true" packaged="true" encoding="UTF-8">
+                    <directory>src/main/java</directory>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="true" encoding="UTF-8">
+                    <directory>src/test/java</directory>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/main/amp/config/alfresco/web-extension</directory>
+                    <includes>
+                        <include>*.xml</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/amp</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/test/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
+
+        <module id="repo" dir="repo" name="repo">
+            <fileSets>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/properties</directory>
+                    <includes>
+                        <include>**/*.properties</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
+
+        <module id="solr4" dir="solr-config" name="solr4" filtered="false">
+        </module>
+
+        <module id="share" dir="share" name="share" filtered="false">
+            <fileSets>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/test/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
+
+        <module id="runner" dir="runner" name="runner" filtered="false">
+            <fileSets>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>tomcat</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>test-ng</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>src/main/webapp</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
+    </modules>
+
+    <fileSets>
         <fileSet encoding="UTF-8">
-          <directory>src/main/solr-properties</directory>
-          <includes>
-            <include>**</include>
-            <include>**</include>
-          </includes>
+            <directory></directory>
+            <includes>
+                <include>run.sh</include>
+                <include>run.bat</include>
+            </includes>
         </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/webapp</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-    </module>
-    
-    <module id="share" dir="share" name="share" filtered="false">
-      <fileSets>
-        <fileSet encoding="UTF-8">
-          <directory>src/main/properties</directory>
-          <includes>
-            <include>**/*.properties</include>
-          </includes>
-        </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
-          <directory>src/main/resources</directory>
-          <includes>
-            <include>**</include>
-          </includes>
-        </fileSet>
-      </fileSets>
-    </module>
-    <module id="runner" dir="runner" name="runner" filtered="false">
-        <fileSets>
-            <fileSet encoding="UTF-8" filtered="false">
-              <directory>tomcat</directory>
-              <includes>
-                <include>**</include>
-              </includes>
-            </fileSet>
-        </fileSets>
-    </module>
-  </modules>
+    </fileSets>
 </archetype-descriptor>

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

@@ -1,64 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>Quickstart of Alfresco and Share with DB and runner embedded</name>
-    <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr, AMPs) in one project</description>
-    <packaging>pom</packaging>    
+    <name>Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.</name>
+    <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
+    </description>
+    <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-parent</artifactId>
         <version>@@alfresco.sdk.parent.version@@</version>
     </parent>
-    
-    <!-- 
-       | SDK properties have sensible defaults in the SDK parent, but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+
+    <!-- 
+       SDK properties have sensible defaults in the SDK parent,
+       but you can override the properties below to use another version.
+       For more available properties see the alfresco-sdk-parent POM.
        -->
     <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
-        -->
-        <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) 
+        <!-- The following are default values for data location, Alfresco Community version, and Records Management Module version.
+             Uncomment if you need to change (Note. current default version for Enterprise edition is @@alfresco.enterprise.default.version@@)
+          <alfresco.version>@@alfresco.community.default.version@@</alfresco.version>
+          <alfresco.rm.version>@@alfresco.rm.version@@</alfresco.rm.version>
+          <alfresco.data.location>alf_data_dev</alfresco.data.location> -->
+
+        <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
+            <app.log.root.level>WARN</app.log.root.level>
         -->
-        <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 -->
-        <alfresco.data.location>alf_data_dev</alfresco.data.location>
-        <!-- This controls which properties will be picked in multi-enviromment build -->
+
+        <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
+             for embedded run, defaults to the 'local' environment. See SDK Parent POM for more info.
         <env>local</env>
+        -->
+
+        <!-- The Alfresco Share web application is accessible via this URL -->
+        <share.client.url>http://localhost:8080/share</share.client.url>
     </properties>
 
-   <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
-   <dependencyManagement>
-     <dependencies>
-          <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
-               (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
-               NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
-               NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom   
-           -->
-          <dependency>
-              <groupId>${alfresco.groupId}</groupId>
-              <artifactId>alfresco-platform-distribution</artifactId>
-              <version>${alfresco.version}</version>
-              <type>pom</type>
-              <scope>import</scope>
-          </dependency>
-     </dependencies>
-  </dependencyManagement>
+    <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
+    <dependencyManagement>
+        <dependencies>
+            <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco plaftorm
+                 (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies)
+                 NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement.
+                 NOTE: It defaults to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom
+             -->
+            <dependency>
+                <groupId>${alfresco.groupId}</groupId>
+                <artifactId>alfresco-platform-distribution</artifactId>
+                <version>${alfresco.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <!-- Compress JavaScript files and store as *-min.js -->
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>yuicompressor-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
-    <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE. 
-         See 'run' profile in the sub modules pom.xml for further behavioral details.
-     -->
     <profiles>
         <profile>
+            <!-- Invoke your build with -Prun to run the multimodule project and enable rapid dev mode in your IDE.
+                 See 'run' profile in the sub modules pom.xml for further behavioral details.
+             -->
             <id>run</id>
             <properties>
                 <!-- While running in rapid dev mode with -Prun, we don't want amp web resources 
@@ -68,5 +87,4 @@
             </properties>
         </profile>
     </profiles>
-    
 </project>

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

@@ -2,38 +2,63 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
-    <name>Alfresco repository AMP Module</name>
+    <name>Alfresco Repository AMP Module</name>
     <packaging>amp</packaging>
-    <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR module</description>
+    <description>This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR aggregator</description>
 
     <parent>
         <groupId>${groupId}</groupId>
         <artifactId>${rootArtifactId}</artifactId>
         <version>${version}</version>
     </parent>
+    
+    <properties>
+        <!-- Property overrides are mostly done in parent pom -->
+    </properties>
 
-    <!--
-    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-integration-parent
-    POM definition
-    @TODO - document
-    -->
+    <!-- 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 -->
     <dependencies>
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
+
+        <!-- Uncomment if you are using RM (Records Management) module, brings in RM related classes -->
+        <!--
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-rm</artifactId>
+            <version>${alfresco.rm.version}</version>
+            <classifier>classes</classifier>
+        </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>
-        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war profile
-        .    | Could be org.alfresco or your corporate groupId -->
-        <!-- <alfresco.client.war.groupId>org.alfresco</alfresco.client.war.groupId> -->
-        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war profile -->
-        <!-- <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version> -->
-    </properties>
-    
+
+    <profiles>
+
+        <!--
+            Brings in the extra Enterprise specific repository classes,
+            if the 'enterprise' profile has been activated, needs to be activated manually. -->
+        <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>
+
+        <!-- If we are running in embedded Tomcat skip unit tests -->
+        <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/extension/templates/webscripts/helloworld.get.desc.xml

@@ -1,5 +1,5 @@
 <webscript>
-    <shortname>Javascript Sample Webscript</shortname>
+    <shortname>Hello World Sample Webscript</shortname>
     <description>Hands back a greeting</description>
     <url>/sample/helloworld</url>
     <authentication>user</authentication>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl

@@ -0,0 +1 @@
+Message: ${fromJS} ${fromJava}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js

@@ -0,0 +1 @@
+model["fromJS"] = "Hello World from JS!";

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.html.ftl

@@ -1 +0,0 @@
-Message: ${message}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.js

@@ -1 +0,0 @@
-model["message"] = "Hello World!";

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties

@@ -0,0 +1,5 @@
+## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module.
+## Define default values for all properties here.
+## System Administrators can override these values in environment specific configurations in
+## alfresco/tomcat/shared/classes/alfresco-global.properties.
+##

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

@@ -0,0 +1,27 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <!-- The bootstrap-context.xml file is used for patch definitions, importers, 
+		 workflow, and loading custom content models.  -->
+
+
+    <!-- Registration of new models -->
+    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
+                <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
+
+            </list>
+        </property>
+    </bean>
+	
+
+
+</beans>

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

@@ -1,34 +1,38 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements.  See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You under the Apache License, Version 2.0
-	(the "License"); you may not use this file except in compliance with
-	the License.  You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-	
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	contributor license agreements.  See the NOTICE file distributed with
+	this work for additional information regarding copyright ownership.
+	The ASF licenses this file to You under the Apache License, Version 2.0
+	(the "License"); you may not use this file except in compliance with
+	the License.  You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
 -->
 <beans>
     
     <!-- A simple class that is initialized by Spring -->
-    <bean id="changeMe.exampleBean" class="org.alfresco.demoamp.Demo" init-method="init" />
+    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
     
     <!-- A simple module component that will be executed once -->
-    <bean id="changeMe.exampleComponent" class="org.alfresco.demoamp.DemoComponent" parent="module.baseComponent" >
+    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
         <property name="moduleId" value="${project.artifactId}" />  <!-- See module.properties -->
         <property name="name" value="exampleComponent" />
         <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/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml

@@ -0,0 +1,27 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	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.
+-->
+<beans>
+	<bean id="webscript.helloworld.get"
+		  class="${package}.demoamp.HelloWorldWebScript"
+		  parent="webscript">
+	</bean>
+</beans>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+    <!-- Optional meta-data about the model -->
+    <description>Document Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco System Model Definitions -->
+        <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+
+</model>

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+    <!-- Optional meta-data about the model -->
+    <description>Workflow Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco Workflow Model Definitions -->
+        <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+</model>
+

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

@@ -15,11 +15,14 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 	
--->
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-	
-    <import resource="classpath:alfresco/module/${artifactId}/context/service-context.xml" />
-    
-</beans>
+-->
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+    <!-- This is filtered by Maven at build time, so that module name is single sourced. -->
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />
+
+</beans>

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

@@ -1,8 +1,11 @@
-package org.alfresco.demoamp;
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.demoamp;
 
 /**
  * This class does nothing except dump some output to <i>system.out</i>.
- * This is a sample taken from Alfresco SDK
+ * This is a sample taken from Maven Alfresco SDK
  * 
  * @author Derek Hulley
  */

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

@@ -1,20 +1,23 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
 /*
-    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;
+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 ${package}.demoamp;
 
 import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -25,54 +28,51 @@ import org.apache.commons.logging.LogFactory;
 
 /**
  * A basic component that will be started for this module.
- * Uses the NodeLocatorService to easily find nodes and the 
+ * Uses the NodeLocatorService to easily find nodes and the
  * NodeService to display them
- * 
+ *
  * @author Gabriele Columbro
  * @author Maurizio Pillitu
  */
-public class DemoComponent extends AbstractModuleComponent
-{
+public class DemoComponent extends AbstractModuleComponent {
     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 
+     * Bogus component execution
      */
     @Override
-    protected void executeInternal() throws Throwable
-    {
+    protected void executeInternal() throws Throwable {
         System.out.println("DemoComponent has been executed");
         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 
+     * This sample method returns the number of child nodes of a certain type
      * under a certain node.
-     * 
+     *
      * @return
      */
-    public int childNodesCount(NodeRef nodeRef)
-    {
+    public int childNodesCount(NodeRef nodeRef) {
         return nodeService.countChildAssocs(nodeRef, true);
     }
-    
+
     /**
      * Returns the NodeRef of "Company Home"
-     * 
+     *
      * @return
      */
     public NodeRef getCompanyHome()

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

@@ -0,0 +1,43 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+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 ${package}.demoamp;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A demonstration Java controller for the Hello World Web Script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 2.1.0
+ */
+public class HelloWorldWebScript extends DeclarativeWebScript {
+    protected Map<String, Object> executeImpl(
+            WebScriptRequest req, Status status, Cache cache) {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("fromJava", "HelloFromJava");
+        return model;
+    }
+}

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

@@ -1,26 +0,0 @@
-package org.alfresco.demoamp;
-
-import java.util.logging.Logger;
-
-import org.alfresco.repo.module.AbstractModuleComponent;
-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 Alfresco SDK
- * 
- * @author Derek Hulley
- */
-public class DemoComponent extends AbstractModuleComponent
-{
-	Log log = LogFactory.getLog(DemoComponent.class);
-	
-    @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");
-    }
-}

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

@@ -1,11 +1,12 @@
-package org.alfresco.demoamp.test;
-
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+package ${package}.demoamp.test;
 
 import static org.junit.Assert.assertEquals;
-
 import static org.junit.Assert.assertNotNull;
 
-import org.alfresco.demoamp.DemoComponent;
+import ${package}.demoamp.DemoComponent;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -41,7 +42,6 @@ import com.tradeshift.test.remote.RemoteTestRunner;
  * @author Maurizio Pillitu
  *
  */
-
 @RunWith(RemoteTestRunner.class)
 @Remote(runnerClass=SpringJUnit4ClassRunner.class)
 @ContextConfiguration("classpath:alfresco/application-context.xml")

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

@@ -13,23 +13,21 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+########################################################################################################################
+# Alfresco configuration for running locally
+#
+# Configuration when running Tomcat embedded from Maven.
+# This will create the alf_data_dev directory relative to Tomcat run folder.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
 
-
-# RUN TIME PROPERTIES
-# -------------------
-
-# 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 jetty 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
-# This is default. Allowed values are: solr, lucene, noindex
-index.subsystem.name=solr
 
-#dir.keystore=.
-#keystore.password=storepassword
-#metadata.password=metapassword
+# Use Solr4 as that is used by default with Alfresco 5
+index.subsystem.name=solr4
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
 
 # Fail or not when there are node integrity checker errors
 integrity.failOnError=true
@@ -41,17 +39,9 @@ db.username=${alfresco.db.username}
 db.password=${alfresco.db.password}
 db.pool.initial=10
 db.pool.max=100
+hibernate.dialect=org.hibernate.dialect.H2Dialect
 
 # File servers related properties
-# For local builds we disable CIFS and FTP. Edit the following property to reenable them
-smb.server.enabled=false
-smb.server.name=CFS_SHARE_LOCAL
-smb.server.domain=mycompany.com
-smb.server.bindto=127.0.0.1
-smb.tcpip.port=1445
-netbios.session.port=1139
-netbios.name.port=1137
-netbios.datagram.port=1138
-ftp.server.enables=false
-ftp.port=1121
-ftp.authenticator=alfresco
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false

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

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is included only when running this project with -Pamp-to-war -->
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
-
-
-  <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" description="The fully qualified name of a org.hibernate.dialect.Dialect subclass that allows Hibernate to generate SQL optimized for a particular relational database. Choose from org.hibernate.dialect.DerbyDialect, org.hibernate.dialect.MySQLInnoDBDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" description="Enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve natively generated keys after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier generators. By default, tries to determine the driver capabilities using connection metadata."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" description="Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be necessary to set this when the target database has more than one schema."/>
-   -->
-   
-  <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
-  <JarScanner scanAllDirectories="true" />
-  
-</Context>

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

@@ -9,14 +9,14 @@
     License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
     OF ANY KIND, either express or implied. See the License for the specific 
     language governing permissions and limitations under the License. -->
-    
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
-    <name>Alfresco Repository and Explorer Client</name>
+    <name>Alfresco Repository WAR Aggregator</name>
     <packaging>war</packaging>
-    <description>Alfresco Repository and Explorer Client, installs your AMPs in the Alfresco WAR for aggregation purposes</description>
+    <description>Alfresco Repository aggregator, installs your repository AMPs in the Alfresco WAR for aggregation and easy deployment purposes</description>
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -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 -->
@@ -37,13 +38,24 @@
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
-        <!-- Demonstrating the usage of a well known GA AMP (SharePoint Protocol Support) -->
+        <!-- Uncomment if you are using SPP (SharePoint Protocol Support) for Online Edit etc -->
+        <!--
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-spp</artifactId>
             <version>${alfresco.version}</version>
             <type>amp</type>
         </dependency>
+        -->
+        <!-- Uncomment if you are using the RM (Records Management) module. -->
+        <!--
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-rm</artifactId>
+            <version>${alfresco.rm.version}</version>
+            <type>amp</type>
+        </dependency>
+        -->
     </dependencies>
 
     <build>
@@ -63,7 +75,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,16 +86,28 @@
                             <artifactId>repo-amp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        <!-- Uncomment if you are using SPP -->
+                        <!--
                         <overlay>
                             <groupId>${alfresco.groupId}</groupId>
                             <artifactId>alfresco-spp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        -->
+                        <!-- Uncomment if you are using RM -->
+                        <!--
+                        <overlay>
+                            <groupId>${alfresco.groupId}</groupId>
+                            <artifactId>alfresco-rm</artifactId>
+                            <type>amp</type>
+                        </overlay>
+                        -->
                     </overlays>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+
     <profiles>
         <!-- Overrides the run profile to disable securecomms and add rapid development configuration -->
         <profile>
@@ -140,12 +164,11 @@
                     </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>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/src/main/properties/local/alfresco-global.properties

@@ -15,33 +15,45 @@
 # RUN TIME PROPERTIES
 # -------------------
 
-# 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 jetty and jboss deployments) but it can also be edited here.
-
-###############################
-## Common Alfresco Properties #
-###############################
-
+########################################################################################################################
+# Alfresco configuration for running locally
+#
+# Configuration when running Tomcat embedded from Maven.
+# This will create the alf_data_dev directory relative to Tomcat run folder.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
 
 dir.root=${alfresco.data.location}
-# Allowed values are: NONE, AUTO, FULL
-index.recovery.mode=FULL
 
-index.subsystem.name=solr
+# Alfresco Repo Webapp (alfresco.war) context, ports etc
+alfresco.context=alfresco
+alfresco.host=localhost
+alfresco.port=8080
+alfresco.protocol=http
+
+# Alfresco Share Webapp (share.war) context, ports etc
+share.context=share
+share.host=localhost
+share.port=8080
+share.protocol=http
+
+# Use Solr4 as that is used by default with Alfresco 5
+index.subsystem.name=solr4
 solr.host=localhost
 solr.port=8080
 solr.secureComms=none
-# Setting Solr backup for the future. Tweak this if needed (ideally in other env properties files) 
-solr.backup.alfresco.cronExpression=0 30 2 * * ? 2050  
+
+# Setting Solr backup for the future. Tweak this if needed (ideally in other env properties files)
+solr.backup.alfresco.cronExpression=0 30 2 * * ? 2050
 solr.backup.archive.cronExpression=0 30 3 * * ? 2050
-solr.backup.alfresco.remoteBackupLocation=${dir.root}/solrBackup/alfresco
-solr.backup.archive.remoteBackupLocation=${dir.root}/solrBackup/archive
+solr.backup.alfresco.remoteBackupLocation=${dir.root}/solr4Backup/alfresco
+solr.backup.archive.remoteBackupLocation=${dir.root}/solr4Backup/archive
+
 # We are in the local DEV properties file, no need for Solr backup
 solr.backup.alfresco.numberToKeep=0
 solr.backup.archive.numberToKeep=0
 
-# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disasble them / set to future date
+# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date
 # See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597
 # If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene
 wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060
@@ -51,258 +63,16 @@ wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060
 # Fail or not when there are node integrity checker errors
 integrity.failOnError=true
 
-# database connection properties
-# MySQL connection (This is default and requires mysql-connector-java-5.0.3-bin.jar, which ships with the Alfresco server)
-
+# Database connection properties
 db.driver=${alfresco.db.datasource.class}
 db.url=${alfresco.db.url}
 db.username=${alfresco.db.username}
 db.password=${alfresco.db.password}
 db.pool.initial=10
 db.pool.max=100
+hibernate.dialect=org.hibernate.dialect.H2Dialect
 
-
-#
-# Sample custom content and index data location
-#
-#dir.root=/srv/alfresco/alf_data
-#dir.keystore=${dir.root}/keystore
-
-#
-# Sample database connection properties
-#
-#db.username=alfresco
-#db.password=alfresco
-
-#
-# External locations
-#-------------
-#ooo.exe=soffice
-#ooo.enabled=false
-#jodconverter.officeHome=./OpenOffice.org
-#jodconverter.portNumbers=8101
-#jodconverter.enabled=true
-#img.root=./ImageMagick
-#swf.exe=./bin/pdf2swf
-
-#
-# Property to control whether schema updates are performed automatically.
-# Updates must be enabled during upgrades as, apart from the static upgrade scripts,
-# there are also auto-generated update scripts that will need to be executed.  After
-# upgrading to a new version, this can be disabled.
-#
-#db.schema.update=true
-
-#
-# MySQL connection
-#
-#db.driver=org.gjt.mm.mysql.Driver
-#db.url=jdbc:mysql://localhost/alfresco?useUnicode=yes&characterEncoding=UTF-8
-
-#
-# Oracle connection
-#
-#db.driver=oracle.jdbc.OracleDriver
-#db.url=jdbc:oracle:thin:@localhost:1521:alfresco
-
-#
-# SQLServer connection
-# Requires jTDS driver version 1.2.5 and SNAPSHOT isolation mode
-# Enable TCP protocol on fixed port 1433
-# Prepare the database with:
-# ALTER DATABASE alfresco SET ALLOW_SNAPSHOT_ISOLATION ON; 
-#
-#db.driver=net.sourceforge.jtds.jdbc.Driver
-#db.url=jdbc:jtds:sqlserver://localhost:1433/alfresco
-#db.txn.isolation=4096
-
-#
-# PostgreSQL connection (requires postgresql-8.2-504.jdbc3.jar or equivalent)
-#
-#db.driver=org.postgresql.Driver
-#db.url=jdbc:postgresql://localhost:5432/alfresco
-
-#
-# DB2 connection
-#
-#db.driver=com.ibm.db2.jcc.DB2Driver
-#db.url=jdbc:db2://localhost:50000/alfresco:retrieveMessagesFromServerOnGetMessage=true;
-
-#
-# Index Recovery Mode
-#-------------
-#index.recovery.mode=AUTO
-
-#
-# Outbound Email Configuration
-#-------------
-#mail.host=
-#mail.port=25
-#mail.username=anonymous
-#mail.password=
-#mail.encoding=UTF-8
-#mail.from.default=alfresco@alfresco.org
-#mail.smtp.auth=false
-
-#
-# Alfresco Email Service and Email Server
-#-------------
-
-# Enable/Disable the inbound email service.  The service could be used by processes other than
-# the Email Server (e.g. direct RMI access) so this flag is independent of the Email Service.
-#-------------
-#email.inbound.enabled=true
-
-# Email Server properties 
-#-------------
-#email.server.enabled=true
-#email.server.port=25
-#email.server.domain=alfresco.com
-#email.inbound.unknownUser=anonymous
-
-# A comma separated list of email REGEX patterns of allowed senders.
-# If there are any values in the list then all sender email addresses
-# must match. For example:
-#   .*\@alfresco\.com, .*\@alfresco\.org
-# Allow anyone:
-#-------------
-#email.server.allowed.senders=.*
-
-#
-# The default authentication chain
-# To configure external authentication subsystems see:
-# http://wiki.alfresco.com/wiki/Alfresco_Authentication_Subsystems
-#-------------
-#authentication.chain=alfrescoNtlm1:alfrescoNtlm
-
-#
-# URL Generation Parameters (The ${localname} token is replaced by the local server name)
-#-------------
-#alfresco.context=alfresco
-#alfresco.host=${localname}
-#alfresco.port=8080
-#alfresco.protocol=http
-#
-#share.context=share
-#share.host=${localname}
-#share.port=8080
-#share.protocol=http
-
-#imap.server.enabled=true
-#imap.server.port=143
-#imap.server.host=localhost
-
-# Default value of alfresco.rmi.services.host is 0.0.0.0 which means 'listen on all adapters'.
-# This allows connections to JMX both remotely and locally.
-#
-alfresco.rmi.services.host=0.0.0.0
-
-#
-# RMI service ports for the individual services.
-# These seven services are available remotely.
-#
-# Assign individual ports for each service for best performance 
-# or run several services on the same port. You can even run everything on 50500 if needed.
-#
-# Select 0 to use a random unused port.
-# 
-#avm.rmi.service.port=50501
-#avmsync.rmi.service.port=50502
-#attribute.rmi.service.port=50503
-#authentication.rmi.service.port=50504
-#repo.rmi.service.port=50505
-#action.rmi.service.port=50506
-#wcm-deployment-receiver.rmi.service.port=50507
-#monitor.rmi.service.port=50508
-
-
-# Dialect is autodetected starting from 3.2
-# H2 dialect
-#hibernate.dialect=org.hibernate.dialect.H2Dialect
-
-
-# Property to control whether schema updates are performed automatically.
-# Updates must be enabled during upgrades as, apart from the static upgrade scripts,
-# there are also auto-generated update scripts that will need to be executed.  After
-# upgrading to a new version, this can be disabled.
-#db.schema.update=true
-
-
-# File servers related properties 
-# For local builds we disable CIFS and FTP. Edit the following property to reenable them
-smb.server.enabled=false
-smb.server.name=CFS_SHARE_LOCAL
-smb.server.domain=mycompany.com
-smb.server.bindto=127.0.0.1
-smb.tcpip.port=1445
-netbios.session.port=1139
-netbios.name.port=1137
-netbios.datagram.port=1138
-ftp.server.enabled=false
-ftp.port=1121
-ftp.authenticator=alfresco
-
-# This properties file is used to configure LDAP authentication
-# NB: The following LDAP related properties are read only in case -Denteprise mvn build property is specified
-# Wheter to allow silent deletion of users in the Alfresco UI (note: users will be then resynced in the next synchronization)
-ldap.authentication.allowDeleteUser=true
-# LDAP JNDI provider
-ldap.authentication.provider=com.sun.jndi.ldap.LdapCtxFactory
-# Url and protocol for LDAP server to carry authentication against 
-ldap.authentication.url=ldap://ldap.mycompany.com:636
-# can be (simple, ssl)
-ldap.authentication.protcol=ssl
-# Credentials with full access to the directoty used
-ldap.authentication.adminUser=ou=Admin,ou=Services,o=Company
-ldap.authentication.adminPassword=secret
-# Wheter to allow unauthenticated guest a read only login
-ldap.authentication.guestLogin.allowed=false
-# Wheter users can be created on the fly upon successful external (e.g. LDAP) authentication. Useful to avoid user synchronization in case just uid and pwd are needed for a user
-server.transaction.allow-writes=true
-# Wheter user names are case sensitive
-user.name.caseSensitive=true
-# Wheter the synchronization process has to process duplicated users (e.g. synced users and users coming from the sync)
-personService.processDuplicates=true
-# Which action to take when processin duplicates. One of:  LEAVE, SPLIT, DELETE 
-personService.duplicateMode=DELETE
-# Which of the users (in case of SPLIT duplicates policy) should be considered valid
-personService.lastIsBest=true
-# Wheter auto created users should be considered when processing duplicates
-personService.includeAutoCreated=true
-# The query to find the people to import
-ldap.synchronisation.personQuery=(objectclass=inetOrgPerson)
-# The search base of the query to find people to import
-ldap.synchronisation.personSearchBase=ou=Identities,ou=mycompany,o=com
-# The attribute name on people objects found in LDAP to use as the uid in Alfresco
-ldap.synchronisation.userIdAttributeName=cn
-# The attribute on person objects in LDAP to map to the first name property in Alfresco
-ldap.synchronisation.userFirstNameAttributeName=givenName
-# The attribute on person objects in LDAP to map to the last name property in Alfresco
-ldap.synchronisation.userLastNameAttributeName=sn
-# The attribute on person objects in LDAP to map to the email property in Alfresco
-ldap.synchronisation.userEmailAttributeName=cn
-# The attribute on person objects in LDAP to map to the organizational id  property in Alfresco
-ldap.synchronisation.userOrganizationalIdAttributeName=maildomain
-# The default home folder provider to use for people created via LDAP import
-ldap.synchronisation.defaultHomeFolderProvider=companyHomeFolderProvider
-# The query to find group objects
-ldap.synchronisation.groupQuery=(objectclass=AlfrescoGroup)
-# The search base to use to find group objects
-ldap.synchronisation.groupSearchBase=ou=AlfrescoGroups,ou=mycompany,o=com
-# The attribute on LDAP group objects to map to the gid property in Alfrecso
-ldap.synchronisation.groupIdAttributeName=cn
-# The group type in LDAP
-ldap.synchronisation.groupType=AlfrescoGroup
-# The person type in LDAP
-ldap.synchronisation.personType=inetOrgPerson
-# The attribute in LDAP on group objects that defines the DN for its members
-ldap.synchronisation.groupMemberAttributeName=member
-# The cron expression defining when people imports should take place (e.g. every evening at 22:00 hours)
-ldap.synchronisation.import.person.cron=0 0 22 * * ?
-# The cron expression defining when group imports should take place (e.g. every evening at 21:45 hours)
-ldap.synchronisation.import.group.cron=0 45 21 * * ?
-# Should all groups be cleared out at import time?
-# - this is safe as groups are not used in Alfresco for other things (unlike person objects which you should never clear out during an import)
-# - setting this to true means old group definitions will be tidied up.
-ldap.synchronisation.import.group.clearAllChildren=false
-
+# File servers related properties
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat

@@ -0,0 +1,15 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community     ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
+
+if not exist %springloadedfile% (
+  mvn validate -Psetup
+)
+
+set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G
+
+mvn install -Prun -nsu
+:: mvn install -Prun 

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

@@ -0,0 +1,9 @@
+#!/bin/bash
+# Downloads the spring-loaded lib if not existing and runs the full all-in-one
+# (Alfresco + Share + Solr) using the runner project
+springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
+
+if [ ! -f $springloadedfile ]; then
+mvn validate -Psetup
+fi
+MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn install -Prun

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

@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
-    <name>Alfresco, Share and Solr Tomcat Runner</name>
+    <name>Alfresco, Share and Solr4 Tomcat Runner</name>
     <packaging>pom</packaging>
-    <description>Alfresco, Share and Solr Tomcat Runner</description>
+    <description>Alfresco, Share and Solr4 Tomcat Runner</description>
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -15,12 +15,17 @@
     <profiles>
         <profile>
             <id>run</id>
+
+            <!-- TODO: figure out a way to define these properties in a parent POM, they are now also duplicated
+                       in the solr-config/pom.xml -->
             <properties>
-            	<!-- Location of the Solr project, which is loaded via filesystem. Change if your Solr customization project lives in a different folder. -->
-                <solr.project.dir>${project.basedir}/../solr</solr.project.dir>
+                <alfresco.solr.dir>${project.parent.basedir}/${alfresco.data.location}/solr4</alfresco.solr.dir>
+                <alfresco.solr.home.dir>${alfresco.solr.dir}/config</alfresco.solr.home.dir>
             </properties>
+
             <build>
                 <plugins>
+                    <!-- Copy and filter webapp context files - output dir is runner/target/contexts -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
@@ -43,6 +48,11 @@
                             </execution>
                         </executions>
                     </plugin>
+
+                    <!-- Run Tomcat 7 embedded with Alfresco.war and Share.war contexts.
+                         The solr4.war is fetched directly from the Maven repo, it is not built like the other WARs.
+                         Plugin version is picked up from alfresco-sdk-parent.pom pluginManagement definition,
+                         which also brings in the H2 database lib -->
                     <plugin>
                         <groupId>org.apache.tomcat.maven</groupId>
                         <artifactId>tomcat7-maven-plugin</artifactId>
@@ -52,26 +62,33 @@
                                 <goals>
                                     <goal>run</goal>
                                 </goals>
-                                <phase>integration-test</phase>
+                                <phase>pre-integration-test</phase>
                             </execution>
                         </executions>
                         <configuration>
-                            <warSourceDirectory>${project.parent.basedir}/solr/target/solr-overlay</warSourceDirectory>
-                            <path>/solr</path>
-                            <useTestClasspath>false</useTestClasspath>
                             <ignorePackaging>true</ignorePackaging>
+                            <!-- Make sure Catalina classes are picked up when we got virtual webapp contexts with classpaths -->
                             <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                            <path>/</path>
                             <systemProperties>
-                                <solr.solr.home>${project.parent.basedir}/solr/solr_home</solr.solr.home>
-                                <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+                                <solr.solr.home>${alfresco.solr.home.dir}</solr.solr.home>
                             </systemProperties>
-                            <delegate>true</delegate>
+                            <!-- Should this class loader delegate to the parent class loader before searching its
+                                 own repositories (i.e. the usual Java2 delegation model) -->
+                            <!-- Prevent parent classloader delegation, each webapp loads.
+                                 If set to true then you will get a truckload of Solr logging as
+                                 the alf_data_dev/solr4/config/log4j-solr.properties file is not picked up.
+                                 This also fixes issues with the Google Guava Library, which this tomcat plugin uses
+                                 version 10.0.1 of but Solr uses 14.0.1 -->
+                            <delegate>false</delegate>
                             <webapps>
                                 <webapp>
                                     <groupId>${project.groupId}</groupId>
                                     <artifactId>repo</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
+                                    <!-- Make sure webapp is loaded with context and everything,
+                                         if set to 'false' then you will get 404 when trying to access the webapp from browser -->
                                     <asWebapp>true</asWebapp>
                                     <contextPath>/alfresco</contextPath>
                                     <contextFile>${project.build.directory}/contexts/context-repo.xml</contextFile>
@@ -85,11 +102,319 @@
                                     <contextPath>/share</contextPath>
                                     <contextFile>${project.build.directory}/contexts/context-share.xml</contextFile>
                                 </webapp>
+                                <webapp>
+                                    <groupId>${alfresco.groupId}</groupId>
+                                    <artifactId>alfresco-solr4</artifactId>
+                                    <version>${alfresco.version}</version>
+                                    <type>war</type>
+                                    <asWebapp>true</asWebapp>
+                                    <contextPath>/solr4</contextPath>
+                                    <contextFile>${project.build.directory}/contexts/context-solr.xml</contextFile>
+                                </webapp>
                             </webapps>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
+
+        <!-- Runs Share User Interface regression tests using Alfresco Share PO (Page Object) vanilla Selenium / Webdrone (WebDriver wrapper).
+             NOTE: Assumes an already running Alfresco + Share at the default location ${share.client.url}
+             (e.g. by invoking:
+                        $ mvn clean install -Prun,regression-testing
+                   to run a specific test do:
+                        $ mvn clean install -Prun,regression-testing -Dit.test=LoginPageTest
+              -->
+        <profile>
+            <id>regression-testing</id>
+            <properties>
+                <!-- Re-configure Tomcat 7 Plugin (see run profile) to fork so we can run tests in parallel -->
+                <!-- Note. the fork option does not fork a new JVM. Rather it is run in a thread created by the
+                     Maven Launcher class (org.codehaus.plexus.classworlds.launcher.Launcher) that is invoked by the mvn command. -->
+                <maven.tomcat.fork>true</maven.tomcat.fork>
+
+                <!-- Make sure we are actually testing something -->
+                <skipTests>false</skipTests>
+            </properties>
+            <build>
+                <plugins>
+                    <!-- Need to unpack the tests becuase of Jiras: -->
+                    <!-- https://jira.codehaus.org/browse/SUREFIRE-997 -->
+                    <!-- https://jira.codehaus.org/browse/SUREFIRE-1024 -->
+                    <!-- 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-failsafe-plugin</artifactId>
+                        <version>2.18.1</version>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <!-- Smaller test suite for Share, essential stuff like Login, Navigation, DocLib, and Search -->
+                                <!-- Currently using our own config to be able to comment out one test class
+                                    <suiteXmlFile>${project.build.directory}/testng-resources/testng-alfresco-share.xml</suiteXmlFile> -->
+                                <suiteXmlFile>${project.basedir}/test-ng/testng-alfresco-share.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <testClassesDirectory>${project.build.directory}/testng-resources</testClassesDirectory>
+                            <systemPropertyVariables>
+                                <!-- Where is the Alfresco Share Webapp that we are testing -->
+                                <share.target>${share.client.url}</share.target>
+                            </systemPropertyVariables>
+
+                            <!-- The out-of-the-box Alfresco Share PO test classes does not follow the *IT.java
+                                 naming convention, they use *Test.java, so need to add that -->
+                            <includes>
+                                <include>**/*Test.java</include>
+                            </includes>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>regression-tests</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>verify-tests</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                </plugins>
+            </build>
+
+            <dependencies>
+                <!-- Bring in the Share Page Objects (PO) used in the regression tests -->
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-po</artifactId>
+                    <version>${alfresco.version}</version>
+                    <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <!-- Bring in the Share Page Object (PO) regression tests that comes with Alfresco.
+                     These tests cover the Alfresco Share Web Application -->
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-po</artifactId>
+                    <version>${alfresco.version}</version>
+                    <classifier>tests</classifier>
+                    <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Make sure we are running with newer selenium that works with newest FF (newer than 2.39.0) -->
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                    <version>2.45.0-alfresco</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-server</artifactId>
+                    <version>2.45.0-alfresco</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>servlet-api-2.5</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Test NG is defined with test scope in share-po, so need it here too -->
+                <!-- Alfresco code creates a wrapper around Test NG -->
+                <dependency>
+                    <groupId>org.alfresco.test</groupId>
+                    <artifactId>alfresco-testng</artifactId>
+                    <version>1.1</version>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.hamcrest</groupId>
+                            <artifactId>hamcrest-core</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!-- Runs functional domain specific tests using Alfresco Share PO (Page Object) vanilla Selenium / Webdrone (WebDriver wrapper).
+             NOTE: Assumes an already running Alfresco + Share at the default location ${share.client.url}
+             (e.g. by invoking:
+                        $ mvn clean install -Prun,functional-testing
+                   to run a specific test do:
+                        $ mvn clean install -Prun,functional-testing -Dit.test=DemoPageTestIT
+              -->
+        <profile>
+            <id>functional-testing</id>
+            <properties>
+                <!-- Re-configure Tomcat 7 Plugin (see run profile) to fork so we can run tests in parallel -->
+                <!-- Note. the fork option does not fork a new JVM. Rather it is run in a thread created by the
+                     Maven Launcher class (org.codehaus.plexus.classworlds.launcher.Launcher) that is invoked by the mvn command. -->
+                <maven.tomcat.fork>true</maven.tomcat.fork>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>2.18.1</version>
+                        <configuration>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>${project.parent.basedir}/share-amp/target/test-classes/testng.xml</suiteXmlFile>
+                            </suiteXmlFiles>
+                            <testClassesDirectory>${project.parent.basedir}/share-amp/target/test-classes</testClassesDirectory>
+                            <systemPropertyVariables>
+                                <!-- Where is the Alfresco Share Webapp that we are testing -->
+                                <share.target>${share.client.url}</share.target>
+                            </systemPropertyVariables>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>functional-tests</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>verify-tests</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+
+            <dependencies>
+                <!-- Bring in the Share Page Objects (PO) used in our functional tests.
+                     Without it TestNG cannot load our test class when it uses page objects such as LoginPage -->
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-po</artifactId>
+                    <version>${alfresco.version}</version>
+                    <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Bring in the Share Page Object (PO) Tests that comes with Alfresco. It has
+                     the org.alfresco.po.share.AbstractTest class that our custom tests extend.
+                     Without it TestNG cannot load our test class -->
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>share-po</artifactId>
+                    <version>${alfresco.version}</version>
+                    <classifier>tests</classifier>
+                    <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Make sure we are running with newer selenium that works with newest FF (newer than 2.39.0) -->
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                    <version>2.45.0-alfresco</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-server</artifactId>
+                    <version>2.45.0-alfresco</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>servlet-api-2.5</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Test NG is defined with test scope in share-po, so need it here too -->
+                <!-- Alfresco code creates a wrapper around Test NG -->
+                <dependency>
+                    <groupId>org.alfresco.test</groupId>
+                    <artifactId>alfresco-testng</artifactId>
+                    <version>1.1</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/runner/src/main/webapp/index.html

@@ -0,0 +1,24 @@
+<html>
+	<head>
+		<title>Alfresco SDK @@alfresco.sdk.parent.version@@ - Running Alfresco ${alfresco.version}</title>
+	</head>
+	<body style="font: 13px/1.231 Open Sans,arial,helvetica,clean,sans-serif;">
+		<img alt="Maven Alfresco SDK" src="https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg">
+		<p>Congratulations, you are successfully running the <a href="https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/archetypes/alfresco-allinone-archetype/index.html">All in One project from the <a href="https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html">Alfresco SDK @@alfresco.sdk.parent.version@@</a>, powered by <a href="http://maven.apache.org/">Apache Maven</a>!
+		<br/>
+		You can access the Alfresco components running embedded below:</p>
+		<ul>
+			<li><a href="/share">Alfresco Share</a></li>
+			<li><a href="/alfresco">Alfresco Repository</a></li>
+			<li><a href="/solr4">Alfresco Solr4</a></li>
+		</ul>
+		<p><b>Resources:</b></p>
+		<ul>
+			<li><a href="http://docs.alfresco.com">Alfresco Documentation</a></li>
+			<li><a href="https://support.alfresco.com">Alfresco Enterprise Support portal</a></li>
+			<li><a href="https://github.com/Alfresco/alfresco-sdk/fork">Fork and contribute to this SDK!</a></li>
+			<li><a href="https://issues.alfresco.com/jira/browse/ALF">Report an Alfresco issue</a></li>
+			<li><a href="https://github.com/Alfresco/alfresco-sdk/issues/new">Report an SDK issue</a></li>
+		</ul>
+	</body>
+</html>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite thread-count="1" parallel="tests" preserve-order="true" verbose="6" name="Alfresco Share UI Basic Regression Test">
+    <groups>
+        <run>
+            <include name="unit"/>
+            <include name="alfresco-one"/>
+            <exclude name=".*Bug42"/>
+            <exclude name=".*Bug"/>
+            <exclude name="chromeOnly"/>
+            <exclude name="Hybrid"/>
+            <exclude name="download"/>
+            <exclude name="communityIssue"/>
+        </run>
+    </groups>
+    <test name="LoginPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.LoginPageTest" />
+        </classes>
+    </test>
+    <test name="NavigationBarTest">
+        <classes>
+            <class name="org.alfresco.po.share.NavigationBarTest" />
+        </classes>
+    </test>
+    <test name="LiveSearchDropdownTest">
+        <classes>
+            <class name="org.alfresco.po.share.search.LiveSearchDropdownTest" />
+        </classes>
+    </test>
+    <test name="FacetedSearchResultsPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.search.FacetedSearchResultsPageTest" />
+        </classes>
+    </test>
+    <test name="DocumentDetailsPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.DocumentDetailsPageTest"/>
+        </classes>
+    </test>
+    <!-- TODO: fix this, currently does not work
+    <test name="DocumentLibraryPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.DocumentLibraryPageTest"/>
+        </classes>
+    </test>
+    -->
+    <test name="FileDirectoryInfoTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.FileDirectoryInfoTest">
+                <methods>
+                    <!-- these currently take longer than 60 seconds for page rendering... -->
+                    <exclude name="test107TagsForFolder" />
+                    <exclude name="test114TagsForFile" />
+                </methods>
+            </class>
+        </classes>
+    </test>
+    <test name="FolderDetailsPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.FolderDetailsPageTest"/>
+        </classes>
+    </test>
+    <test name="ManagePermissionsTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.ManagePermissionsTest"/>
+        </classes>
+    </test>
+    <test name="InviteMembersPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.InviteMembersPageTest" />
+        </classes>
+    </test>
+    <test name="SiteFinderPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.SiteFinderPageTest" />
+        </classes>
+    </test>
+</suite>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml

@@ -1,14 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This context file is used only for rapid development, never installed released with the webapp -->
-<Context>
-    
-    <Resources className="org.apache.naming.resources.VirtualDirContext" extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Alfresco.war
+
+    IMPORTANT: If an AMP or JAR extension is added to the Alfresco WAR,
+              then you need to add the paths below for this new extension.
+    =================================================================================================================-->
+
+<!-- Pick up static resource files from ../repo/target/repo.
+     The Alfresco.war 5.0 does not have a webapp (it used to have Alfresco Explorer but not anymore)
+     that we will access, so this docBase might not be needed -->
+<Context docBase="${project.parent.basedir}/alfresco-war/target/${project.build.finalName}">
+    <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) -->
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
+
+    <!-- Configure where the Alfresco (alfresco.war) web application can load classes, test classes, and config files -->
+    <!-- Setup the virtual class path like this:
+         1) target/classes
+         2) target/${project.build.finalName}/config
+         3) target/test-classes
+
+         This way mvn compile can be invoked and all changes will be picked up
+    -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-        searchVirtualFirst="true"
-        virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/test-classes;${project.parent.basedir}/repo-amp/target/repo-amp/config" />
-        
-    <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
-    <JarScanner scanAllDirectories="true" />    
+            searchVirtualFirst="true"
+            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/repo-amp/config;${project.parent.basedir}/repo-amp/target/test-classes" />
+
+    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
+    <JarScanner scanAllDirectories="true" />
 </Context>
-    
+
+
     

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml

@@ -1,13 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This context file is used only for rapid development, never installed released with the webapp -->
-<Context docBase="../share/target/share">
-    
-    <Resources className="org.apache.naming.resources.VirtualDirContext" extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Share.war
+
+    IMPORTANT: If an AMP or JAR extension is added to the Share WAR,
+               then you need to add the paths below for this new extension.
+=================================================================================================================-->
+<Context>
+    <!-- Pick up static resource files from any Share extensions, being it a JAR or an AMP
+         (this should not include docBase) -->
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
+
+    <!-- Configure where the Share (share.war) web application can load classes, config, and test classes (in that order) -->
+    <!-- Setup the virtual class path like this:
+         1) share-amp/target/classes
+         2) share-amp/target/${project.build.finalName}/config
+         3) share-amp/target/test-classes
+         4)     Add other AMP paths here....
+         5) share/target/test-classes              (loads the share-config-custom.xml used during test runs)
+
+         This way mvn compile can be invoked and all changes will be picked up
+    -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
-        searchVirtualFirst="true"
-        virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share-amp/target/share-amp/config" />
-        
-    <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
+            searchVirtualFirst="true"
+            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share/target/test-classes" />
+
+    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
     <JarScanner scanAllDirectories="true" />
-     
-</Context>
+</Context>
+
+
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-solr.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Context>
+    <Environment name="solr/home"        type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/config/" override="true"/>
+    <Environment name="solr/model/dir"   type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/config/alfrescoModels/" override="true"/>
+    <Environment name="solr/content/dir" type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/data/content/" override="true"/>
+
+    <!-- Pick up static resource files from any Solr extensions, being it a JAR or an AMP,
+         by default there are no extensions, just the standard Solr webapp files.
+         (this should not include docBase)-->
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/runner/target/tomcat/webapps/alfresco-solr4" />
+
+    <!-- Configure where the Solr (solr4.war) web application can load classes, test classes, and config -->
+    <!-- Solr is not customized by default so just points to standard Solr classes. -->
+    <!-- Setup the virtual class path like this:
+         1) target/classes
+         3) target/test-classes
+
+         This way mvn compile can be invoked and all changes will be picked up-->
+
+    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
+            searchVirtualFirst="true"
+            virtualClasspath="${project.parent.basedir}/runner/target/tomcat/webapps/alfresco-solr4/WEB-INF/classes" />
+
+    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
+    <JarScanner scanAllDirectories="true" />
+</Context>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
-    <name>Share AMP project</name>
+    <name>Alfresco Share AMP Module</name>
     <packaging>amp</packaging>
-    <description>This is a sample Share AMP project, depended upon by the share WAR module</description>
+    <description>This is a sample Alfresco Share AMP project, depended upon by the share WAR module</description>
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -14,35 +14,93 @@
     </parent>
 
     <!-- 
-       | SDK properties have sensible defaults in the SDK parent,
-       | but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+        SDK properties have sensible defaults in the SDK parent,
+        but you can override the properties below to use another version.
+        For more available properties see the alfresco-sdk-parent POM.
        -->
     <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>
-
-        <!-- Since Alfresco is already running on port 8080, we run Share on port 8081 -->
-        <maven.tomcat.port>8081</maven.tomcat.port>
-
-        <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco -->
-        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
+             Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
+        <app.amp.client.war.artifactId>share</app.amp.client.war.artifactId>
 
         <!-- Defines the log level used in log4j.properties -->
-        <app.log.root.level>WARN</app.log.root.level>
+        <app.log.root.level>WARN</app.log.root.level>
     </properties>
 
-   
     <!-- 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 -->
-    <dependencies>
-        <dependency>
-          <groupId>org.springframework.extensions.surf</groupId>
-          <artifactId>spring-surf-api</artifactId>
-          <scope>provided</scope>
-        </dependency>        
+    <dependencies>
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <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>
+
+        <!--===============================================================
+            The following dependencies are needed to be able to compile the
+            custom functional tests that are based on Page Objects (PO)
+            ===============================================================-->
+
+        <!-- Bring in the Share Page Objects (PO) used in our functional tests.
+             It contains page objects such as LoginPage -->
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>share-po</artifactId>
+            <version>${alfresco.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- Bring in the Share Page Object (PO) Tests that comes with Alfresco. It has
+             the org.alfresco.po.share.AbstractTest class that our custom tests extend. -->
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>share-po</artifactId>
+            <version>${alfresco.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+
+            <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+               version 2.45 later on here -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-server</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Bring in newer selenium version -->
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>2.45.0-alfresco</version>
+        </dependency>
+        <!-- Test NG is defined with test scope in share-po, so need it here too -->
+        <!-- Alfresco code creates a wrapper around Test NG -->
+        <dependency>
+            <groupId>org.alfresco.test</groupId>
+            <artifactId>alfresco-testng</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
 </project>

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

@@ -0,0 +1,29 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+   
+   <!--
+    Define beans related to this Share extension here, such as
+     evaluators and resource bootstrapping.
+
+     Note. Any configuration related to the whole Share.war webapp
+           (i.e. not specific to this share extension) should be
+            placed in the alfresco-allinone/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml file
+   -->
+
+   <!-- Add module specific messages and labels -->
+   <bean id="${package}.share-amp.resources"
+         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.web-extension.messages.custom</value>
+         </list>
+      </property>
+   </bean>
+
+</beans>

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

@@ -0,0 +1,9 @@
+# This file should contain messages and labels specific to this share extension
+# Put here things like:
+#   Content Model Aspect and Type Labels
+#   Form field labels
+#   Doc lib Action labels and messages
+#   Doc Lib Action Forms labels
+#
+
+

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js

@@ -5,23 +5,25 @@ model.jsonModel = {
         config: {
             title: "This is a simple page"
         }
-    }, 
-    {
-        id: "MY_HORIZONTAL_WIDGET_LAYOUT",
-        name: "alfresco/layout/HorizontalWidgets",
-        config: {
-            widgetWidth: 50,
-            widgets: [
-                {
-                    name: "alfresco/logo/Logo",
-                    config: {
-                        logoClasses: "alfresco-logo-only"
+    },
+        {
+            id: "MY_HORIZONTAL_WIDGET_LAYOUT",
+            name: "alfresco/layout/HorizontalWidgets",
+            config: {
+                widgetWidth: 50,
+                widgets: [
+                    {
+                        id: "DEMO_SIMPLE_LOGO",
+                        name: "alfresco/logo/Logo",
+                        config: {
+                            logoClasses: "alfresco-logo-only"
+                        }
+                    },
+                    {
+                        id: "DEMO_SIMPLE_MSG",
+                        name: "example/widgets/TemplateWidget"
                     }
-                },
-                {
-                  name: "example/widgets/TemplateWidget"
-                }
-            ]
-        }
-    }]
+                ]
+            }
+        }]
 };

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md

@@ -0,0 +1,6 @@
+## If you are overriding out-of-the-box Alfresco web scripts, put these files here
+## in the correct org.alfresco... package.
+## If you are defining a new custom web script, add it under
+## resources/alfresco/web-extension/site-webscripts/{your domain path}.
+##
+

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/main/resources/META-INF/share-config-custom.xml.sample

@@ -1,422 +1,14 @@
+<!-- Share configuration related to this particular Share module extension, such as:
+     - Doclib action config
+     - Form config
+     - Aspect and Type config
+
+    Note. Any configuration related to the whole Share.war webapp
+           (i.e. not specific to this share extension) should be
+            placed in the environment specific config:
+             alfresco-allinone/share/src/main/resources/alfresco/web-extension/share-config-custom.xml file
+     -->
 <alfresco-config>
 
-   <!-- Global config section -->
-   <config replace="true">
-      <flags>
-         <!--
-            Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-         -->
-         <client-debug>false</client-debug>
 
-         <!--
-            LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-            This flag automatically activates logging on page load.
-         -->
-         <client-debug-autologging>false</client-debug-autologging>
-      </flags>
-   </config>
-   
-   <config evaluator="string-compare" condition="WebFramework">
-      <web-framework>
-         <!-- SpringSurf Autowire Runtime Settings -->
-         <!-- 
-              Developers can set mode to 'development' to disable; SpringSurf caches,
-              FreeMarker template caching and Rhino JavaScript compilation.
-         -->
-         <autowire>
-            <!-- Pick the mode: "production" or "development" -->
-            <mode>production</mode>
-         </autowire>
-
-         <!-- Allows extension modules with <auto-deploy> set to true to be automatically deployed -->
-         <module-deployment>
-            <mode>manual</mode>
-            <enable-auto-deploy-modules>true</enable-auto-deploy-modules>
-         </module-deployment>
-      </web-framework>
-   </config>
-
-   <!-- Disable the CSRF Token Filter -->
-   <!--
-   <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-      <filter/>
-   </config>
-   -->
-
-   <!--
-      To run the CSRF Token Filter behind 1 or more proxies that do not rewrite the Origin or Referere headers:
-
-      1. Copy the "CSRFPolicy" default config in share-security-config.xml and paste it into this file.
-      2. Replace the old config by setting the <config> element's "replace" attribute to "true" like below:
-         <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-      3. To every <action name="assertReferer"> element add the following child element
-         <param name="referer">http://www.proxy1.com/.*|http://www.proxy2.com/.*</param>
-      4. To every <action name="assertOrigin"> element add the following child element
-         <param name="origin">http://www.proxy1.com|http://www.proxy2.com</param>
-   -->
-
-   <!--
-      Remove the default wildcard setting and use instead a strict whitelist of the only domains that shall be allowed
-      to be used inside iframes (i.e. in the WebView dashlet on the dashboards)
-   -->
-   <!--
-   <config evaluator="string-compare" condition="IFramePolicy" replace="true">
-      <cross-domain>
-         <url>http://www.trusted-domain-1.com/</url>
-         <url>http://www.trusted-domain-2.com/</url>
-      </cross-domain>
-   </config>
-   -->
-
-   <!-- Turn off header that stops Share from being displayed in iframes on pages from other domains -->
-   <!--
-   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
-      <headers>
-         <header>
-            <name>X-Frame-Options</name>
-            <enabled>false</enabled>
-         </header>
-      </headers>
-   </config>
-   -->
-
-   <!-- Prevent browser communication over HTTP (for HTTPS servers) -->
-   <!--
-   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
-      <headers>
-         <header>
-            <name>Strict-Transport-Security</name>
-            <value>max-age=31536000</value>
-         </header>
-      </headers>
-   </config>
-   -->
-
-   <config evaluator="string-compare" condition="Replication">
-      <share-urls>
-         <!--
-            To discover a Repository Id, browse to the remote server's CMIS landing page at:
-              http://{server}:{port}/alfresco/service/cmis/index.html
-            The Repository Id field is found under the "CMIS Repository Information" expandable panel.
-
-            Example config entry:
-              <share-url repositoryId="622f9533-2a1e-48fe-af4e-ee9e41667ea4">http://new-york-office:8080/share/</share-url>
-         -->
-      </share-urls>
-   </config>
-
-   <!-- Document Library config section -->
-   <config evaluator="string-compare" condition="DocumentLibrary" replace="true">
-
-      <tree>
-         <!--
-            Whether the folder Tree component should enumerate child folders or not.
-            This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
-         -->
-         <evaluate-child-folders>false</evaluate-child-folders>
-         
-         <!--
-            Optionally limit the number of folders shown in treeview throughout Share.
-         -->
-         <maximum-folder-count>1000</maximum-folder-count>
-         
-         <!--  
-            Default timeout in milliseconds for folder Tree component to recieve response from Repository
-         -->
-         <timeout>7000</timeout>
-      </tree>
-
-      <!--
-         Used by the "Manage Aspects" action
-
-         For custom aspects, remember to also add the relevant i18n string(s)
-            cm_myaspect=My Aspect
-      -->
-      <aspects>
-         <!-- Aspects that a user can see -->
-         <visible>
-            <aspect name="cm:generalclassifiable" />
-            <aspect name="cm:complianceable" />
-            <aspect name="cm:dublincore" />
-            <aspect name="cm:effectivity" />
-            <aspect name="cm:summarizable" />
-            <aspect name="cm:versionable" />
-            <aspect name="cm:templatable" />
-            <aspect name="cm:emailed" />
-            <aspect name="emailserver:aliasable" />
-            <aspect name="cm:taggable" />
-            <aspect name="app:inlineeditable" />
-            <aspect name="gd:googleEditable" />
-            <aspect name="cm:geographic" />
-            <aspect name="exif:exif" />
-            <aspect name="audio:audio" />
-            <aspect name="cm:indexControl" />
-            <aspect name="dp:restrictable" />
-         </visible>
-
-         <!-- Aspects that a user can add. Same as "visible" if left empty -->
-         <addable>
-         </addable>
-
-         <!-- Aspects that a user can remove. Same as "visible" if left empty -->
-         <removeable>
-         </removeable>
-      </aspects>
-
-      <!--
-         Used by the "Change Type" action
-
-         Define valid subtypes using the following example:
-            <type name="cm:content">
-               <subtype name="cm:mysubtype" />
-            </type>
-
-         Remember to also add the relevant i18n string(s):
-            cm_mysubtype=My SubType
-      -->
-      <types>
-         <type name="cm:content">
-         </type>
-
-         <type name="cm:folder">
-         </type>
- 
-         <type name="trx:transferTarget">
-            <subtype name="trx:fileTransferTarget" />
-         </type>
-      </types>
-
-      <!--
-         If set, will present a WebDAV link for the current item on the Document and Folder details pages.
-         Also used to generate the "View in Alfresco Explorer" action for folders.
-      -->
-      <repository-url>http://localhost:8080/alfresco</repository-url>
-
-      <!--
-         Google Docs integration
-      -->
-      <google-docs>
-         <!--
-            Enable/disable the Google Docs UI integration (Extra types on Create Content menu, Google Docs actions).
-         -->
-         <enabled>false</enabled>
-
-         <!--
-            The mimetypes of documents Google Docs allows you to create via the Share interface.
-            The I18N label is created from the "type" attribute, e.g. google-docs.doc=Google Docs&trade; Document
-         -->
-         <creatable-types>
-            <creatable type="doc">application/msword</creatable>
-            <creatable type="xls">application/vnd.ms-excel</creatable>
-            <creatable type="ppt">application/vnd.ms-powerpoint</creatable>
-         </creatable-types>
-      </google-docs>
-
-      <!--
-         File upload configuration
-      -->
-      <file-upload>
-         <!--
-            Adobe Flash™
-            In certain environments, an HTTP request originating from Flash cannot be authenticated using an existing session.
-            See: http://bugs.adobe.com/jira/browse/FP-4830
-            For these cases, it is useful to disable the Flash-based uploader for Share Document Libraries.
-         -->
-         <adobe-flash-enabled>true</adobe-flash-enabled>
-      </file-upload>
-   </config>
-
-
-   <!-- Custom DocLibActions config section -->
-   <config evaluator="string-compare" condition="DocLibActions">
-      <actionGroups>
-         <actionGroup id="document-browse">
-
-            <!-- Simple Repo Actions -->
-            <!--
-            <action index="340" id="document-extract-metadata" />
-            <action index="350" id="document-increment-counter" />
-            -->
-
-            <!-- Dialog Repo Actions -->
-            <!--
-            <action index="360" id="document-transform" />
-            <action index="370" id="document-transform-image" />
-            <action index="380" id="document-execute-script" />
-            -->
-
-         </actionGroup>
-      </actionGroups>
-   </config>
-
-   <!-- Global folder picker config section -->
-   <config evaluator="string-compare" condition="GlobalFolder">
-      <siteTree>
-         <container type="cm:folder">
-            <!-- Use a specific label for this container type in the tree -->
-            <rootLabel>location.path.documents</rootLabel>
-            <!-- Use a specific uri to retreive the child nodes for this container type in the tree -->
-            <uri>slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&amp;max={maximumFolderCountSite}</uri>
-         </container>
-      </siteTree>
-   </config>
-
-   <!-- Repository Library config section -->
-   <config evaluator="string-compare" condition="RepositoryLibrary" replace="true">
-      <!--
-         Root nodeRef or xpath expression for top-level folder.
-         e.g. alfresco://user/home, /app:company_home/st:sites/cm:site1
-         If using an xpath expression, ensure it is properly ISO9075 encoded here.
-      -->
-      <root-node>alfresco://company/home</root-node>
-
-      <tree>
-         <!--
-            Whether the folder Tree component should enumerate child folders or not.
-            This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
-         -->
-         <evaluate-child-folders>false</evaluate-child-folders>
-         
-         <!--
-            Optionally limit the number of folders shown in treeview throughout Share.
-         -->
-         <maximum-folder-count>500</maximum-folder-count>
-      </tree>
-
-      <!--
-         Whether the link to the Repository Library appears in the header component or not.
-      -->
-      <visible>true</visible>
-   </config>
-   
-   <!-- Kerberos settings -->
-   <!-- To enable kerberos rename this condition to "Kerberos" -->
-   <config evaluator="string-compare" condition="KerberosDisabled" replace="true">
-      <kerberos>
-         <!--
-            Password for HTTP service account.
-            The account name *must* be built from the HTTP server name, in the format :
-               HTTP/<server_name>@<realm>
-            (NB this is because the web browser requests an ST for the
-            HTTP/<server_name> principal in the current realm, so if we're to decode
-            that ST, it has to match.)
-         -->
-         <password>secret</password>
-         <!--
-            Kerberos realm and KDC address.
-         -->
-         <realm>ALFRESCO.ORG</realm>
-         <!--
-            Service Principal Name to use on the repository tier.
-            This must be like: HTTP/host.name@REALM
-         -->
-         <endpoint-spn>HTTP/repository.server.com@ALFRESCO.ORG</endpoint-spn>
-         <!--
-            JAAS login configuration entry name.
-         -->
-         <config-entry>ShareHTTP</config-entry>
-      </kerberos>
-   </config>
-
-   <!-- Uncomment and modify the URL to Activiti Admin Console if required. -->
-   <!--
-   <config evaluator="string-compare" condition="ActivitiAdmin" replace="true">
-      <activiti-admin-url>http://localhost:8080/alfresco/activiti-admin</activiti-admin-url>
-   </config>
-   -->
-
-   <config evaluator="string-compare" condition="Remote">
-      <remote>
-         <endpoint>
-            <id>alfresco-noauth</id>
-            <name>Alfresco - unauthenticated access</name>
-            <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-            <connector-id>alfresco</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <identity>none</identity>
-         </endpoint>
-
-         <endpoint>
-            <id>alfresco</id>
-            <name>Alfresco - user access</name>
-            <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-            <connector-id>alfresco</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <identity>user</identity>
-         </endpoint>
-
-         <endpoint>
-            <id>alfresco-feed</id>
-            <name>Alfresco Feed</name>
-            <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-            <connector-id>http</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/s</endpoint-url>
-            <basic-auth>true</basic-auth>
-            <identity>user</identity>
-         </endpoint>
-         
-         <endpoint>
-            <id>activiti-admin</id>
-            <name>Activiti Admin UI - user access</name>
-            <description>Access to Activiti Admin UI, that requires user authentication</description>
-            <connector-id>activiti-admin-connector</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/activiti-admin</endpoint-url>
-            <identity>user</identity>
-         </endpoint>
-      </remote>
-   </config>
-
-   <!-- 
-        Overriding endpoints to reference an Alfresco server with external SSO enabled
-        NOTE: If utilising a load balancer between web-tier and repository cluster, the "sticky
-              sessions" feature of your load balancer must be used.
-        NOTE: If alfresco server location is not localhost:8080 then also combine changes from the
-              "example port config" section below.
-        *Optional* keystore contains SSL client certificate + trusted CAs.
-        Used to authenticate share to an external SSO system such as CAS
-        Remove the keystore section if not required i.e. for NTLM.
-        
-        NOTE: For Kerberos SSO rename the "KerberosDisabled" condition above to "Kerberos"
-        
-        NOTE: For external SSO, switch the endpoint connector to "AlfrescoHeader" and set
-              the userHeader to the name of the HTTP header that the external SSO
-              uses to provide the authenticated user name.
-   -->
-   <!--
-   <config evaluator="string-compare" condition="Remote">
-      <remote>
-         <keystore>
-             <path>alfresco/web-extension/alfresco-system.p12</path>
-             <type>pkcs12</type>
-             <password>alfresco-system</password>
-         </keystore>
-         
-         <connector>
-            <id>alfrescoCookie</id>
-            <name>Alfresco Connector</name>
-            <description>Connects to an Alfresco instance using cookie-based authentication</description>
-            <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
-         </connector>
-         
-         <connector>
-            <id>alfrescoHeader</id>
-            <name>Alfresco Connector</name>
-            <description>Connects to an Alfresco instance using header and cookie-based authentication</description>
-            <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
-            <userHeader>SsoUserHeader</userHeader>
-         </connector>
-
-         <endpoint>
-            <id>alfresco</id>
-            <name>Alfresco - user access</name>
-            <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-            <connector-id>alfrescoCookie</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/wcs</endpoint-url>
-            <identity>user</identity>
-            <external-auth>true</external-auth>
-         </endpoint>
-      </remote>
-   </config>
-   -->
-   
 </alfresco-config>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/DemoPageTestIT.java

@@ -0,0 +1,92 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
+ * This file is part of Alfresco
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ${package}.demoamp;
+
+import ${package}.demoamp.po.DemoPage;
+import org.alfresco.po.share.AbstractTest;
+import org.alfresco.po.share.LoginPage;
+import org.alfresco.po.share.PeopleFinderPage;
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Functional test that demonstrates how to write and
+ * extend an alfresco share page object.
+ * This test shows the interaction with page objects
+ * brought from share-po project along with newly created ones
+ * that are present in the Demo amp.
+ *
+ * @author Michael Suzuki
+ * @since 2.0.1
+ */
+public class DemoPageTestIT extends AbstractTest {
+    DemoPage page;
+
+    @BeforeClass(groups = {"alfresco-one"})
+    public void prepare() throws Exception {
+        // Navigate to share
+        drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page");
+        // Reuse Alfresco Share login page object from share-po lib.
+        LoginPage loginPage = new LoginPage(drone);
+        loginPage.loginAs(username, password);
+    }
+
+    @BeforeMethod
+    public void loadPage() {
+        // Goto demo page
+        drone.navigateTo(shareUrl + "/page/hdp/ws/simple-page");
+        page = new DemoPage(drone);
+    }
+
+    @Test
+    public void findLogo() {
+        Assert.assertTrue(page.isSimpleLogoDisplayed());
+    }
+
+    @Test
+    public void messageIsDisplayed() {
+        page.render();
+        String msg = page.getMessage();
+        Assert.assertNotNull(msg);
+        Assert.assertEquals("Hello from i18n!", msg);
+    }
+
+    /**
+     * Example of test reusing methods in abstract share page objects.
+     */
+    @Test
+    public void titleDisplayed() {
+        // Invoke render when ready to use page object.
+        page.render();
+        Assert.assertNotNull(page);
+        Assert.assertTrue(page.getTitle().contains("This is a simple page"));
+    }
+
+    /**
+     * Test that show how we are able to reuse share page objects
+     * objects in particular the navigation object.
+     */
+    @Test
+    public void navigate() {
+        Assert.assertNotNull(page.getNav());
+        PeopleFinderPage peoppleFinderPage = page.getNav().selectPeople().render();
+        Assert.assertNotNull(peoppleFinderPage);
+    }
+}

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/java/demoamp/po/DemoPage.java

@@ -0,0 +1,88 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
+ * This file is part of Alfresco
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ${package}.demoamp.po;
+
+import org.alfresco.po.share.SharePage;
+import org.alfresco.webdrone.RenderTime;
+import org.alfresco.webdrone.WebDrone;
+import org.openqa.selenium.By;
+import org.openqa.selenium.NoSuchElementException;
+
+/**
+ * Demo of simple share page object that encapsulates the demo of simple page.
+ *
+ * @author Michael Suzuki
+ * @since 2.0.1
+ */
+public class DemoPage extends SharePage {
+    private By SIMPLE_DEMO_LOGO = By.id("DEMO_SIMPLE_LOGO");
+    private By SIMPLE_DEMO_MESSAGE = By.id("DEMO_SIMPLE_MSG");
+
+    public DemoPage(WebDrone drone) {
+        super(drone);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public DemoPage render() {
+        return render(new RenderTime(maxPageLoadingTime));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public DemoPage render(RenderTime timer) {
+        while (true) {
+            timer.start();
+            try {
+                if (isSimpleLogoDisplayed() && isMessageDisplayed()) {
+                    break;
+                }
+            } catch (NoSuchElementException nse) {
+            } finally {
+                timer.end();
+            }
+        }
+        return this;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public DemoPage render(long time) {
+        return render(new RenderTime(time));
+    }
+
+    public boolean isSimpleLogoDisplayed() {
+        try {
+            return drone.find(SIMPLE_DEMO_LOGO).isDisplayed();
+        } catch (NoSuchElementException se) {
+        }
+        return false;
+    }
+
+    public boolean isMessageDisplayed() {
+        try {
+            return drone.find(SIMPLE_DEMO_MESSAGE).isDisplayed();
+        } catch (NoSuchElementException se) {
+        }
+        return false;
+    }
+
+    public String getMessage() {
+        return drone.find(SIMPLE_DEMO_MESSAGE).getText();
+    }
+}

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

@@ -1,74 +0,0 @@
-<alfresco-config>
-
-      <config evaluator="string-compare" condition="WebFramework">
-           <web-framework>
-               <autowire>
-                   <mode>development</mode>
-               </autowire>
-           </web-framework>
-       </config>
-
-
-    <!-- Global config section -->
-    <config replace="true">
-        <flags>
-            <!--
-               Developer debugging setting to turn on DEBUG mode for client scripts in the browser
-            -->
-            <client-debug>true</client-debug>
-            <!--
-               LOGGING can always be toggled at runtime when in DEBUG mode (Ctrl, Ctrl, Shift, Shift).
-               This flag automatically activates logging on page load.
-            -->
-            <client-debug-autologging>false</client-debug-autologging>
-        </flags>
-    </config>
-
-    <!-- Disable CSRF completely for now -->
-    <!-- It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy -->
-    <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-	<filter/>
-    </config>
-
-    <config evaluator="string-compare" condition="Remote">
-        <remote>
-            <endpoint>
-                <id>alfresco-noauth</id>
-                <name>Alfresco - unauthenticated access</name>
-                <description>Access to Alfresco Repository WebScripts that do not require authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${alfresco.repo.url}/s</endpoint-url>
-                <identity>none</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco</id>
-                <name>Alfresco - user access</name>
-                <description>Access to Alfresco Repository WebScripts that require user authentication</description>
-                <connector-id>alfresco</connector-id>
-                <endpoint-url>${alfresco.repo.url}/s</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>alfresco-feed</id>
-                <name>Alfresco Feed</name>
-                <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
-                <connector-id>http</connector-id>
-                <endpoint-url>${alfresco.repo.url}/s</endpoint-url>
-                <basic-auth>true</basic-auth>
-                <identity>user</identity>
-            </endpoint>
-
-            <endpoint>
-                <id>activiti-admin</id>
-                <name>Activiti Admin UI - user access</name>
-                <description>Access to Activiti Admin UI, that requires user authentication</description>
-                <connector-id>activiti-admin-connector</connector-id>
-                <endpoint-url>${alfresco.repo.url}/activiti-admin</endpoint-url>
-                <identity>user</identity>
-            </endpoint>
-        </remote>
-    </config>
-</alfresco-config>
-

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

@@ -1,266 +0,0 @@
-# This is a full override of Alfresco 4.2.b log4j.properties
-# This file overwrites the alfresco.war log4j.properties
-
-# Set root logger level to error
-log4j.rootLogger=${app.log.root.level}, Console, File
-
-###### Console appender definition #######
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-# use log4j NDC to replace %x with tenant domain / username
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
-#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### File appender definition #######
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=${app.log.dir}alfresco.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### Hibernate specific appender definition #######
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-###### Log level overrides #######
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
-
-# Spring
-log4j.logger.org.springframework=warn
-# Turn off Spring remoting warnings that should really be info or debug.
-log4j.logger.org.springframework.remoting.support=error
-log4j.logger.org.springframework.util=error
-
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
-# MyFaces
-log4j.logger.org.apache.myfaces.util.DebugUtils=info
-log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
-log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
-log4j.logger.org.apache.myfaces.taglib=error
-
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity ###
-log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
-# Alfresco
-log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.repo.avm=info
-log4j.logger.org.alfresco.config=warn
-log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
-log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.repo.webservice=info
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.web.ui.common.Utils=error
-#log4j.logger.org.alfresco.web.ui.common.Utils=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=error
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# AVM filesystem debug logging
-#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Forms debugging
-# log4j.logger.org.alfresco.web.forms=debug
-# log4j.logger.org.chiba.xml.xforms=debug
-log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
-log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
-#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.repo.forms=info
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-###### Scripting #######
-
-# Web Framework
-log4j.logger.org.springframework.extensions.webscripts=info
-log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
-log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
-
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.avm.actions=info
-
-# Freemarker
-# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
-log4j.logger.org.alfresco.demoamp.test=DEBUG

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/testng.xml

@@ -0,0 +1,12 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Custom Share AMP Page Object Tests" parallel="false">
+    <test name="DemoPageTest">
+        <classes>
+            <class name="${package}.demoamp.DemoPageTestIT"/>
+        </classes>
+    </test>
+</suite>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file is included only when running this project with -Pamp-to-war -->
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
-
-
-  <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" description="The fully qualified name of a org.hibernate.dialect.Dialect subclass that allows Hibernate to generate SQL optimized for a particular relational database. Choose from org.hibernate.dialect.DerbyDialect, org.hibernate.dialect.MySQLInnoDBDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" description="Enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve natively generated keys after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier generators. By default, tries to determine the driver capabilities using connection metadata."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" description="Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be necessary to set this when the target database has more than one schema."/>
-   -->
-   
-  <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources --> 
-  <JarScanner scanAllDirectories="true" />
-  
-</Context>

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

@@ -3,9 +3,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
-    <name>Alfresco Share Client</name>
+    <name>Alfresco Share WAR Aggregator</name>
     <packaging>war</packaging>
-    <description>Alfresco Share Client</description>
+    <description>Alfresco Share aggregator, installs your Share AMPs in the Share WAR for aggregation and easy deployment purposes</description>
 
     <parent>
         <groupId>${groupId}</groupId>
@@ -13,10 +13,17 @@
         <version>${version}</version>
     </parent>
 
+    <properties>
+        <!-- Used in share-config-custom.xml when testing.
+             By default points to standard location (local) of Alfresco Repository -->
+        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
+    </properties>
+
     <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 -->
@@ -26,7 +33,17 @@
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
+        <!-- Uncomment if you are using RM (Records Management) module -->
+        <!--
+        <dependency>
+            <groupId>${alfresco.groupId}</groupId>
+            <artifactId>alfresco-rm-share</artifactId>
+            <version>${alfresco.rm.version}</version>
+            <type>amp</type>
+        </dependency>
+        -->
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -44,7 +61,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/>
@@ -55,6 +72,14 @@
                             <artifactId>share-amp</artifactId>
                             <type>amp</type>
                         </overlay>
+                        <!-- Uncomment if you are using RM module -->
+                        <!--
+                        <overlay>
+                            <groupId>${alfresco.groupId}</groupId>
+                            <artifactId>alfresco-rm-share</artifactId>
+                            <type>amp</type>
+                        </overlay>
+                        -->
                     </overlays>
                 </configuration>
             </plugin>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties

@@ -1,8 +0,0 @@
-# SHARE client environment dependent properties (local build)
-share.server.scheme=http
-share.server.name=localhost
-share.server.port=${jetty.port}
-alfresco.server.scheme=http
-alfresco.server.name=localhost
-alfresco.server.port=${jetty.port}
-alfresco.webapp.name=alfresco

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample

@@ -1,12 +1,18 @@
+<!-- Alfresco 5.0.d custom-slingshot-application-context.xml sample
+
+     Note. Any configuration related to a specific Share extension
+           (such as evaluator bean and message resource bean) should be
+            placed in the specific extension config file, such as for example
+            alfresco-allinone/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml
+-->
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- This is a sample configuration file from Alfresco Community 4.2.b - Please adapt to your version -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:hz="http://www.hazelcast.com/schema/config"
+       xmlns:hz="http://www.hazelcast.com/schema/spring"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                http://www.hazelcast.com/schema/config
-                http://www.hazelcast.com/schema/config/hazelcast-spring.xsd">
+                http://www.hazelcast.com/schema/spring
+                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
    
    <!--
         Hazelcast distributed messaging configuration - Share web-tier cluster config (3.4.8 and 4.0.1)
@@ -47,6 +53,7 @@
    <bean id="webframework.factory.requestcontext.servlet" class="org.alfresco.web.site.ClusterAwareRequestContextFactory" parent="webframework.factory.base">
       <property name="linkBuilderFactory" ref="webframework.factory.linkbuilder.servlet" />
       <property name="extensibilityModuleHandler" ref="webscripts.extensibility.handler" />
+      <property name="dependencyHandler" ref="dependency.handler" />
       <property name="clusterObjectPersister" ref="webframework.slingshot.persister.remote" />
    </bean>
    -->

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

@@ -1,4 +1,11 @@
-<!-- This is a sample configuration file from Alfresco Community 4.2.b - Please adapt to your version -->
+<!-- Alfresco 5.0.d share-config-custom.xml sample.
+
+     Note:
+     Any configuration related to a specific Share AMP extension
+     (such as doclib action config and form config)
+     should be added to that extension's custom config
+     (i.e. into the share-amp/src/main/resources/META-INF/share-config-custom.xml)
+     -->
 <alfresco-config>
 
    <!-- Global config section -->
@@ -37,6 +44,62 @@
       </web-framework>
    </config>
 
+   <!-- Disable the CSRF Token Filter -->
+   <!--
+   <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
+      <filter/>
+   </config>
+   -->
+
+   <!--
+      To run the CSRF Token Filter behind 1 or more proxies that do not rewrite the Origin or Referere headers:
+
+      1. Copy the "CSRFPolicy" default config in share-security-config.xml and paste it into this file.
+      2. Replace the old config by setting the <config> element's "replace" attribute to "true" like below:
+         <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
+      3. To every <action name="assertReferer"> element add the following child element
+         <param name="referer">http://www.proxy1.com/.*|http://www.proxy2.com/.*</param>
+      4. To every <action name="assertOrigin"> element add the following child element
+         <param name="origin">http://www.proxy1.com|http://www.proxy2.com</param>
+   -->
+
+   <!--
+      Remove the default wildcard setting and use instead a strict whitelist of the only domains that shall be allowed
+      to be used inside iframes (i.e. in the WebView dashlet on the dashboards)
+   -->
+   <!--
+   <config evaluator="string-compare" condition="IFramePolicy" replace="true">
+      <cross-domain>
+         <url>http://www.trusted-domain-1.com/</url>
+         <url>http://www.trusted-domain-2.com/</url>
+      </cross-domain>
+   </config>
+   -->
+
+   <!-- Turn off header that stops Share from being displayed in iframes on pages from other domains -->
+   <!--
+   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
+      <headers>
+         <header>
+            <name>X-Frame-Options</name>
+            <enabled>false</enabled>
+         </header>
+      </headers>
+   </config>
+   -->
+
+   <!-- Prevent browser communication over HTTP (for HTTPS servers) -->
+   <!--
+   <config evaluator="string-compare" condition="SecurityHeadersPolicy">
+      <headers>
+         <header>
+            <name>Strict-Transport-Security</name>
+            <value>max-age=31536000</value>
+         </header>
+      </headers>
+   </config>
+   -->
+
    <config evaluator="string-compare" condition="Replication">
       <share-urls>
          <!--
@@ -63,7 +126,12 @@
          <!--
             Optionally limit the number of folders shown in treeview throughout Share.
          -->
-         <maximum-folder-count>-1</maximum-folder-count>
+         <maximum-folder-count>1000</maximum-folder-count>
+         
+         <!--  
+            Default timeout in milliseconds for folder Tree component to recieve response from Repository
+         -->
+         <timeout>7000</timeout>
       </tree>
 
       <!--
@@ -86,9 +154,11 @@
             <aspect name="emailserver:aliasable" />
             <aspect name="cm:taggable" />
             <aspect name="app:inlineeditable" />
-            <aspect name="gd:googleEditable" />
             <aspect name="cm:geographic" />
             <aspect name="exif:exif" />
+            <aspect name="audio:audio" />
+            <aspect name="cm:indexControl" />
+            <aspect name="dp:restrictable" />
          </visible>
 
          <!-- Aspects that a user can add. Same as "visible" if left empty -->
@@ -117,6 +187,10 @@
 
          <type name="cm:folder">
          </type>
+
+         <type name="trx:transferTarget">
+            <subtype name="trx:fileTransferTarget" />
+         </type>
       </types>
 
       <!--
@@ -139,8 +213,8 @@
             The I18N label is created from the "type" attribute, e.g. google-docs.doc=Google Docs&trade; Document
          -->
          <creatable-types>
-            <creatable type="doc">application/msword</creatable>
-            <creatable type="xls">application/vnd.ms-excel</creatable>
+            <creatable type="doc">application/vnd.openxmlformats-officedocument.wordprocessingml.document</creatable>
+            <creatable type="xls">application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</creatable>
             <creatable type="ppt">application/vnd.ms-powerpoint</creatable>
          </creatable-types>
       </google-docs>
@@ -209,14 +283,19 @@
             This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures.
          -->
          <evaluate-child-folders>false</evaluate-child-folders>
-         
+
          <!--
             Optionally limit the number of folders shown in treeview throughout Share.
          -->
          <maximum-folder-count>500</maximum-folder-count>
       </tree>
+
+      <!--
+         Whether the link to the Repository Library appears in the header component or not.
+      -->
+      <visible>true</visible>
    </config>
-   
+
    <!-- Kerberos settings -->
    <!-- To enable kerberos rename this condition to "Kerberos" -->
    <config evaluator="string-compare" condition="KerberosDisabled" replace="true">
@@ -243,11 +322,21 @@
             JAAS login configuration entry name.
          -->
          <config-entry>ShareHTTP</config-entry>
+        <!--
+           A Boolean which when true strips the @domain sufix from Kerberos authenticated usernames.
+           Use together with stripUsernameSuffix property in alfresco-global.properties file.
+        -->
+        <stripUserNameSuffix>true</stripUserNameSuffix>
       </kerberos>
    </config>
 
-	<!-- example port config used to access remote Alfresco server (default is 8080) -->
+   <!-- Uncomment and modify the URL to Activiti Admin Console if required. -->
    <!--
+   <config evaluator="string-compare" condition="ActivitiAdmin" replace="true">
+      <activiti-admin-url>http://localhost:8080/alfresco/activiti-admin</activiti-admin-url>
+   </config>
+   -->
+
    <config evaluator="string-compare" condition="Remote">
       <remote>
          <endpoint>
@@ -277,20 +366,21 @@
             <basic-auth>true</basic-auth>
             <identity>user</identity>
          </endpoint>
-         
+
          <endpoint>
-            <id>activiti-admin</id>
-            <name>Activiti Admin UI - user access</name>
-            <description>Access to Activiti Admin UI, that requires user authentication</description>
-            <connector-id>activiti-admin-connector</connector-id>
-            <endpoint-url>http://localhost:8080/alfresco/activiti-admin</endpoint-url>
+            <id>alfresco-api</id>
+            <parent-id>alfresco</parent-id>
+            <name>Alfresco Public API - user access</name>
+            <description>Access to Alfresco Repository Public API that require user authentication.
+                         This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
+            <connector-id>alfresco</connector-id>
+            <endpoint-url>http://localhost:8080/alfresco/api</endpoint-url>
             <identity>user</identity>
          </endpoint>
       </remote>
    </config>
-	-->
 
-   <!-- 
+   <!--
         Overriding endpoints to reference an Alfresco server with external SSO enabled
         NOTE: If utilising a load balancer between web-tier and repository cluster, the "sticky
               sessions" feature of your load balancer must be used.
@@ -299,12 +389,23 @@
         *Optional* keystore contains SSL client certificate + trusted CAs.
         Used to authenticate share to an external SSO system such as CAS
         Remove the keystore section if not required i.e. for NTLM.
-        
+
         NOTE: For Kerberos SSO rename the "KerberosDisabled" condition above to "Kerberos"
-        
-        NOTE: For external SSO, switch the endpoint connector to "AlfrescoHeader" and set
-              the userHeader to the name of the HTTP header that the external SSO
+
+        NOTE: For external SSO, switch the endpoint connector to "alfrescoHeader" and set
+              the userHeader value to the name of the HTTP header that the external SSO
               uses to provide the authenticated user name.
+        NOTE: For external SSO, Share now supports the "userIdPattern" mechanism as is available
+              on the repository config for External Authentication sub-system. Add the following
+              element to your "alfrescoHeader" connector config:
+              <userIdPattern>^ignore-(\w+)-ignore</userIdPattern>
+              This is an example, ensure the Id pattern matches your repository config.
+        NOTE: For external SSO, Share now supports stateless (no Http Session or sticky session)
+              connection to the repository when using the alfrescoHeader remote user connector.
+              e.g. You can change endpoint config to use the faster /service URL instead of the
+              /wcs URL if you are using External Authentication and then remove sticky session config
+              from your proxy between Share and Alfresco. Note that this is also faster because Share
+              will no longer call the /touch REST API before every remote call to the repository.
    -->
    <!--
    <config evaluator="string-compare" condition="Remote">
@@ -314,14 +415,14 @@
              <type>pkcs12</type>
              <password>alfresco-system</password>
          </keystore>
-         
+
          <connector>
             <id>alfrescoCookie</id>
             <name>Alfresco Connector</name>
             <description>Connects to an Alfresco instance using cookie-based authentication</description>
             <class>org.alfresco.web.site.servlet.SlingshotAlfrescoConnector</class>
          </connector>
-         
+
          <connector>
             <id>alfrescoHeader</id>
             <name>Alfresco Connector</name>
@@ -339,8 +440,50 @@
             <identity>user</identity>
             <external-auth>true</external-auth>
          </endpoint>
+
+         <endpoint>
+            <id>alfresco-feed</id>
+            <parent-id>alfresco</parent-id>
+            <name>Alfresco Feed</name>
+            <description>Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet</description>
+            <connector-id>alfrescoHeader</connector-id>
+            <endpoint-url>http://localhost:8080/alfresco/wcs</endpoint-url>
+            <identity>user</identity>
+            <external-auth>true</external-auth>
+         </endpoint>
+
+         <endpoint>
+            <id>alfresco-api</id>
+            <parent-id>alfresco</parent-id>
+            <name>Alfresco Public API - user access</name>
+            <description>Access to Alfresco Repository Public API that require user authentication.
+                         This makes use of the authentication that is provided by parent 'alfresco' endpoint.</description>
+            <connector-id>alfrescoHeader</connector-id>
+            <endpoint-url>http://localhost:8080/alfresco/api</endpoint-url>
+            <identity>user</identity>
+            <external-auth>true</external-auth>
+         </endpoint>
       </remote>
    </config>
    -->
-   
+
+   <!-- Cookie settings -->
+   <!-- To disable alfUsername2 cookie set enableCookie value to "false" -->
+   <!--
+   <plug-ins>
+      <element-readers>
+         <element-reader element-name="cookie" class="org.alfresco.web.config.cookie.CookieElementReader"/>
+      </element-readers>
+   </plug-ins>
+
+   <config evaluator="string-compare" condition="Cookie" replace="true">
+      <cookie>
+         <enableCookie>false</enableCookie>
+         <cookies-to-remove>
+            <cookie-to-remove>alfUsername3</cookie-to-remove>
+            <cookie-to-remove>alfLogin</cookie-to-remove>
+         </cookies-to-remove>
+      </cookie>
+   </config>
+   -->
 </alfresco-config>

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

@@ -1,5 +1,5 @@
 # Set root logger level to error
-log4j.rootLogger=${app.log.root.level}, Console, File
+log4j.rootLogger=error, Console, File
 
 ###### Console appender definition #######
 
@@ -17,27 +17,7 @@ log4j.appender.File.File=${app.log.dir}share.log
 log4j.appender.File.Append=true
 log4j.appender.File.DatePattern='.'yyyy-MM-dd
 log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
-
-###### Hibernate specific appender definition #######
-#log4j.appender.file=org.apache.log4j.FileAppender
-#log4j.appender.file.File=hibernate.log
-#log4j.appender.file.layout=org.apache.log4j.PatternLayout
-#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-
-###### Log level overrides #######
-
-# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
-# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
-# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
-# Log4j addLoggerMBean as long as the logger exists and has been loaded.
-
-# Hibernate
-log4j.logger.org.hibernate=error
-log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
-log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
-log4j.logger.org.hibernate.type=warn
-log4j.logger.org.hibernate.cfg.SettingsFactory=warn
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
 
 # Spring
 log4j.logger.org.springframework=warn
@@ -45,218 +25,23 @@ log4j.logger.org.springframework=warn
 log4j.logger.org.springframework.remoting.support=error
 log4j.logger.org.springframework.util=error
 
-# Axis/WSS4J
-log4j.logger.org.apache.axis=info
-log4j.logger.org.apache.ws=info
-
-# CXF
-log4j.logger.org.apache.cxf=error
-
 # MyFaces
 log4j.logger.org.apache.myfaces.util.DebugUtils=info
 log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
 log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
 log4j.logger.org.apache.myfaces.taglib=error
 
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
-# log prepared statement cache activity ###
-log4j.logger.org.hibernate.ps.PreparedStatementCache=info
-
 # Alfresco
 log4j.logger.org.alfresco=error
-log4j.logger.org.alfresco.repo.admin=info
-log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
-log4j.logger.org.alfresco.repo.model.filefolder=warn
-log4j.logger.org.alfresco.repo.tenant=info
-log4j.logger.org.alfresco.repo.avm=info
 log4j.logger.org.alfresco.config=warn
 log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
-log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
-log4j.logger.org.alfresco.repo.management.subsystems=warn
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
-log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
-log4j.logger.org.alfresco.repo.security.sync=info
-log4j.logger.org.alfresco.repo.security.person=info
-
-log4j.logger.org.alfresco.sample=info
 log4j.logger.org.alfresco.web=info
-#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
-#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
-#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
-#log4j.logger.org.alfresco.web.bean.clipboard=debug
-log4j.logger.org.alfresco.repo.webservice=info
-log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
-#log4j.logger.org.alfresco.web.page=debug
-
-log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
-#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
-
-log4j.logger.org.alfresco.web.ui.common.Utils=error
-#log4j.logger.org.alfresco.web.ui.common.Utils=info
-
-log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
-log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
-
-# Specific patches
-log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
-log4j.logger.org.alfresco.repo.version.VersionMigrator=info
-log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
-
-log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
-log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
-log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
-log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
-log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
-log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
-log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
-log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
-log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
-log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
-log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
-log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info
-log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
-
-#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
-
-log4j.logger.org.alfresco.repo.workflow=info
-
-# CIFS server debugging
-log4j.logger.org.alfresco.smb.protocol=error
-#log4j.logger.org.alfresco.smb.protocol.auth=debug
-#log4j.logger.org.alfresco.acegi=debug
-
-# FTP server debugging
-log4j.logger.org.alfresco.ftp.protocol=error
-#log4j.logger.org.alfresco.ftp.server=debug
-
-# WebDAV debugging
-#log4j.logger.org.alfresco.webdav.protocol=debug
-log4j.logger.org.alfresco.webdav.protocol=error
-
-# NTLM servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
-
-# Kerberos servlet filters
-#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
-#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
-
-# File servers
-log4j.logger.org.alfresco.fileserver=warn
-
-# Repo filesystem debug logging
-#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
-
-# AVM filesystem debug logging
-#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
-
-# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
-log4j.logger.org.alfresco.repo.node.integrity=ERROR
-
-# Indexer debugging
-log4j.logger.org.alfresco.repo.search.Indexer=error
-#log4j.logger.org.alfresco.repo.search.Indexer=debug
-
-log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
-log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
-#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
-
-# Audit debugging
-# log4j.logger.org.alfresco.repo.audit=DEBUG
-# log4j.logger.org.alfresco.repo.audit.model=DEBUG
-
-# Forms debugging
-# log4j.logger.org.alfresco.web.forms=debug
-# log4j.logger.org.chiba.xml.xforms=debug
-log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
-log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
-
-# Property sheet and modelling debugging
-# change to error to hide the warnings about missing properties and associations
-log4j.logger.alfresco.missingProperties=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
-log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
-#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
-
-# Dictionary/Model debugging
-log4j.logger.org.alfresco.repo.dictionary=warn
-log4j.logger.org.alfresco.repo.dictionary.types.period=warn
-
-# Virtualization Server Registry
-log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
-
-# Spring context runtime property setter
-log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
-
-# Debugging options for clustering
-log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
-log4j.logger.org.alfresco.repo.content.replication=error
-
-#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
-
-# Activity service
-log4j.logger.org.alfresco.repo.activities=warn
-
-# User usage tracking
-log4j.logger.org.alfresco.repo.usage=info
-
-# Sharepoint
-log4j.logger.org.alfresco.module.vti=info
-
-# Forms Engine
-log4j.logger.org.alfresco.repo.forms=info
-log4j.logger.org.alfresco.web.config.forms=info
-log4j.logger.org.alfresco.web.scripts.forms=info
-
-# CMIS
-log4j.logger.org.alfresco.opencmis=error
-log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
-log4j.logger.org.alfresco.cmis=error
-log4j.logger.org.alfresco.cmis.dictionary=warn
-log4j.logger.org.apache.chemistry.opencmis=info
-
-# IMAP
-log4j.logger.org.alfresco.repo.imap=info
-
-# JBPM
-# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler 
-log4j.logger.org.jbpm.graph.def.GraphElement=fatal
-
-#log4j.logger.org.alfresco.repo.googledocs=debug
-
-###### Scripting #######
 
 # Web Framework
 log4j.logger.org.springframework.extensions.webscripts=info
 log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
 log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
 
-# Repository
-log4j.logger.org.alfresco.repo.web.scripts=warn
-log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
-log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
-log4j.logger.org.alfresco.repo.jscript=error
-log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
-log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
-
-log4j.logger.org.alfresco.repo.avm.actions=info
-
 # Freemarker
 # Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
-log4j.logger.freemarker.runtime=
-
-# Metadata extraction
-log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
-
-# Reduces PDFont error level due to ALF-7105
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
-log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
-
-# no index support
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
-log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
+log4j.logger.freemarker.runtime=

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

@@ -1,12 +1,25 @@
 <alfresco-config>
 
-      <config evaluator="string-compare" condition="WebFramework">
-           <web-framework>
-               <autowire>
-                   <mode>development</mode>
-               </autowire>
-           </web-framework>
-       </config>
+    <config evaluator="string-compare" condition="WebFramework">
+        <web-framework>
+            <autowire>
+                <!-- Changing this to 'development' currently breaks the Admin Console.
+                     Instead we make a POST to clear Share dependency caches, see 'clear-caches-refresh-ws' profile. -->
+                <mode>production</mode> <!-- not really need in the long run, used for YUI - deprecate -->
+            </autowire>
+
+            <!--
+                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
+
+                 If resource caching has been disabled then all the dependency caches will be cleared
+                 before processing the Aikau jsonModel request...
+                    (i.e. this.dojoDependencyHandler.clearCaches() )
+
+                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
+            -->
+            <disable-resource-caching>false</disable-resource-caching>
+        </web-framework>
+    </config>
 
 
     <!-- Global config section -->
@@ -24,12 +37,18 @@
         </flags>
     </config>
 
-    <!-- Disable CSRF completely for now -->
-    <!-- It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy -->
+    <!--
+        Disable CSRF completely for now
+        It seems Share has issues on 4.2.x with the embedded tomcat and CSRFPolicy
+        -->
     <config evaluator="string-compare" condition="CSRFPolicy" replace="true">
-	<filter/>
+        <filter/>
     </config>
 
+    <!--
+        Change so it is picked up from property where the Alfresco Repo Webapp is running
+        (e.g. http://localhost:8080/alfresco)
+        -->
     <config evaluator="string-compare" condition="Remote">
         <remote>
             <endpoint>

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

@@ -0,0 +1,52 @@
+# This file is copied from Alfresco Share 5.0.d
+# Overrides tomcat/webapps/share/WEB-INF/classes/log4j,properties
+# and sets new file location from property and log level from property.
+#
+
+# Set root logger level to error
+log4j.rootLogger=${app.log.root.level}, Console, File
+
+###### Console appender definition #######
+
+# All outputs currently set to be a ConsoleAppender.
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+
+# use log4j NDC to replace %x with tenant domain / username
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n 
+#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### File appender definition #######
+log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.File.File=${app.log.dir}alfresco.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.config=warn
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.web=info
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=

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

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>solr-config</artifactId>
+    <packaging>pom</packaging>
+    <name>Alfresco Solr 4 Configuration</name>
+    <description>Apache Solr 4 Configuration Customization</description>
+
+    <!-- Setup the parent extension project, which contain all the Alfresco Maven SDK stuff -->
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+    <!-- Build Solr Configuration only when we run an embedded Tomcat (i.e. profile run is enabled).
+         We assume that there is no need to customize Apache Solr 4 itself. -->
+    <profiles>
+        <profile>
+            <id>run</id>
+
+            <properties>
+                <alfresco.solr.dir>${project.parent.basedir}/${alfresco.data.location}/solr4</alfresco.solr.dir>
+                <alfresco.solr.home.dir>${alfresco.solr.dir}/config</alfresco.solr.home.dir>
+                <alfresco.solr.data.dir>${alfresco.solr.dir}/data</alfresco.solr.data.dir>
+            </properties>
+
+            <dependencies>
+                <!-- Download the default Solr4-config.zip Configuration files,
+                     they will be updated so we can run locally over HTTP -->
+                <dependency>
+                    <groupId>${alfresco.groupId}</groupId>
+                    <artifactId>alfresco-solr4</artifactId>
+                    <version>${alfresco.version}</version>
+                    <classifier>config</classifier>
+                    <type>zip</type>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                    <!-- Run goal unpack and unzip the content of the downloaded default solr-config.zip file into the
+                         alfresco-maven-sdk2-test/alf_data_dev/solr4/config directory
+                         (The solr-config.zip is brought in via the dependency section) -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack-alfresco-config</id>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <outputDirectory>${alfresco.solr.home.dir}</outputDirectory>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>${alfresco.groupId}</groupId>
+                                            <artifactId>alfresco-solr4</artifactId>
+                                            <version>${alfresco.version}</version>
+                                            <classifier>config</classifier>
+                                            <type>zip</type>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- For windows paths, convert single \ to / for the ${alfresco.solr.data.dir} path,
+                         by default it will be c:\bla\, we need forward slash or double backslash. -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>regexp-property</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>regex-property</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <name>solrDataDir</name>
+                            <value>${alfresco.solr.data.dir}</value>
+                            <regex>\\</regex>
+                            <replacement>/</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </plugin>
+
+
+                    <!-- Run the goal replace and update configuration files for the
+                         Solr cores to reflect our build structure -->
+                    <plugin>
+                        <groupId>com.google.code.maven-replacer-plugin</groupId>
+                        <artifactId>replacer</artifactId>
+                        <executions>
+                            <execution>
+                                <id>setup-solr-config</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>replace</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <regex>false</regex>
+                            <includes>
+                                <include>${alfresco.solr.home.dir}/archive-SpacesStore/conf/solrcore.properties</include>
+                                <include>${alfresco.solr.home.dir}/workspace-SpacesStore/conf/solrcore.properties</include>
+                            </includes>
+                            <replacements>
+                                <replacement>
+                                    <token>@@ALFRESCO_SOLR4_DATA_DIR@@</token>
+                                    <value>${solrDataDir}/index</value>
+                                </replacement>
+                            </replacements>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+</project>

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

@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>${artifactId}</artifactId>
-    <name>Alfresco Apache Solr customization</name>
-    <packaging>pom</packaging>
-    <description>Alfresco Apache Solr Customization</description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <properties>
-        <alfresco.solr.dir>${project.basedir}/solr_home</alfresco.solr.dir>
-        <alfresco.solr.war.overlay>${project.build.directory}/${project.artifactId}-overlay</alfresco.solr.war.overlay>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-alfresco-community-lib</id>
-                        <goals><goal>unpack</goal></goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>${alfresco.solr.dir}</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <artifactId>alfresco-solr</artifactId>
-                                    <groupId>${alfresco.groupId}</groupId>
-                                    <classifier>config</classifier>
-                                    <version>${alfresco.version}</version>
-                                    <type>zip</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-alfresco-solr</id>
-                        <goals><goal>unpack</goal></goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>${alfresco.solr.war.overlay}</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <artifactId>alfresco-solr</artifactId>
-                                    <groupId>${alfresco.groupId}</groupId>
-                                    <version>${alfresco.version}</version>
-                                    <type>war</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-            
-            <!-- Replaces web.xml where applicable, commenting out the security-constraints -->
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <executions>
-                    <execution>
-                        <id>disable-securecomms</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <ignoreErrors>true</ignoreErrors>
-                    <file>${alfresco.solr.war.overlay}/WEB-INF/web.xml</file>
-                    <replacements>
-                        <replacement>
-                            <token><![CDATA[<security-constraint>]]></token>
-                            <value><![CDATA[<!-- <security-constraint>]]></value>
-                        </replacement>
-                        <replacement>
-                            <token><![CDATA[</security-role>]]></token>
-                            <value><![CDATA[</security-role> -->]]></value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>create-solr-war</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo message="Packaging Apache Solr WAR overlay" />
-                                <zip basedir="${alfresco.solr.war.overlay}" destfile="${alfresco.solr.dir}/apache-solr-1.4.1-overlay.war" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>overlay-web-xml</id>
-                        <phase>generate-resources</phase>
-                        <goals><goal>copy-resources</goal></goals>
-                        <configuration>
-                            <outputDirectory>${alfresco.solr.war.overlay}/WEB-INF</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <filtering>true</filtering>
-                                    <targetPath>classes</targetPath>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-solr-resources</id>
-                        <phase>package</phase>
-                        <goals><goal>copy-resources</goal></goals>
-                        <configuration>
-                            <outputDirectory>${alfresco.solr.dir}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/solr-properties/archive</directory>
-                                    <filtering>true</filtering>
-                                    <targetPath>${alfresco.solr.dir}/archive-SpacesStore/conf</targetPath>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/solr-properties/workspace</directory>
-                                    <filtering>true</filtering>
-                                    <targetPath>${alfresco.solr.dir}/workspace-SpacesStore/conf</targetPath>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/solr-properties</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>log4j-solr.properties</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>${alfresco.groupId}</groupId>
-            <artifactId>alfresco-solr</artifactId>
-            <classifier>config</classifier>
-            <version>${alfresco.version}</version>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/archive/solrcore.properties

@@ -1,84 +0,0 @@
-#
-# solrcore.properties - used in solrconfig.xml
-#
-# data is in ${data.dir.root}/${data.dir.store} 
-
-data.dir.root=${alfresco.solr.dir}
-data.dir.store=archive/SpacesStore
-enable.alfresco.tracking=true
-cache.alfresco.size=100
-max.field.length=2147483647
-
-
-#
-# Properties loaded during alfresco tracking
-#
-
-alfresco.host=localhost
-alfresco.port=8080
-alfresco.port.ssl=8443
-alfresco.baseUrl=/alfresco
-alfresco.cron=0/15 * * * * ? *
-alfresco.stores=archive://SpacesStore
-alfresco.lag=1000
-alfresco.hole.retention=3600000
-alfresco.batch.count=1000
-
-# encryption
-
-# none, https
-alfresco.secureComms=none
-
-# ssl
-alfresco.encryption.ssl.keystore.type=JCEKS
-alfresco.encryption.ssl.keystore.provider=
-alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore
-alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties
-alfresco.encryption.ssl.truststore.type=JCEKS
-alfresco.encryption.ssl.truststore.provider=
-alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore
-alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties
-
-## Tracking
-
-alfresco.enableMultiThreadedTracking=true
-alfresco.corePoolSize=3
-alfresco.maximumPoolSize=-1
-alfresco.keepAliveTime=120
-alfresco.threadPriority=5
-alfresco.threadDaemon=true
-alfresco.workQueueSize=-1
-
-# HTTP Client
-
-alfresco.maxTotalConnections=40
-alfresco.maxHostConnections=40
-alfresco.socketTimeout=60000
-
-# SOLR caching
-
-solr.filterCache.size=64
-solr.filterCache.initialSize=64
-solr.queryResultCache.size=64
-solr.queryResultCache.initialSize=64
-solr.documentCache.size=64
-solr.documentCache.initialSize=64
-solr.queryResultMaxDocsCached=200
-
-solr.authorityCache.size=64
-solr.authorityCache.initialSize=64
-solr.pathCache.size=64
-solr.pathCache.initialSize=64
-
-# SOLR
-
-solr.maxBooleanClauses=10000
-
-#
-# TODO
-#
-# cross language support
-# locale expansion
-# logging check report ....
-#
-# 

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

@@ -1,18 +0,0 @@
-# Set root logger level to error
-log4j.rootLogger=${app.log.root.level}, Console, File
-
-###### Console appender definition #######
-
-# All outputs currently set to be a ConsoleAppender.
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-
-log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
-
-###### File appender definition #######
-log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.File.File=${app.log.dir}solr.log
-log4j.appender.File.Append=true
-log4j.appender.File.DatePattern='.'yyyy-MM-dd
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/src/main/solr-properties/workspace/solrcore.properties

@@ -1,110 +0,0 @@
-#
-# solrcore.properties - used in solrconfig.xml
-#
-# data is in ${data.dir.root}/${data.dir.store} 
-
-data.dir.root=${alfresco.solr.dir}
-data.dir.store=workspace/SpacesStore
-enable.alfresco.tracking=true
-cache.alfresco.size=100
-max.field.length=2147483647
-
-
-#
-# Properties loaded during alfresco tracking
-#
-
-alfresco.host=localhost
-alfresco.port=8080
-alfresco.port.ssl=8443
-alfresco.baseUrl=/alfresco
-alfresco.cron=0/15 * * * * ? *
-alfresco.stores=workspace://SpacesStore
-#alfresco.index.transformContent=false
-#alfresco.ignore.datatype.1=d:content
-alfresco.lag=1000
-alfresco.hole.retention=3600000
-# alfresco.hole.check.after is not used yet
-# It will reduce the hole checking load 
-alfresco.hole.check.after=300000
-alfresco.batch.count=1000
-
-# encryption
-
-# none, https
-alfresco.secureComms=none
-
-# ssl
-alfresco.encryption.ssl.keystore.type=JCEKS
-alfresco.encryption.ssl.keystore.provider=
-alfresco.encryption.ssl.keystore.location=ssl.repo.client.keystore
-alfresco.encryption.ssl.keystore.passwordFileLocation=ssl-keystore-passwords.properties
-alfresco.encryption.ssl.truststore.type=JCEKS
-alfresco.encryption.ssl.truststore.provider=
-alfresco.encryption.ssl.truststore.location=ssl.repo.client.truststore
-alfresco.encryption.ssl.truststore.passwordFileLocation=ssl-truststore-passwords.properties
-
-# Tracking
-
-alfresco.enableMultiThreadedTracking=true
-alfresco.corePoolSize=3
-alfresco.maximumPoolSize=-1
-alfresco.keepAliveTime=120
-alfresco.threadPriority=5
-alfresco.threadDaemon=true
-alfresco.workQueueSize=-1
-
-# HTTP Client
-
-alfresco.maxTotalConnections=40
-alfresco.maxHostConnections=40
-alfresco.socketTimeout=60000
-
-# SOLR caching
-
-solr.filterCache.size=64
-solr.filterCache.initialSize=64
-solr.queryResultCache.size=1024
-solr.queryResultCache.initialSize=1024
-solr.documentCache.size=64
-solr.documentCache.initialSize=64
-solr.queryResultMaxDocsCached=2000
-
-solr.authorityCache.size=64
-solr.authorityCache.initialSize=64
-solr.pathCache.size=64
-solr.pathCache.initialSize=64
-
-solr.readerToAclIdsCache.size=64
-solr.readerToAclIdsCache.initialSize=64
-
-# SOLR
-
-solr.maxBooleanClauses=10000
-
-# Batch fetch
-
-alfresco.transactionDocsBatchSize=100
-alfresco.changeSetAclsBatchSize=100
-alfresco.aclBatchSize=10
-
-# Warming
-
-solr.filterCache.autowarmCount=128
-solr.authorityCache.autowarmCount=0
-solr.pathCache.autowarmCount=128
-
-solr.queryResultWindowSize=200
-
-
-#
-# TODO
-#
-# cross language support
-# locale expansion
-# logging check report ....
-#
-# 
-
-
-alfresco.doPermissionChecks=true

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

@@ -1,23 +1,23 @@
   ------
-  Alfresco Maven All-in-One Archetype Advanced Usage
+  Alfresco All-in-One Archetype Advanced Usage
   ------
   Gabriele Columbro
   ------
-  Nov 2012
+  Aug 2014
   ------
 
 
 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
     
     * direclty in *.properties, particularly
     
-        * For Alfresco WAR projects
+        * For the <<<repo>>> project
         
-            * <<<src/main/properties/<env>/alfresco-global.properties>>> (environment dependent <<<alfresco-global.properties>>> packaged in the WAR )
+            * <<<src/main/properties/<env>/alfresco-global.properties>>> (environment dependent <<<alfresco-global.properties>>> packaged in the WAR when running directly within the AMP project)
         
         * For Alfresco/Share AMP projects
         
@@ -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
@@ -22,27 +22,46 @@ Introduction
   
   * Embedded run in Tomcat and embedded H2 database of the full Alfresco suite, including Repository, Share, Solr
   
-  * Support for unit and integration testings
+  * Support for unit and integration testing and rapid development (using spring-loaded, see run.sh)
+  
+  * Seamless IDE integration with Eclipse and Idea
 
 How to create a project:
 
-  You can create the latest release archetype with the following command:
+  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:
+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: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.
 
+Quickstart
+
+   Once your project is created:
+   
+   * 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 start Alfresco, Share and Solr in embedded mode.  
+    
+   * Wait for the startup of the webapps and then go <<<http://localhost:8080>>>.
+  
+   * Import the projects in your favorite IDE (with Maven integration) and start developing right away.
+   
 Usage
 
-  Instructions on how to use the Alfresco All in One archetype can be found on the {{{./usage.html}usage page}}, while 
+  
+  Full instructions on how to use the Alfresco All in One archetype can be found on the {{{./usage.html}usage page}}, while 
   for more advanced use cases refer to the {{{./advanced-usage.html}advanced usage page}}

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

@@ -1,9 +1,9 @@
   ------
-  Alfresco Maven All-in-One Archetype Usage
+  Maven Alfresco All-in-One Archetype Usage
   ------
   Gabriele Columbro
   ------
-  Nov 2012
+  Sep 2013
   ------
 
 Prerequisites
@@ -16,8 +16,9 @@ Project layout
 
 +---+
     pom.xml
-    |-> amp
-    |-> alfresco
+    |-> repo-amp
+    |-> repo
+    |-> share-amp
     |-> share
     |-> solr
     |-> runner (a Tomcat embedded runner / integration test runner)
@@ -48,7 +49,7 @@ Usage
         
         * AMP/WAR packaging
         
-        * AMP Unit testing
+        * AMP Unit testing and rapid development
         
         * run embedded in Tomcat + H2 database. 
           (<<NOTE>>: this is not a {{{http://www.alfresco.com/services/subscription/supported-platforms/} supported stack}} so use <<only for development purposes>>)
@@ -61,13 +62,13 @@ Usage
 
     for all the components of the Alfresco landscape. For more information, check the See the {{{./advanced-usage.html}advanced usage page}} page.
     
-    <<NOTE>>: AMPs produced with this project are fully compatible with Alfresco MMT,in fact the Alfresco Maven plugin - used to manage AMPs in this SDK - embeds the official Alfresco MMT to install depended AMPs. 
+    <<NOTE>>: AMPs produced with this project are fully compatible with Alfresco MMT,in fact the Maven Alfresco plugin - used to manage AMPs in this SDK - embeds the official Alfresco MMT to install depended AMPs.
 
 Commands
 
-* Commands from the root aggregator project
+    <<<run.sh>>> will automatically set up the SDK and run the webapps embedded to enable rapid development
 
-    Common Alfresco project lifecycle commands you want to run from the aggregator :
+    Additional common Maven lifecycle commands you want to run from the aggregator are:
 
     * <<<mvn package>>>: Runs unit tests and packages all customized modules in their respective <<<$\{project.build.directory\}/$\{project.build.finalName\}.amp>>>
 
@@ -81,4 +82,4 @@ Commands
 
 * Commands from from the <<<runner>>> project
 
-    * <<<mvn jetty:run -Prun'>>> or <<<'mvn integration-test -Prun'>>> to quickly run already packaged webapps
+    * <<<mvn install -Prun'>>> or <<<'mvn integration-test -Prun'>>> to quickly run already packaged webapps

archetypes/alfresco-allinone-archetype/src/site/site.xml

@@ -27,14 +27,14 @@
           <item name="Alfresco AMP Archetype" href="../alfresco-amp-archetype/index.html" />
           <item name="Share AMP Archetype" href="../share-amp-archetype/index.html" />
           <item name="Alfresco All-in-One Archetype" href="./index.html" />
-          <item name="Alfresco SDK Parent POM" href="../../poms/alfresco-sdk-parent/index.html" />
+          <item name="Maven 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="Alfresco Maven Plugin" href="../../plugins/alfresco-maven-plugin/index.html" />
+          <item name="Maven Alfresco Plugin" href="../../plugins/alfresco-maven-plugin/index.html" />
         </menu>
 
-        <menu name="Maven Alfresco Docs">
-            <item name="Official Alfresco SDK docs" href="http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html" />
-            <item name="Alfresco Maven Wiki Docs" href="http://wiki.alfresco.com/wiki/Maven_Alfresco_SDK" />
+        <menu name="Alfresco Documentation">
+            <item name="Official Maven Alfresco SDK docs" 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/" />
             <item name="Gabriele Columbro's blog" href="http://www.mindthegab.com/" />

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

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

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

@@ -0,0 +1,5 @@
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=allInOneTestRunEnterprise
+package=it.pkg
+

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

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

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

@@ -6,13 +6,13 @@
   <artifactId>alfresco-amp-archetype</artifactId>
 
   <packaging>maven-archetype</packaging>
-  <name>Repository AMP Archetype from Maven Alfresco SDK</name>
+  <name>Maven Alfresco SDK - Repository AMP Archetype</name>
   <description>Sample project with full support for lifecycle and rapid development of Repository AMPs (Alfresco Module Packages)</description>
 
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.0.0-beta-2</version>
+    <version>2.1.0</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -22,6 +22,9 @@
             <directory>src/main/resources</directory>
             <includes>
                 <include>archetype-resources/pom.xml</include>
+                <include>archetype-resources/run.sh</include>
+                <include>archetype-resources/run.bat</include>
+                <include>META-INF/maven/archetype-metadata.xml</include>
             </includes>
             <filtering>true</filtering>
         </resource>
@@ -29,6 +32,9 @@
             <directory>src/main/resources</directory>
             <excludes>
                 <exclude>archetype-resources/pom.xml</exclude>
+                <exclude>archetype-resources/run.sh</exclude>
+                <exclude>archetype-resources/run.bat</exclude>
+                <exclude>META-INF/maven/archetype-metadata.xml</exclude>
             </excludes>
             <filtering>false</filtering>
         </resource>
@@ -36,7 +42,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,66 +1,66 @@
 <?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"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <requiredProperties>
-    <requiredProperty key="version">
-      <defaultValue>1.0-SNAPSHOT</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_groupId">
-      <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>
-    </requiredProperty>
-    <requiredProperty key="package">
-      <defaultValue>(not used)</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
-  <fileSets>
-    <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-      <directory>src/main/amp</directory>
-      <includes>
-        <include>**/**</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" packaged="false" encoding="UTF-8">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-      <directory>src/test/resources</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-      <directory>src/test/properties</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-      <directory>tomcat</directory>
-      <includes>
-        <include>**/*.xml</include>
-      </includes>
-    </fileSet>
-  </fileSets>
+<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>
+        <requiredProperty key="version">
+            <defaultValue>1.0-SNAPSHOT</defaultValue>
+        </requiredProperty>
+    </requiredProperties>
+    <fileSets>
+        <fileSet filtered="true" packaged="true" encoding="UTF-8">
+            <directory>src/main/java</directory>
+            <includes>
+                <include>**/*.java</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="true" 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>
+                <include>**</include>
+            </includes>
+            <excludes>
+                <exclude>**/*-context.xml</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="true" packaged="false">
+            <directory>src/main/amp</directory>
+            <includes>
+                <include>**/*-context.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="false" encoding="UTF-8">
+            <directory>src/test/resources</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="false" encoding="UTF-8">
+            <directory>src/test/properties</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="false" encoding="UTF-8">
+            <directory>tomcat</directory>
+            <includes>
+                <include>**/*.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8">
+            <directory></directory>
+            <includes>
+                <include>run.sh</include>
+                <include>run.bat</include>
+            </includes>
+        </fileSet>
+    </fileSets>
 </archetype-descriptor>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
@@ -16,41 +16,35 @@
     </parent>
 
     <!-- 
-       | SDK properties have sensible defaults in the SDK parent,
-       | but you can override the properties below to use another version. 
-       | For more available properties see the alfresco-sdk-parent POM. 
+        SDK properties have sensible defaults in the SDK parent,
+        but you can override the properties below to use another version.
+        For more available properties see the alfresco-sdk-parent POM.
        -->
     <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
+        <!-- The following are default values for data location and Alfresco Community version.
+             Uncomment if you need to change (Note. current default version for Enterprise edition is @@alfresco.enterprise.default.version@@)
+          <alfresco.version>@@alfresco.community.default.version@@</alfresco.version>
+          <alfresco.data.location>alf_data_dev</alfresco.data.location> -->
+
+        <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
+            <app.log.root.level>WARN</app.log.root.level>
         -->
-        <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>
-        <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 -->
+
+        <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
+             for embedded run, defaults to the 'local' environment. See SDK Parent POM for more info.
         <env>local</env>
+        -->
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform 
         (e.g.version and edition) -->
     <dependencyManagement>
         <dependencies>
-            <!-- This will import the dependencyManagement for all artifacts in the selected Alfresco version/edition
-                (see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies) 
-                NOTE: You still need to define dependencies in your POM, but you can omit version as it's enforced by this dependencyManagement. NOTE: It defaults 
-                to the latest version this SDK pom has been tested with, but alfresco version can/should be overridden in your project's pom -->
+            <!-- Setup what versions of the different Alfresco artifacts that will be used (depends on alfresco.version),
+                 so we don't have to specify version in any of the dependency definitions in our POM.
+                 For more info see:
+                    http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies
+            -->
             <dependency>
                 <groupId>${alfresco.groupId}</groupId>
                 <artifactId>alfresco-platform-distribution</artifactId>
@@ -60,14 +54,50 @@
             </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 -->
+
     <dependencies>
+        <!-- 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 -->
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
     </dependencies>
-  
+
+    <profiles>
+        <!--
+            Brings in the extra Enterprise specific repository classes,
+            if the 'enterprise' profile has been activated, needs to be activated manually.
+            -->
+        <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>
+
+        <!--
+            If the 'amp-to-war' profile is enabled then make sure to bring in the alfresco-rad module,
+            which has the H2 scripts and other RAD features.
+
+            TODO: TO INVESTIGATE: This dependency is already defined in the parent SDK pom in the 'amp-to-war' profile
+                  but this does not work, it is not include...
+            -->
+        <profile>
+            <id>amp-to-war</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.alfresco.maven</groupId>
+                    <artifactId>alfresco-rad</artifactId>
+                    <version>${maven.alfresco.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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

@@ -0,0 +1,19 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::      Dev environment startup script for Alfresco Community.    ::
+::                                                                ::
+::      Downloads the spring-loaded lib if not existing and       ::
+::      runs the Repo AMP applied to Alfresco WAR.                ::
+::      Note. the Share WAR is not deployed.                      ::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+@echo off
+
+set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
+
+if not exist %springloadedfile% (
+  mvn validate -Psetup
+)
+
+set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G
+
+mvn integration-test -Pamp-to-war -nsu
+:: mvn integration-test -Pamp-to-war 

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

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Downloads the spring-loaded lib if not existing and      
+# runs the Repo AMP applied to Alfresco WAR.           
+# Note. the Share WAR is not deployed.              
+springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
+
+if [ ! -f $springloadedfile ]; then
+mvn validate -Psetup
+fi
+
+MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.desc.xml

@@ -1,5 +1,5 @@
 <webscript>
-    <shortname>Javascript Sample Webscript</shortname>
+    <shortname>Hello World Sample Webscript</shortname>
     <description>Hands back a greeting</description>
     <url>/sample/helloworld</url>
     <authentication>user</authentication>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.html.ftl

@@ -0,0 +1 @@
+Message: ${fromJS} ${fromJava}

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/extension/templates/webscripts/helloworld.get.js

@@ -0,0 +1 @@
+model["fromJS"] = "Hello World from JS!";

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.html.ftl

@@ -1 +0,0 @@
-Message: ${message}

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/extension/templates/webscripts/webscript.get.js

@@ -1 +0,0 @@
-model["message"] = "Hello World!";

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties

@@ -0,0 +1,5 @@
+## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module.
+## Define default values for all properties here.
+## System Administrators can override these values in environment specific configurations in
+## alfresco/tomcat/shared/classes/alfresco-global.properties.
+## 

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml

@@ -0,0 +1,26 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <!-- The bootstrap-context.xml file is used for patch definitions, importers, 
+		 workflow, and loading custom content models.  -->
+
+
+    <!-- Registration of new models -->
+    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+        <property name="models">
+            <list>
+                <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>
+                <value>alfresco/module/${project.artifactId}/model/workflow-model.xml</value>
+            </list>
+        </property>
+    </bean>
+	
+
+
+</beans>

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

@@ -1,28 +1,31 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-    	
-    http://www.apache.org/licenses/LICENSE-2.0
-    	
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    	
+    http://www.apache.org/licenses/LICENSE-2.0
+    	
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 <beans>
-    
+
     <!-- A simple class that is initialized by Spring -->
-    <bean id="changeme.exampleBean" class="org.alfresco.demoamp.Demo" init-method="init" />
-    
+    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
+
     <!-- A simple module component that will be executed once -->
-    <bean id="changeme.exampleComponent" class="org.alfresco.demoamp.DemoComponent" parent="module.baseComponent" >
+    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
         <property name="moduleId" value="${project.artifactId}" />  <!-- See module.properties -->
         <property name="name" value="exampleComponent" />
         <property name="description" value="A demonstration component" />

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/webscript-context.xml

@@ -0,0 +1,27 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<!--
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	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.
+-->
+<beans>
+	<bean id="webscript.helloworld.get"
+		  class="${package}.demoamp.HelloWorldWebScript"
+		  parent="webscript">
+	</bean>
+</beans>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myc:contentModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+
+    <!-- Optional meta-data about the model -->
+    <description>Document Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco System Model Definitions -->
+        <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/content/1.0" prefix="myc"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+
+</model>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model name="myw:workflowModel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+    <!-- Optional meta-data about the model -->
+    <description>Workflow Model for Repo Extension X</description>
+    <author>My Name</author>
+    <version>1.0</version>
+
+    <imports>
+        <!-- Import Alfresco Dictionary Definitions -->
+        <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
+        <!-- Import Alfresco Content Domain Model Definitions -->
+        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+        <!-- Import Alfresco Workflow Model Definitions -->
+        <import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
+    </imports>
+
+    <!-- Custom namespace for your domain -->
+    <namespaces>
+        <namespace uri="http://www.mycompany.com/model/workflow/1.0" prefix="myw"/>
+    </namespaces>
+
+    <!-- ===============================================================================================================
+        Constraints, Types, and Aspects go here...
+        -->
+</model>
+

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

@@ -14,11 +14,13 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 	
--->
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
-    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
-    
-</beans>
+-->
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
+    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />
+
+</beans>

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/main/java/demoamp/Demo.java

@@ -0,0 +1,18 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+package ${package}.demoamp;
+
+/**
+ * This class does nothing except dump some output to <i>system.out</i>.
+ * This is a sample taken from Maven Alfresco SDK
+ * 
+ * @author Derek Hulley
+ */
+public class Demo
+{
+	public void init()
+	{
+		System.out.println("SDK Demo AMP class has been loaded");
+	}
+}

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

@@ -0,0 +1,83 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+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 ${package}.demoamp;
+
+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.
+ * Uses the NodeLocatorService to easily find nodes and the
+ * NodeService to display them
+ *
+ * @author Gabriele Columbro
+ * @author Maurizio Pillitu
+ */
+public class DemoComponent extends AbstractModuleComponent {
+    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. 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-amp-archetype/src/main/resources/archetype-resources/src/main/java/demoamp/HelloWorldWebScript.java

@@ -0,0 +1,43 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+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 ${package}.demoamp;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A demonstration Java controller for the Hello World Web Script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 2.1.0
+ */
+public class HelloWorldWebScript extends DeclarativeWebScript {
+    protected Map<String, Object> executeImpl(
+            WebScriptRequest req, Status status, Cache cache) {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("fromJava", "HelloFromJava");
+        return model;
+    }
+}

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/java/org/alfresco/demoamp/Demo.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- * As a special exception to the terms and conditions of version 2.0 of 
- * the GPL, you may redistribute this Program in connection with Free/Libre 
- * and Open Source Software ("FLOSS") applications as described in Alfresco's 
- * FLOSS exception.  You should have recieved a copy of the text describing 
- * the FLOSS exception, and it is also available here: 
- * http://www.alfresco.com/legal/licensing"
- */
-package org.alfresco.demoamp;
-
-/**
- * This class does nothing except dump some output to <i>system.out</i>.
- * NB: This code is taken from Alfresco Eclipse SDK Samples 
- * @author Derek Hulley
- */
-public class Demo
-{
-	public void init()
-	{
-		System.out.println("SDK Demo AMP class has been loaded");
-	}
-}

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

@@ -0,0 +1,86 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+package ${package}.demoamp.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import ${package}.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-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties

@@ -12,48 +12,57 @@
 #    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.
-
-
-
 # RUN TIME PROPERTIES
 # -------------------
 
-# 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.
+########################################################################################################################
+# Alfresco configuration for running locally
+#
+# Configuration when running Tomcat embedded from Maven.
+# This will create the alf_data_dev directory relative to Tomcat run folder.
+# Property values from the POM but it can also be edited here.
+########################################################################################################################
+
 dir.root=${alfresco.data.location}
-# Allowed values are: NONE, AUTO, FULL
+
+# Alfresco Repo Webapp (alfresco.war) context, ports etc
+alfresco.context=alfresco
+alfresco.host=localhost
+alfresco.port=8080
+alfresco.protocol=http
+
+# Alfresco Share Webapp (share.war) context, ports etc
+share.context=share
+share.host=localhost
+share.port=8080
+share.protocol=http
+
+# Don't try and recover any index
 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=buildonly
 
-#dir.keystore=.
-#keystore.password=storepassword
-#metadata.password=metapassword
+# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date
+# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597
+# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene
+wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060
+wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060
+wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060
 
 # Fail or not when there are node integrity checker errors
 integrity.failOnError=true
 
 # Database connection properties
-# These are also filtered from Maven at build time from POM properties. 
-# Alternatively you can directly define them directly here
 db.driver=${alfresco.db.datasource.class}
 db.url=${alfresco.db.url}
 db.username=${alfresco.db.username}
 db.password=${alfresco.db.password}
 db.pool.initial=10
 db.pool.max=100
+hibernate.dialect=org.hibernate.dialect.H2Dialect
 
 # File servers related properties
-# For local builds we disable CIFS and FTP. Edit the following property to reenable them
-smb.server.enabled=false
-smb.server.name=CFS_SHARE_LOCAL
-smb.server.domain=mycompany.com
-smb.server.bindto=127.0.0.1
-smb.tcpip.port=1445
-netbios.session.port=1139
-netbios.name.port=1137
-netbios.datagram.port=1138
-ftp.server.enables=false
-ftp.port=1121
-ftp.authenticator=alfresco
+# For local runs we disable CIFS and FTP
+cifs.enabled=false
+ftp.enabled=false

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml

@@ -17,7 +17,17 @@
     limitations under the License.
 -->
 <beans>
-    <!-- This disables javascript compilation so that webscripts can be hot reloaded -->
+    <!--
+        To support hot reloading of server side Javascript files in Share, we have to turn on development mode.
+        This setting will tell the Rhinoscript Processor not to compile and cache the JS files.
+        Cool, we can now change server side JS files and have the changes picked up,
+        without having to restart or refresh web scripts.
+
+        But… Due to a known bug in the Surf framework (ALF-9970) this will break the admin consoles in Share.
+
+        Override this bean and disable javascript compilation so that webscripts can be hot reloaded.
+        We have changed the 'compile' property from true to false.
+        -->
     <bean id="javaScriptProcessor" class="org.alfresco.repo.jscript.RhinoScriptProcessor" init-method="register">
         <property name="name">
             <value>javascript</value>
@@ -25,7 +35,7 @@
         <property name="extension">
             <value>js</value>
         </property>
-        <!-- compile javascript and cache compiled scripts -->
+        <!-- Do not "compile javascript and cache compiled scripts" -->
         <property name="compile">
             <value>false</value>
         </property>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml

@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
+<!-- ===================================================================================================================
+    This context file is used only in a development IDE for rapid development,
+    it is never released with the Alfresco.war
+    =================================================================================================================-->
 
+<!-- Setup docBase to something like repo-amp/target/repo-amp-war
+     and path to /alfresco
+     The Alfresco.war 5.0 does not have a webapp (it used to have Alfresco Explorer but not anymore)
+     that we will access, so this docBase might not be needed
+-->
+<Context docBase="${app.amp.client.war.folder}" path="${alfresco.client.contextPath}">
 
   <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
-    
-     
-    <Loader searchVirtualFirst="true" className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${project.build.testOutputDirectory};${project.build.directory}/${project.build.finalName}/config" />
-  
-  <!-- 
-  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
-  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" description="The fully qualified name of a org.hibernate.dialect.Dialect subclass that allows Hibernate to generate SQL optimized for a particular relational database. Choose from org.hibernate.dialect.DerbyDialect, org.hibernate.dialect.MySQLInnoDBDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect"/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
-  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" description="Enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve natively generated keys after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier generators. By default, tries to determine the driver capabilities using connection metadata."/>
-  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" description="Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be necessary to set this when the target database has more than one schema."/>
-   -->
-   
-  
+             extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
+
+    <!-- Setup the virtual class path like this:
+         1) target/classes
+         2) target/${project.build.finalName}/config
+         3) target/test-classes
+
+         This way mvn compile can be invoked and all changes will be picked up
+    -->
+    <Loader searchVirtualFirst="true"
+            className="org.apache.catalina.loader.VirtualWebappLoader"
+            virtualClasspath="${project.build.outputDirectory};${project.build.directory}/${project.build.finalName}/config;${project.build.testOutputDirectory}" />
+
+
+    <!-- This enables hot reloading of web resources from uncompressed jars (while in prod they would be loaded from  WEB-INF/lib/{\*.jar}/META-INF/resources -->
+    <JarScanner scanAllDirectories="true" />
 </Context>

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

@@ -1,5 +1,5 @@
   ------
-  Alfresco Maven AMP Archetype Advanced Usage
+  Maven Alfresco AMP Archetype Advanced Usage
   ------
   Gabriele Columbro
   ------

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

@@ -3,7 +3,7 @@
   ------
   Gabriele Columbro
   ------
-  Nov 2012
+  Sept 2014
   ------
 
 Introduction
@@ -22,30 +22,52 @@ Introduction
   * Installation of AMPs in an Alfresco WAR
   
   * AMP Unit Testing support. Just run the standard <<<mvn test>>> and see your <<<src/test/java>>> Alfresco unit tests run. 
-    An sample Unit Test is provided in this archetype.
+    An sample Unit Test is provided in this archetype. 
   
   * Embedded run in Tomcat and embedded H2 database for demo purposes, rapid application development and integration testing 
   (<<NOTE>>: this is not a {{{http://www.alfresco.com/services/subscription/supported-platforms/} supported stack}} so use <<only for development purposes>>)
 
+  * Support for (remote) Junit and integration testing and rapid development (using spring-loaded, see run.sh)
+  
+  * Seamless IDE integration with Eclipse and Idea
+
 How to create a project:
 
-  You can create the latest release archetype with the following command:
+  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:
+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: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
   
   [[3]] (<Optionally>) Select Alfresco Version / Edition (current default is: Alfresco Community 4.2.c)
   
  You can find new Alfresco AMP project ready to go in the <<<artifactId>>> folder.
+ 
+Quickstart
+
+   Once your project is created:
+   
+   * 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/alfresco>>>.
+  
+   * Import the project in your favorite IDE (with Maven integration) and start developing right away.
+   
 
 Usage
 
-  Instructions on how to use the Alfresco AMP archetype can be found on the {{{./usage.html}usage page}}, while 
+  Full instructions on how to use the Alfresco AMP archetype can be found on the {{{./usage.html}usage page}}, while 
   for more advanced use cases refer to the {{{./advanced-usage.html}advanced usage page}}

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

@@ -3,7 +3,7 @@
   ------
   Gabriele Columbro
   ------
-  Nov 2012
+  Sept 2014
   ------
 
 
@@ -27,6 +27,7 @@ Project layout
             |-> licenses/
   src/main/java //Java classes to be packaged in the AMP embedded JAR)
   src/main/resources //resources to the packaged in the AMP embedded JAR
+  src/main/resources/META-INF/resources //web resources to the packaged in the AMP embedded JAR, mapped to the root of the webapp as of Servlet 3.0)
   src/test/java // Unit tests
   src/test/resources // Unit test resources
   src/test/properties/<env> //  Environment aware alfresco-global.properties. By default <env>=local 
@@ -51,11 +52,13 @@ Usage
     
     * release and distribution of your AMP artifact.
     
-    The AMPs produced with this project are fully compatible with Alfresco MMT, in fact the Alfresco Maven plugin used to manage AMPs in this SDK embeds the official Alfresco MMT to install depdended AMPs. 
+    The AMPs produced with this project are fully compatible with Alfresco MMT, in fact the Maven Alfresco plugin used to manage AMPs in this SDK embeds the official Alfresco MMT to install depdended AMPs.
 
 Commands
+    
+    <<<run.sh>>> will automatically set up the SDK and run the AMP on an Alfresco repo embedded to enable rapid development
 
-    Common AMP project lifecycle commands you want to run are:
+    Also, common AMP Maven lifecycle commands you want to run are:
 
     * <<<mvn package>>>: Runs unit tests and packages AMP in <<<$\{project.build.directory\}/$\{project.build.finalName\}.amp>>>
     
@@ -63,7 +66,7 @@ Commands
     
     * <<<mvn install -Dmaven.test.skip=true>>>: Like <<<mvn install>>> but skips unit tests
     
-    * <<<mvn install -Pamp-to-war>>> Like <<<mvn package -Pamp-to-war>>> 
+    * <<<mvn install -Pamp-to-war>>>: Like <<<mvn package -Pamp-to-war>>> 
     but also installs and runs the resulting WAR+AMP in Tomcat + H2 embedded from running and development.
     This also enables rapid application development features, like hot reloading and remote JUnit running.
     When you run this command then you can access in your browser <<< {{{http://localhost:8080/alfresco}}} >>>.