You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/11/12 23:58:05 UTC
svn commit: r713542 - in /myfaces/tomahawk/trunk:
assembly/src/main/resources/NOTICE.txt core/pom.xml
core/src/main/resources/META-INF/NOTICE.txt core12/pom.xml
core12/src/main/resources/META-INF/NOTICE.txt
Author: lu4242
Date: Wed Nov 12 14:58:04 2008
New Revision: 713542
URL: http://svn.apache.org/viewvc?rev=713542&view=rev
Log:
update notice description and fix problem NOTICE.txt overriden when unpack shared dependencies occur
Modified:
myfaces/tomahawk/trunk/assembly/src/main/resources/NOTICE.txt
myfaces/tomahawk/trunk/core/pom.xml
myfaces/tomahawk/trunk/core/src/main/resources/META-INF/NOTICE.txt
myfaces/tomahawk/trunk/core12/pom.xml
myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/NOTICE.txt
Modified: myfaces/tomahawk/trunk/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/assembly/src/main/resources/NOTICE.txt?rev=713542&r1=713541&r2=713542&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/tomahawk/trunk/assembly/src/main/resources/NOTICE.txt Wed Nov 12 14:58:04 2008
@@ -1,5 +1,5 @@
Apache MyFaces
-Copyright 2004-2007 The Apache Software Foundation
+Copyright 2004-2008 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
@@ -9,11 +9,24 @@
See licenses for accompanying products in the "/licenses" subdirectory.
------------------------------------------------------------------------
-This product includes software developed by Heng Yuan
+This product includes software developed by Heng Yuan (jscookmenu)
http://www.cs.ucla.edu/~heng/JSCookMenu
This product includes software developed by Sam Stephenson (the ProtoType library)
http://conio.net/
-This product includes software developed by Thomas Fuchs (the Ruby on Rails Ajax javascript extensions)
+This product includes software developed by Thomas Fuchs (the Ruby on Rails Ajax javascript extensions, script.aculo.us)
http://script.aculo.us/
+
+This product includes software developed by the Kupu Project
+(http://kupu.oscom.org/).
+
+This product includes Sarissa ECMAScript written by Manos Batsis, released under
+the Kupu License with kind permission by the author (used by the Kupu HTML editor). See the Sarissa
+homepage at http://sarissa.sourceforge.net/ for more information.
+
+This product includes software developed by Guido Wesdorp (i18n.js, used by the KUPU html editor)
+(http://kupu.oscom.org/).
+
+This product includes software developed by Dojo Foundation (http://dojotoolkit.org/foundation/)
+http://www.dojotoolkit.org/
Modified: myfaces/tomahawk/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/pom.xml?rev=713542&r1=713541&r2=713542&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/core/pom.xml Wed Nov 12 14:58:04 2008
@@ -431,6 +431,7 @@
<phase>process-classes</phase>
<goals><goal>unpack</goal></goals>
<configuration>
+ <excludes>META-INF/*.*</excludes>
<artifactItems>
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
@@ -449,6 +450,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <excludes>META-INF/*.*</excludes>
<artifactItems>
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
Modified: myfaces/tomahawk/trunk/core/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/META-INF/NOTICE.txt?rev=713542&r1=713541&r2=713542&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/META-INF/NOTICE.txt Wed Nov 12 14:58:04 2008
@@ -1,5 +1,5 @@
Apache MyFaces
-Copyright 2004-2007 The Apache Software Foundation
+Copyright 2004-2008 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/tomahawk/trunk/core12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/pom.xml?rev=713542&r1=713541&r2=713542&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/pom.xml (original)
+++ myfaces/tomahawk/trunk/core12/pom.xml Wed Nov 12 14:58:04 2008
@@ -520,6 +520,7 @@
<phase>process-classes</phase>
<goals><goal>unpack</goal></goals>
<configuration>
+ <excludes>META-INF/*.*</excludes>
<artifactItems>
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
@@ -538,6 +539,7 @@
<goal>unpack</goal>
</goals>
<configuration>
+ <excludes>META-INF/*.*</excludes>
<artifactItems>
<artifactItem>
<groupId>org.apache.myfaces.shared</groupId>
@@ -762,4 +764,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/NOTICE.txt?rev=713542&r1=713541&r2=713542&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tomahawk/trunk/core12/src/main/resources/META-INF/NOTICE.txt Wed Nov 12 14:58:04 2008
@@ -1,5 +1,5 @@
Apache MyFaces
-Copyright 2004-2007 The Apache Software Foundation
+Copyright 2004-2008 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).