Author: tv
Date: Sun Jun 3 09:12:53 2007
New Revision: 543926
URL: http://svn.apache.org/viewvc?view=rev&rev=543926
Log:
Fixed licensing issues for the release.
Added:
jakarta/jcs/trunk/LICENSE.xerox
Modified:
jakarta/jcs/trunk/NOTICE
jakarta/jcs/trunk/maven.xml
jakarta/jcs/trunk/project.xml
Added: jakarta/jcs/trunk/LICENSE.xerox
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/LICENSE.xerox?view=auto&rev=543926
==============================================================================
--- jakarta/jcs/trunk/LICENSE.xerox (added)
+++ jakarta/jcs/trunk/LICENSE.xerox Sun Jun 3 09:12:53 2007
@@ -0,0 +1,9 @@
+Copyright (c) Xerox Corporation 1998-2001. All rights reserved.
+
+Use and copying of this software and preparation of derivative works based
+upon this software are permitted. Any distribution of this software or
+derivative works must comply with all applicable United States export control
+laws.
+
+This software is made available AS IS, and Xerox Corporation makes no warranty
+about the software, its performance or its conformity to any specification.
Modified: jakarta/jcs/trunk/NOTICE
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/NOTICE?view=diff&rev=543926&r1=543925&r2=543926
==============================================================================
--- jakarta/jcs/trunk/NOTICE (original)
+++ jakarta/jcs/trunk/NOTICE Sun Jun 3 09:12:53 2007
@@ -1,16 +1,10 @@
Apache Jakarta JCS
Copyright 2001-2007 The Apache Software Foundation.
-Portions Copyright (c) Xerox Corporation 1998-2001. All rights reserved.
+Portions Copyright (c) Xerox Corporation 1998-2001.
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).
+See the LICENSE.txt file.
-Copyright (c) Xerox Corporation 1998-2001. All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted. Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
+This product includes software developed at Xerox Corporation.
+See the LICENSE.xerox file.
Modified: jakarta/jcs/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/maven.xml?view=diff&rev=543926&r1=543925&r2=543926
==============================================================================
--- jakarta/jcs/trunk/maven.xml (original)
+++ jakarta/jcs/trunk/maven.xml Sun Jun 3 09:12:53 2007
@@ -89,8 +89,14 @@
</j:forEach -->
<copy todir="${maven.dist.bin.assembly.dir}" failonerror="false">
- <fileset file='${basedir}/NOTICE'/>
- <fileset file='${basedir}/LICENSE.txt'/>
+ <fileset dir="${basedir}">
+ <include name="pom.xml"/>
+ <include name="project.xml"/>
+ <include name="project.properties"/>
+ <include name="NOTICE"/>
+ <include name="LICENSE.txt"/>
+ <include name="LICENSE.xerox"/>
+ </fileset>
</copy>
</preGoal>
@@ -98,12 +104,14 @@
<!-- D I S T : B U I L D _ S R C P R E G O A L -->
<!-- ================================================================== -->
<preGoal name="dist:build-src">
- <copy todir="${maven.dist.src.assembly.dir}">
+ <copy todir="${maven.dist.src.assembly.dir}">
<fileset dir="${basedir}">
+ <include name="pom.xml"/>
<include name="project.xml"/>
<include name="project.properties"/>
<include name="NOTICE"/>
<include name="LICENSE.txt"/>
+ <include name="LICENSE.xerox"/>
</fileset>
</copy>
</preGoal>
Modified: jakarta/jcs/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/project.xml?view=diff&rev=543926&r1=543925&r2=543926
==============================================================================
--- jakarta/jcs/trunk/project.xml (original)
+++ jakarta/jcs/trunk/project.xml Sun Jun 3 09:12:53 2007
@@ -185,9 +185,6 @@
<version>1.2.2</version>
<url>http://jakarta.apache.org/commons</url>
<type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- JDBC DISK CACHE -->
@@ -197,9 +194,6 @@
<version>1.3</version>
<url>http://jakarta.apache.org/commons</url>
<type>jar</type>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
</dependency>
<!-- REQUIRED FOR JCS CORE -->
@@ -318,7 +312,7 @@
<build>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <aspectSourceDirectories></aspectSourceDirectories>
+ <!-- aspectSourceDirectories></aspectSourceDirectories -->
<unitTest>
<includes>
<include>**/*${test}Test.java</include>
@@ -352,6 +346,7 @@
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE</include>
+ <include>LICENSE.xerox</include>
</includes>
</resource>
</resources>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.