Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-2437

Browse Source 
Fixed the first bunch of license issues.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@614306 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Antonio Petrelli
2008-01-22 20:23:19 +00:00
parent 4b8c29dff4
commit 764877efeb
15 changed files with 98 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/portlet/pom.xml
+4
View File
@@ -129,6 +129,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
apps/showcase/pom.xml
+10
View File
@@ -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>
assembly/src/main/assembly/all.xml
+7
View File
@@ -44,6 +44,13 @@
<include>NOTICE*</include>
</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>
assembly/src/main/assembly/lib-jdk14.xml
+1 -2
View File
@@ -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>
assembly/src/main/assembly/lib.xml
+7
View File
@@ -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>
assembly/src/main/resources/NOTICE.txt
+7
View File
@@ -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/).
assembly/src/main/resources/backport/NOTICE.txt
+7
View File
@@ -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/).
assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt → assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt
View File
core/pom.xml
+6
View File
@@ -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 -->
core/src/main/resources/NOTICE.txt
+1 -1
View File
@@ -3,4 +3,4 @@ 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/).
plugins/dojo/src/main/resources/NOTICE.txt
+6
View File
@@ -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/).
plugins/portlet/pom.xml
+6
View File
@@ -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 -->
plugins/sitemesh/pom.xml
+6
View File
@@ -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>
plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
+26
View File
@@ -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.
plugins/struts1/src/main/resources/NOTICE.txt
+4 -1
View File
@@ -2,4 +2,7 @@ Apache Struts
Copyright 2000-2007 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
The Apache Software Foundation (http://www.apache.org/).
The binary distributions includes the following third party software:
ANTLR (http://www.antlr.org/).