Merge branch 'master' of https://github.com/Alfresco/alfresco-sdk

archetypes/alfresco-allinone-archetype/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   

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

@@ -68,6 +68,12 @@
                         <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>
@@ -117,6 +123,12 @@
                         <include>**</include>
                     </includes>
                 </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/test/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
             </fileSets>
         </module>
 

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

@@ -12,17 +12,19 @@
     <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, test classes, and config -->
+    <!-- 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) target/classes
+         1) share-amp/target/classes
-         2) target/${project.build.finalName}/config
+         2) share-amp/target/${project.build.finalName}/config
-         3) target/test-classes
+         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/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes" />
+            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" />

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

@@ -23,9 +23,6 @@
              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>
 
-        <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco Repository -->
-        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
-
         <!-- Defines the log level used in log4j.properties -->
         <app.log.root.level>WARN</app.log.root.level>
     </properties>

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

@@ -1,11 +1,11 @@
+#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"
-       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.springframework.org/schema/beans/spring-beans-2.5.xsd">
-                http://www.hazelcast.com/schema/spring
-                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
    
    <!--
     Define beans related to this Share extension here, such as
@@ -16,12 +16,12 @@
             placed in the alfresco-allinone/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml file
    -->
 
-   <!-- Add extension specific messages and labels -->
+   <!-- Add module specific messages and labels -->
-   <bean id="com.mycompany.share-amp.resources"
+   <bean id="${package}.share-amp.resources"
          class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
       <property name="resourceBundles">
          <list>
-            <value>alfresco.messages.custom</value>
+            <value>alfresco.web-extension.messages.custom</value>
          </list>
       </property>
    </bean>

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

@@ -1,4 +1,6 @@
-## If you are overriding out-of-the-box Alfresco web scripts put these files here.
+## If you are overriding out-of-the-box Alfresco web scripts, put these files here
-## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
+## 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/pom.xml

@@ -13,6 +13,12 @@
         <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>

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

@@ -9,11 +9,15 @@
             </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>true</disable-resource-caching>
+            <disable-resource-caching>false</disable-resource-caching>
         </web-framework>
     </config>
 

archetypes/alfresco-amp-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/share-amp-archetype/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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

@@ -22,6 +22,12 @@
                 <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>

archetypes/share-amp-archetype/src/main/resources/archetype-resources/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 tomcat/shared/classes/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/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample

@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       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/spring
-                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.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 environment specific config:
-             alfresco/tomcat/shared/classes/alfresco/web-extension/custom-slingshot-application-context.xml file
-   -->
-
-   <!-- Add extension specific messages and labels -->
-   <bean id="com.mycompany.share-amp.resources"
-         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
-      <property name="resourceBundles">
-         <list>
-            <value>alfresco.messages.custom</value>
-         </list>
-      </property>
-   </bean>
-
-</beans>

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

@@ -1,4 +1,6 @@
-## If you are overriding out-of-the-box Alfresco web scripts put these files here.
+## If you are overriding out-of-the-box Alfresco web scripts, put these files here
-## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
+## 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/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml

@@ -9,11 +9,15 @@
             </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>true</disable-resource-caching>
+            <disable-resource-caching>false</disable-resource-caching>
         </web-framework>
     </config>
 

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

@@ -11,7 +11,7 @@
   <Resources className="org.apache.naming.resources.VirtualDirContext"
     extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />
 
-
+  <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
   <!-- Setup the virtual class path like this:
        1) target/classes
        2) target/${project.build.finalName}/config

modules/alfresco-rad/pom.xml

@@ -9,7 +9,7 @@
   <parent>
       <groupId>org.alfresco.maven</groupId>
       <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.1.0-SNAPSHOT</version>
+      <version>2.1.1-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

plugins/alfresco-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
   <parent>
       <groupId>org.alfresco.maven</groupId>
       <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.1.0-SNAPSHOT</version>
+      <version>2.1.1-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
   </parent>
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <name>Alfresco SDK</name>
     <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>

poms/alfresco-sdk-parent/pom.xml

@@ -14,12 +14,12 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <!-- This defines the version of the SDK in terms of features -->
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
 
 
     <properties>
@@ -131,7 +131,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.clean.version>2.6.1</maven.clean.version>
         <maven.dependency.version>2.9</maven.dependency.version>
-        <maven.enforcer.plugin>1.3.1</maven.enforcer.plugin>
+        <maven.enforcer.plugin>1.4</maven.enforcer.plugin>
         <maven.resources.version>2.7</maven.resources.version>
         <maven.surefire.version>2.18</maven.surefire.version>
         <maven.install.version>2.5.2</maven.install.version>
@@ -150,7 +150,7 @@
               - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin)
               - Alfresco Rapid Application Development module (alfresco-rad)
         -->
-        <maven.alfresco.version>2.1.0-SNAPSHOT</maven.alfresco.version>
+        <maven.alfresco.version>2.1.1-SNAPSHOT</maven.alfresco.version>
 
         <!-- Setup the default Embedded Tomcat port for use by the tomcat7-maven-plugin so
              it can be accessed from the Groovy scripts and other places -->
@@ -846,17 +846,16 @@
                                         <!-- Test for Alfresco version -->
                                         <requireProperty>
                                             <property>alfresco.version</property>
-                                            <message>The SDK 2.1.x is supported only for Alfresco 5.0.d Community and above or 
+                                            <message>The SDK 2.1.x is supported only for Alfresco 5.0.d Community and above or
-                                                Alfresco Enterprise 5.1.0 
+                                                Alfresco Enterprise 5.0.1 and above
                                             </message>
-                                            <!-- TODO: Need to be updated for DEVPLAT-67 -->
+                                            <regex>^(5\.(0\.[d-z1-9]|[1-9])|6\.).*$</regex>
-                                            <regex>^5\..*</regex>
                                         </requireProperty>
 
                                         <!-- Test for JDK version -->
                                         <requireJavaVersion>
                                             <version>[1.8.0,)</version>
-                                            <message>Alfresco 5+ requires Java 8</message>
+                                            <message>Alfresco 5.0.d and 5.0.1 runs on JDK8</message>
                                         </requireJavaVersion>
 
                                         <!-- Test for Maven version -->
@@ -873,7 +872,10 @@
             </build>
         </profile>
 
-
+        <!--
+            Turn on webapp refresh for both Alfresco Repo (alfresco.war) and Alfresco Share (share.war)
+            if we find a module.properties file for an AMP extension.
+             -->
         <profile>
             <id>refresh-both</id>
             <activation>
@@ -901,8 +903,6 @@
         </profile>
 
 
-
-
         <!-- ====================================================================================================
               ONE OFF/SETUP operations
              ==================================================================================================== -->