From 76881030ad71fb65dfc37831974072ccfafb65b0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 19 Mar 2013 17:28:00 +0000
Subject: [PATCH] build.xml: Fixed indentation in several places.
---
opends/build.xml | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index a8073ed..b577b71 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -23,7 +23,7 @@
!
!
! Copyright 2006-2010 Sun Microsystems, Inc.
- ! Portions Copyright 2011-2012 ForgeRock AS
+ ! Portions Copyright 2011-2013 ForgeRock AS
! -->
<project name="Directory Server" basedir="." default="package">
@@ -754,11 +754,11 @@
<fileset dir="${quicksetup.src.dir}"
includes="**/*.properties, **/*.gif, **/*.png" />
</copy>
- <mkdir dir="${quicksetup.classes.dir}/messages" />
- <copy todir="${quicksetup.classes.dir}/messages">
- <fileset dir="${msg.prop.dir}"
- includes="**/quicksetup.properties" />
- </copy>
+ <mkdir dir="${quicksetup.classes.dir}/messages" />
+ <copy todir="${quicksetup.classes.dir}/messages">
+ <fileset dir="${msg.prop.dir}"
+ includes="**/quicksetup.properties" />
+ </copy>
</target>
@@ -1033,10 +1033,10 @@
<jar jarfile="${pdir}/lib/${SHORT_NAME}.jar"
basedir="${classes.dir}"
- excludes="${ads.classes.dir}, ${quicksetup.globalcompile.classes.dir}, org/opends/server/snmp/**,**/*_fr.properties,**/*_ja.properties,**/*_de.properties,**/*_es.properties,**/*_zh_TW.properties,**/*_zh_CN.properties,**/*_ko.properties,**/*_pl.properties,**/*_ca_ES.properties"
- compress="true" index="true" />
+ excludes="${ads.classes.dir}, ${quicksetup.globalcompile.classes.dir}, org/opends/server/snmp/**,**/*_fr.properties,**/*_ja.properties,**/*_de.properties,**/*_es.properties,**/*_zh_TW.properties,**/*_zh_CN.properties,**/*_ko.properties,**/*_pl.properties,**/*_ca_ES.properties"
+ compress="true" index="true" />
- <jar jarfile="${pdir}/lib/${SHORT_NAME}_fr.jar"
+ <jar jarfile="${pdir}/lib/${SHORT_NAME}_fr.jar"
basedir="${classes.dir}"
includes="**/*_fr.properties"
compress="true" index="true" />
@@ -1071,15 +1071,15 @@
includes="**/*_zh_TW.properties"
compress="true" index="true" />
- <jar jarfile="${pdir}/lib/${SHORT_NAME}_pl.jar"
- basedir="${classes.dir}"
- includes="**/*_pl.properties"
- compress="true" index="true" />
-
- <jar jarfile="${pdir}/lib/${SHORT_NAME}_ca_ES.jar"
+ <jar jarfile="${pdir}/lib/${SHORT_NAME}_pl.jar"
basedir="${classes.dir}"
- includes="**/*_ca_ES.properties"
- compress="true" index="true" />
+ includes="**/*_pl.properties"
+ compress="true" index="true" />
+
+ <jar jarfile="${pdir}/lib/${SHORT_NAME}_ca_ES.jar"
+ basedir="${classes.dir}"
+ includes="**/*_ca_ES.properties"
+ compress="true" index="true" />
<jar jarfile="${pdir}/lib/quicksetup.jar"
basedir="${quicksetup.classes.dir}" compress="true" index="true" />
@@ -1114,7 +1114,7 @@
tofile="${pdir}/config/upgrade/config.ldif.${REVISION_NUMBER}" />
<!-- Create buildinfo files -->
- <echo message="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}.${REVISION_NUMBER}"
+ <echo message="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}.${REVISION_NUMBER}"
file="${pdir}/config/buildinfo" />
<taskdef name="concatschema"
@@ -1239,9 +1239,9 @@
<!-- Package the Directory Server for the RPM distribution. -->
<target name="package-RPM"
- description="Package the Directory Server for RPM distribution.">
+ description="Package the Directory Server for RPM distribution.">
<taskdef name="getversionnumber"
- classname="org.opends.build.tools.CreateVersionString">
+ classname="org.opends.build.tools.CreateVersionString">
<classpath>
<fileset dir="${build.dir}/build-tools">
<include name="*.jar" />
@@ -1254,7 +1254,7 @@
<property name="prefix" value="/opt/opends"/>
<property name="release" value="0"/>
<taskdef name="genrpm"
- classname="org.opends.build.tools.GenerateRpm">
+ classname="org.opends.build.tools.GenerateRpm">
<classpath>
<fileset dir="${build.dir}/build-tools">
<include name="*.jar" />
@@ -1274,18 +1274,18 @@
<mkdir dir="${build.dir}/rpm/SRPMS" />
<genrpm
- topDir="${build.dir}/rpm"
- prefix="${prefix}"
- sourceDirName="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
- specFileName="${build.dir}/rpm/SPECS/specFile"
- version="${VERSION_NUMBER_STRING}"
- release="${release}"
- overwrite="true">
+ topDir="${build.dir}/rpm"
+ prefix="${prefix}"
+ sourceDirName="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
+ specFileName="${build.dir}/rpm/SPECS/specFile"
+ version="${VERSION_NUMBER_STRING}"
+ release="${release}"
+ overwrite="true">
</genrpm>
<rpm
- specfile="specFile"
- topdir="${build.dir}/rpm"
+ specfile="specFile"
+ topdir="${build.dir}/rpm"
quiet="true"
/>
@@ -1376,8 +1376,8 @@
<include name="${SHORT_NAME}_es.jar" />
<include name="${SHORT_NAME}_zh_TW.jar" />
<include name="${SHORT_NAME}_zh_CN.jar" />
- <include name="${SHORT_NAME}_pl.jar" />
- <include name="${SHORT_NAME}_ca_ES.jar" />
+ <include name="${SHORT_NAME}_pl.jar" />
+ <include name="${SHORT_NAME}_ca_ES.jar" />
</lib>
</war>
--
Gitblit v1.10.0