[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-3

This reverts commit 3b579596db.

archetypes/alfresco-allinone-archetype/pom.xml

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

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

@@ -26,7 +26,7 @@
              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> -->
+          <alfresco.data.location>/absolute/path/to/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>

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

@@ -20,7 +20,6 @@
 # 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}
 
 # Use Solr4 as that is used by default with Alfresco 5

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

@@ -11,5 +11,5 @@ if not exist %springloadedfile% (
 
 set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G
 
-mvn install -Prun -nsu
+mvn clean install -Prun -nsu
 :: mvn install -Prun 

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

@@ -6,4 +6,4 @@ springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloade
 if [ ! -f $springloadedfile ]; then
 mvn validate -Psetup
 fi
-MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn install -Prun
+MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun

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

@@ -19,8 +19,9 @@
             <!-- 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>
-                <alfresco.solr.dir>${project.parent.basedir}/${alfresco.data.location}/solr4</alfresco.solr.dir>
+                <alfresco.solr.dir>${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>
 
             <build>

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

@@ -1,8 +1,8 @@
 <?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"/>
+    <Environment name="solr/home"        type="java.lang.String" value="${alfresco.solr.home.dir}/" override="true"/>
+    <Environment name="solr/model/dir"   type="java.lang.String" value="${alfresco.solr.home.dir}/alfrescoModels/" override="true"/>
+    <Environment name="solr/content/dir" type="java.lang.String" value="${alfresco.solr.data.dir}/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.

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

@@ -21,7 +21,7 @@
             <id>run</id>
 
             <properties>
-                <alfresco.solr.dir>${project.parent.basedir}/${alfresco.data.location}/solr4</alfresco.solr.dir>
+                <alfresco.solr.dir>${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>

archetypes/alfresco-amp-archetype/pom.xml

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

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

@@ -24,7 +24,7 @@
         <!-- 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> -->
+          <alfresco.data.location>/absolute/path/to/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>
@@ -88,7 +88,7 @@
 
             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>
@@ -98,6 +98,6 @@
                     <version>${maven.alfresco.version}</version>
                 </dependency>
             </dependencies>
-        </profile>
+        </profile> -->
     </profiles>
 </project>

archetypes/share-amp-archetype/pom.xml

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

modules/alfresco-rad/pom.xml

@@ -9,7 +9,7 @@
   <parent>
       <groupId>org.alfresco.maven</groupId>
       <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.1.1-beta-1</version>
+      <version>2.1.1-beta-3</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.1-beta-1</version>
+      <version>2.1.1-beta-3</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.1-beta-1</version>
+    <version>2.1.1-beta-3</version>
     <name>Alfresco SDK</name>
     <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>
@@ -30,7 +30,7 @@
         <connection>scm:git:${scm.url.base}.git</connection>
         <developerConnection>scm:git:${scm.url.base}</developerConnection>
         <url>${scm.url.base}</url>
-      <tag>alfresco-sdk-aggregator-2.1.1-beta-1</tag>
+      <tag>alfresco-sdk-aggregator-2.1.1-beta-3</tag>
   </scm>
 
     <developers>

poms/alfresco-sdk-parent/pom.xml

@@ -14,12 +14,12 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>2.1.1-beta-1</version>
+        <version>2.1.1-beta-3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <!-- This defines the version of the SDK in terms of features -->
-    <version>2.1.1-beta-1</version>
+    <version>2.1.1-beta-3</version>
 
 
     <properties>
@@ -44,8 +44,9 @@
         <!-- This is the name of the Alfresco data folder.
              Configured in alfresco-global.properties with the 'dir.root' property.
              This folder will contain all content files, index files, and database with metadata when running embedded.
-             (this folder is relative to the top folder in the project) -->
-        <alfresco.data.location>alf_data_dev</alfresco.data.location>
+             (best practice is absolute path to this folder, here we use session.executionRootDirectory
+             property to get correct path to alf_data when running in AIO and Repo AMP) -->
+        <alfresco.data.location>${session.executionRootDirectory}/alf_data_dev</alfresco.data.location>
 
         <!-- Alfresco Repo Database configuration.
              By default it uses a flat file H2 database to be able to run embedded.
@@ -59,7 +60,7 @@
         <alfresco.db.password>alfresco</alfresco.db.password>
         <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0
         </alfresco.db.params>
-        <alfresco.db.url>jdbc:h2:./${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}</alfresco.db.url>
+        <alfresco.db.url>jdbc:h2:${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params}</alfresco.db.url>
         <alfresco.db.datasource.class>org.h2.jdbcx.JdbcDataSource</alfresco.db.datasource.class>
 
         <!--
@@ -111,7 +112,6 @@
               as it may break SDK functionalities
              -->
         <app.filtering.enabled>true</app.filtering.enabled>
-        <app.testing.jvm.args>-Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en</app.testing.jvm.args>
 
         <!--  Logging in project's target folder by default
               NOTE: Remember the trailing slash when overriding this.
@@ -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.1-beta-1</maven.alfresco.version>
+        <maven.alfresco.version>2.1.1-beta-3</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 -->
@@ -159,6 +159,9 @@
         <!-- Sets the H2 Database version to use.
              Note. Upgrading to 1.4.186 did not work, on second start (after initial db creation etc) it will not connect... -->
         <h2.version>1.4.185</h2.version>
+
+        <!-- Give the JVM some more memory so it can load the alfresco.war,share.war,and solr4.war -->
+        <argLine>-Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en</argLine>
     </properties>
 
     <!--
@@ -446,7 +449,7 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>${project.basedir}/${alfresco.data.location}</directory>
+                                    <directory>${alfresco.data.location}</directory>
                                 </fileset>
                                 <fileset>
                                     <directory>${project.basedir}</directory>
@@ -507,7 +510,7 @@
             </properties>
             <build>
                 <plugins>
-                    <!-- Fetch and unpack Alfresco Repository WAR (alfresco.war) -->
+                    <!-- Fetch and unpack Alfresco Repository/Share WAR (alfresco.war or share.war) -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
@@ -532,7 +535,8 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <!-- The current AMP artifact is installed into the Alfresco folder using alfresco-maven-plugin -->
+                    <!-- The current AMP artifact is installed into the Alfresco.war or share.war
+                        using alfresco-maven-plugin -->
                     <plugin>
                         <groupId>org.alfresco.maven.plugin</groupId>
                         <artifactId>alfresco-maven-plugin</artifactId>
@@ -546,11 +550,13 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <!-- We need to selectively not install web resources so to enable rapid dev -->
+                            <!-- We need to selectively not install web resources (i.e. /web folder in AMP),
+                                so these files can be picked up directly from the build project instead,
+                                enabling rapid application dev -->
                             <includeWebResources>false</includeWebResources>
                         </configuration>
                     </plugin>
-                    <!-- Configures tomcat to run against the Alfresco WAR with Tomcat7 virtual webapp features.
+                    <!-- Configures Tomcat to run with the alfresco.war or share.war as virtual webapp.
                          (http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Virtual_webapp)
                          The target/classes and target/test-classes (containing tests and the amp config for test purposes) are prepended to the
                          running webapp context, so changes from the IDE are automatically picked up first. See context.xml for details.
@@ -577,16 +583,17 @@
                                 </configuration>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <!-- Include H2 scripts and lib -->
+                            <dependency>
+                                <groupId>org.alfresco.maven</groupId>
+                                <artifactId>alfresco-rad</artifactId>
+                                <version>${maven.alfresco.version}</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.alfresco.maven</groupId>
-                    <artifactId>alfresco-rad</artifactId>
-                    <version>${maven.alfresco.version}</version>
-                </dependency>
-            </dependencies>
         </profile>
 
 
@@ -680,9 +687,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${maven.surefire.version}</version>
-                        <configuration>
-                            <argLine>${app.testing.jvm.args}</argLine>
-                        </configuration>
                     </plugin>
                 </plugins>
             </build>

poms/alfresco-sdk-parent/src/site/apt/sdk-properties.apt.vm

@@ -24,9 +24,9 @@ Common SDK properties
         <!-- Defines root logger log level for testing and embedded run -->
         <app.log.root.level>WARN</app.log.root.level>
         <!-- Logging dir. Note the trailing slash is required -->
-        <app.log.dir>${project.build.directory}/</app.log.root.level>
+        <app.log.dir>${project.build.directory}/</app.log.dir>
         <!-- The alf_data folder -->
-        <alfresco.data.location>alf_data_dev</alfresco.data.location>
+        <alfresco.data.location>${project.basedir}/alf_data_dev</alfresco.data.location>
         <!-- This controls which properties will be picked in src/test/properties for embedded run -->
         <env>local</env>
     </properties>