From 09ab5b29b6ddaead715eda757eca7aa5d22c3407 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 02 Mar 2016 15:45:31 +0000
Subject: [PATCH] OPENDJ-2692 Fix OpenDJ localization
---
opendj-dsml-servlet/pom.xml | 18 ++++----
opendj-server-legacy/pom.xml | 75 +++++++++++++++++++++++++++++++++----
pom.xml | 2
3 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index e12d7c0..03c4d6f 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -115,7 +115,7 @@
<version>${project.version}</version>
<classifier>ca_ES</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-ca_ES.jar</destFileName>
+ <destFileName>${product.name.lowercase}_ca_ES.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -124,7 +124,7 @@
<version>${project.version}</version>
<classifier>de</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-de.jar</destFileName>
+ <destFileName>${product.name.lowercase}_de.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -133,7 +133,7 @@
<version>${project.version}</version>
<classifier>es</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-es.jar</destFileName>
+ <destFileName>${product.name.lowercase}_es.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -142,7 +142,7 @@
<version>${project.version}</version>
<classifier>fr</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-fr.jar</destFileName>
+ <destFileName>${product.name.lowercase}_fr.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -151,7 +151,7 @@
<version>${project.version}</version>
<classifier>ja</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-ja.jar</destFileName>
+ <destFileName>${product.name.lowercase}_ja.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -160,7 +160,7 @@
<version>${project.version}</version>
<classifier>ko</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-ko.jar</destFileName>
+ <destFileName>${product.name.lowercase}_ko.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -169,7 +169,7 @@
<version>${project.version}</version>
<classifier>pl</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-pl.jar</destFileName>
+ <destFileName>${product.name.lowercase}_pl.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -178,7 +178,7 @@
<version>${project.version}</version>
<classifier>zh_CN</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-zh_CN.jar</destFileName>
+ <destFileName>${product.name.lowercase}_zh_CN.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -187,7 +187,7 @@
<version>${project.version}</version>
<classifier>zh_TW</classifier>
<outputDirectory>${project.build.directory}/${opendj.jars.folder}</outputDirectory>
- <destFileName>${product.name.lowercase}-zh_TW.jar</destFileName>
+ <destFileName>${product.name.lowercase}_zh_TW.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 036dbc2..8a69946 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -877,7 +877,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>ca_ES</classifier>
+ <finalName>opendj_ca_ES</finalName>
<includes>
<include>**/*_ca_ES.properties</include>
</includes>
@@ -891,7 +891,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>de</classifier>
+ <finalName>opendj_de</finalName>
<includes>
<include>**/*_de.properties</include>
</includes>
@@ -905,7 +905,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>es</classifier>
+ <finalName>opendj_es</finalName>
<includes>
<include>**/*_es.properties</include>
</includes>
@@ -919,7 +919,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>fr</classifier>
+ <finalName>opendj_fr</finalName>
<includes>
<include>**/*_fr.properties</include>
</includes>
@@ -933,7 +933,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>ja</classifier>
+ <finalName>opendj_ja</finalName>
<includes>
<include>**/*_ja.properties</include>
</includes>
@@ -947,7 +947,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>ko</classifier>
+ <finalName>opendj_ko</finalName>
<includes>
<include>**/*_ko.properties</include>
</includes>
@@ -961,7 +961,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>pl</classifier>
+ <finalName>opendj_pl</finalName>
<includes>
<include>**/*_pl.properties</include>
</includes>
@@ -975,7 +975,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>zh_CN</classifier>
+ <finalName>opendj_zh_CN</finalName>
<includes>
<include>**/*_zh_CN.properties</include>
</includes>
@@ -989,7 +989,7 @@
<goal>jar</goal>
</goals>
<configuration>
- <classifier>zh_TW</classifier>
+ <finalName>opendj_zh_TW</finalName>
<includes>
<include>**/*_zh_TW.properties</include>
</includes>
@@ -1359,6 +1359,63 @@
</sources>
</configuration>
</execution>
+
+ <!-- Attach localized jars to this module -->
+ <execution>
+ <id>attach-localized-jars</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${jars.dir}/opendj_ca_ES.jar</file>
+ <classifier>${localized.jars.classifier}-ca_ES</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_de.jar</file>
+ <classifier>${localized.jars.classifier}-de</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_es.jar</file>
+ <classifier>${localized.jars.classifier}-es</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_fr.jar</file>
+ <classifier>${localized.jars.classifier}-fr</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_ja.jar</file>
+ <classifier>${localized.jars.classifier}-ja</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_ko.jar</file>
+ <classifier>${localized.jars.classifier}-ko</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_pl.jar</file>
+ <classifier>${localized.jars.classifier}-pl</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_zh_CN.jar</file>
+ <classifier>${localized.jars.classifier}-zh_CN</classifier>
+ </artifact>
+
+ <artifact>
+ <file>${jars.dir}/opendj_zh_TW.jar</file>
+ <classifier>${localized.jars.classifier}-zh_TW</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
</executions>
</plugin>
diff --git a/pom.xml b/pom.xml
index 3410429..6caa687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,9 +147,9 @@
<product.name>OpenDJ</product.name>
<product.name.lowercase>opendj</product.name.lowercase>
<opendj.core.test.jar.version>4.0.0-SNAPSHOT</opendj.core.test.jar.version>
+ <localized.jars.classifier>i18n</localized.jars.classifier>
</properties>
-
<build>
<pluginManagement>
<plugins>
--
Gitblit v1.10.0