Merge remote-tracking branch 'origin/release/V2.4' into feature-2.4/RM-3325_pom_descriptions

This commit is contained in:
David Webster
2016-05-09 10:53:43 +01:00
7 changed files with 784 additions and 788 deletions

680
pom.xml
View File

@@ -1,340 +1,340 @@
<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/maven-v4_0_0.xsd">
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.4.1-SNAPSHOT</version>
<version>2.4-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>
</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>
</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.rm.version>${project.version}</alfresco.rm.version>
<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>${alfresco.rm.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> <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,399 +1,398 @@
<?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.4.1-SNAPSHOT</version>
<version>2.4-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>
<!-- 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> <configuration>
<configuration> <licenseName>alfresco_enterprise</licenseName>
<licenseName>alfresco_enterprise</licenseName> <licenseResolver>file:${project.parent.basedir}/license</licenseResolver>
<licenseResolver>file:${project.parent.basedir}/license</licenseResolver> <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
<descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate> </configuration>
</configuration> </plugin>
</plugin>
</plugins>
</plugins> <pluginManagement>
<pluginManagement> <plugins>
<plugins> <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <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>
<groupId> org.codehaus.mojo
org.codehaus.mojo </groupId>
</groupId> <artifactId>
<artifactId> license-maven-plugin
license-maven-plugin </artifactId>
</artifactId> <versionRange>
<versionRange> [1.8,)
[1.8,) </versionRange>
</versionRange> <goals>
<goals> <goal>
<goal> update-file-header
update-file-header </goal>
</goal> </goals>
</goals> </pluginExecutionFilter>
</pluginExecutionFilter> <action>
<action> <ignore />
<ignore></ignore> </action>
</action> </pluginExecution>
</pluginExecution> </pluginExecutions>
</pluginExecutions> </lifecycleMappingMetadata>
</lifecycleMappingMetadata> </configuration>
</configuration> </plugin>
</plugin> </plugins>
</plugins> </pluginManagement>
</pluginManagement> </build>
</build>
<dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.alfresco.test</groupId>
<groupId>org.alfresco.test</groupId> <artifactId>dataprep</artifactId>
<artifactId>dataprep</artifactId> <version>1.8</version>
<version>1.8</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.alfresco.test</groupId>
<groupId>org.alfresco.test</groupId> <artifactId>alfresco-testng</artifactId>
<artifactId>alfresco-testng</artifactId> <version>1.1</version>
<version>1.1</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.alfresco</groupId>
<groupId>org.alfresco</groupId> <artifactId>selenium-grid</artifactId>
<artifactId>selenium-grid</artifactId> <version>1.8</version>
<version>1.4</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
<artifactId>spring-beans</artifactId> <version>${spring.version}</version>
<version>${spring.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.springframework</groupId> <artifactId>spring-core</artifactId>
<artifactId>spring-core</artifactId> <version>${spring.version}</version>
<version>${spring.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.springframework</groupId> <artifactId>spring-context</artifactId>
<artifactId>spring-context</artifactId> <version>${spring.version}</version>
<version>${spring.version}</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
<artifactId>spring-tx</artifactId> <version>${spring.version}</version>
<version>${spring.version}</version> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework</groupId>
<groupId>org.springframework</groupId> <artifactId>spring-test</artifactId>
<artifactId>spring-test</artifactId> <version>${spring.version}</version>
<version>${spring.version}</version> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.testng</groupId>
<groupId>org.testng</groupId> <artifactId>testng</artifactId>
<artifactId>testng</artifactId> <version>6.8.8</version>
<version>6.8.8</version> </dependency>
</dependency> <dependency>
<dependency> <groupId>ru.yandex.qatools.htmlelements</groupId>
<groupId>ru.yandex.qatools.htmlelements</groupId> <artifactId>htmlelements-all</artifactId>
<artifactId>htmlelements-all</artifactId> <version>1.12</version>
<version>1.12</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-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-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-community-repo</artifactId>
<artifactId>alfresco-rm-community-repo</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-repo</artifactId>
<artifactId>alfresco-rm-enterprise-repo</artifactId> <version>${project.version}</version>
<version>${project.version}</version> <type>amp</type>
<type>amp</type> </artifactItem>
</artifactItem> </artifactItems>
</artifactItems> <outputDirectory>${project.build.directory}/amps</outputDirectory>
<outputDirectory>${project.build.directory}/amps</outputDirectory> <useBaseVersion>true</useBaseVersion>
<useBaseVersion>true</useBaseVersion> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.alfresco.maven.plugin</groupId>
<groupId>org.alfresco.maven.plugin</groupId> <artifactId>alfresco-maven-plugin</artifactId>
<artifactId>alfresco-maven-plugin</artifactId> <extensions>true</extensions>
<extensions>true</extensions> <executions>
<executions> <execution>
<execution> <id>install-community-repo-amp</id>
<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-community-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-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-enterprise-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-community-share-amp</id>
<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-community-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>
<execution> <id>install-enterprise-share-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-enterprise-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> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build> </profile>
</profile> <profile>
<profile> <id>run-alfresco</id>
<id>run-alfresco</id> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.jacoco</groupId>
<groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId>
<artifactId>jacoco-maven-plugin</artifactId> <version>0.7.5.201505241946</version>
<version>0.7.5.201505241946</version> <executions>
<executions> <execution>
<execution> <id>prepare-jacoco</id>
<id>prepare-jacoco</id> <goals>
<goals> <goal>prepare-agent</goal>
<goal>prepare-agent</goal> </goals>
</goals> </execution>
</execution> </executions>
</executions> <configuration>
<configuration> <includes>
<includes> <include>org.alfresco.*</include>
<include>org.alfresco.*</include> </includes>
</includes> </configuration>
</configuration> </plugin>
</plugin> <plugin>
<plugin> <artifactId>maven-antrun-plugin</artifactId>
<artifactId>maven-antrun-plugin</artifactId> <executions>
<executions> <execution>
<execution> <id>start-alfresco</id>
<id>start-alfresco</id> <phase>process-test-classes</phase>
<phase>process-test-classes</phase> <goals>
<goals> <goal>run</goal>
<goal>run</goal> </goals>
</goals> <configuration>
<configuration> <target>
<target> <echo>Starting Alfresco...</echo>
<echo>Starting 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="start" />
<arg value="start" /> <env key="CATALINA_OPTS" value="${argLine}" />
<env key="CATALINA_OPTS" value="${argLine}" /> </exec>
</exec> <sleep minutes="5" />
<sleep minutes="5" /> </target>
</target> </configuration>
</configuration> </execution>
</execution> <execution>
<execution> <id>stop-alfresco</id>
<id>stop-alfresco</id> <phase>post-integration-test</phase>
<phase>post-integration-test</phase> <goals>
<goals> <goal>run</goal>
<goal>run</goal> </goals>
</goals> <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> </plugins>
</plugins> </build>
</build> </profile>
</profile> </profiles>
</profiles> </project>
</project>

View File

@@ -1,29 +1,28 @@
<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/maven-v4_0_0.xsd">
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.4.1-SNAPSHOT</version>
<version>2.4-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

@@ -1,16 +1,16 @@
dod_dod5015.description=DOD5015 Content Model dod_dod5015.description=DoD 5015-konformes Content-Modell
dod_dod5015.type.dod_site.title=DOD5015 Site dod_dod5015.type.dod_site.title=DoD 5015-konforme Site
dod_dod5015.type.dod_site.description=DOD5015 Site dod_dod5015.type.dod_site.description=DoD 5015-konforme Site
dod_dod5015.type.dod_filePlan.title=DOD5015 Ablageplan dod_dod5015.type.dod_filePlan.title=DoD 5015 Ablageplan
dod_dod5015.type.dod_filePlan.description=DOD5015 Ablageplan dod_dod5015.type.dod_filePlan.description=DoD 5015 Ablageplan
dod_dod5015.type.dod_recordSeries.title=Record-Serien (abgelehnt) dod_dod5015.type.dod_recordSeries.title=Record-Serien (abgelehnt)
dod_dod5015.type.dod_recordSeries.description=Record-Serien (abgelehnt) dod_dod5015.type.dod_recordSeries.description=Record-Serien (abgelehnt)
dod_dod5015.aspect.dod_dod5015record.title=DOD5015 Record dod_dod5015.aspect.dod_dod5015record.title=DoD 5015-konformer Record
dod_dod5015.aspect.dod_dod5015record.description=DOD5015 Record dod_dod5015.aspect.dod_dod5015record.description=DoD 5015-konformer Record
dod_dod5015.property.dod_publicationDate.title=Ver\u00f6ffentlichungsdatum dod_dod5015.property.dod_publicationDate.title=Ver\u00f6ffentlichungsdatum
dod_dod5015.property.dod_publicationDate.decription=Ver\u00f6ffentlichungsdatum dod_dod5015.property.dod_publicationDate.decription=Ver\u00f6ffentlichungsdatum
dod_dod5015.property.dod_originator.title=Ersteller dod_dod5015.property.dod_originator.title=Ersteller

View File

@@ -93,6 +93,6 @@ dod_dod5015.property.dod_captureDate.title=Vastlegdatum
dod_dod5015.property.dod_captureDate.description=Vastlegdatum dod_dod5015.property.dod_captureDate.description=Vastlegdatum
dod_dod5015.property.dod_contact.title=Contact dod_dod5015.property.dod_contact.title=Contact
dod_dod5015.property.dod_contact.description=Contact dod_dod5015.property.dod_contact.description=Contact
dod_dod5015.property.dod_contentManagementSystem.title=Content Management System dod_dod5015.property.dod_contentManagementSystem.title=Contentmanagementsysteem
dod_dod5015.property.dod_contentManagementSystem.description=Content Management System dod_dod5015.property.dod_contentManagementSystem.description=Contentmanagementsysteem

View File

@@ -1 +1 @@
dataset.dod5015.label=DOD 5015 Beispieldaten dataset.dod5015.label=DoD 5015 Beispieldaten

View File

@@ -1,5 +1,4 @@
<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/maven-v4_0_0.xsd">
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-repo</artifactId> <artifactId>alfresco-rm-community-repo</artifactId>
@@ -10,7 +9,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community</artifactId> <artifactId>alfresco-rm-community</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
@@ -85,10 +84,9 @@
<configuration> <configuration>
<target> <target>
<copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco"> <copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
<fileset dir="${project.build.outputDirectory}/alfresco"/> <fileset dir="${project.build.outputDirectory}/alfresco" />
</copy> </copy>
<move file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" <move file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" />
todir="${project.build.directory}/${project.build.finalName}"/>
</target> </target>
</configuration> </configuration>
</execution> </execution>
@@ -251,7 +249,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore></ignore> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
@@ -266,7 +264,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore></ignore> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
@@ -357,7 +355,7 @@
<alfresco.db.name>${my.db.name}</alfresco.db.name> <alfresco.db.name>${my.db.name}</alfresco.db.name>
<alfresco.db.port>${my.db.port}</alfresco.db.port> <alfresco.db.port>${my.db.port}</alfresco.db.port>
<alfresco.db.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect> <alfresco.db.hibernate.dialect>org.hibernate.dialect.MySQLInnoDBDialect</alfresco.db.hibernate.dialect>
<alfresco.db.params></alfresco.db.params> <alfresco.db.params />
<alfresco.db.master.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.master.url> <alfresco.db.master.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.master.url>
<alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url> <alfresco.db.url>jdbc:mysql://${alfresco.db.host}:${alfresco.db.port}/${alfresco.db.name}</alfresco.db.url>
<alfresco.db.datasource.class>org.gjt.mm.mysql.Driver</alfresco.db.datasource.class> <alfresco.db.datasource.class>org.gjt.mm.mysql.Driver</alfresco.db.datasource.class>
@@ -369,7 +367,7 @@
<alfresco.db.name>${my.db.name}</alfresco.db.name> <alfresco.db.name>${my.db.name}</alfresco.db.name>
<alfresco.db.port>${my.db.port}</alfresco.db.port> <alfresco.db.port>${my.db.port}</alfresco.db.port>
<alfresco.db.hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</alfresco.db.hibernate.dialect> <alfresco.db.hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</alfresco.db.hibernate.dialect>
<alfresco.db.params></alfresco.db.params> <alfresco.db.params />
<alfresco.db.master.url>jdbc:postgresql:template1</alfresco.db.master.url> <alfresco.db.master.url>jdbc:postgresql:template1</alfresco.db.master.url>
<alfresco.db.url>jdbc:postgresql:${alfresco.db.name}</alfresco.db.url> <alfresco.db.url>jdbc:postgresql:${alfresco.db.name}</alfresco.db.url>
<alfresco.db.datasource.class>org.postgresql.Driver</alfresco.db.datasource.class> <alfresco.db.datasource.class>org.postgresql.Driver</alfresco.db.datasource.class>