Merge remote-tracking branch 'remotes/origin/release/V2.7' into merge-3.0/APPS-236_RunCRTests_merge3.0_no

# Conflicts:
#	.travis.yml
#	rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties
#	travis-env-vars.yml

rm-automation/pom.xml

@@ -90,6 +90,7 @@
    </build>
 
    <profiles>
+      <!-- Profile used to install alfresco on bamboo. It can be removed after travis migration is finished -->
       <profile>
          <id>install-alfresco</id>
          <build>
@@ -130,6 +131,83 @@
             </plugins>
          </build>
       </profile>
+      <!-- Profile used to install alfresco on travis -->
+      <profile>
+         <id>installAlfresco</id>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>io.fabric8</groupId>
+                  <artifactId>docker-maven-plugin</artifactId>
+                  <version>0.31.0</version>
+                  <executions>
+                     <execution>
+                        <id>start-postgresql</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                           <goal>start</goal>
+                        </goals>
+                        <configuration>
+                           <images>
+                              <image>
+                                 <alias>test-database</alias>
+                                 <name>postgres:9.1</name>
+                                 <run>
+                                    <ports>
+                                       <port>5432:5432</port>
+                                    </ports>
+                                    <env>
+                                       <POSTGRES_PASSWORD>alfresco</POSTGRES_PASSWORD>
+                                       <POSTGRES_USER>alfresco</POSTGRES_USER>
+                                       <POSTGRES_DB>alfresco</POSTGRES_DB>
+                                    </env>
+                                    <cmd>
+                                       <shell>-c max_connections=300</shell>
+                                    </cmd>
+                                    <wait>
+                                       <log>database system is ready to accept connections</log>
+                                       <time>20000</time>
+                                    </wait>
+                                 </run>
+                              </image>
+                           </images>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+
+               <plugin>
+                  <artifactId>maven-antrun-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>fetch-installer</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                           <goal>run</goal>
+                        </goals>
+                        <configuration>
+                           <target>
+                              <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
+                              <echo>Installing Alfresco...</echo>
+                              <exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true">
+                                 <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
+                              </exec>
+                              <delete file="target/alf-installer.bin" verbose="true" />
+                           </target>
+                        </configuration>
+                     </execution>
+                  </executions>
+                  <dependencies>
+                     <dependency>
+                        <groupId>postgresql</groupId>
+                        <artifactId>postgresql</artifactId>
+                        <version>9.1-901-1.jdbc4</version>
+                     </dependency>
+                  </dependencies>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
       <profile>
          <id>apply-rm-community</id>
          <build>

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/search/SearchRecordsV1CmisTests.java

@@ -123,7 +123,8 @@ public class SearchRecordsV1CmisTests extends BaseRMRestTest
         assertEquals(searchResponse.getEntries().size(), 5, "Expected total entries to be five");
     }
 
-    @Test
+    // TODO enable the test when APPS-46 is fixed
+    @Test (enabled = false)
     public void searchWhenTotalItemsReachWithNonRM() throws Exception
     {
         final SearchRequestBuilder sqlRequest = new SearchRequestBuilder().setQueryBuilder(queryModel)
@@ -157,7 +158,8 @@ public class SearchRecordsV1CmisTests extends BaseRMRestTest
         assertEquals(searchResponse.getEntries().size(), 4, "Expected total entries to be four");
     }
 
-    @Test
+    // TODO enable the test when APPS-46 is fixed
+    @Test (enabled = false)
     public void searchWhenTotalItemsExceedNonRMUser() throws Exception
     {
         final SearchRequestBuilder sqlRequest = new SearchRequestBuilder().setQueryBuilder(queryModel)
@@ -191,7 +193,8 @@ public class SearchRecordsV1CmisTests extends BaseRMRestTest
         assertEquals(searchResponse.getEntries().size(), 4, "Expected total entries to be four");
     }
 
-    @Test
+    // TODO enable the test when APPS-46 is fixed
+    @Test (enabled = false)
     public void searchResultsUnderTotalItemsNonRMUser() throws Exception
     {
         final SearchRequestBuilder sqlRequest = new SearchRequestBuilder().setQueryBuilder(queryModel)

rm-automation/rm-automation-community-rest-api/src/test/resources/log4j.properties

@@ -1,7 +1,14 @@
-log4j.rootLogger=info, console
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
 
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/rm-automation-community-rest-api.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
 
-log4j.logger.com.example=debug
+# Direct log messages to console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n

scripts/downloadInstaller.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# fail script immediately on any errors in external commands and print the lines
+set -ev
+
+outputFile="$TRAVIS_BUILD_DIR/$1/alf-installer.bin"
+host="s3-eu-west-1.amazonaws.com"
+contentType="binary/octet-stream"
+dateValue=`TZ=GMT date -R`
+stringToSign="GET\n\n${contentType}\n${dateValue}\n${S3_INSTALLER_PATH}"
+signature=`echo -en ${stringToSign} | openssl sha1 -hmac $RELEASE_AWS_SECRET_KEY -binary | base64`
+curl -H "Host: ${host}" \
+     -H "Date: ${dateValue}" \
+     -H "Content-Type: ${contentType}" \
+     -H "Authorization: AWS $RELEASE_AWS_ACCESS_KEY:${signature}" \
+     https://${host}${S3_INSTALLER_PATH} -o ${outputFile}