diff --git a/README.md b/README.md
index df8b8d37..2235008e 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
# [](#features) Maven 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.
+Maven Alfresco SDK for Alfresco Development and Customizations based on Apache Maven.
+
+Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects.
It 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)
@@ -14,38 +16,38 @@ It is composed of:
## Resources
-### Developer docs
+### Developer Documentation
**SDK 2.x**: Full documentation is available at the [Maven Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html).
-**SDK 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 Documentation
-### 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).
+Additional documentation for Alfresco Community and Enterprise, tutorials and examples is available in the [Alfresco Documentation](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html).
### Samples
-Advanced sample projects are maintained by @ohej in the [Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
+Advanced sample projects are maintained by @ohej in the [Maven Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
### 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 Maven 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/4.2/concepts/dev-extensions-maven-sdk-intro.html) for supported features.
## News
- 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.
diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml
index 43c00474..bb2c17e3 100644
--- a/archetypes/alfresco-allinone-archetype/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/pom.xml
@@ -5,7 +5,7 @@
org.alfresco.maven.archetype
alfresco-allinone-archetype
maven-archetype
- All-in-One Archetype from Maven Alfresco SDK
+ Maven Alfresco SDK - All-in-One Archetype
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
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
index 22374930..bd8d5468 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -4,7 +4,7 @@
${groupId}
${artifactId}
${version}
- Quickstart of Alfresco and Share with DB and runner embedded
+ Alfresco Repository and Share Quickstart with database and an embedded runner.
This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr, AMPs) in one project
pom
@@ -14,18 +14,18 @@
@@alfresco.sdk.parent.version@@
-
+ | 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_target_groupId}
-
${alfresco_target_version}
@@ -39,10 +39,10 @@
-
${alfresco.groupId}
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
index ae698e46..7f885400 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml
@@ -2,7 +2,7 @@
4.0.0
${artifactId}
- Alfresco repository AMP Module
+ Alfresco Repository AMP Module
amp
This is a sample Alfresco repository AMP project, depended upon by the alfresco WAR module
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh
new file mode 100644
index 00000000..c536a941
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run-spring-loaded.sh
@@ -0,0 +1 @@
+MAVEN_OPTS="-javaagent:./lib/springloaded-1.2.0.RELEASE.jar -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Pamp-to-war
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh
new file mode 100644
index 00000000..e5929027
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+MAVEN_OPTS="-Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Pamp-to-war
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/Demo.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/Demo.java
index 8ea79e2a..bf31080a 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/Demo.java
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/Demo.java
@@ -2,7 +2,7 @@ package org.alfresco.demoamp;
/**
* This class does nothing except dump some output to system.out.
- * This is a sample taken from Alfresco SDK
+ * This is a sample taken from Maven Alfresco SDK
*
* @author Derek Hulley
*/
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/DemoComponent.java b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/DemoComponent.java
index 3de78f01..de4c2cbb 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/DemoComponent.java
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/org/alfresco/demoamp/DemoComponent.java
@@ -8,7 +8,7 @@ import org.apache.commons.logging.LogFactory;
/**
* A basic component that will be started for this module.
- * This is a sample taken from Alfresco SDK
+ * This is a sample taken from Maven Alfresco SDK
*
* @author Derek Hulley
*/
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
index 70a4ed97..786e6303 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
+++ b/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. -->
-
-
4.0.0
${artifactId}
- Alfresco Repository and Explorer Client
+ Alfresco Repository and Explorer Module
war
- Alfresco Repository and Explorer Client, installs your AMPs in the Alfresco WAR for aggregation purposes
+ Alfresco Repository and Explorer Module, installs your AMPs in the Alfresco WAR for aggregation purposes
${groupId}
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
index 6d511acc..3edf8628 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/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">
4.0.0
${artifactId}
- Share AMP project
+ Alfresco Share AMP Module
amp
- This is a sample Share AMP project, depended upon by the share WAR module
+ This is a sample Alfresco Share AMP project, depended upon by the share WAR module
${groupId}
@@ -30,19 +30,27 @@
http://localhost:8080/alfresco
- WARN
+ WARN
-
-
- org.springframework.extensions.surf
- spring-surf-api
- provided
-
+
+
+ ${alfresco.groupId}
+ share
+ ${alfresco.version}
+ classes
+ provided
+
+
+
+ org.springframework.extensions.surf
+ spring-surf-api
+ provided
+
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh
new file mode 100644
index 00000000..10bc9f6a
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run-spring-loaded.sh
@@ -0,0 +1 @@
+mvn integration-test -Pamp-to-war
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh
new file mode 100644
index 00000000..1ae1aec1
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+mvn integration-test -Pamp-to-war
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
index 82b63dbe..30e888cf 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
+++ b/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">
4.0.0
${artifactId}
- Alfresco Share Client
+ Alfresco Share Module
war
- Alfresco Share Client
+ Alfresco Share Module
${groupId}
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
index b1717345..e34eed4e 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
@@ -2,7 +2,7 @@
4.0.0
${artifactId}
- Alfresco Apache Solr customization
+ Alfresco Apache Solr Customization Module
pom
Alfresco Apache Solr Customization
diff --git a/archetypes/alfresco-allinone-archetype/src/site/apt/advanced-usage.apt.vm b/archetypes/alfresco-allinone-archetype/src/site/apt/advanced-usage.apt.vm
index 0b54cc81..3c678984 100644
--- a/archetypes/alfresco-allinone-archetype/src/site/apt/advanced-usage.apt.vm
+++ b/archetypes/alfresco-allinone-archetype/src/site/apt/advanced-usage.apt.vm
@@ -1,5 +1,5 @@
------
- Alfresco Maven All-in-One Archetype Advanced Usage
+ Maven Alfresco All-in-One Archetype Advanced Usage
------
Gabriele Columbro
------
diff --git a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm
index 1798c010..1299af15 100644
--- a/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm
+++ b/archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm
@@ -1,5 +1,5 @@
------
- Alfresco Maven All-in-One Archetype Usage
+ Maven Alfresco All-in-One Archetype Usage
------
Gabriele Columbro
------
@@ -61,7 +61,7 @@ Usage
for all the components of the Alfresco landscape. For more information, check the See the {{{./advanced-usage.html}advanced usage page}} page.
- <>: 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.
+ <>: 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
diff --git a/archetypes/alfresco-allinone-archetype/src/site/site.xml b/archetypes/alfresco-allinone-archetype/src/site/site.xml
index 344bd53b..837fea41 100644
--- a/archetypes/alfresco-allinone-archetype/src/site/site.xml
+++ b/archetypes/alfresco-allinone-archetype/src/site/site.xml
@@ -27,14 +27,14 @@
-
+
-
+
-