donaldp 2002/07/08 23:30:58
Modified: . build.xml LICENSE.txt
Log:
Remove manifest file from CVS
Revision Changes Path
1.133 +28 -25 jakarta-avalon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon/build.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 1 Jun 2002 17:57:40 -0000 1.132
+++ build.xml 9 Jul 2002 06:30:58 -0000 1.133
@@ -194,19 +194,17 @@
</target>
<target name="jar-exceptionutil" depends="compile-exceptionutil, prepare-conf">
- <copy
- file="${conf.dir}/MANIFEST.MF"
- tofile="${build.conf}/MANIFEST-EXCEPTIONUTIL.MF">
- <filterset>
- <filter token="name" value="avalon-exceptionutil"/>
- <filter token="version" value="${version}"/>
- </filterset>
- </copy>
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/exceptionutil.jar"
basedir="${build.classes}"
- compress="${compress.jars}"
- manifest="${build.conf}/MANIFEST-EXCEPTIONUTIL.MF">
+ compress="${compress.jars}">
+ <manifest>
+ <attribute name="Extension-Name" value="avalon-exceptionutil"/>
+ <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Specification-Version" value="1.0"/>
+ <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ </manifest>
<include name="org/apache/avalon/framework/ExceptionUtil.class" />
<include name="org/apache/avalon/framework/Cascading*" />
<zipfileset dir="${build.conf}" prefix="META-INF/">
@@ -338,16 +336,16 @@
<filter token="link3.href" value="http://jakarta.apache.org/avalon/"/>
<filter token="group-logo.src" value="images/jakarta-logo.gif"/>
<filter token="group-logo.href" value="http://jakarta.apache.org/"/>
- <filter token="project-logo.src" value="images/header.gif"/>
- <filter token="project-logo.href" value="http://jakarta.apache.org/avalon/"/>
- <filter token="year" value="2002"/>
- <filter token="vendor" value="Apache Software Foundation"/>
-
+ <filter token="project-logo.src" value="images/header.gif"/>
+ <filter token="project-logo.href" value="http://jakarta.apache.org/avalon/"/>
+ <filter token="year" value="2002"/>
+ <filter token="vendor" value="Apache Software Foundation"/>
+
<mkdir dir="${build.context}"/>
<mkdir dir="${build.docs}"/>
<mkdir dir="${build.xdocs}"/>
<mkdir dir="${build.dir}/work"/>
-
+
<!-- Base pointers for non-xdocs documentation. Override these in
.ant.properties to link to local docs -->
<property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
<property name="framework.base"
value="http://jakarta.apache.org/avalon/framework"/>
@@ -386,14 +384,14 @@
<copy todir="${build.xdocs}" filtering="on" overwrite="true">
<fileset dir="${xdocs.dir}"/>
</copy>
-
- <copy file="${context.dir}/resources/schema/CatalogManager.properties"
+
+ <copy file="${context.dir}/resources/schema/CatalogManager.properties"
todir="${build.context}/resources/schema" filtering="off"/>
-
+
<echo
message="-------------------------------------------------------------"/>
<echo message=" Building docs, please stand by ..."/>
-
+
<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m"
failonerror="true">
<arg value="-c${build.context}/"/>
<arg value="-d${build.docs}"/>
@@ -410,7 +408,7 @@
<echo message=" ...docs generated succesfully in ./build/docs dir."/>
<echo
message="-------------------------------------------------------------"/>
-
+
<mkdir dir="${build.docs}/framework/diagrams"/>
<copy todir="${build.docs}/framework/diagrams" filtering="off">
<fileset dir="${context.dir}/diagrams"/>
@@ -538,12 +536,11 @@
</target>
- <!-- Copies and filters the manifest and license. Used by jar and dist -->
+ <!-- Copies and filters the license. Used by jar and dist -->
<target name="prepare-conf">
<mkdir dir="${build.conf}"/>
<copy todir="${build.conf}" flatten="true">
<fileset dir="." includes="LICENSE.txt"/>
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
<filterset>
<filter token="name" value="${framework.name}"/>
@@ -559,8 +556,14 @@
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/${framework.name}.jar"
basedir="${build.classes}"
- compress="${compress.jars}"
- manifest="${build.conf}/MANIFEST.MF">
+ compress="${compress.jars}">
+ <manifest>
+ <attribute name="Extension-Name" value="${framework.name}"/>
+ <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Specification-Version" value="1.0"/>
+ <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ </manifest>
<exclude name="**/test/*"/>
<include name="org/apache/avalon/framework/**"/>
<zipfileset dir="${build.conf}" prefix="META-INF/">
1.3 +15 -15 jakarta-avalon/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon/LICENSE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LICENSE.txt 26 Jun 2002 09:22:17 -0000 1.2
+++ LICENSE.txt 9 Jul 2002 06:30:58 -0000 1.3
@@ -3,34 +3,34 @@
============================================================================
The Apache Software License, Version 1.1
============================================================================
-
- Copyright (C) @year@ The Apache Software Foundation. All rights reserved.
-
+
+ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
+
Redistribution and use in source and binary forms, with or without modifica-
tion, are permitted provided that the following conditions are met:
-
+
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-
+
3. The end-user documentation included with the redistribution, if any, must
include the following acknowledgment: "This product includes software
developed by the Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
-
- 4. The names "Jakarta", "Apache Avalon", "Avalon Excalibur", "Avalon
- Framework" and "Apache Software Foundation" must not be used to endorse
- or promote products derived from this software without prior written
+
+ 4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
+ "Apache Software Foundation" must not be used to endorse or promote
+ products derived from this software without prior written
permission. For written permission, please contact [EMAIL PROTECTED]
-
+
5. Products derived from this software may not be called "Apache", nor may
"Apache" appear in their name, without prior written permission of the
Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -41,9 +41,9 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation. For more information on the
+ on behalf of the Apache Software Foundation. For more information on the
Apache Software Foundation, please see <http://www.apache.org/>.
-
+
*/
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
