From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/build-tools/org/opends/build/tools/CreateVersionString.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java b/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java
index b23b2da..4aaf9380 100644
--- a/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java
+++ b/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java
@@ -23,49 +23,42 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS
*/
package org.opends.build.tools;
-
-
import java.text.DecimalFormat;
import org.apache.tools.ant.Task;
-
-
/**
- * This class provides an implemenation of an Ant task that may be used to
+ * This class provides an implementation of an Ant task that may be used to
* construct the full version number string that the Directory Server should
- * use. The value of the version number string will be stored in an Ant
+ * use. The value of the version number string will be stored in an Ant
* property.
*/
-public class CreateVersionString
- extends Task
+public class CreateVersionString extends Task
{
// The name of the property in which the revision number should be set.
private String propertyName = null;
-
-
/**
* Specifies the name of the Ant property into which the Subversion revision
* number will be stored.
*
- * @param propertyName The name of the Ant property into which the
- * Subversion revision number will be stored.
+ * @param propertyName
+ * The name of the Ant property into which the Subversion revision
+ * number will be stored.
*/
public void setProperty(String propertyName)
{
this.propertyName = propertyName;
}
-
-
/**
- * Performs the appropriate processing needed for this task. In this case,
- * it uses SVNKit to identify the current revision number for the local
- * workspace and store it in a specified property.
+ * Performs the appropriate processing needed for this task. In this case, it
+ * uses SVNKit to identify the current revision number for the local workspace
+ * and store it in a specified property.
*/
@Override()
public void execute()
@@ -84,15 +77,17 @@
try
{
int buildNumber =
- Integer.parseInt(getProject().getProperty("BUILD_NUMBER"));
+ Integer.parseInt(getProject().getProperty("BUILD_NUMBER"));
if (buildNumber > 0)
{
versionString.append("-build");
versionString.append(new DecimalFormat("000").format(buildNumber));
}
- } catch (NumberFormatException nfe) {}
+ }
+ catch (NumberFormatException nfe)
+ {
+ }
getProject().setNewProperty(propertyName, versionString.toString());
}
}
-
--
Gitblit v1.10.0