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

Gaetan Boismal
24.38.2015 28acaa0ac7a1342cc63dc24498497fa9668df25e
OPENDJ-1777 Change 'build' folder to 'target'
3 files modified
10 ■■■■■ changed files
opendj-server-legacy/build.xml 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/pom.xml 4 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java 4 ●●●● patch | view | raw | blame | history
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"                     />
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>
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");
  }