Merged 'master'.

Conflicts:
	rm-community/rm-community-share/pom.xml
	rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get.js
This commit is contained in:
ddraper
2016-07-04 10:52:42 +01:00
parent 6cbe022956
commit 001eaa649c
10 changed files with 910 additions and 791 deletions

691
pom.xml
View File

@@ -1,346 +1,345 @@
<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId> <artifactId>alfresco-rm</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>2.5-SNAPSHOT</version> <version>2.5-SNAPSHOT</version>
<name>Alfresco Records Management</name> <name>Alfresco Records Management</name>
<parent> <parent>
<groupId>org.alfresco.maven</groupId> <groupId>org.alfresco.maven</groupId>
<artifactId>alfresco-sdk-parent</artifactId> <artifactId>alfresco-sdk-parent</artifactId>
<version>2.1.1</version> <version>2.1.1</version>
</parent> </parent>
<url>http://www.alfresco.org/</url> <url>http://www.alfresco.org/</url>
<inceptionYear>2005</inceptionYear> <inceptionYear>2005</inceptionYear>
<organization> <organization>
<name>Alfresco Software</name> <name>Alfresco Software</name>
<url>http://www.alfresco.org/</url> <url>http://www.alfresco.org/</url>
</organization> </organization>
<scm> <scm>
<connection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</connection> <connection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</connection>
<developerConnection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</developerConnection> <developerConnection>scm:git:https://gitlab.alfresco.com/records-management/records-management.git</developerConnection>
<url>https://gitlab.alfresco.com/records-management/records-management</url> <url>https://gitlab.alfresco.com/records-management/records-management</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
<issueManagement> <issueManagement>
<system>JIRA</system> <system>JIRA</system>
<url>https://issues.alfresco.com/jira/browse/RM</url> <url>https://issues.alfresco.com/jira/browse/RM</url>
</issueManagement> </issueManagement>
<ciManagement> <ciManagement>
<system>Bamboo</system> <system>Bamboo</system>
<url>https://bamboo.alfresco.com/bamboo/browse/RM</url> <url>https://bamboo.alfresco.com/bamboo/browse/RM</url>
</ciManagement> </ciManagement>
<prerequisites> <prerequisites>
<maven>3.2.5</maven> <maven>3.2.5</maven>
</prerequisites> </prerequisites>
<repositories> <repositories>
<repository> <repository>
<id>alfresco-internal</id> <id>alfresco-internal</id>
<url>https://artifacts.alfresco.com/nexus/content/groups/private</url> <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>alfresco-public</id> <id>alfresco-public</id>
<url>https://artifacts.alfresco.com/nexus/content/groups/public</url> <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>alfresco-internal</id> <id>alfresco-internal</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/</url> <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases/</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>alfresco-internal-snapshots</id> <id>alfresco-internal-snapshots</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/</url> <url>https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${alfresco.groupId}</groupId> <groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-platform-distribution</artifactId> <artifactId>alfresco-platform-distribution</artifactId>
<version>${alfresco.version}</version> <version>${alfresco.version}</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>0.9.10</version> <version>0.9.10</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<modules> <modules>
<module>rm-community</module> <module>rm-community</module>
<module>rm-enterprise</module> <module>rm-enterprise</module>
<module>rm-automation</module> <module>rm-automation</module>
</modules> </modules>
<properties> <properties>
<alfresco.rm.version>${project.version}</alfresco.rm.version> <alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params>
<alfresco.db.params>AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0;IGNORECASE=TRUE</alfresco.db.params> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.build.sourceVersion>1.7</maven.build.sourceVersion>
<maven.build.sourceVersion>1.7</maven.build.sourceVersion> <maven.build.testSourceVersion>1.8</maven.build.testSourceVersion>
<maven.build.testSourceVersion>1.8</maven.build.testSourceVersion> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<argLine>-Xmx1024m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
<!-- license properties -->
<!-- license properties --> <license.update.dryrun>true</license.update.dryrun>
<license.update.dryrun>true</license.update.dryrun> <license.verbose>false</license.verbose>
<license.verbose>false</license.verbose>
</properties>
</properties>
<build>
<build> <finalName>${project.artifactId}-${project.version}</finalName>
<finalName>${project.artifactId}-${project.version}</finalName> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId>
<artifactId>maven-enforcer-plugin</artifactId> <executions>
<executions> <execution>
<execution> <id>enforce-java</id>
<id>enforce-java</id> <goals>
<goals> <goal>enforce</goal>
<goal>enforce</goal> </goals>
</goals> <configuration>
<configuration> <rules>
<rules> <requireJavaVersion>
<requireJavaVersion> <version>1.8</version>
<version>1.8</version> </requireJavaVersion>
</requireJavaVersion> </rules>
</rules> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> <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>regex-properties</id>
<id>regex-properties</id> <goals>
<goals> <goal>regex-properties</goal>
<goal>regex-properties</goal> </goals>
</goals> <configuration>
<configuration> <regexPropertySettings>
<regexPropertySettings> <regexPropertySetting>
<regexPropertySetting> <name>rm.module.repo.version.min</name>
<name>rm.module.repo.version.min</name> <value>${alfresco.version}</value>
<value>${alfresco.version}</value> <regex>(\d+)\.(\d+).*</regex>
<regex>(\d+)\.(\d+).*</regex> <replacement>$1.$2</replacement>
<replacement>$1.$2</replacement> <failIfNoMatch>false</failIfNoMatch>
<failIfNoMatch>false</failIfNoMatch> </regexPropertySetting>
</regexPropertySetting> <regexPropertySetting>
<regexPropertySetting> <name>rm.module.version</name>
<name>rm.module.version</name> <value>${project.version}</value>
<value>${alfresco.rm.version}</value> <regex>(\d+)\.(\d+).*</regex>
<regex>(\d+)\.(\d+).*</regex> <replacement>$1.$2</replacement>
<replacement>$1.$2</replacement> <failIfNoMatch>false</failIfNoMatch>
<failIfNoMatch>false</failIfNoMatch> </regexPropertySetting>
</regexPropertySetting> </regexPropertySettings>
</regexPropertySettings> </configuration>
</configuration> </execution>
</execution> <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> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId>
<artifactId>maven-surefire-plugin</artifactId> <configuration>
<configuration> <includes>
<includes> <include>**/*UnitTest.java</include>
<include>**/*UnitTest.java</include> </includes>
</includes> </configuration>
</configuration> </plugin>
</plugin> </plugins>
</plugins> <pluginManagement>
<pluginManagement> <plugins>
<plugins> <plugin>
<plugin> <artifactId>maven-compiler-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId> <version>${maven.compiler.version}</version>
<version>${maven.compiler.version}</version> <configuration>
<configuration> <source>${maven.build.sourceVersion}</source>
<source>${maven.build.sourceVersion}</source> <target>${maven.build.sourceVersion}</target>
<target>${maven.build.sourceVersion}</target> </configuration>
</configuration> <executions>
<executions> <execution>
<execution> <id>default-testCompile</id>
<id>default-testCompile</id> <phase>process-test-sources</phase>
<phase>process-test-sources</phase> <goals>
<goals> <goal>testCompile</goal>
<goal>testCompile</goal> </goals>
</goals> <configuration>
<configuration> <source>${maven.build.testSourceVersion}</source>
<source>${maven.build.testSourceVersion}</source> <target>${maven.build.testSourceVersion}</target>
<target>${maven.build.testSourceVersion}</target> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.eclipse.m2e</groupId>
<groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId>
<artifactId>lifecycle-mapping</artifactId> <version>1.0.0</version>
<version>1.0.0</version> <configuration>
<configuration> <lifecycleMappingMetadata>
<lifecycleMappingMetadata> <pluginExecutions>
<pluginExecutions> <pluginExecution>
<pluginExecution> <pluginExecutionFilter>
<pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId>
<artifactId>maven-enforcer-plugin</artifactId> <versionRange>[1.0.0,)</versionRange>
<versionRange>[1.0.0,)</versionRange> <goals>
<goals> <goal>enforce</goal>
<goal>enforce</goal> </goals>
</goals> </pluginExecutionFilter>
</pluginExecutionFilter> <action>
<action> <ignore />
<ignore /> </action>
</action> </pluginExecution>
</pluginExecution> <pluginExecution>
<pluginExecution> <pluginExecutionFilter>
<pluginExecutionFilter> <groupId>
<groupId> org.codehaus.mojo
org.codehaus.mojo </groupId>
</groupId> <artifactId>
<artifactId> build-helper-maven-plugin
build-helper-maven-plugin </artifactId>
</artifactId> <versionRange>
<versionRange> [1.9.1,)
[1.9.1,) </versionRange>
</versionRange> <goals>
<goals> <goal>regex-properties</goal>
<goal>regex-properties</goal> </goals>
</goals> </pluginExecutionFilter>
</pluginExecutionFilter> <action>
<action> <ignore />
<ignore /> </action>
</action> </pluginExecution>
</pluginExecution> </pluginExecutions>
</pluginExecutions> </lifecycleMappingMetadata>
</lifecycleMappingMetadata> </configuration>
</configuration> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId>
<artifactId>maven-enforcer-plugin</artifactId> <version>${maven.enforcer.plugin}</version>
<version>${maven.enforcer.plugin}</version> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.codehaus.mojo</groupId>
<groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId>
<artifactId>properties-maven-plugin</artifactId> <version>1.0-alpha-2</version>
<version>1.0-alpha-2</version> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId>
<artifactId>maven-failsafe-plugin</artifactId> <version>2.19</version>
<version>2.19</version> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.codehaus.mojo</groupId>
<groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId>
<artifactId>build-helper-maven-plugin</artifactId> <version>${maven.buildhelper.version}</version>
<version>${maven.buildhelper.version}</version> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.codehaus.mojo</groupId>
<groupId>org.codehaus.mojo</groupId> <artifactId>sql-maven-plugin</artifactId>
<artifactId>sql-maven-plugin</artifactId> <version>1.5</version>
<version>1.5</version> </plugin>
</plugin>
<!-- Maven Release Plugin (Use a recent version for better Git Support) -->
<!-- Maven Release Plugin (Use a recent version for better Git Support) --> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId>
<artifactId>maven-release-plugin</artifactId> <version>2.5.3</version>
<version>2.5.3</version> <configuration>
<configuration> <tagNameFormat>V@{project.version}</tagNameFormat>
<tagNameFormat>V@{project.version}</tagNameFormat> </configuration>
</configuration> </plugin>
</plugin>
<!-- Disable doclint until RM-3150 is fixed -->
<!-- Disable doclint until RM-3150 is fixed --> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId>
<artifactId>maven-javadoc-plugin</artifactId> <configuration>
<configuration> <additionalparam>-Xdoclint:none</additionalparam>
<additionalparam>-Xdoclint:none</additionalparam> </configuration>
</configuration> </plugin>
</plugin>
<!-- License header generation -->
<!-- License header generation --> <plugin>
<plugin> <groupId>org.codehaus.mojo</groupId>
<groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId>
<artifactId>license-maven-plugin</artifactId> <version>1.8</version>
<version>1.8</version> <configuration>
<configuration>
<verbose>${license.verbose}</verbose>
<verbose>${license.verbose}</verbose> <addSvnKeyWords>false</addSvnKeyWords>
<addSvnKeyWords>false</addSvnKeyWords> <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<!-- header configuration -->
<!-- header configuration --> <organizationName>Alfresco Software Limited</organizationName>
<organizationName>Alfresco Software Limited</organizationName> <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
<descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate> <canUpdateCopyright>true</canUpdateCopyright>
<canUpdateCopyright>true</canUpdateCopyright> <canUpdateDescription>true</canUpdateDescription>
<canUpdateDescription>true</canUpdateDescription>
<!-- licence configuration -->
<!-- licence configuration --> <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
<licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
<!-- dry run options -->
<!-- dry run options --> <dryRun>${license.update.dryrun}</dryRun>
<dryRun>${license.update.dryrun}</dryRun> <failOnMissingHeader>true</failOnMissingHeader>
<failOnMissingHeader>true</failOnMissingHeader> <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
<failOnNotUptodateHeader>true</failOnNotUptodateHeader>
<!-- default root -->
<!-- default root --> <roots>
<roots> <root>src</root>
<root>src</root> </roots>
</roots>
<!-- exculsions -->
<!-- exculsions --> <excludes>
<excludes> <exclude>**/package-info.java</exclude>
<exclude>**/package-info.java</exclude> <exclude>**/*.properties</exclude>
<exclude>**/*.properties</exclude> <exclude>**/*.css</exclude>
<exclude>**/*.css</exclude> <exclude>**/*.xml</exclude>
<exclude>**/*.xml</exclude> <exclude>**/*.json</exclude>
<exclude>**/*.json</exclude> <exclude>**/*.txt</exclude>
<exclude>**/*.txt</exclude> <exclude>**/*.html</exclude>
<exclude>**/*.html</exclude> </excludes>
</excludes>
</configuration>
</configuration> <executions>
<executions> <execution>
<execution> <id>first</id>
<id>first</id> <goals>
<goals> <goal>update-file-header</goal>
<goal>update-file-header</goal> </goals>
</goals> <phase>process-sources</phase>
<phase>process-sources</phase> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </pluginManagement>
</pluginManagement> </build>
</build> </project>
</project>

