Fixed audit log issue

This commit is contained in:
Tuna Aksoy
2016-07-01 22:56:45 +01:00
parent 361d77532e
commit d8bf1acb9c
2 changed files with 954 additions and 1005 deletions

View File

@@ -1,396 +1,348 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-automation</artifactId> <artifactId>alfresco-rm-automation</artifactId>
<name>Alfresco Records Management Automation</name> <name>Alfresco Records Management Automation</name>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId> <artifactId>alfresco-rm</artifactId>
<version>2.5-SNAPSHOT</version> <version>2.5-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<selenium.version>2.45.0</selenium.version> <selenium.version>2.45.0</selenium.version>
<spring.version>4.0.5.RELEASE</spring.version> <spring.version>4.0.5.RELEASE</spring.version>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<suiteXmlFile>testng.xml</suiteXmlFile> <suiteXmlFile>testng.xml</suiteXmlFile>
<skip.automationtests>true</skip.automationtests> <skip.automationtests>true</skip.automationtests>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>add-test-source</id> <id>add-test-source</id>
<goals> <goals>
<goal>add-test-source</goal> <goal>add-test-source</goal>
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source>src/unit-test/java</source> <source>src/unit-test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<redirectTestOutputToFile>false</redirectTestOutputToFile> <redirectTestOutputToFile>false</redirectTestOutputToFile>
<suiteXmlFiles> <suiteXmlFiles>
<suiteXmlFile>${project.build.testOutputDirectory}/${suiteXmlFile}</suiteXmlFile> <suiteXmlFile>${project.build.testOutputDirectory}/${suiteXmlFile}</suiteXmlFile>
</suiteXmlFiles> </suiteXmlFiles>
<skipTests>${skip.automationtests}</skipTests> <skipTests>${skip.automationtests}</skipTests>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>
<configuration> <configuration>
<target> <target>
<echo>Stopping Alfresco...</echo> <echo>Stopping Alfresco...</echo>
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true"> <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
<arg value="stop" /> <arg value="stop" />
</exec> </exec>
</target> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<!-- License header generation --> <groupId>org.codehaus.mojo</groupId>
<plugin> <artifactId>license-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId> <configuration>
<artifactId>license-maven-plugin</artifactId> <licenseName>alfresco_enterprise</licenseName>
<configuration> <licenseResolver>file:${project.parent.basedir}/license</licenseResolver>
<licenseName>alfresco_enterprise</licenseName> <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
<licenseResolver>file:${project.parent.basedir}/license</licenseResolver> </configuration>
<descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate> </plugin>
</configuration> </plugins>
</plugin> <pluginManagement>
<plugins>
</plugins> <plugin>
<pluginManagement> <groupId>org.eclipse.m2e</groupId>
<plugins> <artifactId>lifecycle-mapping</artifactId>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <version>1.0.0</version>
<plugin> <configuration>
<groupId>org.eclipse.m2e</groupId> <lifecycleMappingMetadata>
<artifactId>lifecycle-mapping</artifactId> <pluginExecutions>
<version>1.0.0</version> <pluginExecution>
<configuration> <pluginExecutionFilter>
<lifecycleMappingMetadata> <groupId>org.codehaus.mojo</groupId>
<pluginExecutions> <artifactId>license-maven-plugin</artifactId>
<pluginExecution> <versionRange>[1.8,)</versionRange>
<pluginExecutionFilter> <goals>
<groupId> <goal>update-file-header</goal>
org.codehaus.mojo </goals>
</groupId> </pluginExecutionFilter>
<artifactId> <action>
license-maven-plugin <ignore />
</artifactId> </action>
<versionRange> </pluginExecution>
[1.8,) </pluginExecutions>
</versionRange> </lifecycleMappingMetadata>
<goals> </configuration>
<goal> </plugin>
update-file-header </plugins>
</goal> </pluginManagement>
</goals> </build>
</pluginExecutionFilter>
<action> <dependencies>
<ignore /> <dependency>
</action> <groupId>org.alfresco.test</groupId>
</pluginExecution> <artifactId>dataprep</artifactId>
</pluginExecutions> <version>1.8</version>
</lifecycleMappingMetadata> </dependency>
</configuration> <dependency>
</plugin> <groupId>org.alfresco.test</groupId>
</plugins> <artifactId>alfresco-testng</artifactId>
</pluginManagement> <version>1.1</version>
</build> </dependency>
<dependency>
<dependencies> <groupId>org.alfresco</groupId>
<dependency> <artifactId>selenium-grid</artifactId>
<groupId>org.alfresco.test</groupId> <version>1.8</version>
<artifactId>dataprep</artifactId> </dependency>
<version>1.8</version> <dependency>
</dependency> <groupId>org.springframework</groupId>
<dependency> <artifactId>spring-beans</artifactId>
<groupId>org.alfresco.test</groupId> <version>${spring.version}</version>
<artifactId>alfresco-testng</artifactId> </dependency>
<version>1.1</version> <dependency>
</dependency> <groupId>org.springframework</groupId>
<dependency> <artifactId>spring-core</artifactId>
<groupId>org.alfresco</groupId> <version>${spring.version}</version>
<artifactId>selenium-grid</artifactId> </dependency>
<version>1.8</version> <dependency>
</dependency> <groupId>org.springframework</groupId>
<dependency> <artifactId>spring-context</artifactId>
<groupId>org.springframework</groupId> <version>${spring.version}</version>
<artifactId>spring-beans</artifactId> </dependency>
<version>${spring.version}</version> <dependency>
</dependency> <groupId>org.springframework</groupId>
<dependency> <artifactId>spring-tx</artifactId>
<groupId>org.springframework</groupId> <version>${spring.version}</version>
<artifactId>spring-core</artifactId> <scope>test</scope>
<version>${spring.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.springframework</groupId> <artifactId>spring-test</artifactId>
<artifactId>spring-context</artifactId> <version>${spring.version}</version>
<version>${spring.version}</version> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.testng</groupId>
<artifactId>spring-tx</artifactId> <artifactId>testng</artifactId>
<version>${spring.version}</version> <version>6.8.8</version>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>ru.yandex.qatools.htmlelements</groupId>
<groupId>org.springframework</groupId> <artifactId>htmlelements-all</artifactId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.8</version>
</dependency>
<dependency>
<groupId>ru.yandex.qatools.htmlelements</groupId>
<artifactId>htmlelements-all</artifactId>
<version>1.15</version> <version>1.15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.yandex.qatools.properties</groupId> <groupId>ru.yandex.qatools.properties</groupId>
<artifactId>properties-loader</artifactId> <artifactId>properties-loader</artifactId>
<version>1.5</version> <version>1.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.tomakehurst</groupId> <groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId> <artifactId>wiremock</artifactId>
<version>1.56</version> <version>1.56</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<profile> <profile>
<id>install-alfresco</id> <id>install-alfresco</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>fetch-installer</id> <id>fetch-installer</id>
<phase>generate-test-resources</phase> <phase>generate-test-resources</phase>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<target> <target>
<echo>Recreating database...</echo> <echo>Recreating database...</echo>
<sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql> <sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql>
<echo>Downloading Alfresco installer...</echo> <echo>Downloading Alfresco installer...</echo>
<sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${installer.path} | tail -1 | tr ' ' '?' " /> <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${installer.path} | tail -1 | tr ' ' '?' " />
<scp remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" /> <scp remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" />
<chmod file="target/alf-installer.bin" perm="a+x" verbose="true" /> <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
<echo>Installing Alfresco...</echo> <echo>Installing Alfresco...</echo>
<exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true"> <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" /> <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
</exec> </exec>
</target> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId> <artifactId>ant-jsch</artifactId>
<version>1.8.2</version> <version>1.8.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>postgresql</groupId> <groupId>postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>9.1-901-1.jdbc4</version> <version>9.1-901-1.jdbc4</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>fetch-amps</id> <id>fetch-amps</id>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<goals> <goals>
<goal>copy</goal> <goal>copy</goal>
</goals> </goals>
<configuration> <configuration>
<artifactItems> <artifactItems>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community-share</artifactId> <artifactId>alfresco-rm-enterprise-share</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>amp</type> <type>amp</type>
</artifactItem> </artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-share</artifactId> <artifactId>alfresco-rm-enterprise-repo</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>amp</type> <type>amp</type>
</artifactItem> </artifactItem>
<artifactItem> </artifactItems>
<groupId>org.alfresco</groupId> <outputDirectory>${project.build.directory}/amps</outputDirectory>
<artifactId>alfresco-rm-community-repo</artifactId> <useBaseVersion>true</useBaseVersion>
<version>${project.version}</version> </configuration>
<type>amp</type> </execution>
</artifactItem> </executions>
<artifactItem> </plugin>
<groupId>org.alfresco</groupId> <plugin>
<artifactId>alfresco-rm-enterprise-repo</artifactId> <groupId>org.alfresco.maven.plugin</groupId>
<version>${project.version}</version> <artifactId>alfresco-maven-plugin</artifactId>
<type>amp</type> <extensions>true</extensions>
</artifactItem> <executions>
</artifactItems> <execution>
<outputDirectory>${project.build.directory}/amps</outputDirectory> <id>install-enterprise-repo-amp</id>
<useBaseVersion>true</useBaseVersion> <goals>
</configuration> <goal>install</goal>
</execution> </goals>
</executions> <phase>process-test-resources</phase>
</plugin> <configuration>
<plugin> <backup>true</backup>
<groupId>org.alfresco.maven.plugin</groupId> <ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp</ampLocation>
<artifactId>alfresco-maven-plugin</artifactId> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
<extensions>true</extensions> </configuration>
<executions> </execution>
<execution> <execution>
<id>install-community-repo-amp</id> <id>install-enterprise-share-amp</id>
<goals> <goals>
<goal>install</goal> <goal>install</goal>
</goals> </goals>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<configuration> <configuration>
<backup>true</backup> <backup>true</backup>
<ampLocation>${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp</ampLocation> <ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
</configuration> </configuration>
</execution> </execution>
<execution> </executions>
<id>install-enterprise-repo-amp</id> </plugin>
<goals> </plugins>
<goal>install</goal> </build>
</goals> </profile>
<phase>process-test-resources</phase> <profile>
<configuration> <id>run-alfresco</id>
<backup>true</backup> <build>
<ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp</ampLocation> <plugins>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation> <plugin>
</configuration> <groupId>org.jacoco</groupId>
</execution> <artifactId>jacoco-maven-plugin</artifactId>
<execution> <version>0.7.5.201505241946</version>
<id>install-community-share-amp</id> <executions>
<goals> <execution>
<goal>install</goal> <id>prepare-jacoco</id>
</goals> <goals>
<phase>process-test-resources</phase> <goal>prepare-agent</goal>
<configuration> </goals>
<backup>true</backup> </execution>
<ampLocation>${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp</ampLocation> </executions>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation> <configuration>
</configuration> <includes>
</execution> <include>org.alfresco.*</include>
<execution> </includes>
<id>install-enterprise-share-amp</id> </configuration>
<goals> </plugin>
<goal>install</goal> <plugin>
</goals> <artifactId>maven-antrun-plugin</artifactId>
<phase>process-test-resources</phase> <executions>
<configuration> <execution>
<backup>true</backup> <id>start-alfresco</id>
<ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp</ampLocation> <phase>process-test-classes</phase>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation> <goals>
</configuration> <goal>run</goal>
</execution> </goals>
</executions> <configuration>
</plugin> <target>
</plugins> <echo>Starting Alfresco...</echo>
</build> <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
</profile> <arg value="start" />
<profile> <env key="CATALINA_OPTS" value="${argLine}" />
<id>run-alfresco</id> </exec>
<build> <sleep minutes="5" />
<plugins> </target>
<plugin> </configuration>
<groupId>org.jacoco</groupId> </execution>
<artifactId>jacoco-maven-plugin</artifactId> <execution>
<version>0.7.5.201505241946</version> <id>stop-alfresco</id>
<executions> <phase>post-integration-test</phase>
<execution> <goals>
<id>prepare-jacoco</id> <goal>run</goal>
<goals> </goals>
<goal>prepare-agent</goal> <configuration>
</goals> <target>
</execution> <echo>Stopping Alfresco...</echo>
</executions> <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
<configuration> <arg value="stop" />
<includes> </exec>
<include>org.alfresco.*</include> </target>
</includes> </configuration>
</configuration> </execution>
</plugin> </executions>
<plugin> </plugin>
<artifactId>maven-antrun-plugin</artifactId> </plugins>
<executions> </build>
<execution> </profile>
<id>start-alfresco</id> </profiles>
<phase>process-test-classes</phase> </project>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo>Starting Alfresco...</echo>
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
<arg value="start" />
<env key="CATALINA_OPTS" value="${argLine}" />
</exec>
<sleep minutes="5" />
</target>
</configuration>
</execution>
<execution>
<id>stop-alfresco</id>
<phase>post-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<echo>Stopping Alfresco...</echo>
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
<arg value="stop" />
</exec>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

File diff suppressed because it is too large Load Diff