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 70bd8b2a..3bad8104 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
@@ -53,25 +53,6 @@
-
-
-
-
- alfresco-public
- https://artifacts.alfresco.com/nexus/content/groups/public
-
-
- alfresco-public-snapshots
- https://artifacts.alfresco.com/nexus/content/groups/public-snapshots
-
-
-
-
- alfresco-public
- https://artifacts.alfresco.com/nexus/content/groups/public
-
-
- alfresco-public-snapshots
- https://artifacts.alfresco.com/nexus/content/groups/public-snapshots
-
- true
- daily
-
-
-
+
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
index 419cca75..81be215f 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties
@@ -20,7 +20,7 @@
# 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.
+# 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.
dir.root=${alfresco.data.location}
# Allowed values are: NONE, AUTO, FULL
index.recovery.mode=NONE
diff --git a/archetypes/alfresco-amp-archetype/src/site/apt/advanced-usage.apt.vm b/archetypes/alfresco-amp-archetype/src/site/apt/advanced-usage.apt.vm
index da021400..e82778c3 100644
--- a/archetypes/alfresco-amp-archetype/src/site/apt/advanced-usage.apt.vm
+++ b/archetypes/alfresco-amp-archetype/src/site/apt/advanced-usage.apt.vm
@@ -34,7 +34,8 @@ AMP Archetype properties
* AMP specific properties
- In addition to the common properties, the following properties are specific of the AMP archetype:
+ In addition to the common properties, the following properties are specific of the AMP archetype. You can change
+ these properties to select a different WAR to install your AMP to (e.g. a pre-customized Alfresco or Share instance):
+---+
diff --git a/archetypes/alfresco-amp-archetype/src/site/apt/index.apt.vm b/archetypes/alfresco-amp-archetype/src/site/apt/index.apt.vm
index 5490aee3..26d99ed8 100644
--- a/archetypes/alfresco-amp-archetype/src/site/apt/index.apt.vm
+++ b/archetypes/alfresco-amp-archetype/src/site/apt/index.apt.vm
@@ -9,7 +9,7 @@
Introduction
The Alfresco AMP Archetype is a sample fully featured project to manage AMP (Alfresco Module Package) projects.
- This archetype can be used both for Alfresco Repository and Alfresco Share AMPs.
+ This archetype can be used for Alfresco Repository. For Share, please refer to the {{{../share-amp-archetype/index.html}Share AMP archetype}}
* Features
@@ -19,12 +19,12 @@ Introduction
* AMP dependency management in Maven
- * Installation of AMPs in an Alfresco or Share WAR
+ * Installation of AMPs in an Alfresco WAR
* AMP Unit Testing support. Just run the standard <<>> and see your <<>> Alfresco unit tests run.
An sample Unit Test is provided in this archetype.
- * Embedded run in Jetty and embedded H2 database for demo purposes, rapid application development and integration testing
+ * Embedded run in Tomcat and embedded H2 database for demo purposes, rapid application development and integration testing
(<>: this is not a {{{http://www.alfresco.com/services/subscription/supported-platforms/} supported stack}} so use <>)
How to create a project:
@@ -32,7 +32,7 @@ How to create a project:
You can create the latest release archetype with the following command:
+---+
-mvn archetype:generate -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml -Dfilter=org.alfresco.maven.archetype:
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:
+---+
You should then:
diff --git a/archetypes/alfresco-amp-archetype/src/site/apt/usage.apt.vm b/archetypes/alfresco-amp-archetype/src/site/apt/usage.apt.vm
index 906a833f..5ce8a008 100644
--- a/archetypes/alfresco-amp-archetype/src/site/apt/usage.apt.vm
+++ b/archetypes/alfresco-amp-archetype/src/site/apt/usage.apt.vm
@@ -1,5 +1,5 @@
------
- Alfresco Maven AMP Archetype Usage
+ Alfresco AMP Archetype Usage
------
Gabriele Columbro
------
@@ -26,7 +26,7 @@ Project layout
|-> web/
|-> 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 //resources to the packaged in the AMP embedded JAR
src/test/java // Unit tests
src/test/resources // Unit test resources
src/test/properties/ // Environment aware alfresco-global.properties. By default =local
@@ -41,7 +41,9 @@ Usage
* packaging
- * testing
+ * rapid development
+
+ * testing (unit and integration)
* run embedded
@@ -62,11 +64,10 @@ Commands
* <<>>: Like <<>> but skips unit tests
* <<>> Like <<>>
- but also installs and runs the resulting WAR+AMP in Tomcat + H2 embedded for integration testing.
- When you run this command then you can access in your browser <<< {{{http://localhost:8080/alfresco}}} >>> or <<< {{{http://localhost:8080/share}}} >>>
- depending on the value of the property <<>>
+ 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}}} >>>.
- * <<>>: Like <<>> but installs the AMP and runs on the Share WAR in Tomcat embedded.
* <<>>: Removes DB, alf_data, indexes and log files. Useful to purge the development repo (by default self contained in <<<$\{project.basedir\}/alf_data_dev>>>
diff --git a/archetypes/alfresco-amp-archetype/src/site/site.xml b/archetypes/alfresco-amp-archetype/src/site/site.xml
index f2e1c9c2..f85c2ab7 100644
--- a/archetypes/alfresco-amp-archetype/src/site/site.xml
+++ b/archetypes/alfresco-amp-archetype/src/site/site.xml
@@ -26,6 +26,7 @@
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/advanced-usage.apt.vm b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/advanced-usage.apt.vm
new file mode 100644
index 00000000..c7b25e71
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/advanced-usage.apt.vm
@@ -0,0 +1,62 @@
+ ------
+ Share AMP Archetype Advanced Usage
+ ------
+ Gabriele Columbro
+ ------
+ Aug 2014
+ ------
+
+AMP Unit Testing
+
+ Unit test your AMP customization is as easy as adding your tests in <<>>. The current module in development
+ will be added to the test classpath together with all necessary Alfresco Spring contexts.
+
+ Running <<>> will results in your unit tests to be run. You can skip this (<<>>)
+ adding <<<-DskipTests>>> to your command line.
+
+Share AMP Archetype properties
+
+ In the AMP archetype (as in the whole Part of the Maven Alfresco SDK\x99) properties are configurable at many levels:
+
+ * as POM properties
+
+ * direclty in *.properties, particularly
+
+ * <<>> (filtered and packaged in the AMP)
+
+ * <</alfresco-global.properties>>> (environment dependent properties for WAR run embedded)
+
+* Common properties
+
+ Archetype behavior can mostly be controlled directly in the POM, via common properties provided by the parent POM.
+ See {{{../../poms/alfresco-sdk-parent/sdk-properties.html} SDK properties reference}} for details.
+
+
+* AMP specific properties
+
+ In addition to the common properties, the following properties are specific of the AMP archetype. You can change
+ these properties to select a different WAR to install your AMP to (e.g. a pre-customized Alfresco or Share instance):
+
++---+
+
+ ...
+
+
+ alfresco
+ ${alfresco.groupId}
+ ${alfresco.version}
+
+ ...
+
++---+
+
+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 <<>> to analyze your POM at runtime.
+
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm
new file mode 100644
index 00000000..7c277481
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm
@@ -0,0 +1,52 @@
+ ------
+ Building AMPs (Alfresco Module Packages) with Maven
+ ------
+ Gabriele Columbro
+ ------
+ Aug 2014
+ ------
+
+Introduction
+
+ The Share AMP Archetype is a sample fully featured project to manage AMP (Alfresco Module Package) projects for Alfresco Share.
+ This archetype can be used for Alfresco Share. For Alfresco Repository AMPs, please refer to the {{{../alfresco-amp-archetype/index.html}Alfresco AMP archetype}}
+
+* Features
+
+ Amongst other features, this archetype provides support for:
+
+ * <<>> packaging support for your projects
+
+ * AMP dependency management in Maven
+
+ * Installation of AMPs in the Share WAR
+
+ * AMP Unit Testing support. Just run the standard <<>> and see your <<>> Alfresco unit tests run.
+ 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. Share runs on port 8081 by default, but you can control
+ this setting with the <<>> pom property.
+ (<>: this is not a {{{http://www.alfresco.com/services/subscription/supported-platforms/} supported stack}} so use <>)
+
+How to create a project:
+
+ You can create the latest release archetype with the following command:
+
++---+
+mvn archetype:generate -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml -Dfilter=org.alfresco.maven.archetype:
++---+
+
+ You should then:
+
+ [[1]] Select the <<>> option
+
+ [[2]] Specify the <<>> and <<>> for the project you want to create
+
+ [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a)
+
+ You can find new Share AMP project ready to go in the <<>> folder.
+
+Usage
+
+ Instructions on how to use the Share 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}}
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/usage.apt.vm b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/usage.apt.vm
new file mode 100644
index 00000000..cf87e300
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/usage.apt.vm
@@ -0,0 +1,73 @@
+ ------
+ Share AMP Archetype Usage
+ ------
+ Gabriele Columbro
+ ------
+ Nov 2012
+ ------
+
+
+Prerequisites
+
+ See {{{../../prerequisites.html}SDK Pre-Requisites}} to successfully run this archetype.
+
+
+Project layout
+
+ The archetype generated project should look like:
+
++---+
+
+ pom.xml
+ src/main/amp
+ |-> module.properties
+ |-> file-mapping.properties (optional)
+ |-> config/
+ |-> web/
+ |-> 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/resource //resources to the packaged in the AMP embedded JAR/META-INF and automatically mapped to the root of the webapp
+ src/test/java // Unit tests
+ src/test/resources // Unit test resources
+ src/test/properties/ // Environment aware alfresco-global.properties. By default =local
+
++---+
+
+ Basically by default the folder <<>> maps the {{{https://wiki.alfresco.com/wiki/AMP_Files#The_structure_of_an_AMP_file}AMP structure}} and it's where you can build your module.
+
+Usage
+
+ This project manages an AMP and provides support for typical development lifecycle use cases like:
+
+ * packaging
+
+ * rapid development
+
+ * testing (unit and integration)
+
+ * run embedded
+
+ * integration testing
+
+ * 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.
+
+Commands
+
+ Common AMP project lifecycle commands you want to run are:
+
+ * <<>>: Runs unit tests and packages AMP in <<<$\{project.build.directory\}/$\{project.build.finalName\}.amp>>>
+
+ * <<>>: Like <<>> but also installs AMP in local Maven repository to be depended upon
+
+ * <<>>: Like <<>> but skips unit tests
+
+ * <<>> Like <<>>
+ 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:8081/share}}} >>>.
+
+ * <<>>: Removes DB, alf_data, indexes and log files. Useful to purge the development repo (by default self contained in <<<$\{project.basedir\}/alf_data_dev>>>
+
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/site.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/site.xml
new file mode 100644
index 00000000..6737ce08
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/site.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/site/apt/index.apt.vm b/archetypes/share-amp-archetype/src/site/apt/index.apt.vm
index 5490aee3..234dbf32 100644
--- a/archetypes/share-amp-archetype/src/site/apt/index.apt.vm
+++ b/archetypes/share-amp-archetype/src/site/apt/index.apt.vm
@@ -24,7 +24,7 @@ Introduction
* AMP Unit Testing support. Just run the standard <<>> and see your <<>> Alfresco unit tests run.
An sample Unit Test is provided in this archetype.
- * Embedded run in Jetty and embedded H2 database for demo purposes, rapid application development and integration testing
+ * Embedded run in Tomcat and embedded H2 database for demo purposes, rapid application development and integration testing
(<>: this is not a {{{http://www.alfresco.com/services/subscription/supported-platforms/} supported stack}} so use <>)
How to create a project:
@@ -32,7 +32,7 @@ How to create a project:
You can create the latest release archetype with the following command:
+---+
-mvn archetype:generate -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/content/groups/public/archetype-catalog.xml -Dfilter=org.alfresco.maven.archetype:
+mvn archetype:generate -Dfilter=org.alfresco.maven.archetype:
+---+
You should then:
diff --git a/modules/alfresco-rad/.gitignore b/modules/alfresco-rad/.gitignore
new file mode 100644
index 00000000..b83d2226
--- /dev/null
+++ b/modules/alfresco-rad/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/plugins/alfresco-maven-plugin/src/site/site.xml b/plugins/alfresco-maven-plugin/src/site/site.xml
index dc2280e7..98e8fee0 100644
--- a/plugins/alfresco-maven-plugin/src/site/site.xml
+++ b/plugins/alfresco-maven-plugin/src/site/site.xml
@@ -28,6 +28,7 @@