View File

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

View File

@@ -1,28 +1,28 @@
<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-community</artifactId> <artifactId>alfresco-rm-community</artifactId>
<name>Alfresco Records Management Community</name> <name>Alfresco Records Management Community</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<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>
<licenses> <licenses>
<license> <license>
<name>LGPL 3</name> <name>LGPL 3</name>
</license> </license>
</licenses> </licenses>
<modules> <modules>
<module>rm-community-repo</module> <module>rm-community-repo</module>
<module>rm-community-share</module> <module>rm-community-share</module>
</modules> </modules>
<properties> <properties>
<alfresco.version>5.1.e</alfresco.version> <alfresco.version>5.1.e</alfresco.version>
</properties> </properties>
</project> </project>

View File

@@ -36,4 +36,5 @@ rm.action.records_only_undeclared=Only records can be completed.
rm.action.event-not-undone=The event {0} can't be undone, because it's not defined on the disposition lifecycle. rm.action.event-not-undone=The event {0} can't be undone, because it's not defined on the disposition lifecycle.
rm.action.node-not-record-category=The disposition schedule could not be created, because the actioned upon node ({0}) was not a record category. rm.action.node-not-record-category=The disposition schedule could not be created, because the actioned upon node ({0}) was not a record category.
rm.action.parameter-not-supplied=The parameter ''{0}'' has not been supplied. rm.action.parameter-not-supplied=The parameter ''{0}'' has not been supplied.
rm.action.delete-not-hold-type=The hold couldn't be deleted, because the node isn't of type {0}. (actionedUponNodeRef={1}) rm.action.delete-not-hold-type=The hold couldn't be deleted, because the node isn't of type {0}. (actionedUponNodeRef={1})
rm.action.record-folder-create=Operation failed, because you can't place a record folder into another record folder.

