From 959b1e598820a58b1c7a4de7c4361cf6559591bc Mon Sep 17 00:00:00 2001
From: jploski <>
Date: Thu, 1 May 2008 20:37:08 +0000
Subject: [PATCH] Added JDOM license terms.

---
 org.epic.feature.main/build.xml    |  2 +-
 org.epic.feature.main/feature.xml  | 61 ++++++++++++++++++++++++++-
 org.epic.feature.main/license.html | 68 ++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/org.epic.feature.main/build.xml b/org.epic.feature.main/build.xml
index 9fc37ee9..1276d7c9 100644
--- a/org.epic.feature.main/build.xml
+++ b/org.epic.feature.main/build.xml
@@ -77,7 +77,7 @@
 		<copy todir="${feature.base}/features/org.epic.feature.main_0.6.22" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}" includes="feature.xml,icons/,license.html"			/>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.epic.feature.main_0.6.22/feature.xml"  selfVersion="0.6.22" featureIds="" pluginIds="org.epic.regexp,0.6.0,org.epic.perleditor,0.6.7,org.epic.doc,0.6.1,org.epic.debug,0.6.14,org.epic.lib,0.6.0,org.epic.source,0.6.14,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.epic.feature.main_0.6.22/feature.xml"  selfVersion="0.6.22" featureIds="" pluginIds="org.epic.regexp,0.6.1,org.epic.perleditor,0.6.15,org.epic.doc,0.6.1,org.epic.debug,0.6.16,org.epic.lib,0.6.0,org.epic.source,0.6.22,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFiles*_*_*">
diff --git a/org.epic.feature.main/feature.xml b/org.epic.feature.main/feature.xml
index e50b5d9a..3bc796fa 100644
--- a/org.epic.feature.main/feature.xml
+++ b/org.epic.feature.main/feature.xml
@@ -17,7 +17,12 @@ components.
    </copyright>
 
    <license url="license.html">
-      Common Public License - v 1.0 
+EPIC plugins are distributed under Common Public License v 1.0,
+which is reproduced below. EPIC includes software developed by
+the JDOM Project (http://www.jdom.org/), 
+   
+Common Public License - v 1.0 
+
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS
 COMMON PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE, REPRODUCTION OR
 DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT&apos;S ACCEPTANCE
@@ -217,6 +222,60 @@ No party to this Agreement will bring a legal action under this
 Agreement more than one year after the cause of action arose.
 Each party waives its rights to a jury trial in any resulting
 litigation.
+
+***
+
+The included JDOM software is distributed under the following license:
+
+ Copyright (C) 2000-2004 Jason Hunter &amp; Brett McLaughlin.
+ 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 disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact &lt;request_AT_jdom_DOT_org&gt;.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management &lt;request_AT_jdom_DOT_org&gt;.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS 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.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter &lt;jhunter_AT_jdom_DOT_org&gt; and
+ Brett McLaughlin &lt;brett_AT_jdom_DOT_org&gt;.  For more information
+ on the JDOM Project, please see &lt;http://www.jdom.org/&gt;.
    </license>
 
    <url>
diff --git a/org.epic.feature.main/license.html b/org.epic.feature.main/license.html
index b49561a3..5f8f7988 100644
--- a/org.epic.feature.main/license.html
+++ b/org.epic.feature.main/license.html
@@ -243,6 +243,74 @@
 </ol>
 </td>
 </tr>
+<tr>
+<td>
+<hr />
+<p>
+EPIC includes software developed by the JDOM Project (http://www.jdom.org/),
+redistributed according to the following license:
+</p>
+<blockquote>
+<p>
+ Copyright (C) 2000-2004 Jason Hunter &amp; Brett McLaughlin.
+ All rights reserved.
+</p>
+<p>
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+</p>
+<ol>
+<li> Redistributions of source code must retain the above copyright
+    notice, this list of conditions, and the following disclaimer.</li>
+<li> Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions, and the disclaimer that follows
+    these conditions in the documentation and/or other materials
+    provided with the distribution.</li>
+<li> The name "JDOM" must not be used to endorse or promote products
+    derived from this software without prior written permission.  For
+    written permission, please contact &lt;request_AT_jdom_DOT_org&gt;.</li>
+<li> Products derived from this software may not be called "JDOM", nor
+    may "JDOM" appear in their name, without prior written permission
+    from the JDOM Project Management &lt;request_AT_jdom_DOT_org&gt;.</li>
+</ol>
+<p>
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+</p>
+<blockquote>
+     "This product includes software developed by the
+      JDOM Project (http://www.jdom.org/)."
+</blockquote>
+<p>
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+</p>
+<p>
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS 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.
+</p>
+<p>
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter &lt;jhunter_AT_jdom_DOT_org&gt; and
+ Brett McLaughlin &lt;brett_AT_jdom_DOT_org&gt;.  For more information
+ on the JDOM Project, please see <a href="http://www.jdom.org">http://www.jdom.org</a>.
+</p>
+</blockquote>
+</td>
+</tr>
 </table>
 </body>
 </html>