DEVPLAT-43

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

@@ -1,31 +1,24 @@
 <?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="All In One Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded of Alfresco Repo, Share and Solr"
+<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>
-    <requiredProperty key="alfresco_target_groupId">
-      <defaultValue>org.alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_version">
-      <defaultValue>@@alfresco.community.default.version@@</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">
+                <fileSet filtered="true" packaged="true" encoding="UTF-8">
                     <directory>src/main/java</directory>
                     <includes>
                         <include>**/*.java</include>
                     </includes>
                 </fileSet>
-        <fileSet filtered="false" packaged="false" encoding="UTF-8">
+                <fileSet filtered="true" packaged="true" encoding="UTF-8">
                     <directory>src/test/java</directory>
                     <includes>
                         <include>**/*.java</include>
@@ -36,9 +29,15 @@
                     <includes>
                         <include>**</include>
                     </includes>
+                    <excludes>
+                        <exclude>**/*-context.xml</exclude>
+                    </excludes>
                 </fileSet>
-        <fileSet encoding="UTF-8" filtered="false">
+                <fileSet encoding="UTF-8" filtered="true" packaged="false">
-          <directory>src/main/amp/config/alfresco/extension/templates/webscripts</directory>
+                    <directory>src/main/amp</directory>
+                    <includes>
+                        <include>**/*-context.xml</include>
+                    </includes>
                 </fileSet>
                 <fileSet encoding="UTF-8" filtered="false">
                     <directory>src/test/resources</directory>
@@ -57,12 +56,18 @@
 
         <module id="share-amp" dir="share-amp" name="share-amp">
             <fileSets>
-        <fileSet filtered="false" packaged="false" encoding="UTF-8">
+                <fileSet filtered="false" packaged="true" encoding="UTF-8">
                     <directory>src/main/java</directory>
                     <includes>
                         <include>**/*.java</include>
                     </includes>
                 </fileSet>
+                <fileSet filtered="false" 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>

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

@@ -5,9 +5,8 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>Alfresco Repository and Share Quickstart with database and an embedded runner.</name>
+    <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,
+    <description>This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
-        Share, Solr4, AMPs) in one project
     </description>
     <packaging>pom</packaging>
 
@@ -24,15 +23,18 @@
        -->
     <properties>
         <!-- The following are default values for data location and Alfresco version.
-             Uncomment if you need to change -->
+             Uncomment if you need to change
-        <!-- <alfresco.version>${alfresco_target_version}</alfresco.version>-->
+          <alfresco.version>${alfresco.community.default.version}</alfresco.version>
-        <!-- <alfresco.data.location>${alfresco.data.location}</alfresco.data.location> -->
+          <alfresco.data.location>${alfresco.data.location}</alfresco.data.location> -->
 
-        <!-- This control the root logging level for all apps -->
+        <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
             <app.log.root.level>WARN</app.log.root.level>
+        -->
 
-        <!-- 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>
+        -->
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->

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

@@ -1,3 +1,6 @@
+#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"
@@ -9,7 +12,7 @@
 
 
     <!-- Registration of new models -->
-    <bean id="com.mycompany.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+    <bean id="${package}.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
         <property name="models">
             <list>
                 <value>alfresco/module/${project.artifactId}/model/content-model.xml</value>

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

@@ -1,3 +1,6 @@
+#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'>
 <!--
@@ -15,15 +18,14 @@
 	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-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/java/demoamp/Demo.java

@@ -1,4 +1,7 @@
-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>.

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

@@ -1,3 +1,6 @@
+#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
@@ -14,7 +17,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package org.alfresco.demoamp;
+package ${package}.demoamp;
 
 import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -31,8 +34,7 @@ import org.apache.commons.logging.LogFactory;
  * @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;
@@ -51,8 +53,7 @@ public class DemoComponent extends AbstractModuleComponent
      * 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");
@@ -65,8 +66,7 @@ public class DemoComponent extends AbstractModuleComponent
      *
      * @return
      */
