inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Webster
2016-05-09 10:53:43 +01:00
parent 4d1a53ffbf 332ced249b
commit d20d4a5f8c
7 changed files with 784 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -1,11 +1,10 @@
<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-SNAPSHOT</version> <version>2.4.1-SNAPSHOT</version>
<name>Alfresco Records Management</name> <name>Alfresco Records Management</name>
<parent> <parent>
@@ -25,6 +24,7 @@
<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>
@@ -230,7 +230,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore></ignore> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>

9
rm-automation/pom.xml
View File

@@ -1,6 +1,5 @@
<?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>
@@ -9,7 +8,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId> <artifactId>alfresco-rm</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4.1-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
@@ -108,7 +107,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore></ignore> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
@@ -133,7 +132,7 @@
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>selenium-grid</artifactId> <artifactId>selenium-grid</artifactId>
<version>1.4</version> <version>1.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>

5
rm-community/pom.xml
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</artifactId> <artifactId>alfresco-rm-community</artifactId>
@@ -9,7 +8,7 @@
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId> <artifactId>alfresco-rm</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4.1-SNAPSHOT</version>
</parent> </parent>
<licenses> <licenses>

14
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_de.properties
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

4
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_nl.properties Executable file → Normal file
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

2
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties
View File

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

18
rm-community/rm-community-repo/pom.xml
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>