View File

@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-community-repo</artifactId> <artifactId>alfresco-rm-community-repo</artifactId>
<name>Alfresco Records Management Community Repo</name> <name>Alfresco Records Management Community Repo</name>
<description>Alfresco Record Management Core Repository Extension</description> <description>Alfresco Record Management Community Repository Extension</description>
<packaging>amp</packaging> <packaging>amp</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community</artifactId> <artifactId>alfresco-rm-community</artifactId>
<version>2.5-SNAPSHOT</version> <version>2.5-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
@@ -83,10 +83,10 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco"> <move todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
<fileset dir="${project.build.outputDirectory}/alfresco" /> <fileset dir="${project.build.outputDirectory}/alfresco" />
</copy> </move>
<move file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" /> <copy file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" />
</target> </target>
</configuration> </configuration>
</execution> </execution>
@@ -110,7 +110,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
@@ -205,24 +205,21 @@
</excludes> </excludes>
</configuration> </configuration>
</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_community</licenseName>
<configuration> <roots>
<licenseName>alfresco_community</licenseName> <root>source/java</root>
<roots> <root>unit-test/java</root>
<root>source/java</root> <root>source/compatibility</root>
<root>unit-test/java</root> <root>config</root>
<root>source/compatibility</root> <root>test/java</root>
<root>config</root> <root>test/resources</root>
<root>test/java</root> </roots>
<root>test/resources</root> </configuration>
</roots> </plugin>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@@ -246,17 +243,17 @@
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<versionRange>[1.8,)</versionRange> <versionRange>[1.8,)</versionRange>
<goals> <goals>
<goal>update-file-header</goal> <goal>update-file-header</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore /> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
@@ -298,8 +295,8 @@
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>2.5</version> <version>2.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${alfresco.groupId}</groupId> <groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-repository</artifactId> <artifactId>alfresco-repository</artifactId>
<version>${alfresco.version}</version> <version>${alfresco.version}</version>
@@ -337,11 +334,11 @@
</exclusions> </exclusions>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>

