Fixed licensing issues for the release.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jcs/trunk@543926 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/LICENSE.xerox b/LICENSE.xerox
new file mode 100644
index 0000000..cb0efc1
--- /dev/null
+++ b/LICENSE.xerox
@@ -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.
diff --git a/NOTICE b/NOTICE
index aa4b874..b045be0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -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.
diff --git a/maven.xml b/maven.xml
index cf5757f..adde110 100644
--- a/maven.xml
+++ b/maven.xml
@@ -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>
diff --git a/project.xml b/project.xml
index 9833a76..45939d8 100644
--- a/project.xml
+++ b/project.xml
@@ -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>
