From c6ce7e613e4e85f77c2a6d5dd818f8a1f552ceae Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 12 Nov 2015 09:38:42 +0000
Subject: [PATCH] OPENDJ-2427 Maven resource filtering not working in GUI setup
---
opendj-server/pom.xml | 1 -
opendj-server-legacy/src/main/resources/META-INF/opendj.properties | 4 ++--
opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java | 2 +-
opendj-server/src/main/resources/META-INF/product/opendj.properties | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/resources/META-INF/opendj.properties b/opendj-server-legacy/src/main/resources/META-INF/opendj.properties
index bb10d44..36ed11f 100644
--- a/opendj-server-legacy/src/main/resources/META-INF/opendj.properties
+++ b/opendj-server-legacy/src/main/resources/META-INF/opendj.properties
@@ -30,13 +30,13 @@
# Product name.
product.name=${project.name}
-product.name.short=${shortProductName}
+product.name.short=${product.name}
product.release.date=${softwareReleaseDate}
product.publication.date=${publicationDate}
# Version.
version=${project.version}
-version.compact=${shortProductName}-${project.version}
+version.compact=${product.name}-${project.version}
version.major=${parsedVersion.majorVersion}
version.minor=${parsedVersion.minorVersion}
version.point=${parsedVersion.incrementalVersion}
diff --git a/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java b/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
index 71870bd..8885208 100644
--- a/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
+++ b/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
@@ -46,7 +46,7 @@
/**
* The short product name for the Directory Server.
*/
- public static String SHORT_NAME = "${shortProductName}";
+ public static String SHORT_NAME = "${product.name}";
/**
* The major version number for the Directory Server.
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index 25f0625..7a23f65 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -39,7 +39,6 @@
<packaging>jar</packaging>
<properties>
<!-- Product information properties -->
- <shortProductName>OpenDJ</shortProductName>
<patchFixIds />
<isDebugBuild>false</isDebugBuild>
<docHomepageUrl>http://opendj.forgerock.org/</docHomepageUrl>
diff --git a/opendj-server/src/main/resources/META-INF/product/opendj.properties b/opendj-server/src/main/resources/META-INF/product/opendj.properties
index 5918560..2173ef4 100644
--- a/opendj-server/src/main/resources/META-INF/product/opendj.properties
+++ b/opendj-server/src/main/resources/META-INF/product/opendj.properties
@@ -3,13 +3,13 @@
# Product name.
product.name=${project.name}
-product.name.short=${shortProductName}
+product.name.short=${product.name}
product.release.date=${softwareReleaseDate}
product.publication.date=${publicationDate}
# Version.
version=${project.version}
-version.compact=${shortProductName}-${project.version}
+version.compact=${product.name}-${project.version}
version.major=${parsedVersion.majorVersion}
version.minor=${parsedVersion.minorVersion}
version.point=${parsedVersion.incrementalVersion}
--
Gitblit v1.10.0