From 0997ea25ee19daeeef528630a395188187156f2c Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 13 Aug 2013 08:02:29 +0000
Subject: [PATCH] Fix for OPENDJ-1069, no longer delivering the instance.loc file. Now that the .bat files can cope with the absence of the file, we can remove it completely. CR-2142
---
/dev/null | 1 -
opendj-sdk/opends/build.xml | 18 +++++++-----------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index cb78d24..dd0b64e 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -177,7 +177,7 @@
<property name="snmp.src.dir" location="src/snmp/src" />
<property name="snmp.classes.dir"
location="${classes.dir}/org/opends/server/snmp" />
-
+
<!-- Properties for license inclusion. -->
<condition property="include.license.file">
@@ -975,7 +975,7 @@
<!-- Regenerate example plugin. -->
<antcall target="example-plugin" />
-
+
<!-- Copy license if required. -->
<antcall target="copylicense" />
</target>
@@ -1022,18 +1022,18 @@
<jvmarg value="-DLdapMapping"/>
</java>
</target>
-
+
<!-- Create license file if requested.
-
+
This target should only be called from targets which have defined the
pdir property, such as prepackage and rebuild.
-
+
The license file will be copied to ${pdir}/Legal/license_to_accept.txt.
This file location is hard-coded in the following classes:
-
+
org.opends.server.tools.upgrade.LicenseFile
org.opends.quicksetup.LicenseFile
-
+
Care must be taken to keep these filenames synchronized.
-->
<target name="copylicense" if="include.license.file" >
@@ -1156,10 +1156,6 @@
<fileset file="${lib.dir}/*.exe" />
</copy>
- <copy todir="${pdir}">
- <fileset file="${resource.dir}/instance.loc" />
- </copy>
-
<antcall target="example-plugin" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat,_client-script.sh,_server-script.sh,_mixed-script.sh,_script-util.sh" eol="lf" />
diff --git a/opendj-sdk/opends/resource/instance.loc b/opendj-sdk/opends/resource/instance.loc
deleted file mode 100644
index 9c558e3..0000000
--- a/opendj-sdk/opends/resource/instance.loc
+++ /dev/null
@@ -1 +0,0 @@
-.
--
Gitblit v1.10.0