Merge branch 'master' into bug312752
diff --git a/build-web-container/build.xml b/build-web-container/build.xml index 96a0577..9e99aea 100644 --- a/build-web-container/build.xml +++ b/build-web-container/build.xml
@@ -26,5 +26,25 @@ <mkdir dir="${collect.output.dir}"/> <ivy:retrieve organisation="org.eclipse.gemini.web" module="org.eclipse.gemini.web" inline="true" type="jar" pattern="${collect.output.dir}/[artifact]-[revision].[ext]"/> </target> + + <target name="package" depends="ivy.init"> + <delete dir="${package.output.dir}" quiet="true"/> + <mkdir dir="${package.output.dir}"/> + + <ivy:resolve resolveId="copy.path" file="${basedir}/package-ivy.xml" transitive="false"/> + <ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/[artifact]-[revision].[ext]" conf="package" type="jar"/> + + <ivy:resolve resolveId="copy.path" file="${basedir}/dependencies-ivy.xml" transitive="false"/> + <ivy:retrieve resolveId="copy.path" pattern="${package.output.dir}/dep/[artifact]-[revision].[ext]" conf="dep" type="jar"/> + + <copy todir="${package.output.dir}" failonerror="false"> + <fileset dir="${basedir}/resources"/> + </copy> + + <mkdir dir="${artifacts.dir}"/> + <zip destfile="${package.output.file}"> + <zipfileset dir="${package.dir}"/> + </zip> + </target> </project>
diff --git a/build-web-container/dependencies-ivy.xml b/build-web-container/dependencies-ivy.xml new file mode 100644 index 0000000..a7ba571 --- /dev/null +++ b/build-web-container/dependencies-ivy.xml
@@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3"> + + <info organisation="org.eclipse.gemini.web" module="${ant.project.name}" /> + + <configurations> + <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/> + <conf name="dep" visibility="public" description="Dependencies to be packaged in dep"/> + </configurations> + + <dependencies> + <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="dep->runtime"/> + + <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.common" rev="${org.eclipse.virgo.util}" conf="dep->runtime"/> + <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="dep->runtime"/> + <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.math" rev="${org.eclipse.virgo.util}" conf="dep->runtime"/> + <dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.parser.manifest" rev="${org.eclipse.virgo.util}" conf="dep->runtime"/> + + <dependency org="org.springframework" name="org.springframework.aop" rev="${org.springframework}" conf="dep->runtime"/> + <dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="dep->runtime"/> + <dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="dep->runtime"/> + <dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="dep->runtime"/> + + <dependency org="org.springframework.osgi" name="org.springframework.osgi.core" rev="${org.springframework.osgi}" conf="dep->runtime"/> + <dependency org="org.springframework.osgi" name="org.springframework.osgi.io" rev="${org.springframework.osgi}" conf="dep->runtime"/> + + <dependency org="org.apache.catalina.springsource" name="com.springsource.org.apache.catalina.ha.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.catalina.springsource" name="com.springsource.org.apache.catalina.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.catalina.springsource" name="com.springsource.org.apache.catalina.tribes.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.coyote.springsource" name="com.springsource.org.apache.coyote.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.el.springsource" name="com.springsource.org.apache.el.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.jasper.springsource" name="com.springsource.org.apache.jasper.org.eclipse.jdt.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.jasper.springsource" name="com.springsource.org.apache.jasper.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + <dependency org="org.apache.juli.springsource" name="com.springsource.org.apache.juli.extras.springsource" rev="${org.apache.tomcat}" conf="dep->runtime"/> + + <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="${org.apache.commons.logging}" conf="dep->runtime"/> + <dependency org="javax.activation" name="com.springsource.javax.activation" rev="${javax.activation}" conf="dep->runtime"/> + <dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="${javax.annotation}" conf="dep->runtime"/> + <dependency org="javax.ejb" name="com.springsource.javax.ejb" rev="${javax.ejb}" conf="dep->runtime"/> + <dependency org="javax.el" name="com.springsource.javax.el" rev="${javax.el}" conf="dep->runtime"/> + <dependency org="javax.mail" name="com.springsource.javax.mail" rev="${javax.mail}" conf="dep->runtime"/> + <dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="${javax.persistence}" conf="dep->runtime"/> + <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="${javax.servlet}" conf="dep->runtime"/> + <dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="${javax.servlet.jsp}" conf="dep->runtime"/> + <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="${javax.transaction}" conf="dep->runtime"/> + <dependency org="javax.xml.bind" name="com.springsource.javax.xml.bind" rev="${javax.xml.bind}" conf="dep->runtime"/> + <dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="${javax.xml.rpc}" conf="dep->runtime"/> + <dependency org="javax.xml.soap" name="com.springsource.javax.xml.soap" rev="${javax.xml.soap}" conf="dep->runtime"/> + <dependency org="javax.xml.stream" name="com.springsource.javax.xml.stream" rev="${javax.xml.stream}" conf="dep->runtime"/> + <dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="${javax.xml.ws}" conf="dep->runtime"/> + + <dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="${org.aopalliance}" conf="dep->runtime"/> + + <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="dep->runtime"/> + <dependency org="org.slf4j" name="com.springsource.slf4j.nop" rev="${org.slf4j}" conf="dep->runtime"/> + </dependencies> + +</ivy-module> \ No newline at end of file
diff --git a/build-web-container/package-ivy.xml b/build-web-container/package-ivy.xml new file mode 100644 index 0000000..46986e5 --- /dev/null +++ b/build-web-container/package-ivy.xml
@@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> +<ivy-module xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3"> + + <info organisation="org.eclipse.gemini.web" module="${ant.project.name}" /> + + <configurations> + <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/> + <conf name="package" visibility="public" description="Gemini Web bundles"/> + </configurations> + + <dependencies> + <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.core" rev="latest.integration" conf="package->runtime"/> + <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.tomcat" rev="latest.integration" conf="package->runtime"/> + <dependency org="org.eclipse.gemini.web" name="org.eclipse.gemini.web.extender" rev="latest.integration" conf="package->runtime"/> + </dependencies> + +</ivy-module> \ No newline at end of file
diff --git a/build-web-container/resources/About.html b/build-web-container/resources/About.html new file mode 100644 index 0000000..9c83ee0 --- /dev/null +++ b/build-web-container/resources/About.html
@@ -0,0 +1,171 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0047)http://www.eclipse.org/legal/epl/longabout.html --> +<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + +<TITLE>About</TITLE> +</HEAD><BODY lang="EN-US"> +<H2>About This Content</H2> + +<P><<EM>insert current release date here, e.g., June 5, 2007</EM>></P> +<H3>License</H3> + +<P>The Eclipse Foundation makes available all content in this plug-in ("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="http://www.eclipse.org/legal/epl-v10.html">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/">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> + + <h4> + <a href="about_files/apache-v20.txt">Apache License 2.0</a> + </h4> + 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> + </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> + </li> + <li> + Apache MINA Core 2.0.0.RC1 - binary and source is available from the + <a href="http://mina.apache.org/">Apache MINA project</a> + </li> + <li> + Apache SSHD Daemon 0.3.0 - binary and source is available from the <a href="http://mina.apache.org/sshd/">Apache SSHD project</a> + </li> + <li> + Spring Dynamic Modules 1.2.1 - binary and source is available from the + <a href="http://www.springsource.org/osgi">Spring Dynamic Modules project</a> + </li> + <li> + 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> + </h4> + <ul> + <li> + javax.activation 1.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.activation&version=1.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.activation&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.annotation 1.0.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.annotation&version=1.0.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.annotation&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.ejb 3.0.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.ejb&version=3.0.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.ejb&version=3.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.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.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> + javax.xml.bind 2.1.7 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.bind&version=2.1.7&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.bind&version=2.1.7&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a> (Dual-licensed CDDL or GPL. Virgo elects to use CDDL.) + </li> + <li> + javax.xml.rpc 1.1.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.rpc&version=1.1.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.rpc&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.xml.soap 1.3.0 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.soap&version=1.3.0&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.soap&version=1.3.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.xml.stream 1.0.1 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.stream&version=1.0.1&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.stream&version=1.0.1&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a> (Dual-licensed CDDL or GPL. Virgo elects to use CDDL.) + </li> + <li> + javax.xml.ws 2.1.1 - <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.ws&version=2.1.1&type=binary">binary</a> and <a href="http://www.springsource.com/repository/app/bundle/version/download?name=com.springsource.javax.xml.ws&version=2.1.1&type=source">source</a> is available from the SpringSource <a href="http://www.springsource.com/repository/app/">Enterprise Bundle Repository</a> (Dual-licensed CDDL or GPL. Virgo elects to use CDDL.) + </li> + </ul> + <h4> + <a href="epl-v10.html">Eclipse Public License 1.0</a> + </h4> + <ul> + <li> + Logback 0.9.18 - 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> + <li> + AOP Alliance 1.0.0 - binary and source is available from the + <a href="http://aopalliance.sourceforge.net/">AOP Alliance project</a> + </li> + </ul> + <h4> + <a href="about_files/slf4j.txt">SLF4J License</a> + </h4> + <ul> + <li> + Simple Logging Facade for Java (SLF4J) 1.5.10 - binary and source is available from the + <a href="http://www.slf4j.org/">SLF4J Project</a> + </li> + </ul> + + + +</BODY></HTML> \ No newline at end of file
diff --git a/build-web-container/resources/README b/build-web-container/resources/README new file mode 100644 index 0000000..1e19e0f --- /dev/null +++ b/build-web-container/resources/README
@@ -0,0 +1 @@ +For more information about Gemini Web, please refer to http://wiki.eclipse.org/Gemini/Web. \ No newline at end of file
diff --git a/build-web-container/resources/about_files/LICENSE-AspectJ.html b/build-web-container/resources/about_files/LICENSE-AspectJ.html new file mode 100644 index 0000000..8f7d0a4 --- /dev/null +++ b/build-web-container/resources/about_files/LICENSE-AspectJ.html
@@ -0,0 +1,91 @@ +<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. 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/apache-v20.txt b/build-web-container/resources/about_files/apache-v20.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/build-web-container/resources/about_files/apache-v20.txt
@@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.
diff --git a/build-web-container/resources/about_files/asm.txt b/build-web-container/resources/about_files/asm.txt new file mode 100644 index 0000000..75ad085 --- /dev/null +++ b/build-web-container/resources/about_files/asm.txt
@@ -0,0 +1,29 @@ +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.
diff --git a/build-web-container/resources/about_files/cddl-10.txt b/build-web-container/resources/about_files/cddl-10.txt new file mode 100644 index 0000000..9709055 --- /dev/null +++ b/build-web-container/resources/about_files/cddl-10.txt
@@ -0,0 +1,380 @@ +COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + +1. Definitions. + +1.1. "Contributor" means each individual or entity that +creates or contributes to the creation of Modifications. + +1.2. "Contributor Version" means the combination of the +Original Software, prior Modifications used by a +Contributor (if any), and the Modifications made by that +particular Contributor. + +1.3. "Covered Software" means (a) the Original Software, or +(b) Modifications, or (c) the combination of files +containing Original Software with files containing +Modifications, in each case including portions thereof. + +1.4. "Executable" means the Covered Software in any form +other than Source Code. + +1.5. "Initial Developer" means the individual or entity +that first makes Original Software available under this +License. + +1.6. "Larger Work" means a work which combines Covered +Software or portions thereof with code not governed by the +terms of this License. + +1.7. "License" means this document. + +1.8. "Licensable" means having the right to grant, to the +maximum extent possible, whether at the time of the initial +grant or subsequently acquired, any and all of the rights +conveyed herein. + +1.9. "Modifications" means the Source Code and Executable +form of any of the following: + +A. Any file that results from an addition to, +deletion from or modification of the contents of a +file containing Original Software or previous +Modifications; + +B. Any new file that contains any part of the +Original Software or previous Modification; or + +C. Any new file that is contributed or otherwise made +available under the terms of this License. + +1.10. "Original Software" means the Source Code and +Executable form of computer software code that is +originally released under this License. + +1.11. "Patent Claims" means any patent claim(s), now owned +or hereafter acquired, including without limitation, +method, process, and apparatus claims, in any patent +Licensable by grantor. + +1.12. "Source Code" means (a) the common form of computer +software code in which modifications are made and (b) +associated documentation included in or with such code. + +1.13. "You" (or "Your") means an individual or a legal +entity exercising rights under, and complying with all of +the terms of, this License. For legal entities, "You" +includes any entity which controls, is controlled by, or is +under common control with You. For purposes of this +definition, "control" means (a) the power, direct or +indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (b) ownership +of more than fifty percent (50%) of the outstanding shares +or beneficial ownership of such entity. + +2. License Grants. + +2.1. The Initial Developer Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, the +Initial Developer hereby grants You a world-wide, +royalty-free, non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Initial Developer, +to use, reproduce, modify, display, perform, +sublicense and distribute the Original Software (or +portions thereof), with or without Modifications, +and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using or selling of Original Software, to make, have +made, use, practice, sell, and offer for sale, and/or +otherwise dispose of the Original Software (or +portions thereof). + +(c) The licenses granted in Sections 2.1(a) and (b) +are effective on the date Initial Developer first +distributes or otherwise makes the Original Software +available to a third party under the terms of this +License. + +(d) Notwithstanding Section 2.1(b) above, no patent +license is granted: (1) for code that You delete from +the Original Software, or (2) for infringements +caused by: (i) the modification of the Original +Software, or (ii) the combination of the Original +Software with other software or devices. + +2.2. Contributor Grant. + +Conditioned upon Your compliance with Section 3.1 below and +subject to third party intellectual property claims, each +Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than +patent or trademark) Licensable by Contributor to +use, reproduce, modify, display, perform, sublicense +and distribute the Modifications created by such +Contributor (or portions thereof), either on an +unmodified basis, with other Modifications, as +Covered Software and/or as part of a Larger Work; and + +(b) under Patent Claims infringed by the making, +using, or selling of Modifications made by that +Contributor either alone and/or in combination with +its Contributor Version (or portions of such +combination), to make, use, sell, offer for sale, +have made, and/or otherwise dispose of: (1) +Modifications made by that Contributor (or portions +thereof); and (2) the combination of Modifications +made by that Contributor with its Contributor Version +(or portions of such combination). + +(c) The licenses granted in Sections 2.2(a) and +2.2(b) are effective on the date Contributor first +distributes or otherwise makes the Modifications +available to a third party. + +(d) Notwithstanding Section 2.2(b) above, no patent +license is granted: (1) for any code that Contributor +has deleted from the Contributor Version; (2) for +infringements caused by: (i) third party +modifications of Contributor Version, or (ii) the +combination of Modifications made by that Contributor +with other software (except as part of the +Contributor Version) or other devices; or (3) under +Patent Claims infringed by Covered Software in the +absence of Modifications made by that Contributor. + +3. Distribution Obligations. + +3.1. Availability of Source Code. + +Any Covered Software that You distribute or otherwise make +available in Executable form must also be made available in +Source Code form and that Source Code form must be +distributed only under the terms of this License. You must +include a copy of this License with every copy of the +Source Code form of the Covered Software You distribute or +otherwise make available. You must inform recipients of any +such Covered Software in Executable form as to how they can +obtain such Covered Software in Source Code form in a +reasonable manner on or through a medium customarily used +for software exchange. + +3.2. Modifications. + +The Modifications that You create or to which You +contribute are governed by the terms of this License. You +represent that You believe Your Modifications are Your +original creation(s) and/or You have sufficient rights to +grant the rights conveyed by this License. + +3.3. Required Notices. + +You must include a notice in each of Your Modifications +that identifies You as the Contributor of the Modification. +You may not remove or alter any copyright, patent or +trademark notices contained within the Covered Software, or +any notices of licensing or any descriptive text giving +attribution to any Contributor or the Initial Developer. + +3.4. Application of Additional Terms. + +You may not offer or impose any terms on any Covered +Software in Source Code form that alters or restricts the +applicable version of this License or the recipients' +rights hereunder. You may choose to offer, and to charge a +fee for, warranty, support, indemnity or liability +obligations to one or more recipients of Covered Software. +However, you may do so only on Your own behalf, and not on +behalf of the Initial Developer or any Contributor. You +must make it absolutely clear that any such warranty, +support, indemnity or liability obligation is offered by +You alone, and You hereby agree to indemnify the Initial +Developer and every Contributor for any liability incurred +by the Initial Developer or such Contributor as a result of +warranty, support, indemnity or liability terms You offer. + +3.5. Distribution of Executable Versions. + +You may distribute the Executable form of the Covered +Software under the terms of this License or under the terms +of a license of Your choice, which may contain terms +different from this License, provided that You are in +compliance with the terms of this License and that the +license for the Executable form does not attempt to limit +or alter the recipient's rights in the Source Code form +from the rights set forth in this License. If You +distribute the Covered Software in Executable form under a +different license, You must make it absolutely clear that +any terms which differ from this License are offered by You +alone, not by the Initial Developer or Contributor. You +hereby agree to indemnify the Initial Developer and every +Contributor for any liability incurred by the Initial +Developer or such Contributor as a result of any such terms +You offer. + +3.6. Larger Works. + +You may create a Larger Work by combining Covered Software +with other code not governed by the terms of this License +and distribute the Larger Work as a single product. In such +a case, You must make sure the requirements of this License +are fulfilled for the Covered Software. + +4. Versions of the License. + +4.1. New Versions. + +Sun Microsystems, Inc. is the initial license steward and +may publish revised and/or new versions of this License +from time to time. Each version will be given a +distinguishing version number. Except as provided in +Section 4.3, no one other than the license steward has the +right to modify this License. + +4.2. Effect of New Versions. + +You may always continue to use, distribute or otherwise +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. If the Initial Developer includes a +notice in the Original Software prohibiting it from being +distributed or otherwise made available under any +subsequent version of the License, You must distribute and +make the Covered Software available under the terms of the +version of the License under which You originally received +the Covered Software. Otherwise, You may also choose to +use, distribute or otherwise make the Covered Software +available under the terms of any subsequent version of the +License published by the license steward. + +4.3. Modified Versions. + +When You are an Initial Developer and You want to create a +new license for Your Original Software, You may create and +use a modified version of this License if You: (a) rename +the license and remove any references to the name of the +license steward (except to note that the license differs +from this License); and (b) otherwise make it clear that +the license contains terms which differ from this License. + +5. DISCLAIMER OF WARRANTY. + +COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" +BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED +SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR +PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY +COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE +INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF +ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF +WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF +ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS +DISCLAIMER. + +6. TERMINATION. + +6.1. This License and the rights granted hereunder will +terminate automatically if You fail to comply with terms +herein and fail to cure such breach within 30 days of +becoming aware of the breach. Provisions which, by their +nature, must remain in effect beyond the termination of +this License shall survive. + +6.2. If You assert a patent infringement claim (excluding +declaratory judgment actions) against Initial Developer or +a Contributor (the Initial Developer or Contributor against +whom You assert such claim is referred to as "Participant") +alleging that the Participant Software (meaning the +Contributor Version where the Participant is a Contributor +or the Original Software where the Participant is the +Initial Developer) directly or indirectly infringes any +patent, then any and all rights granted directly or +indirectly to You by such Participant, the Initial +Developer (if the Initial Developer is not the Participant) +and all Contributors under Sections 2.1 and/or 2.2 of this +License shall, upon 60 days notice from Participant +terminate prospectively and automatically at the expiration +of such 60 day notice period, unless if within such 60 day +period You withdraw Your claim with respect to the +Participant Software against such Participant either +unilaterally or pursuant to a written agreement with +Participant. + +6.3. In the event of termination under Sections 6.1 or 6.2 +above, all end user licenses that have been validly granted +by You or any distributor hereunder prior to termination +(excluding licenses granted to You by any distributor) +shall survive termination. + +7. LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT +(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE +INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF +COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE +LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR +CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT +LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK +STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL +INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT +APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT +APPLY TO YOU. + +8. U.S. GOVERNMENT END USERS. + +The Covered Software is a "commercial item," as that term is +defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial +computer software" (as that term is defined at 48 C.F.R. ¤ +252.227-7014(a)(1)) and "commercial computer software +documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. +1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 +through 227.7202-4 (June 1995), all U.S. Government End Users +acquire Covered Software with only those rights set forth herein. +This U.S. Government Rights clause is in lieu of, and supersedes, +any other FAR, DFAR, or other clause or provision that addresses +Government rights in computer software under this License. + +9. MISCELLANEOUS. + +This License represents the complete agreement concerning subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the +extent necessary to make it enforceable. This License shall be +governed by the law of the jurisdiction specified in a notice +contained within the Original Software (except to the extent +applicable law, if any, provides otherwise), excluding such +jurisdiction's conflict-of-law provisions. Any litigation +relating to this License shall be subject to the jurisdiction of +the courts located in the jurisdiction and venue specified in a +notice contained within the Original Software, with the losing +party responsible for costs, including, without limitation, court +costs and reasonable attorneys' fees and expenses. The +application of the United Nations Convention on Contracts for the +International Sale of Goods is expressly excluded. Any law or +regulation which provides that the language of a contract shall +be construed against the drafter shall not apply to this License. +You agree that You alone are responsible for compliance with the +United States export administration regulations (and the export +control laws and regulation of any other countries) when You use, +distribute or otherwise make available any Covered Software. + +10. RESPONSIBILITY FOR CLAIMS. + +As between Initial Developer and the Contributors, each party is +responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License +and You agree to work with Initial Developer and Contributors to +distribute such responsibility on an equitable basis. Nothing +herein is intended or shall be deemed to constitute any admission +of liability.
diff --git a/build-web-container/resources/about_files/slf4j.txt b/build-web-container/resources/about_files/slf4j.txt new file mode 100644 index 0000000..371607c --- /dev/null +++ b/build-web-container/resources/about_files/slf4j.txt
@@ -0,0 +1,20 @@ +Copyright (c) 2004-2008 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.
diff --git a/build-web-container/resources/epl-v10.html b/build-web-container/resources/epl-v10.html new file mode 100644 index 0000000..eecc800 --- /dev/null +++ b/build-web-container/resources/epl-v10.html
@@ -0,0 +1,258 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!-- saved from url=(0049)http://www.eclipse.org/org/documents/epl-v10.html --> +<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + +<TITLE>Eclipse Public License - Version 1.0</TITLE> +<STYLE type="text/css"> + body { + size: 8.5in 11.0in; + margin: 0.25in 0.5in 0.25in 0.5in; + tab-interval: 0.5in; + } + p { + margin-left: auto; + margin-top: 0.5em; + margin-bottom: 0.5em; + } + p.list { + margin-left: 0.5in; + margin-top: 0.05em; + margin-bottom: 0.05em; + } + </STYLE> + +</HEAD><BODY lang="EN-US"> + +<H2>Eclipse Public License - v 1.0</H2> + +<P>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR +DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS +AGREEMENT.</P> + +<P><B>1. DEFINITIONS</B></P> + +<P>"Contribution" means:</P> + +<P class="list">a) in the case of the initial Contributor, the initial +code and documentation distributed under this Agreement, and</P> +<P class="list">b) in the case of each subsequent Contributor:</P> +<P class="list">i) changes to the Program, and</P> +<P class="list">ii) additions to the Program;</P> +<P class="list">where such changes and/or additions to the Program +originate from and are distributed by that particular Contributor. A +Contribution 'originates' from a Contributor if it was added to the +Program by such Contributor itself or anyone acting on such +Contributor's behalf. Contributions do not include additions to the +Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) +are not derivative works of the Program.</P> + +<P>"Contributor" means any person or entity that distributes +the Program.</P> + +<P>"Licensed Patents" mean patent claims licensable by a +Contributor which are necessarily infringed by the use or sale of its +Contribution alone or when combined with the Program.</P> + +<P>"Program" means the Contributions distributed in accordance +with this Agreement.</P> + +<P>"Recipient" means anyone who receives the Program under +this Agreement, including all Contributors.</P> + +<P><B>2. GRANT OF RIGHTS</B></P> + +<P class="list">a) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free copyright license to reproduce, prepare derivative works +of, publicly display, publicly perform, distribute and sublicense the +Contribution of such Contributor, if any, and such derivative works, in +source code and object code form.</P> + +<P class="list">b) Subject to the terms of this Agreement, each +Contributor hereby grants Recipient a non-exclusive, worldwide, +royalty-free patent license under Licensed Patents to make, use, sell, +offer to sell, import and otherwise transfer the Contribution of such +Contributor, if any, in source code and object code form. This patent +license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, +such addition of the Contribution causes such combination to be covered +by the Licensed Patents. The patent license shall not apply to any other +combinations which include the Contribution. No hardware per se is +licensed hereunder.</P> + +<P class="list">c) Recipient understands that although each Contributor +grants the licenses to its Contributions set forth herein, no assurances +are provided by any Contributor that the Program does not infringe the +patent or other intellectual property rights of any other entity. Each +Contributor disclaims any liability to Recipient for claims brought by +any other entity based on infringement of intellectual property rights +or otherwise. As a condition to exercising the rights and licenses +granted hereunder, each Recipient hereby assumes sole responsibility to +secure any other intellectual property rights needed, if any. For +example, if a third party patent license is required to allow Recipient +to distribute the Program, it is Recipient's responsibility to acquire +that license before distributing the Program.</P> + +<P class="list">d) Each Contributor represents that to its knowledge it +has sufficient copyright rights in its Contribution, if any, to grant +the copyright license set forth in this Agreement.</P> + +<P><B>3. REQUIREMENTS</B></P> + +<P>A Contributor may choose to distribute the Program in object code +form under its own license agreement, provided that:</P> + +<P class="list">a) it complies with the terms and conditions of this +Agreement; and</P> + +<P class="list">b) its license agreement:</P> + +<P class="list">i) effectively disclaims on behalf of all Contributors +all warranties and conditions, express and implied, including warranties +or conditions of title and non-infringement, and implied warranties or +conditions of merchantability and fitness for a particular purpose;</P> + +<P class="list">ii) effectively excludes on behalf of all Contributors +all liability for damages, including direct, indirect, special, +incidental and consequential damages, such as lost profits;</P> + +<P class="list">iii) states that any provisions which differ from this +Agreement are offered by that Contributor alone and not by any other +party; and</P> + +<P class="list">iv) states that source code for the Program is available +from such Contributor, and informs licensees how to obtain it in a +reasonable manner on or through a medium customarily used for software +exchange.</P> + +<P>When the Program is made available in source code form:</P> + +<P class="list">a) it must be made available under this Agreement; and</P> + +<P class="list">b) a copy of this Agreement must be included with each +copy of the Program.</P> + +<P>Contributors may not remove or alter any copyright notices contained +within the Program.</P> + +<P>Each Contributor must identify itself as the originator of its +Contribution, if any, in a manner that reasonably allows subsequent +Recipients to identify the originator of the Contribution.</P> + +<P><B>4. COMMERCIAL DISTRIBUTION</B></P> + +<P>Commercial distributors of software may accept certain +responsibilities with respect to end users, business partners and the +like. While this license is intended to facilitate the commercial use of +the Program, the Contributor who includes the Program in a commercial +product offering should do so in a manner which does not create +potential liability for other Contributors. Therefore, if a Contributor +includes the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and +indemnify every other Contributor ("Indemnified Contributor") +against any losses, damages and costs (collectively "Losses") +arising from claims, lawsuits and other legal actions brought by a third +party against the Indemnified Contributor to the extent caused by the +acts or omissions of such Commercial Contributor in connection with its +distribution of the Program in a commercial product offering. The +obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In +order to qualify, an Indemnified Contributor must: a) promptly notify +the Commercial Contributor in writing of such claim, and b) allow the +Commercial Contributor to control, and cooperate with the Commercial +Contributor in, the defense and any related settlement negotiations. The +Indemnified Contributor may participate in any such claim at its own +expense.</P> + +<P>For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those +performance claims and warranties, and if a court requires any other +Contributor to pay any damages as a result, the Commercial Contributor +must pay those damages.</P> + +<P><B>5. NO WARRANTY</B></P> + +<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS +PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS +OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, +ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY +OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely +responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its +exercise of rights under this Agreement , including but not limited to +the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and unavailability or +interruption of operations.</P> + +<P><B>6. DISCLAIMER OF LIABILITY</B></P> + +<P>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT +NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING +WITHOUT LIMITATION LOST PROFITS), 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 OR +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</P> + +<P><B>7. GENERAL</B></P> + +<P>If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further action +by the parties hereto, such provision shall be reformed to the minimum +extent necessary to make such provision valid and enforceable.</P> + +<P>If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other +software or hardware) infringes such Recipient's patent(s), then such +Recipient's rights granted under Section 2(b) shall terminate as of the +date such litigation is filed.</P> + +<P>All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of time +after becoming aware of such noncompliance. If all Recipient's rights +under this Agreement terminate, Recipient agrees to cease use and +distribution of the Program as soon as reasonably practicable. However, +Recipient's obligations under this Agreement and any licenses granted by +Recipient relating to the Program shall continue and survive.</P> + +<P>Everyone is permitted to copy and distribute copies of this +Agreement, but in order to avoid inconsistency the Agreement is +copyrighted and may only be modified in the following manner. The +Agreement Steward reserves the right to publish new versions (including +revisions) of this Agreement from time to time. No one other than the +Agreement Steward has the right to modify this Agreement. The Eclipse +Foundation is the initial Agreement Steward. The Eclipse Foundation may +assign the responsibility to serve as the Agreement Steward to a +suitable separate entity. Each new version of the Agreement will be +given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the +Agreement under which it was received. In addition, after a new version +of the Agreement is published, Contributor may elect to distribute the +Program (including its Contributions) under the new version. Except as +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no +rights or licenses to the intellectual property of any Contributor under +this Agreement, whether expressly, by implication, estoppel or +otherwise. All rights in the Program not expressly granted under this +Agreement are reserved.</P> + +<P>This Agreement is governed by the laws of the State of New York and +the intellectual property laws of the United States of America. 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.</P> + + + + +</BODY></HTML> \ No newline at end of file
diff --git a/build-web-container/resources/notice.html b/build-web-container/resources/notice.html new file mode 100644 index 0000000..0ee73f4 --- /dev/null +++ b/build-web-container/resources/notice.html
@@ -0,0 +1,104 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html --> +<HTML xmlns="http://www.w3.org/1999/xhtml"><HEAD><META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + +<TITLE>Eclipse Foundation Software User Agreement</TITLE> +</HEAD><BODY lang="EN-US"> +<H2>Eclipse Foundation Software User Agreement</H2> +<P>April 14, 2010</P> + +<H3>Usage Of Content</H3> + +<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS + (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND + CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE + OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR + NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND + CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</P> + +<H3>Applicable Licenses</H3> + +<P>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at <A href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. + For purposes of the EPL, "Program" will mean the Content.</P> + +<P>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code + repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</P> + +<UL> + <LI>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</LI> + <LI>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive) in a directory named "plugins".</LI> + <LI>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins + and/or Fragments associated with that Feature.</LI> + <LI>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</LI> +</UL> + +<P>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and +Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module +including, but not limited to the following locations:</P> + +<UL> + <LI>The top-level (root) directory</LI> + <LI>Plug-in and Fragment directories</LI> + <LI>Inside Plug-ins and Fragments packaged as JARs</LI> + <LI>Sub-directories of the directory named "src" of certain Plug-ins</LI> + <LI>Feature directories</LI> +</UL> + +<P>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the +installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or +inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. +Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in +that directory.</P> + +<P>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE +OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P> + +<UL> + <LI>Common Public License Version 1.0 (available at <A href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)</LI> + <LI>Apache Software License 1.1 (available at <A href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)</LI> + <LI>Apache Software License 2.0 (available at <A href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)</LI> + <LI>Metro Link Public License 1.00 (available at <A href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>)</LI> + <LI>Mozilla Public License Version 1.1 (available at <A href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>)</LI> +</UL> + +<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please +contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</P> + + +<H3>Use of Provisioning Technology</H3> + +<P>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse + Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or + other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to + install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <A href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</A> + ("Specification").</P> + +<P>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the + applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology + in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the + Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</P> + +<OL> + <LI>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology + on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based + product.</LI> + <LI>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be + accessed and copied to the Target Machine.</LI> + <LI>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable + Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target + Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern + the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such + indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</LI> +</OL> + +<H3>Cryptography</H3> + +<P>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to + another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + possession, or use, and re-export of encryption software, to see if this is permitted.</P> + +<P><SMALL>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</SMALL></P> + + +</BODY></HTML> \ No newline at end of file
diff --git a/build.properties b/build.properties index 527379b..9a141b7 100644 --- a/build.properties +++ b/build.properties
@@ -1,14 +1,18 @@ -version=1.0.0 +version=1.1.0 release.type=integration javadoc.exclude.package.names=**/internal/**,**/internal ivy.cache=ivy-cache ivy.cache.dir=${basedir}/../${ivy.cache} integration.repo.dir=${basedir}/../integration-repo source.version=1.5 -test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError findbugs.enforce=true clover.enforce=true clover.coverage=40% local.repository.dir=${basedir}/../../ivy-repository -#debug string to append to test.vm.args= -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y +project.name=Gemini Web +natural.name=gemini-web +project.key=GW + +test.vm.args= -Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError +#debug string to append to test.vm.args= -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
diff --git a/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF index fb73801..227a9fc 100644 --- a/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF +++ b/org.eclipse.gemini.web.core/src/main/resources/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ .url" Bundle-Version: 1.0 Tool: Bundlor 1.0.0.M6 -Bundle-Name: SpringSource OSGi Web Container +Bundle-Name: Gemini Web Core (incubation) Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.gemini.web.internal.WebContainerActivato r
diff --git a/org.eclipse.gemini.web.core/template.mf b/org.eclipse.gemini.web.core/template.mf index 24fb9ef..c0b43ef 100644 --- a/org.eclipse.gemini.web.core/template.mf +++ b/org.eclipse.gemini.web.core/template.mf
@@ -2,17 +2,17 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.gemini.web.core Bundle-Version: 1.0 -Bundle-Name: SpringSource OSGi Web Container +Bundle-Name: Gemini Web Core (incubation) Import-Template: org.osgi.framework;version="0", org.eclipse.virgo.util.*;version="2.0", javax.servlet.*;version="2.5", org.osgi.service.packageadmin.*;version="1.2", org.osgi.service.url.*;version="1.0", - org.osgi.util.tracker.*;version="1.4.2", + org.osgi.util.tracker.*;version="1.4.0", org.slf4j;version="1.5.0", org.osgi.service.event;resolution:="optional";version="1.1" Export-Template: org.osgi.services.webcontainer.*;version="1.0", - org.eclipse.gemini.web.*;version="1.0" + org.eclipse.gemini.web.*;version="1.1.0" Excluded-Imports: org.eclipse.virgo.util.io.JarTransformer Excluded-Exports: org.eclipse.gemini.web.internal Bundle-Activator: org.eclipse.gemini.web.internal.WebContainerActivator
diff --git a/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF index bb3a46b..36adc76 100644 --- a/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF +++ b/org.eclipse.gemini.web.extender/src/main/resources/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ .eclipse.gemini.web.core,org.osgi.framework,org.osgi.util.tracker" Bundle-Version: 1 Tool: Bundlor 1.0.0.M6 -Bundle-Name: SpringSource OSGi Web Container Extender +Bundle-Name: Gemini Web Extender (incubation) Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.gemini.web.extender.ExtenderActivator Bundle-SymbolicName: org.eclipse.gemini.web.extender
diff --git a/org.eclipse.gemini.web.extender/template.mf b/org.eclipse.gemini.web.extender/template.mf index 2da2d41..bfbe6a7 100644 --- a/org.eclipse.gemini.web.extender/template.mf +++ b/org.eclipse.gemini.web.extender/template.mf
@@ -2,10 +2,10 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.gemini.web.extender Bundle-Version: 1 -Bundle-Name: SpringSource OSGi Web Container Extender +Bundle-Name: Gemini Web Extender (incubation) Bundle-Activator: org.eclipse.gemini.web.extender.ExtenderActivator Import-Template: org.eclipse.gemini.web.*;version="1.0", org.osgi.framework.*;version="0", - org.osgi.util.tracker.*;version="1.4.2", + org.osgi.util.tracker.*;version="1.4.0", javax.servlet;version="2.5"
diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF index 72c89fd..884a564 100644 --- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF +++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Version: 1.0 Tool: Bundlor 1.0.0.M6 -Bundle-Name: Web Container Tests +Bundle-Name: Gemini Web Tests (incubation) Bundle-ManifestVersion: 2 Import-Package: javax.servlet;version="0",junit.framework;version="0", org.eclipse.gemini.web.core.spi;version="0",org.eclipse.virgo.test.fr
diff --git a/org.eclipse.gemini.web.test/template.mf b/org.eclipse.gemini.web.test/template.mf index 4570730..c7ae820 100644 --- a/org.eclipse.gemini.web.test/template.mf +++ b/org.eclipse.gemini.web.test/template.mf
@@ -1,6 +1,6 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.gemini.web.test -Bundle-Name: Web Container Tests +Bundle-Name: Gemini Web Tests (incubation) Bundle-Version: 1.0 Excluded-Exports: * Import-Template:
diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java index 1d8ead6..aa0856a 100644 --- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java +++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
@@ -48,7 +48,9 @@ try { EquinoxBundleFileResolver.class.getClassLoader().loadClass(BundleHost.class.getName()); return true; - } catch (Exception ex) { + } catch (Exception _) { + return false; + } catch (LinkageError _) { return false; } }
diff --git a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF index 4c796d2..f1bf440 100644 --- a/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF +++ b/org.eclipse.gemini.web.tomcat/src/main/resources/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ rg.osgi.framework" Bundle-Version: 1 Tool: Bundlor 1.0.0.M6 -Bundle-Name: SpringSource OSGi Web Container Tomcat Bootstrap +Bundle-Name: Gemini Web Tomcat Bootstrap (incubation) Bundle-ManifestVersion: 2 Bundle-Activator: org.eclipse.gemini.web.tomcat.internal.Activator Bundle-SymbolicName: org.eclipse.gemini.web.tomcat
diff --git a/org.eclipse.gemini.web.tomcat/template.mf b/org.eclipse.gemini.web.tomcat/template.mf index 7a482bb..1abab2a 100644 --- a/org.eclipse.gemini.web.tomcat/template.mf +++ b/org.eclipse.gemini.web.tomcat/template.mf
@@ -1,5 +1,5 @@ Bundle-ManifestVersion: 2 -Bundle-Name: SpringSource OSGi Web Container Tomcat Bootstrap +Bundle-Name: Gemini Web Tomcat Bootstrap (incubation) Bundle-SymbolicName: org.eclipse.gemini.web.tomcat Bundle-Version: 1 Import-Template: org.eclipse.gemini.web.*;version="1.0", @@ -10,7 +10,7 @@ org.apache.tomcat.*;version="6.0.20.S2-r5956", org.springframework.osgi.*;version="1.2.0", org.osgi.framework.*;version="0", - org.osgi.util.tracker.*;version="1.4.2", + org.osgi.util.tracker.*;version="1.4.0", org.osgi.service.packageadmin.*;version="1.0", org.osgi.service.url.*;version="1.0", org.eclipse.osgi.*;version="0";resolution:="optional",
diff --git a/virgo-build b/virgo-build index 5a215bb..3f4bded 160000 --- a/virgo-build +++ b/virgo-build
@@ -1 +1 @@ -Subproject commit 5a215bb9062764bba1f420d70d0531cb47e3b7c0 +Subproject commit 3f4bdeda733311d2945601e1a3f0117abab3b0cd