View File

@@ -47,6 +47,9 @@ public class EditDispositionActionAsOfDateAction extends RMActionExecuterAbstrac
private static final String MSG_VALID_DATE_DISP_ASOF = "rm.action.valid-date-disp-asof"; private static final String MSG_VALID_DATE_DISP_ASOF = "rm.action.valid-date-disp-asof";
private static final String MSG_DISP_ASOF_LIFECYCLE_APPLIED = "rm.action.disp-asof-lifecycle-applied"; private static final String MSG_DISP_ASOF_LIFECYCLE_APPLIED = "rm.action.disp-asof-lifecycle-applied";
/** Action name */
public static final String NAME = "editDispositionActionAsOfDate";
/** Action parameters */ /** Action parameters */
public static final String PARAM_AS_OF_DATE = "asOfDate"; public static final String PARAM_AS_OF_DATE = "asOfDate";

View File

@@ -889,6 +889,13 @@ public class DispositionServiceImpl extends ServiceBaseImpl
// Get the current action // Get the current action
String currentADId = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION_ID); String currentADId = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION_ID);
currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId); currentDispositionActionDefinition = di.getDispositionActionDefinition(currentADId);
// When the record has multiple disposition schedules the current disposition action may not be found by id
// In this case it will be searched by name
if(currentDispositionActionDefinition == null)
{
String currentADName = (String) nodeService.getProperty(currentDispositionAction, PROP_DISPOSITION_ACTION);
currentDispositionActionDefinition = di.getDispositionActionDefinitionByName(currentADName);
}
// Get the next disposition action // Get the next disposition action
int index = currentDispositionActionDefinition.getIndex(); int index = currentDispositionActionDefinition.getIndex();

