From 80376f4567798ad989ee9a02bb62210a14af6c5c Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 06 Sep 2013 14:50:32 +0000
Subject: [PATCH] CR-2281 Fix for OPENDJ-1021: Remove obsolete opendj/bin/README_Windows.txt
---
/dev/null | 28 ----------------------------
opendj-sdk/opends/build.xml | 8 ++------
opendj-sdk/opends/src/svr4/OpenDS/layout.xml | 3 +--
opendj-sdk/opends/src/svr4/OpenDJ/layout.xml | 2 --
4 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 2fb9ddd..fe00757 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -1160,7 +1160,6 @@
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" excludes="*.bat,_client-script.sh,_server-script.sh,_mixed-script.sh,_script-util.sh" eol="lf" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.sh,_server-script.sh,_mixed-script.sh,_script-util.sh" eol="lf" />
- <fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bin" includes="README_WINDOWS.txt" eol="crlf" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/bat" excludes="_client-script.bat,_server-script.bat,_mixed-script.bat,_script-util.bat,setcp.bat" includes="*.bat" eol="crlf" />
<fixcrlf srcDir="${scripts.dir}" destDir="${pdir}/lib" includes="_client-script.bat,_server-script.bat,_mixed-script.bat,_script-util.bat,setcp.bat" eol="crlf" />
@@ -1303,10 +1302,7 @@
includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh"
filemode="755" dirmode="755" prefix="opendj" />
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/*"
- excludes="bin/README_WINDOWS.txt"
filemode="755" dirmode="755" prefix="opendj" />
- <zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/README_WINDOWS.txt"
- filemode="644" dirmode="755" prefix="opendj" />
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
filemode="755" dirmode="755" prefix="opendj" />
<zipfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="template/**/*"
@@ -1525,12 +1521,12 @@
control="${build.dir}/deb/control" verbose="false">
<tarfileset dir="${build.deb.dir}"
includes="**/*"
- excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright, README, bin/README_WINDOWS.txt, example-plugin.zip, opendj, changelog.Debian.gz"
+ excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright, README, example-plugin.zip, opendj, changelog.Debian.gz"
prefix="${prefix}" filemode="644" dirmode="755" />
<tarfileset dir="${build.deb.dir}" includes="lib/*.sh"
prefix="${prefix}" filemode="755" dirmode="755" />
<tarfileset dir="${build.deb.dir}" includes="bin/*"
- excludes="bin/README_WINDOWS.txt, **/bin/ControlPanel.app/"
+ excludes="**/bin/ControlPanel.app/"
prefix="${prefix}" filemode="755" dirmode="755" />
<tarfileset dir="${build.deb.dir}" includes="setup,uninstall,upgrade"
prefix="${prefix}" filemode="755" dirmode="755" />
diff --git a/opendj-sdk/opends/resource/bin/README_WINDOWS.txt b/opendj-sdk/opends/resource/bin/README_WINDOWS.txt
deleted file mode 100644
index f7a0d04..0000000
--- a/opendj-sdk/opends/resource/bin/README_WINDOWS.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE
- * or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-Note that all the batch files under the 'bin' directory have been moved to the
-'bat' directory.
diff --git a/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml b/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml
index c4a5b5f..45657f2 100644
--- a/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml
+++ b/opendj-sdk/opends/src/svr4/OpenDJ/layout.xml
@@ -89,8 +89,6 @@
<fileset dir="${svr4.layout.pkg.dir}" includes="**/*.exe"/>
<fileset dir="${svr4.layout.pkg.dir}" includes="**/*.bat"/>
<fileset dir="${svr4.layout.pkg.dir}" includes="**/bat/"/>
- <fileset dir="${svr4.layout.pkg.dir}"
- includes="**/README_WINDOWS.txt"/>
</delete>
<!-- Remove MacOS specific files -->
<delete includeemptydirs="true">
diff --git a/opendj-sdk/opends/src/svr4/OpenDS/layout.xml b/opendj-sdk/opends/src/svr4/OpenDS/layout.xml
index ffa798c..2d04405 100644
--- a/opendj-sdk/opends/src/svr4/OpenDS/layout.xml
+++ b/opendj-sdk/opends/src/svr4/OpenDS/layout.xml
@@ -23,6 +23,7 @@
!
!
! Copyright 2006-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2013 ForgeRock AS.
! -->
<project name="OpenDS SVR4 layout" basedir=".">
@@ -87,8 +88,6 @@
<fileset dir="${svr4.layout.pkg.dir}" includes="**/*.exe"/>
<fileset dir="${svr4.layout.pkg.dir}" includes="**/*.bat"/>
<fileset dir="${svr4.layout.pkg.dir}" includes="**/bat/"/>
- <fileset dir="${svr4.layout.pkg.dir}"
- includes="**/README_WINDOWS.txt"/>
</delete>
<!-- Remove MacOS specific files -->
<delete includeemptydirs="true">
--
Gitblit v1.10.0