Correct line endings and set MIME type on the Ant build file.

InCommon · May 22, 2012 · 7fbdb5d · 7fbdb5d
1 parent 12812fa
commit 7fbdb5d
Showing 1 changed file with 57 additions and 57 deletions.
diff --git a/build.xml b/build.xml
@@ -40,7 +40,7 @@
 	<!--
 		Local specialised directories.
 	-->
-	<property name="build.dir" value="${basedir}/build"/>
+	<property name="build.dir" value="${basedir}/build"/>
 	<property name="entities.dir" value="entities"/>
     <property name="mdx.dir" value="${basedir}/mdx"/>
 	<property name="xml.dir" value="${basedir}/xml"/>
@@ -53,9 +53,9 @@
 	<property name="tools.mda" value="${tools.dir}/mda"/>
     <property name="tools.mdnorm" value="${tools.dir}/mdnorm"/>
 	<property name="tools.metadatatool" value="${tools.dir}/metadatatool"/>
-	<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
+	<property name="tools.xmlsectool" value="${tools.dir}/xmlsectool"/>
 	<property name="tools.xalan" value="${tools.dir}/xalan"/>
-
+
 	<!--
 		Additional ANT task definitions.
 	-->
@@ -262,8 +262,8 @@
 			<fileset dir="${xml.dir}">
 				<include name="${md.prod.signed}"/>
 				<include name="${md.wayf.signed}"/>
-				<include name="${md.test.signed}"/>
-				<include name="${md.back.signed}"/>
+				<include name="${md.test.signed}"/>
+				<include name="${md.back.signed}"/>
 				<include name="${md.export.signed}"/>
 			</fileset>
 		</scp>
@@ -303,9 +303,9 @@
 		<echo>Verifying metadata held at ${remote.url}</echo>
 		<VFY.remote i="${md.prod.signed}"/>
 		<VFY.remote i="${md.wayf.signed}"/>
-		<VFY.remote i="${md.test.signed}"/>
+		<VFY.remote i="${md.test.signed}"/>
 		<VFY.remote i="${md.back.signed}"/>
-		<VFY.remote i="${md.export.signed}"/>
+		<VFY.remote i="${md.export.signed}"/>
 		<echo>Verification completed.</echo>
 	</target>
 
@@ -522,53 +522,53 @@
 						<include name="*.jar"/>
 					</fileset>
 				</classpath>
-				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/lib/endorsed"/>
+				<jvmarg value="-Djava.endorsed.dirs=${tools.xmlsectool}/lib/endorsed"/>
 				<jvmarg value="-Dedu.internet2.middleware.security.XmlSecTool.home=${tools.xmlsectool}"/>
-				<args/>
-				<arg value="--validateSchema"/>
-				<arg value="--schemaDirectory"/>
+				<args/>
+				<arg value="--validateSchema"/>
+				<arg value="--schemaDirectory"/>
 				<arg value="${xml.dir}"/>
 				<arg value="--inFile"/>
 				<arg value="${xml.dir}/@{i}"/>
 			</java>
 		</sequential>
 	</macrodef>
 
-	<macrodef name="XMLSECTOOL.SIGN.uk">
-		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
-		<attribute name="o"/><!-- output file, assumed to be in the XML directory -->
-		<sequential>
-			<!-- delete the temporary file to be sure we don't use old data -->
-			<delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
-
-			<!-- perform signing operation into temporary file -->
-			<XMLSECTOOL i="@{i}">
-				<args>
-					<arg value="--sign"/>
-					<arg value="--keystore"/>
-					<arg value="${null.device}"/>
-					<arg value="--keystoreType"/>
-					<arg value="${keystore.uk.sign.type}"/>
-					<arg value="--key"/>
-					<arg value="${keystore.uk.sign.alias}"/>
-					<arg value="--keyPassword"/>
-					<arg value="${keystore.pass}"/>
-					<arg value="--outFile"/>
-					<arg value="${xml.dir}/@{o}"/>
-					<arg value="--referenceIdAttributeName"/>
-					<arg value="ID"/>
-					<!--
-					<arg value="- -quiet"/>
-					-->
-				</args>
-			</XMLSECTOOL>
-
-			<!-- Force the output file to use Unix line endings -->
-			<fixcrlf file="${xml.dir}/@{o}" eol="lf"/>
-
-		</sequential>
-	</macrodef>
-
+	<macrodef name="XMLSECTOOL.SIGN.uk">
+		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
+		<attribute name="o"/><!-- output file, assumed to be in the XML directory -->
+		<sequential>
+			<!-- delete the temporary file to be sure we don't use old data -->
+			<delete file="${xml.dir}/temp.xml" quiet="true" verbose="false"/>
+
+			<!-- perform signing operation into temporary file -->
+			<XMLSECTOOL i="@{i}">
+				<args>
+					<arg value="--sign"/>
+					<arg value="--keystore"/>
+					<arg value="${null.device}"/>
+					<arg value="--keystoreType"/>
+					<arg value="${keystore.uk.sign.type}"/>
+					<arg value="--key"/>
+					<arg value="${keystore.uk.sign.alias}"/>
+					<arg value="--keyPassword"/>
+					<arg value="${keystore.pass}"/>
+					<arg value="--outFile"/>
+					<arg value="${xml.dir}/@{o}"/>
+					<arg value="--referenceIdAttributeName"/>
+					<arg value="ID"/>
+					<!--
+					<arg value="- -quiet"/>
+					-->
+				</args>
+			</XMLSECTOOL>
+
+			<!-- Force the output file to use Unix line endings -->
+			<fixcrlf file="${xml.dir}/@{o}" eol="lf"/>
+
+		</sequential>
+	</macrodef>
+
 	<macrodef name="XMLSECTOOL.VFY.uk">
 		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
 		<sequential>
@@ -577,9 +577,9 @@
 					<arg value="--verifySignature"/>
 					<arg value="--certificate"/>
 					<arg value="${build.dir}/ukfederation-2010.pem"/>
-					<!--
-					<arg value="- -quiet"/>
-					-->
+					<!--
+					<arg value="- -quiet"/>
+					-->
 				</args>
 			</XMLSECTOOL>
 		</sequential>
@@ -696,18 +696,18 @@
 		<!-- [26] -->
 		<SIGN.uk i="${md.wayf.unsigned}" o="${md.wayf.signed}"/>
 
-		<echo>Signing UK test metadata.</echo>
-		<!-- [28] -->
-		<SIGN.uk i="${md.test.unsigned}" o="${md.test.signed}"/>
-
-		<echo>Signing UK export metadata.</echo>
-		<!-- [30] -->
-		<SIGN.uk i="${md.export.unsigned}" o="${md.export.signed}"/>
+		<echo>Signing UK test metadata.</echo>
+		<!-- [28] -->
+		<SIGN.uk i="${md.test.unsigned}" o="${md.test.signed}"/>
+
+		<echo>Signing UK export metadata.</echo>
+		<!-- [30] -->
+		<SIGN.uk i="${md.export.unsigned}" o="${md.export.signed}"/>
 
 		<echo>Signing UK fallback metadata.</echo>
 		<!-- [32] -->
 		<SIGN.uk i="${md.back.unsigned}" o="${md.back.signed}"/>
-
+
 		<echo>Generated signed UK metadata.</echo>
 	</target>