From 28acaa0ac7a1342cc63dc24498497fa9668df25e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 24 Feb 2015 15:38:20 +0000
Subject: [PATCH] OPENDJ-1777 Change 'build' folder to 'target'
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 4 ++--
opendj-server-legacy/pom.xml | 4 ----
opendj-server-legacy/build.xml | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/build.xml b/opendj-server-legacy/build.xml
index 14d348e..832d608 100644
--- a/opendj-server-legacy/build.xml
+++ b/opendj-server-legacy/build.xml
@@ -42,7 +42,7 @@
<!-- General server-wide properties -->
<property name="src.dir" location="src/server" />
- <property name="build.dir" location="build" />
+ <property name="build.dir" location="target" />
<property name="classes.dir" location="${build.dir}/classes" />
<property name="build.lib.dir" location="${build.dir}/lib" />
<property name="lib.dir" location="lib" />
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 72bf232..1f94543 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -191,9 +191,6 @@
</dependencies>
<build>
-
- <directory>build</directory>
-
<resources>
<!-- Main resources -->
<resource>
@@ -663,7 +660,6 @@
<configuration>
<outputDirectory>${jars.dir}</outputDirectory>
<finalName>build-tools</finalName>
- <!-- TODO: Adds the resource/Messages.java.stub to build/build-tools/classes/org/opends/build/tools/resource -->
<includes>
<include>**/messages/Severity.class</include>
<include>**/messages/Category.class</include>
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 86df35e..96ea7b0 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -274,7 +274,7 @@
// Get the build root and use it to create a test package directory.
String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT);
String buildDirStr = System.getProperty(PROPERTY_BUILD_DIR,
- buildRoot + File.separator + "build");
+ buildRoot + File.separator + "target");
File buildDir = new File(buildDirStr);
File unitRoot = new File(buildDir, "unit-tests");
File testInstallRoot;
@@ -1144,7 +1144,7 @@
public static File getUnitTestRootPath()
{
final String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT);
- final String path = System.getProperty(PROPERTY_BUILD_DIR, buildRoot + File.separator + "build");
+ final String path = System.getProperty(PROPERTY_BUILD_DIR, buildRoot + File.separator + "target");
return new File(path, "unit-tests");
}
--
Gitblit v1.10.0