-    public int childNodesCount(NodeRef nodeRef)
+    public int childNodesCount(NodeRef nodeRef) {
-    {
         return nodeService.countChildAssocs(nodeRef, true);
     }
 

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/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md

@@ -1,4 +0,0 @@
-## If you are overriding existing pages/components put these extension modules here.
-## If you are defining new extensions add them under resources/alfresco/site-data.
-##
-

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
+package=it.pkg
-alfresco_target_version=5.0.c

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

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

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
+artifactId=allInOneTestRun
-alfresco_target_groupId=org.alfresco
+package=it.pkg
-alfresco_target_version=5.0.c

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

@@ -1,40 +1,42 @@
 <?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="AMP Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded an Alfresco Repo AMP"
+<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>
-    <requiredProperty key="alfresco_target_groupId">
-      <defaultValue>org.alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_version">
-      <defaultValue>@@alfresco.community.default.version@@</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="package">
-      <defaultValue>(not used)</defaultValue>
-    </requiredProperty>
     </requiredProperties>
     <fileSets>
-    <fileSet filtered="true" packaged="false" encoding="UTF-8">
+        <fileSet filtered="true" packaged="true" encoding="UTF-8">
             <directory>src/main/java</directory>
             <includes>
                 <include>**/*.java</include>
             </includes>
         </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
+        <fileSet filtered="true" packaged="true" 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 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>

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

@@ -21,17 +21,18 @@
         For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!-- If you want to change the default data location and Alfresco version, uncomment the following 2 properties:
+        <!-- The following are default values for data location and Alfresco version.
-               <alfresco.version>specify version number here</alfresco.version>
+             Uncomment if you need to change
-               <alfresco.data.location>specify folder name here</alfresco.data.location> -->
+          <alfresco.version>${alfresco.community.default.version}</alfresco.version>
+          <alfresco.data.location>${alfresco.data.location}</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>
         -->
 
         <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
-             for embedded run, defaults to the 'local' environment.
+             for embedded run, defaults to the 'local' environment. See SDK Parent POM for more info.
-        <env>other environment name</env>
+        <env>local</env>
         -->
     </properties>
 

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

@@ -1,3 +1,6 @@
+#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"
@@ -9,12 +12,11 @@
 
 
     <!-- Registration of new models -->
-    <bean id="com.mycompany.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
+    <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>

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

@@ -1,3 +1,6 @@
+#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'>
 <!--
@@ -19,10 +22,10 @@
 <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/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

@@ -1,3 +1,6 @@
+#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
@@ -14,7 +17,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package org.alfresco.demoamp;
+package ${package}.demoamp;
 
 import org.alfresco.repo.module.AbstractModuleComponent;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
@@ -31,8 +34,7 @@ import org.apache.commons.logging.LogFactory;
  * @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;
@@ -51,8 +53,7 @@ public class DemoComponent extends AbstractModuleComponent
      * 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");
@@ -65,8 +66,7 @@ public class DemoComponent extends AbstractModuleComponent
      *
      * @return
      */
-    public int childNodesCount(NodeRef nodeRef)
+    public int childNodesCount(NodeRef nodeRef) {
-    {
         return nodeService.countChildAssocs(nodeRef, true);
     }
 

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

@@ -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-amp-archetype/src/test/resources/projects/basic/archetype.properties

@@ -1,11 +1,5 @@
-#Tue Oct 30 14:23:01 CET 2012
-package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.c
+artifactId=repoAmpTest
-$=cat archetype.properties
+package=it.pkg
-alfresco_target_groupId=org.alfresco
+
-alfresco_target_amp_client_war=alfresco
-alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.c
-artifactId=basic

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

@@ -1,11 +1,4 @@
-#Tue Oct 30 14:23:01 CET 2012
-package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.c
+artifactId=repoAmpTestRun
-$=cat archetype.properties
+package=it.pkg
-alfresco_target_groupId=org.alfresco
-alfresco_target_amp_client_war=alfresco
-alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.c
-artifactId=basic

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

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

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

@@ -1,77 +1,43 @@
 <?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="Share AMP Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded an Alfresco Share AMP"
+<archetype-descriptor
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+        name="Share AMP Archetype for Alfresco. Provides rapid development, IDE integration, and running embedded an Alfresco Share AMP"
         xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <requiredProperties>
         <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>@@alfresco.community.default.version@@</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="package">
-      <defaultValue>(not used)</defaultValue>
-    </requiredProperty>
     </requiredProperties>
     <fileSets>
-    <fileSet filtered="true" packaged="false" encoding="UTF-8">
+        <fileSet filtered="false" packaged="true" encoding="UTF-8">
             <directory>src/main/java</directory>
             <includes>
                 <include>**/*.java</include>
             </includes>
         </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
+        <fileSet filtered="false" packaged="true" encoding="UTF-8">
-      <directory>src/main/amp</directory>
-      <includes>
-        <include>**/*</include>
-        <include>**/*.xml</include>
-        <include>**/*.properties</include>
-        <include>**/*.txt</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-      <directory>src/main/resources</directory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet encoding="UTF-8">
-      <directory>src/main/amp</directory>
-      <includes>
-        <include>**/*.js</include>
-        <include>**/*.css</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-        <directory>src/main/amp/config/alfresco/module/__artifactId__</directory>
-    </fileSet>
-
-    <fileSet filtered="false" encoding="UTF-8">
-        <directory>src/main/amp/web</directory>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-        <directory>src/main/amp/web/themes</directory>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-        <directory>src/main/amp/web/js</directory>
-    </fileSet>
-    <fileSet filtered="false" encoding="UTF-8">
-        <directory>src/main/amp/web/components</directory>
-    </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">
+        <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>
+                <include>**</include>
+            </includes>
+        </fileSet>
+        <fileSet encoding="UTF-8" filtered="false">
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**</include>
             </includes>
         </fileSet>
         <fileSet filtered="false" encoding="UTF-8">

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

@@ -21,16 +21,16 @@
         For more available properties see the alfresco-sdk-parent POM.
        -->
     <properties>
-        <!-- If you want to change the default Alfresco version, uncomment the following property:
+        <!-- The following are default values for data location and Alfresco version.
-               <alfresco.version>specify version number here</alfresco.version>
+             Uncomment if you need to change
-               -->
+        <alfresco.version>${alfresco.community.default.version}</alfresco.version> -->
 
         <!-- This control the root logging level for all apps uncomment and change, defaults to WARN
             <app.log.root.level>WARN</app.log.root.level>
         -->
 
         <!-- Set the enviroment to use, this controls which properties will be picked in src/test/properties
-             for embedded run, defaults to the 'local' environment.
+             for embedded run, defaults to the 'local' environment. See SDK Parent POM for more info.
         <env>other environment name</env>
         -->
 
@@ -38,10 +38,10 @@
                     defaults to the alfresco.war artifact ID, so we need to override here. -->
         <app.amp.client.war.artifactId>${alfresco.share.artifactId}</app.amp.client.war.artifactId>
 
-        <!-- Since Alfresco is already running on port 8080, we run Share on port 8081 -->
+        <!-- Since Alfresco.WAR (i.e. the Repository) is already running on port 8080, we run Share.WAR on port 8081 -->
         <maven.tomcat.port>8081</maven.tomcat.port>
 
-        <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco -->
+        <!-- Used in share-config-custom.xml. By default points to local installation of Alfresco Repo -->
         <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
 
     </properties>

archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md

@@ -1,4 +0,0 @@
-## If you are overriding existing pages/components put these extension modules here.
-## If you are defining new extensions add them under resources/alfresco/site-data.
-##
-

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

@@ -1,11 +1,4 @@
-#Tue Oct 30 14:23:01 CET 2012
-package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.c
+artifactId=shareAmpTest
-$=cat archetype.properties
+package=it.pkg
-alfresco_target_groupId=org.alfresco
-alfresco_target_amp_client_war=share
-alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.c
-artifactId=basic

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

@@ -1,11 +1,4 @@
-#Tue Oct 30 14:23:01 CET 2012
-package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=5.0.c
+artifactId=shareAmpTestRun
-$=cat archetype.properties
+package=it.pkg
-alfresco_target_groupId=org.alfresco
-alfresco_target_amp_client_war=share
-alfresco_target_amp_client_war_groupId=org.alfresco
-alfresco_target_amp_client_war_version=5.0.c
-artifactId=basic

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

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