Author: bodewig Date: Thu Jul 29 06:43:12 2010 New Revision: 980332 URL: http://svn.apache.org/viewvc?rev=980332&view=rev Log: make sure all files have the proper license, fix indentation that I broke on the last commit, contributors should go to contributors.xml
Modified: ant/sandbox/antlibs/build.xml Modified: ant/sandbox/antlibs/build.xml URL: http://svn.apache.org/viewvc/ant/sandbox/antlibs/build.xml?rev=980332&r1=980331&r2=980332&view=diff ============================================================================== --- ant/sandbox/antlibs/build.xml (original) +++ ant/sandbox/antlibs/build.xml Thu Jul 29 06:43:12 2010 @@ -88,189 +88,288 @@ </filterset> </copy> <echo - file="${antlib.trunk}/version.properties" - message="#artifact.version=1.0alpha" - /> + file="${antlib.trunk}/version.properties"># 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. +artifact.version=1.0alpha</echo> </target> <target name="changes" depends="make-dir-layout"> - <echo file="${antlib.trunk}/changes.xml"><?xml version="1.0" encoding="utf-8"?> - <!DOCTYPE document - [ - <!ELEMENT document (properties?, release+)> - <!ELEMENT properties (title)> - <!ELEMENT title (#PCDATA)> - <!ELEMENT release (action*)> - <!ELEMENT action (#PCDATA)> - <!ATTLIST release - version CDATA #REQUIRED - date CDATA #REQUIRED - description CDATA #IMPLIED> - <!ATTLIST action - issue CDATA #IMPLIED - type (add|fix|remove|update) #REQUIRED - breaks-bwc (true|false) #IMPLIED> - ] - > - <document> - <properties> - <title>Apache AntLib ${antlib.fullname}</title> - </properties> + <echo file="${antlib.trunk}/changes.xml" + encoding="UTF8"><?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. +--> +<!DOCTYPE document +[ +<!ELEMENT document (properties?, release+)> +<!ELEMENT properties (title)> +<!ELEMENT title (#PCDATA)> +<!ELEMENT release (action*)> +<!ELEMENT action (#PCDATA)> +<!ATTLIST release + version CDATA #REQUIRED + date CDATA #REQUIRED + description CDATA #IMPLIED> +<!ATTLIST action + issue CDATA #IMPLIED + type (add|fix|remove|update) #REQUIRED + breaks-bwc (true|false) #IMPLIED> +] +> +<document> + <properties> + <title>Apache AntLib ${antlib.fullname}</title> + </properties> - <release version="SVN trunk" date="unpublished"> - <action type="add"> + <release version="SVN trunk" date="unpublished"> + <action type="add"> Initial import of ${antlib.fullname} - </action> - </release> + </action> + </release> - </document> - </echo> +</document> +</echo> </target> <target name="antlib.xml" depends="make-dir-layout"> - <echo file="${antlib.trunk}/src/main/org/apache/ant/${antlib.shortname}/antlib.xml"><?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. - --> - <antlib> - <!-- - <taskdef + <echo file="${antlib.trunk}/src/main/org/apache/ant/${antlib.shortname}/antlib.xml" + encoding="UTF8"><?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. +--> +<antlib> +<!-- + <taskdef name="" classname="org.apache.ant.${antlib.shortname}." - /> - <macrodef name=""> - <attribute name="" default=""/> - <element name="" optional="yes"/> - <text name="text" optional="yes" trim="true"/> - <sequential> + /> + <macrodef name=""> + <attribute name="" default=""/> + <element name="" optional="yes"/> + <text name="text" optional="yes" trim="true"/> + <sequential> <echo/> - </sequential> - </macrodef> - <presetdef name=""> - </presetdef> - --> - </antlib> - </echo> + </sequential> + </macrodef> + <presetdef name=""> + </presetdef> +--> +</antlib> +</echo> </target> <target name="contributors.xml" depends="make-dir-layout"> - <echo file="${antlib.trunk}/changes.xml"><?xml version="1.0" encoding="utf-8"?> - <!DOCTYPE contributors - [ - <!ELEMENT name (first?, middle?, last)> - <!ELEMENT contributors (introduction, name+)> - <!ELEMENT first (#PCDATA)> - <!ELEMENT introduction (#PCDATA)> - <!ELEMENT middle (#PCDATA)> - <!ELEMENT last (#PCDATA)> - ] - > - <contributors> - <introduction> - These are some of the many people who have helped with this Ant Library. - </introduction> - - <name> - <first>${name.first}</first> - <last>${name.last}</last> - </name> - </contributors> - </echo> + <echo file="${antlib.trunk}/contributors.xml" + encoding="UTF8"><?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. +--> +<!DOCTYPE contributors +[ +<!ELEMENT name (first?, middle?, last)> +<!ELEMENT contributors (introduction, name+)> +<!ELEMENT first (#PCDATA)> +<!ELEMENT introduction (#PCDATA)> +<!ELEMENT middle (#PCDATA)> +<!ELEMENT last (#PCDATA)> +] +> +<contributors> + <introduction> + These are some of the many people who have helped with this Ant Library. + </introduction> + + <name> + <first>${name.first}</first> + <last>${name.last}</last> + </name> +</contributors> +</echo> </target> <target name="manual" depends="make-dir-layout"> - <copy file="${ant.home}/docs/favicon.ico" todir="${manual.dir}"/> - <echoxml file="${manual.dir}/index.html"> - <html> - <head> - <meta http-equiv="Content-Language" content="en-us"/> - <link rel="stylesheet" type="text/css" href="style.css"/> - <title>User Manual - ${antlib.fullname}</title> - </head> - <frameset cols="26%,74%"> - <frame src="toc.html" name="navFrame"/> - <frame src="cover.html" name="mainFrame"/> - </frameset> - <noframes> - <H2>User Manual - ${antlib.fullname}</H2> - <a href="toc.html">User Manual - ${antlib.fullname}</a> - </noframes> - </html> - </echoxml> - <echoxml file="${manual.dir}/toc.html"> - <html> - <head> - <meta http-equiv="Content-Language" content="en-us"/> - <link rel="stylesheet" type="text/css" href="style.css"/> - <title>${antlib.fullname}</title> - <base target="mainFrame"/> - </head> - <body> - <a href="cover.html">Overview</a><br/> - <h2>Tasks</h2> - <a href="task.html">task</a><br/> - </body> - </html> - </echoxml> - <echoxml file="${manual.dir}/cover.html"> - <html> - <head> - <meta http-equiv="Content-Language" content="en-us"/> - <link rel="stylesheet" type="text/css" href="style.css"/> - <title>${antlib.fullname}</title> - </head> - <body> - <h2>${antlib.fullname}</h2> - <p> TODO: something about this antlib </p> - <h3>What's this?</h3> - <h3>Building</h3> - <p>dependencies on Ant <i>version?</i>, external libs and tools</p> - <h3>Using</h3> - </body> - </html> - </echoxml> + <!--copy file="${ant.home}/docs/favicon.ico" todir="${manual.dir}"/--> + <echo file="${manual.dir}/index.html" + encoding="UTF8"><?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. +--> +<html> + <head> + <meta http-equiv="Content-Language" content="en-us"/> + <link rel="stylesheet" type="text/css" href="style.css"/> + <title>User Manual - ${antlib.fullname}</title> + </head> + <frameset cols="26%,74%"> + <frame src="toc.html" name="navFrame"/> + <frame src="cover.html" name="mainFrame"/> + </frameset> + <noframes> + <H2>User Manual - ${antlib.fullname}</H2> + <a href="toc.html">User Manual - ${antlib.fullname}</a> + </noframes> +</html> +</echo> + <echo file="${manual.dir}/toc.html" + encoding="UTF8"><?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. +--> +<html> + <head> + <meta http-equiv="Content-Language" content="en-us"/> + <link rel="stylesheet" type="text/css" href="style.css"/> + <title>${antlib.fullname}</title> + <base target="mainFrame"/> + </head> + <body> + <a href="cover.html">Overview</a><br/> + <h2>Tasks</h2> + <a href="task.html">task</a><br/> + </body> +</html> +</echo> + <echo file="${manual.dir}/cover.html" + encoding="UTF8"><?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. +--> +<html> + <head> + <meta http-equiv="Content-Language" content="en-us"/> + <link rel="stylesheet" type="text/css" href="style.css"/> + <title>${antlib.fullname}</title> + </head> + <body> + <h2>${antlib.fullname}</h2> + <p> TODO: something about this antlib </p> + <h3>What's this?</h3> + <h3>Building</h3> + <p>dependencies on Ant <i>version?</i>, external libs and tools</p> + <h3>Using</h3> + </body> +</html> +</echo> </target> <target name="build.xml" depends="make-dir-layout"> - <echo file="${antlib.trunk}/build.xml"><?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 - - 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="compile" name="${antlib.shortname}"> + <echo file="${antlib.trunk}/build.xml" + encoding="UTF8"><?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 + + 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="compile" name="${antlib.shortname}"> - <!-- easy way to override properties --> - <property file="build.properties"/> + <!-- easy way to override properties --> + <property file="build.properties"/> - <import file="common/build.xml"/> + <import file="common/build.xml"/> - </project> - </echo> +</project> +</echo> </target> <target name="manually-todo" depends="create-artifacts">