Author: apetrelli
Date: Tue Jan 22 12:23:19 2008
New Revision: 614306
URL: http://svn.apache.org/viewvc?rev=614306&view=rev
Log:
WW-2437
Fixed the first bunch of license issues.
Added:
struts/struts2/trunk/assembly/src/main/resources/backport/
struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt
(with props)
struts/struts2/trunk/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt
- copied unchanged from r612799,
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt (with
props)
struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
(with props)
Removed:
struts/struts2/trunk/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
Modified:
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
struts/struts2/trunk/assembly/src/main/assembly/lib.xml
struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/core/src/main/resources/NOTICE.txt
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/sitemesh/pom.xml
struts/struts2/trunk/plugins/struts1/src/main/resources/NOTICE.txt
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Tue Jan 22 12:23:19 2008
@@ -129,6 +129,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Jan 22 12:23:19 2008
@@ -127,6 +127,16 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Tue Jan 22 12:23:19
2008
@@ -45,6 +45,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../plugins/struts1/src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>ANTLR-LICENSE.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>target/apps</directory>
<outputDirectory>apps</outputDirectory>
<includes>
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml Tue Jan 22
12:23:19 2008
@@ -44,10 +44,9 @@
</dependencySets>
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>src/main/resources/backport</directory>
<outputDirectory></outputDirectory>
<includes>
- <include>README*</include>
<include>*LICENSE*</include>
<include>NOTICE*</include>
</includes>
Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Tue Jan 22 12:23:19
2008
@@ -44,5 +44,12 @@
<include>NOTICE*</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../plugins/struts1/src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>ANTLR-LICENSE.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/assembly/src/main/resources/NOTICE.txt Tue Jan 22
12:23:19 2008
@@ -1,3 +1,10 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
+Dojo (http://dojotoolkit.org/).
+domTT (http://www.mojavelinux.com/projects/domtooltip/).
+The binary distributions includes the following third party software:
+ANTLR (http://www.antlr.org/).
Added: struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt?rev=614306&view=auto
==============================================================================
--- struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt (added)
+++ struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt Tue
Jan 22 12:23:19 2008
@@ -0,0 +1,7 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+Retrotranslator (http://retrotranslator.sourceforge.net/).
+
Propchange: struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/assembly/src/main/resources/backport/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Tue Jan 22 12:23:19 2008
@@ -284,6 +284,12 @@
<artifactId>velocity-tools</artifactId>
<version>1.3</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- File upload -->
Modified: struts/struts2/trunk/core/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/NOTICE.txt?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/NOTICE.txt (original)
+++ struts/struts2/trunk/core/src/main/resources/NOTICE.txt Tue Jan 22 12:23:19
2008
@@ -3,4 +3,4 @@
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
-Dojo (http://dojotoolkit.org/).
+domTT (http://www.mojavelinux.com/projects/domtooltip/).
\ No newline at end of file
Added: struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt?rev=614306&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt (added)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt Tue Jan 22
12:23:19 2008
@@ -0,0 +1,6 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+Dojo (http://dojotoolkit.org/).
Propchange: struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/struts2/trunk/plugins/dojo/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Tue Jan 22 12:23:19 2008
@@ -68,6 +68,12 @@
<artifactId>velocity-tools</artifactId>
<version>1.3</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Portlet -->
Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitemesh/pom.xml Tue Jan 22 12:23:19 2008
@@ -59,6 +59,12 @@
<artifactId>velocity-tools</artifactId>
<version>1.3</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>struts</groupId>
+ <artifactId>struts</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
Added: struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt?rev=614306&view=auto
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
(added)
+++ struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
Tue Jan 22 12:23:19 2008
@@ -0,0 +1,26 @@
+[The "BSD licence"]
+Copyright (c) 2003-2006 Terence Parr
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, 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 name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 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.
Propchange:
struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/struts2/trunk/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/struts2/trunk/plugins/struts1/src/main/resources/NOTICE.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/resources/NOTICE.txt?rev=614306&r1=614305&r2=614306&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/resources/NOTICE.txt
(original)
+++ struts/struts2/trunk/plugins/struts1/src/main/resources/NOTICE.txt Tue Jan
22 12:23:19 2008
@@ -2,4 +2,7 @@
Copyright 2000-2007 The Apache Software Foundation
This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+The binary distributions includes the following third party software:
+ANTLR (http://www.antlr.org/).
