Ensure svn properties are set on the build xml files, and they have consistent line...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1631469 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 313dbdb1e82ac87873f85e2f1ed1bf1e5631e28e..601290e29747cc270b0b4e098d47c5f82c5ad4f3 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src/java"/>\r
-       <classpathentry kind="src" path="src/testcases"/>\r
-       <classpathentry kind="src" path="src/resources/main"/>\r
-       <classpathentry kind="src" path="src/ooxml/java"/>\r
-       <classpathentry kind="src" path="src/ooxml/testcases"/>\r
-       <classpathentry kind="src" path="src/resources/ooxml"/>\r
-       <classpathentry kind="src" path="src/scratchpad/src"/>\r
-       <classpathentry kind="src" path="src/scratchpad/testcases"/>\r
-       <classpathentry kind="src" path="src/resources/scratchpad"/>\r
-       <classpathentry kind="src" path="src/contrib/poi-ruby/java"/>\r
-       <classpathentry kind="src" path="src/examples/src"/>\r
-       <classpathentry kind="src" path="src/excelant/java"/>\r
-       <classpathentry kind="src" path="src/excelant/testcases"/>\r
-       <classpathentry kind="src" path="src/excelant/resources"/>\r
-       <classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>\r
-       <classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>\r
-       <classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>\r
-       <classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>\r
-       <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>\r
-       <classpathentry kind="lib" path="lib/junit-4.11.jar"/>\r
-       <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/>\r
-       <classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/>\r
-       <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/>\r
-       <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/>\r
-       <classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/>\r
-       <classpathentry kind="output" path="build/eclipse"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src/java"/>
+       <classpathentry kind="src" path="src/testcases"/>
+       <classpathentry kind="src" path="src/resources/main"/>
+       <classpathentry kind="src" path="src/ooxml/java"/>
+       <classpathentry kind="src" path="src/ooxml/testcases"/>
+       <classpathentry kind="src" path="src/resources/ooxml"/>
+       <classpathentry kind="src" path="src/scratchpad/src"/>
+       <classpathentry kind="src" path="src/scratchpad/testcases"/>
+       <classpathentry kind="src" path="src/resources/scratchpad"/>
+       <classpathentry kind="src" path="src/contrib/poi-ruby/java"/>
+       <classpathentry kind="src" path="src/examples/src"/>
+       <classpathentry kind="src" path="src/excelant/java"/>
+       <classpathentry kind="src" path="src/excelant/testcases"/>
+       <classpathentry kind="src" path="src/excelant/resources"/>
+       <classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>
+       <classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
+       <classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
+       <classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
+       <classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
+       <classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
+       <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+       <classpathentry kind="lib" path="lib/junit-4.11.jar"/>
+       <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/>
+       <classpathentry kind="lib" path="ooxml-lib/ooxml-encryption-1.2.jar" sourcepath="ooxml-lib/ooxml-encryption-src-1.2.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/>
+       <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.51.jar"/>
+       <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.51.jar"/>
+       <classpathentry kind="lib" path="compile-lib/xmlsec-2.0.1.jar"/>
+       <classpathentry kind="output" path="build/eclipse"/>
+</classpath>