View File

@@ -31,6 +31,7 @@ import java.io.Serializable;
import java.util.Map; import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.AbstractDisposableItem; import org.alfresco.module.org_alfresco_module_rm.model.behaviour.AbstractDisposableItem;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService; import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService; import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderService;
@@ -49,6 +50,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.springframework.extensions.surf.util.I18NUtil;
/** /**
* rma:recordFolder behaviour bean * rma:recordFolder behaviour bean
@@ -73,6 +75,9 @@ public class RecordFolderType extends AbstractDisposableItem
/** vital record service */ /** vital record service */
protected VitalRecordService vitalRecordService; protected VitalRecordService vitalRecordService;
/** I18N */
private static final String MSG_CANNOT_CREATE_RECORD_FOLDER = "rm.action.record-folder-create";
/** /**
* @param recordService record service * @param recordService record service
*/ */
@@ -211,12 +216,13 @@ public class RecordFolderType extends AbstractDisposableItem
public void onCreateChildAssociation(ChildAssociationRef childAssocRef, boolean bNew) public void onCreateChildAssociation(ChildAssociationRef childAssocRef, boolean bNew)
{ {
NodeRef nodeRef = childAssocRef.getChildRef(); NodeRef nodeRef = childAssocRef.getChildRef();
if (nodeService.exists(nodeRef) && instanceOf(nodeRef, TYPE_RECORD_FOLDER))
if (nodeService.exists(nodeRef))
{ {
// ensure nothing is being added to a closed record folder // ensure nothing is being added to a closed record folder
NodeRef recordFolder = childAssocRef.getParentRef(); NodeRef recordFolder = childAssocRef.getParentRef();
Boolean isClosed = (Boolean) nodeService.getProperty(recordFolder, PROP_IS_CLOSED); Boolean isClosed = (Boolean) nodeService.getProperty(recordFolder, PROP_IS_CLOSED);
if (isClosed != null && Boolean.TRUE.equals(isClosed)) if (isClosed != null && isClosed)
{ {
throw new AlfrescoRuntimeException("You can't add new items to a closed record folder."); throw new AlfrescoRuntimeException("You can't add new items to a closed record folder.");
} }
@@ -238,6 +244,12 @@ public class RecordFolderType extends AbstractDisposableItem
{ {
final NodeRef recordFolder = childAssocRef.getChildRef(); final NodeRef recordFolder = childAssocRef.getChildRef();
// only records can be added in a record folder or hidden folders(is the case of e-mail attachments)
if (!instanceOf(recordFolder, ContentModel.TYPE_CONTENT) && !nodeService.hasAspect(recordFolder, ContentModel.ASPECT_HIDDEN))
{
throw new AlfrescoRuntimeException(I18NUtil.getMessage(MSG_CANNOT_CREATE_RECORD_FOLDER));
}
behaviourFilter.disableBehaviour(); behaviourFilter.disableBehaviour();
try try
{ {

View File

@@ -0,0 +1,148 @@
/*
* #%L
* Alfresco Records Management Module
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* -
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
* -
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* -
* Alfresco 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 Lesser General Public License for more details.
* -
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.module.org_alfresco_module_rm.test.integration.disposition;
import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_DESCRIPTION;
import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_DISPOSITION_INSTRUCTIONS;
import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.DEFAULT_EVENT_NAME;
import static org.alfresco.module.org_alfresco_module_rm.test.util.CommonRMTestUtils.PERIOD_ONE_WEEK;
import static org.alfresco.util.GUID.generate;
import java.io.Serializable;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.action.impl.CutOffAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.DestroyAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.EditDispositionActionAsOfDateAction;
import org.alfresco.module.org_alfresco_module_rm.action.impl.TransferAction;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
/**
* Update next disposition step integration tests.
*
* @author Roxana Lucanu
* @since 2.4.1
*/
public class UpdateNextDispositionActionTest extends BaseRMTestCase
{
/**
* Given a record with multiple dispositions
* When updating the next step
* Then the action is available
* <p>
* relates to https://issues.alfresco.com/jira/browse/RM-3060
*/
public void testUpdateNextDispositionAction_RM3060() throws Exception
{
doBehaviourDrivenTest(new BehaviourDrivenTest()
{
NodeRef record;
NodeRef folder2;
@Override
public void given()
{
// create category1
NodeRef category1 = filePlanService.createRecordCategory(filePlan, generate());
// create disposition schedule for category1
createDispositionSchedule(category1);
// create category2
NodeRef category2 = filePlanService.createRecordCategory(filePlan, generate());
// create disposition schedule for category2
createDispositionSchedule(category2);
// create folder2 inside category2
folder2 = recordFolderService.createRecordFolder(category2, generate());
// create folder1 inside category1
NodeRef folder1 = recordFolderService.createRecordFolder(category1, generate());
// create record inside folder1
record = utils.createRecord(folder1, generate(), generate());
}
@Override
public void when() throws Exception
{
// link the record to folder2
recordService.link(record, folder2);
// complete record
utils.completeRecord(record);
// set the disposition as of date to now on the record
rmActionService.executeRecordsManagementAction(record,
EditDispositionActionAsOfDateAction.NAME,
Collections.singletonMap(EditDispositionActionAsOfDateAction.PARAM_AS_OF_DATE, new Date()));
// cut off
rmActionService.executeRecordsManagementAction(record, CutOffAction.NAME, null);
}
@Override
public void then() throws Exception
{
assertTrue(nodeService.hasAspect(record, ASPECT_CUT_OFF));
}
});
}
private void createDispositionSchedule(NodeRef category)
{
DispositionSchedule ds = utils.createDispositionSchedule(category, DEFAULT_DISPOSITION_INSTRUCTIONS, DEFAULT_DISPOSITION_DESCRIPTION, true, false, false);
// create the properties for CUTOFF action and add it to the disposition action definition
Map<QName, Serializable> cutOff = new HashMap<QName, Serializable>(3);
cutOff.put(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME);
cutOff.put(PROP_DISPOSITION_DESCRIPTION, generate());
cutOff.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK);
dispositionService.addDispositionActionDefinition(ds, cutOff);
// create the properties for TRANSFER action and add it to the disposition action definition
Map<QName, Serializable> transfer = new HashMap<QName, Serializable>(3);
transfer.put(PROP_DISPOSITION_ACTION_NAME, TransferAction.NAME);
transfer.put(PROP_DISPOSITION_DESCRIPTION, generate());
transfer.put(PROP_DISPOSITION_EVENT, (Serializable)Collections.singletonList(DEFAULT_EVENT_NAME));
dispositionService.addDispositionActionDefinition(ds, transfer);
// create the properties for DESTROY action and add it to the disposition action definition
Map<QName, Serializable> destroy = new HashMap<QName, Serializable>(3);
destroy.put(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME);
destroy.put(PROP_DISPOSITION_DESCRIPTION, generate());
destroy.put(PROP_DISPOSITION_PERIOD, PERIOD_ONE_WEEK);
dispositionService.addDispositionActionDefinition(ds, destroy);
}
}

View File

@@ -86,6 +86,7 @@ public class CommonRMTestUtils implements RecordsManagementModel
public static final String DEFAULT_EVENT_NAME = "case_closed"; public static final String DEFAULT_EVENT_NAME = "case_closed";
public static final String PERIOD_NONE = "none|0"; public static final String PERIOD_NONE = "none|0";
public static final String PERIOD_IMMEDIATELY = "immediately|0"; public static final String PERIOD_IMMEDIATELY = "immediately|0";
public static final String PERIOD_ONE_WEEK = "week|1";
/** /**
* Constructor * Constructor