mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Gaetan Boismal
12.28.2015 c6ce7e613e4e85f77c2a6d5dd818f8a1f552ceae
OPENDJ-2427 Maven resource filtering not working in GUI setup

Performs missing maven property renaming from shortProductName to
product.name
This renaming has been initiated in 7780493b2ff
4 files modified
11 ■■■■ changed files
opendj-server-legacy/src/main/resources/META-INF/opendj.properties 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java 2 ●●● patch | view | raw | blame | history
opendj-server/pom.xml 1 ●●●● patch | view | raw | blame | history
opendj-server/src/main/resources/META-INF/product/opendj.properties 4 ●●●● patch | view | raw | blame | history
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}
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.
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>
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}