diff --git a/patch.xml b/patch.xml
index 2ad888675d6aca6d87f247501901953fc86c7c54..55808a99925aa1abe603d5c55db489ea9c8dabc8 100644 (file)
--- a/patch.xml
+++ b/patch.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-   Licensed to the Apache Software Foundation (ASF) under one or more\r
-   contributor license agreements.  See the NOTICE file distributed with\r
-   this work for additional information regarding copyright ownership.\r
-   The ASF licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance with\r
-   the License.  You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
--->\r
-<!--\r
-  =======================================================================\r
-   Use Apache Ant to generate a patch file.\r
-  =======================================================================\r
--->\r
-<project name="create-patch" default="patchpackage" basedir=".">\r
-    <property environment="env"/>\r
-    <property name="patch.package" value="patch.tar.gz"/>\r
-    <property name="patch.file" value="patch.txt"/>\r
-\r
-    <condition property="svn.found">\r
-        <or>\r
-            <available file="svn" filepath="${env.PATH}"/>\r
-            <available file="svn.exe" filepath="${env.PATH}"/>\r
-            <available file="svn.exe" filepath="${env.Path}"/>\r
-        </or>\r
-    </condition>\r
-\r
-    <target name="createpatch">\r
-        <fail unless="svn.found" message="You need a version of svn to create the patch"/>\r
-        <exec executable="svn" output="${patch.file}">\r
-            <arg value="diff"/>\r
-        </exec>\r
-    </target>\r
-\r
-    <target name="newfiles">\r
-        <exec executable="svn" output="${patch.file}.tmp">\r
-            <arg value="status"/>\r
-        </exec>\r
-\r
-       <!-- prepare the list of files to include in patch.tar.gz --> \r
-       <loadfile srcfile="${patch.file}.tmp" property="tar.file.list">  \r
-         <filterchain>  \r
-            <!-- capture any new files -->\r
-            <linecontainsregexp>\r
-                <regexp pattern="^(\?|A)......"/>\r
-            </linecontainsregexp>\r
-            <!-- filter out the first six characters -->\r
-            <tokenfilter>\r
-              <replaceregex pattern="^(.......)" replace=""/>\r
-            </tokenfilter>\r
-            <!--remove line breaks -->\r
-            <striplinebreaks/>\r
-          </filterchain> \r
-       </loadfile>  \r
-    </target>\r
-\r
-    <target name="patchpackage" depends="createpatch,newfiles">\r
-       <delete file="${patch.package}"/> \r
-       <tar includes="${tar.file.list}"\r
-            destfile="${patch.package}"   \r
-            basedir="." \r
-            compression="gzip" >          \r
-       </tar>  \r
-       <delete file="${patch.file}.tmp"/>\r
-    </target>\r
-\r
-</project>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!--
+  =======================================================================
+   Use Apache Ant to generate a patch file.
+  =======================================================================
+-->
+<project name="create-patch" default="patchpackage" basedir=".">
+    <property environment="env"/>
+    <property name="patch.package" value="patch.tar.gz"/>
+    <property name="patch.file" value="patch.txt"/>
+
+    <condition property="svn.found">
+        <or>
+            <available file="svn" filepath="${env.PATH}"/>
+            <available file="svn.exe" filepath="${env.PATH}"/>
+            <available file="svn.exe" filepath="${env.Path}"/>
+        </or>
+    </condition>
+
+    <target name="createpatch">
+        <fail unless="svn.found" message="You need a version of svn to create the patch"/>
+        <exec executable="svn" output="${patch.file}">
+            <arg value="diff"/>
+        </exec>
+    </target>
+
+    <target name="newfiles">
+        <exec executable="svn" output="${patch.file}.tmp">
+            <arg value="status"/>
+        </exec>
+
+       <!-- prepare the list of files to include in patch.tar.gz --> 
+       <loadfile srcfile="${patch.file}.tmp" property="tar.file.list">  
+         <filterchain>  
+            <!-- capture any new files -->
+            <linecontainsregexp>
+                <regexp pattern="^(\?|A)......"/>
+            </linecontainsregexp>
+            <!-- filter out the first six characters -->
+            <tokenfilter>
+              <replaceregex pattern="^(.......)" replace=""/>
+            </tokenfilter>
+            <!--remove line breaks -->
+            <striplinebreaks/>
+          </filterchain> 
+       </loadfile>  
+    </target>
+
+    <target name="patchpackage" depends="createpatch,newfiles">
+       <delete file="${patch.package}"/> 
+       <tar includes="${tar.file.list}"
+            destfile="${patch.package}"   
+            basedir="." 
+            compression="gzip" >          
+       </tar>  
+       <delete file="${patch.file}.tmp"/>
+    </target>
+
+</project>