Author: bodewig Date: Mon Aug 31 04:12:58 2009 New Revision: 809457 URL: http://svn.apache.org/viewvc?rev=809457&view=rev Log: whitespace
Modified: ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/PackBase.java ant/sandbox/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml Modified: ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml?rev=809457&r1=809456&r2=809457&view=diff ============================================================================== --- ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml (original) +++ ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/antlib.xml Mon Aug 31 04:12:58 2009 @@ -1,134 +1,134 @@ <?xml version="1.0"?> <!-- - 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 + 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 + 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. ---> + 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. + --> <antlib> <taskdef - name="uncpio" - classname="org.apache.ant.compress.taskdefs.Uncpio" - /> - <taskdef - name="unar" - classname="org.apache.ant.compress.taskdefs.Unar" - /> - <taskdef - name="untar" - classname="org.apache.ant.compress.taskdefs.Untar" - /> - <taskdef - name="unzip" - classname="org.apache.ant.compress.taskdefs.Unzip" - /> - <taskdef - name="ar" - classname="org.apache.ant.compress.taskdefs.Ar" - /> - <taskdef - name="cpio" - classname="org.apache.ant.compress.taskdefs.Cpio" - /> - <taskdef - name="tar" - classname="org.apache.ant.compress.taskdefs.Tar" - /> - <taskdef - name="zip" - classname="org.apache.ant.compress.taskdefs.Zip" - /> - <taskdef - name="gunzip" - classname="org.apache.ant.compress.taskdefs.GUnzip" - /> - <taskdef - name="bunzip2" - classname="org.apache.ant.compress.taskdefs.BUnzip2" - /> - <taskdef - name="gzip" - classname="org.apache.ant.compress.taskdefs.GZip" - /> - <taskdef - name="bzip2" - classname="org.apache.ant.compress.taskdefs.BZip2" - /> + name="uncpio" + classname="org.apache.ant.compress.taskdefs.Uncpio" + /> + <taskdef + name="unar" + classname="org.apache.ant.compress.taskdefs.Unar" + /> + <taskdef + name="untar" + classname="org.apache.ant.compress.taskdefs.Untar" + /> + <taskdef + name="unzip" + classname="org.apache.ant.compress.taskdefs.Unzip" + /> + <taskdef + name="ar" + classname="org.apache.ant.compress.taskdefs.Ar" + /> + <taskdef + name="cpio" + classname="org.apache.ant.compress.taskdefs.Cpio" + /> + <taskdef + name="tar" + classname="org.apache.ant.compress.taskdefs.Tar" + /> + <taskdef + name="zip" + classname="org.apache.ant.compress.taskdefs.Zip" + /> + <taskdef + name="gunzip" + classname="org.apache.ant.compress.taskdefs.GUnzip" + /> + <taskdef + name="bunzip2" + classname="org.apache.ant.compress.taskdefs.BUnzip2" + /> + <taskdef + name="gzip" + classname="org.apache.ant.compress.taskdefs.GZip" + /> + <taskdef + name="bzip2" + classname="org.apache.ant.compress.taskdefs.BZip2" + /> <typedef - name="tarentry" - classname="org.apache.ant.compress.resources.TarResource" - /> - <typedef - name="arentry" - classname="org.apache.ant.compress.resources.ArResource" - /> - <typedef - name="cpioentry" - classname="org.apache.ant.compress.resources.CpioResource" - /> - <typedef - name="zipentry" - classname="org.apache.ant.compress.resources.ZipResource" - /> + name="tarentry" + classname="org.apache.ant.compress.resources.TarResource" + /> + <typedef + name="arentry" + classname="org.apache.ant.compress.resources.ArResource" + /> + <typedef + name="cpioentry" + classname="org.apache.ant.compress.resources.CpioResource" + /> + <typedef + name="zipentry" + classname="org.apache.ant.compress.resources.ZipResource" + /> <typedef - name="tarfileset" - classname="org.apache.ant.compress.resources.TarFileSet" - /> - <typedef - name="arfileset" - classname="org.apache.ant.compress.resources.ArFileSet" - /> - <typedef - name="cpiofileset" - classname="org.apache.ant.compress.resources.CpioFileSet" - /> - <typedef - name="zipfileset" - classname="org.apache.ant.compress.resources.ZipFileSet" - /> - <typedef - name="archives" - classname="org.apache.ant.compress.resources.Archives" - /> - <typedef - name="bzip2resource" - classname="org.apache.ant.compress.resources.BZip2Resource" - /> - <typedef - name="gzipresource" - classname="org.apache.ant.compress.resources.GZipResource" - /> + name="tarfileset" + classname="org.apache.ant.compress.resources.TarFileSet" + /> + <typedef + name="arfileset" + classname="org.apache.ant.compress.resources.ArFileSet" + /> + <typedef + name="cpiofileset" + classname="org.apache.ant.compress.resources.CpioFileSet" + /> + <typedef + name="zipfileset" + classname="org.apache.ant.compress.resources.ZipFileSet" + /> + <typedef + name="archives" + classname="org.apache.ant.compress.resources.Archives" + /> + <typedef + name="bzip2resource" + classname="org.apache.ant.compress.resources.BZip2Resource" + /> + <typedef + name="gzipresource" + classname="org.apache.ant.compress.resources.GZipResource" + /> <componentdef name="hasusername" - classname="org.apache.ant.compress.conditions.HasUserName" - /> + classname="org.apache.ant.compress.conditions.HasUserName" + /> <componentdef name="hasgroupname" classname="org.apache.ant.compress.conditions.HasGroupName" - /> + /> <componentdef name="hasuserid" classname="org.apache.ant.compress.conditions.HasUserId" - /> + /> <componentdef name="hasgroupid" classname="org.apache.ant.compress.conditions.HasGroupId" - /> + /> <componentdef name="hasmode" classname="org.apache.ant.compress.conditions.HasMode" - /> + /> </antlib> Modified: ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/PackBase.java URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/PackBase.java?rev=809457&r1=809456&r2=809457&view=diff ============================================================================== --- ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/PackBase.java (original) +++ ant/sandbox/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/PackBase.java Mon Aug 31 04:12:58 2009 @@ -122,7 +122,7 @@ if (src.isDirectory()) { throw new BuildException("source resource must not " - + "represent a directory!", getLocation()); + + "represent a directory!", getLocation()); } if (!src.isExists()) { @@ -136,7 +136,7 @@ if (dest.isDirectory()) { throw new BuildException("dest resource must not " - + "represent a directory!", getLocation()); + + "represent a directory!", getLocation()); } } Modified: ant/sandbox/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml?rev=809457&r1=809456&r2=809457&view=diff ============================================================================== --- ant/sandbox/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml (original) +++ ant/sandbox/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml Mon Aug 31 04:12:58 2009 @@ -1,67 +1,67 @@ <?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. ---> + 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. + --> <project default="antunit" xmlns:au="antlib:org.apache.ant.antunit" xmlns:cmp="antlib:org.apache.ant.compress"> <import file="antunit-base.xml" /> - <target name="setUp"> - <mkdir dir="${output}" /> - <mkdir dir="${output}/empty" /> - <touch file="${output}/fileone" /> - <touch file="${output}/filetwo" /> - </target> - - <target name="testFailNone"> - <au:expectfailure expectedmessage="source resource is required."> - <cmp:gzip destfile="${output}/file.gz"> - <fileset dir="${output}/empty" /> - </cmp:gzip> - </au:expectfailure> - </target> - - <target name="testFailTwo"> - <au:expectfailure expectedmessage="Can only have one source resource."> - <cmp:gzip destfile="${output}/file.gz"> - <fileset dir="${output}" /> - </cmp:gzip> - </au:expectfailure> - </target> - - <target name="testFailNoDest"> - <au:expectfailure expectedmessage="dest resource is required."> - <cmp:gzip src="${output}/fileone"> - <dest> - <fileset dir="${output}/empty" /> - </dest> - </cmp:gzip> - </au:expectfailure> - </target> - - <target name="testFailTwoDests"> - <au:expectfailure expectedmessage="Can only have one destination resource."> - <cmp:gzip src="${output}/fileone"> - <dest> - <fileset dir="${output}" /> - </dest> - </cmp:gzip> - </au:expectfailure> - </target> + <target name="setUp"> + <mkdir dir="${output}" /> + <mkdir dir="${output}/empty" /> + <touch file="${output}/fileone" /> + <touch file="${output}/filetwo" /> + </target> + + <target name="testFailNone"> + <au:expectfailure expectedmessage="source resource is required."> + <cmp:gzip destfile="${output}/file.gz"> + <fileset dir="${output}/empty" /> + </cmp:gzip> + </au:expectfailure> + </target> + + <target name="testFailTwo"> + <au:expectfailure expectedmessage="Can only have one source resource."> + <cmp:gzip destfile="${output}/file.gz"> + <fileset dir="${output}" /> + </cmp:gzip> + </au:expectfailure> + </target> + + <target name="testFailNoDest"> + <au:expectfailure expectedmessage="dest resource is required."> + <cmp:gzip src="${output}/fileone"> + <dest> + <fileset dir="${output}/empty" /> + </dest> + </cmp:gzip> + </au:expectfailure> + </target> + + <target name="testFailTwoDests"> + <au:expectfailure expectedmessage="Can only have one destination resource."> + <cmp:gzip src="${output}/fileone"> + <dest> + <fileset dir="${output}" /> + </dest> + </cmp:gzip> + </au:expectfailure> + </target> </project>