You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2005/04/21 10:18:02 UTC
cvs commit: incubator-myfaces NOTICE.txt STATUS.txt
manolito 2005/04/21 01:18:02
Modified: build build.xml
doc Legal.txt
. NOTICE.txt
Removed: . STATUS.txt
Log:
changed some legal issues
Revision Changes Path
1.98 +9 -2 incubator-myfaces/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/build.xml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- build.xml 14 Apr 2005 23:14:24 -0000 1.97
+++ build.xml 21 Apr 2005 08:18:02 -0000 1.98
@@ -362,7 +362,10 @@
<copy file="${myfaces.jar}" todir="${temp.dir}/${bin.release.bundle}/lib"/>
<copy file="${myfaces-wap.jar}" todir="${temp.dir}/${bin.release.bundle}/lib"/>
<copy file="${myfaces-xdoclet.jar}" todir="${temp.dir}/${bin.release.bundle}/lib"/>
-
+ <copy todir="${temp.dir}/${bin.release.bundle}">
+ <fileset file="${project.dir}/LICENSE.txt"/>
+ <fileset file="${project.dir}/NOTICE.txt"/>
+ </copy>
</target>
<target name="bin-release"
@@ -375,7 +378,7 @@
<tar destfile="${bin.release.tgz}" compression="gzip" >
<tarfileset prefix="${bin.release.bundle}" dir="${temp.dir}/${bin.release.bundle}"/>
</tar>
- <zip destfile="${bin.release.zip}" compress="true">
+ <zip destfile="${bin.release.zip}" compress="true" >
<zipfileset prefix="${bin.release.bundle}" dir="${temp.dir}/${bin.release.bundle}"/>
</zip>
<checksum file="${bin.release.tgz}" forceOverwrite="yes" fileext=".md5"/>
@@ -441,6 +444,10 @@
<copy todir="${temp.dir}/${src.release.bundle}/webapps">
<fileset dir="${apps.dir}" excludes="**/lib/**, **/classes/**"/>
</copy>
+ <copy todir="${temp.dir}/${src.release.bundle}">
+ <fileset file="${project.dir}/LICENSE.txt"/>
+ <fileset file="${project.dir}/NOTICE.txt"/>
+ </copy>
</target>
<target name="src-release"
1.9 +2 -1 incubator-myfaces/doc/Legal.txt
Index: Legal.txt
===================================================================
RCS file: /home/cvs/incubator-myfaces/doc/Legal.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Legal.txt 5 Jul 2004 12:52:43 -0000 1.8
+++ Legal.txt 21 Apr 2005 08:18:02 -0000 1.9
@@ -9,11 +9,12 @@
Acknowledgements
================
-This product includes software developed by:
+This product includes or is developed with software developed by:
- The Apache Software Foundation (http://www.apache.org/)
- Simon Brown (http://www.tagunit.org)
- Heng Yuan (http://www.cs.ucla.edu/~heng/JSCookMenu)
+- Xdoclet project (http://xdoclet.sf.net) licensed under BSD
Trademarks
==========
1.3 +0 -3 incubator-myfaces/NOTICE.txt
Index: NOTICE.txt
===================================================================
RCS file: /home/cvs/incubator-myfaces/NOTICE.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOTICE.txt 30 Dec 2004 09:35:06 -0000 1.2
+++ NOTICE.txt 21 Apr 2005 08:18:02 -0000 1.3
@@ -1,5 +1,2 @@
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
-
-Xdoclet project (http://xdoclet.sf.net) License for
-Xdoclet is BSD.
\ No newline at end of file