aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-10-01 09:56:14 (EDT)
committerGlyn Normington2010-10-08 11:26:12 (EDT)
commit055a747f5c7588c5cc6713723773995f42f69de9 (patch)
treea244c7940b7bd84a829bea553faa74e31e147c66
parent14358aa9e1d28a0f62a6d3f5cc15f24f2a8df158 (diff)
downloadorg.eclipse.gemini.web.gemini-web-container-055a747f5c7588c5cc6713723773995f42f69de9.zip
org.eclipse.gemini.web.gemini-web-container-055a747f5c7588c5cc6713723773995f42f69de9.tar.gz
org.eclipse.gemini.web.gemini-web-container-055a747f5c7588c5cc6713723773995f42f69de9.tar.bz2
bugs 326766, 326774: correct about files
-rw-r--r--build-web-container/resources/About.html64
-rw-r--r--build-web-container/resources/about_files/LICENSE-AspectJ.html91
-rw-r--r--build-web-container/resources/about_files/asm.txt29
3 files changed, 11 insertions, 173 deletions
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html
index c9a7e84..ead3765 100644
--- a/build-web-container/resources/About.html
+++ b/build-web-container/resources/About.html
@@ -6,7 +6,7 @@
</HEAD><BODY lang="EN-US">
<H2>About This Content</H2>
-<P>&lt;<EM>insert current release date here, e.g., June 5, 2007</EM>&gt;</P>
+<P>28 October 2010</P>
<H3>License</H3>
<P>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
@@ -42,28 +42,12 @@ and such source code may be obtained at <A href="http://www.eclipse.org/">http:/
This product contains software developed by the Apache Software Foundation (<a href="http://www.apache.org">http://www.apache.org</a>).
<ul>
<li>
- Apache Commons Codec 1.3.0 - binary and source is available from the <a href="http://commons.apache.org/codec/">Apache Commons Codec project</a>
+ Apache Commons Logging 1.1.1 - binary and source is available from the <a href="http://commons.apache.org/logging/">Apache Commons Logging project</a>
</li>
<li>
- Apache Commons FileUpload 1.2.0 - binary and source is available from the <a href="http://commons.apache.org/fileupload/">Apache Commons FileUpload project</a>
- </li>
- <li>
- Apache Commons IO 1.4.0 - binary and source is available from the <a href="http://commons.apache.org/io/">Apache Commons IO project</a>
- </li>
- <li>
- Apache Felix Configuration Admin 1.2.4 - binary and source is available from the Apache Felix
- <a href="http://felix.apache.org/site/apache-felix-config-admin.html">Configuration Admin subproject</a>
- </li>
- <li>
- Apache Felix Event Admin 1.0.0 - binary and source is available from the Apache Felix
- <a href="http://felix.apache.org/site/apache-felix-event-admin.html">Event Admin subproject</a>
- </li>
- <li>
- Apache Felix Log Service 1.0.0 - binary and source is available from the Apache Felix
- <a href="http://felix.apache.org/site/apache-felix-log.html">Log Service subproject</a>
- </li>
- <li>
- Apache HttpClient 3.1.0 - binary and source is available from the <a href="http://hc.apache.org/httpclient-3.x/">Apache HttpClient project</a>
+ Apache Tomcat 6.0.29.S2-r1559 - binary and source is available from the
+ <a href="http://tomcat.apache.org/">Apache Tomcat project</a>
+ <!-- The following is possibly too detailed. (The S2-r1559 support for embedded Tomcat was backported from the Tomcat 7 stream and is available as <a href="http://www.springsource.com/repository/app/search?query=&includeLibraries=true&_includeLibraries=on&includeBundles=true&_includeBundles=on&version=[6.0.29.S2-r1559,6.0.29.S2-r1559]">binary</a> from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a> and as source under Eclipse CQ 4399) -->
</li>
<li>
Spring Dynamic Modules 1.2.1 - binary and source is available from the
@@ -73,26 +57,6 @@ and such source code may be obtained at <A href="http://www.eclipse.org/">http:/
Spring Framework 3.0.0.RELEASE - binary and source is available from the
<a href="http://www.springsource.com/download/community">Spring Framework project</a>
</li>
- <li>
- Spring JavaScript 2.0.8.RELEASE - binary and source is available from the
- <a href="http://www.springsource.com/download/community?project=Spring%20Web%20Flow">Spring Web Flow project</a>
- </li>
- </ul>
- <h4>
- <a href="about_files/LICENSE-AspectJ.html">AspectJ License</a>
- </h4>
- <ul>
- <li>
- AspectJ Weaver 1.6.6 - binary and source is available from the <a href="http://eclipse.org/aspectj">AspectJ project</a>
- </li>
- </ul>
- <h4>
- <a href="about_files/asm.txt">ASM License</a>
- </h4>
- <ul>
- <li>
- ASM 1.5.3 - binary and source is available from the <a href="http://asm.ow2.org/">ASM project</a>
- </li>
</ul>
<h4>
<a href="about_files/cddl-10.txt">Common Development and Distribution License 1.0</a>
@@ -111,15 +75,18 @@ and such source code may be obtained at <A href="http://www.eclipse.org/">http:/
javax.el 1.0.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.el&version=1.0.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.el&version=1.0.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
</li>
<li>
- javax.jms 1.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.jms&version=1.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.jms&version=1.1.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
- </li>
- <li>
javax.mail 1.4.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.mail&version=1.4.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.mail&version=1.4.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
</li>
<li>
javax.persistence 1.0.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.persistence&version=1.0.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.persistence&version=1.0.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
</li>
<li>
+ javax.servlet 2.5.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.servlet&version=2.5.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.servlet&version=2.5.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
+ </li>
+ <li>
+ javax.servlet.jsp 2.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.servlet.jsp&version=2.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.servlet.jsp&version=2.1.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
+ </li>
+ <li>
javax.transaction 1.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.transaction&version=1.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.transaction&version=1.1.0&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a>
</li>
<li>
@@ -136,15 +103,6 @@ and such source code may be obtained at <A href="http://www.eclipse.org/">http:/
</li>
</ul>
<h4>
- <a href="epl-v10.html">Eclipse Public License 1.0</a>
- </h4>
- <ul>
- <li>
- Logback 0.9.24 - binary and source is available from the
- <a href="http://logback.qos.ch/">Logback project</a> (Dual-licensed EPL or LGPL. Virgo elects to use EPL.)
- </li>
- </ul>
- <h4>
<a href="http://en.wikipedia.org/wiki/Public_domain">Public Domain</a>
</h4>
<ul>
diff --git a/build-web-container/resources/about_files/LICENSE-AspectJ.html b/build-web-container/resources/about_files/LICENSE-AspectJ.html
deleted file mode 100644
index 8f7d0a4..0000000
--- a/build-web-container/resources/about_files/LICENSE-AspectJ.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-
-<head>
-<title>AspectJ License</title>
-
-
-</head>
-
-<BODY BGCOLOR="white">
-
-<h2 align="center"><b>AspectJ<sup><small>TM</small></sup>
- Compiler and Core Tools License</b></h2>
-
-<p>This is a binary-only release.&nbsp; Source code
-is available from
-<a href="http://eclipse.org/aspectj">http://eclipse.org/aspectj</a></p>
-
-<p>The Eclipse Foundation makes available all content in this distribution ("Content").
- Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
- Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
- at <a href="../../org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
- <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
- being redistributed by another party ("Redistributor") and different terms and conditions may
- apply to your use of any object code in the Content. Check the Redistributor's license
- that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
- indicated below, the terms and conditions of the EPL still apply to any source code in the Content
- and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.</p>
-
-
- <h3>Third Party Content</h3>
- <p>The Content includes items that have been sourced from third parties as set out below. If you
- did not receive this Content directly from the Eclipse Foundation, the following is provided
- for informational purposes only, and you should look to the Redistributor?s license for
- terms and conditions of use.</p>
- <em>
-
- <h4>BCEL v5.1</h4>
- <p>This product contains software developed by the
- Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org</a>).</p>
-
- <p>AspectJ includes a modified version of the Apache Jakarta Byte Code Engineering Library (BCEL) v5.1.
- BCEL is available at <a href="http://jakarta.apache.org/bcel/">http://jakarta.apache.org/bcel/</a>. Source
- code for the modified version of BCEL is available at Eclipse.org in the AspectJ source tree. This code
- is made available under the Apache Software License v1.1</p>
-
- <h4>ASM v2.2.1</h4>
- <p>AspectJ includes a binary version of ASM v2.2.1 (<a href="http://asm.objectweb.org/index.html">http://asm.objectweb.org/</a>)
- The source code for ASM is available from the ObjectWeb download site at
- <a href="http://asm.objectweb.org/download/">http://asm.objectweb.org/download/</a>.
- <p>The ASM license is available at <a href="http://asm.objectweb.org/license.html">http://asm.objectweb.org/license.html</a>.
- The license is also reproduced here:
- </p>
-
-<pre>Copyright (c) 2000-2005 INRIA, France Telecom
-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. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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.
-</pre>
-
-</em>
-
-</body>
-
-</html>
diff --git a/build-web-container/resources/about_files/asm.txt b/build-web-container/resources/about_files/asm.txt
deleted file mode 100644
index 75ad085..0000000
--- a/build-web-container/resources/about_files/asm.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-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. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR 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.