[prev in list] [next in list] [prev in thread] [next in thread]
List: forrest-dev
Subject: svn commit: r1070043 - in /forrest/trunk: main/ main/webapp/
From: bdube () apache ! org
Date: 2011-02-12 8:45:52
Message-ID: 20110212084552.BD92B2388A66 () eris ! apache ! org
[Download RAW message or body]
Author: bdube
Date: Sat Feb 12 08:45:51 2011
New Revision: 1070043
URL: http://svn.apache.org/viewvc?rev=1070043&view=rev
Log:
Upgrade Jetty to version 6.1.26
Added:
forrest/trunk/main/webapp/contexts/
forrest/trunk/main/webapp/contexts/root.xml
forrest/trunk/tools/jetty/jetty-6.1.26.jar
forrest/trunk/tools/jetty/jetty-6.1.26.jar.license.txt
forrest/trunk/tools/jetty/jetty-util-6.1.26.jar
forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar
forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar.license.txt
Removed:
forrest/trunk/tools/jetty/jetty-4.2.19.jar
forrest/trunk/tools/jetty/jetty-4.2.19.jar.license.html
forrest/trunk/tools/jetty/servlet-2.3.jar
forrest/trunk/tools/jetty/servlet-2.3.jar.license.txt
Modified:
forrest/trunk/main/forrest.build.xml
forrest/trunk/main/webapp/WEB-INF/web.xml
forrest/trunk/main/webapp/jettyconf.xml
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/forrest.build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=1070043&r1=1070042&r2=1070043&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Sat Feb 12 08:45:51 2011
@@ -409,7 +409,7 @@ The skin that most likely resembles thes
</echo>
</then>
</if>
- <java classname="org.mortbay.jetty.Server"
+ <java classname="org.mortbay.xml.XmlConfiguration"
dir="${forrest.core.webapp}"
fork="yes"
maxmemory="${forrest.maxmemory}"
@@ -420,7 +420,7 @@ The skin that most likely resembles thes
<jvmarg line="${forrest.jvmargs}"/>
<jvmarg
value="-Djava.endorsed.dirs=${java.endorsed.dirs}${path.separator}${forrest.endorsed.lib-dir}"/>
- <arg line="${content-dir}/jettyconf.xml" />
+ <arg value="${content-dir}/jettyconf.xml" />
<syspropertyset>
<propertyref prefix="forrest."/>
<propertyref prefix="project."/>
@@ -443,7 +443,29 @@ The skin that most likely resembles thes
</echo>
</then>
</if>
- <java classname="org.mortbay.jetty.Server"
+ <!-- There are issues using the jetty task:
+ - getting everything we need on the classpath
+ - JNDI and Jetty Plus seem to be required
+ - system properties must be passed individually
+ -->
+ <!--
+ <jetty tempDirectory="tmpjetty">
+ <connectors>
+ <selectChannelConnector port="8888" />
+ </connectors>
+ <systemProperties>
+ <systemProperty name="java.naming.factory.initial" \
value="org.mortbay.naming.InitialContextFactory" /> + <systemProperty \
name="java.naming.factory.url.pkgs" value="org.mortbay.naming" /> + \
<systemProperty name="forrest.core.webapp" value="${forrest.core.webapp}" /> + \
<systemProperty name="project.home" value="${project.home}" /> + \
<systemProperty name="project.content-dir" value="${project.content-dir}" /> + \
</systemProperties> + <webApp name="forrest" warfile="${forrest.core.webapp}" \
contextpath="/" scanIntervalSeconds="5"> + <lib dir="${forrest.core.lib-dir}" \
includes="*.jar" /> + </webApp>
+ </jetty>
+ -->
+ <java classname="org.mortbay.xml.XmlConfiguration"
dir="${forrest.core.webapp}"
fork="yes"
maxmemory="${forrest.maxmemory}"
Modified: forrest/trunk/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/WEB-INF/web.xml?rev=1070043&r1=1070042&r2=1070043&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/web.xml (original)
+++ forrest/trunk/main/webapp/WEB-INF/web.xml Sat Feb 12 08:45:51 2011
@@ -20,11 +20,13 @@
| This is the Cocoon web-app configurations file
+-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee \
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + metadata-complete="true"
+ version="2.5">
-<web-app>
<display-name>Apache Forrest</display-name>
<description>Webapp generated by Forrest</description>
<!--
Added: forrest/trunk/main/webapp/contexts/root.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/contexts/root.xml?rev=1070043&view=auto
==============================================================================
--- forrest/trunk/main/webapp/contexts/root.xml (added)
+++ forrest/trunk/main/webapp/contexts/root.xml Sat Feb 12 08:45:51 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" \
"http://jetty.mortbay.org/configure.dtd"> +
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- Required minimal context configuration : -->
+ <!-- + contextPath -->
+ <!-- + war OR resourceBase -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <Set name="contextPath">/</Set>
+ <Set name="war"><SystemProperty name="forrest.core.webapp" default="." /></Set>
+
+</Configure>
Modified: forrest/trunk/main/webapp/jettyconf.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/jettyconf.xml?rev=1070043&r1=1070042&r2=1070043&view=diff
==============================================================================
--- forrest/trunk/main/webapp/jettyconf.xml (original)
+++ forrest/trunk/main/webapp/jettyconf.xml Sat Feb 12 08:45:51 2011
@@ -1,90 +1,235 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure 1.2//EN" \
"http://jetty.mortbay.org/configure_1_2.dtd"> +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" \
"http://jetty.mortbay.org/configure.dtd"> +
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
+<!-- -->
+<!-- Documentation of this file format can be found at: -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
+<!-- -->
<!-- =============================================================== -->
-<Configure class="org.mortbay.jetty.Server">
-<!-- =============================================================== -->
-<!-- Configure the Request Listeners -->
-<!-- =============================================================== -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Add and configure a HTTP listener to port 8888 -->
-<!-- The default port can also be changed using: -->
-<!-- forrest run -Dforrest.jvmargs="-Djetty.port=80" -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addListener">
- <Arg>
- <New class="org.mortbay.http.SocketListener">
- <Set name="Port">
- <SystemProperty name="jetty.port" default="8888"/>
- </Set>
- <Set name="MinThreads">5</Set>
- <Set name="MaxThreads">100</Set>
- <Set name="MaxIdleTimeMs">30000</Set>
- <Set name="LowResourcePersistTimeMs">5000</Set>
- </New>
- </Arg>
- </Call>
-<!-- =============================================================== -->
-<!-- Configure the Contexts -->
-<!-- =============================================================== -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Add root context web applications. -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Add a all web application within the webapps directory. -->
-<!-- + No virtual host specified -->
-<!-- + Look in the webapps directory relative to jetty.home or . -->
-<!-- + Use the webdefault.xml resource for the defaults descriptor -->
-<!-- + Upack the war file -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addWebApplication">
- <Arg>/</Arg>
- <Arg>
-<!--<SystemProperty name="jetty.home" default="."/>-->.</Arg>
- </Call>
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Build a context manually. -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!--
- <Call name="addContext">
- <Arg>/forrest/*</Arg>
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.ProxyHandler"></New></Arg>
- </Call>
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.ContentEncodingHandler">
- <Call name="addPathSpec"><Arg>/images/*</Arg></Call>
- <Set name="minimumLength">512</Set>
- </New></Arg>
- </Call>
+<Configure id="Server" class="org.mortbay.jetty.Server">
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.HTAccessHandler">
- <Set name="AccessFile">.htaccess</Set>
- </New></Arg>
- </Call>
+ <!-- =========================================================== -->
+ <!-- Server Thread Pool -->
+ <!-- =========================================================== -->
+ <Set name="ThreadPool">
- <Call name="addServlet">
- <Arg>Invoker</Arg>
- <Arg>/*</Arg>
- <Arg>org.mortbay.jetty.servlet.Invoker</Arg>
- <Put name="InitParam">Value</Put>
- </Call>
+ <New class="org.mortbay.thread.QueuedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="maxThreads">200</Set>
+ <Set name="lowThreads">20</Set>
+ </New>
+
+ <!-- Optional Java 5 bounded threadpool with job queue
+ <New class="org.mortbay.thread.concurrent.ThreadPool">
+ <Set name="corePoolSize">50</Set>
+ <Set name="maximumPoolSize">50</Set>
+ </New>
+ -->
+ </Set>
- <Set name="ResourceBase"><SystemProperty name="jetty.home" \
default="."/>/demo/docroot/</Set> +
+
+ <!-- =========================================================== -->
+ <!-- Set connectors -->
+ <!-- =========================================================== -->
+ <!-- One of each type! -->
+ <!-- =========================================================== -->
+
+ <!-- Use this connector for many frequently idle connections
+ and for threadless continuations.
+ -->
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="host"><SystemProperty name="jetty.host" /></Set>
+ <Set name="port"><SystemProperty name="jetty.port" \
default="8888"/></Set> + <Set name="maxIdleTime">30000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="statsOn">false</Set>
+ <Set name="confidentialPort">8443</Set>
+ <Set name="lowResourcesConnections">5000</Set>
+ <Set name="lowResourcesMaxIdleTime">5000</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- Use this connector if NIO is not available.
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.bio.SocketConnector">
+ <Set name="port">8081</Set>
+ <Set name="maxIdleTime">50000</Set>
+ <Set name="lowResourceMaxIdleTime">1500</Set>
+ </New>
+ </Arg>
+ </Call>
+ -->
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- To add a HTTPS SSL listener -->
+ <!-- see jetty-ssl.xml to add an ssl connector. use -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- To allow Jetty to be started from xinetd -->
+ <!-- mixin jetty-xinetd.xml: -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml -->
+ <!-- -->
+ <!-- See jetty-xinetd.xml for further instructions. -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.ResourceHandler"/></Arg>
- </Call>
+ <!-- =========================================================== -->
+ <!-- Set up global session ID manager -->
+ <!-- =========================================================== -->
+ <!--
+ <Set name="sessionIdManager">
+ <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+ <Set name="workerName">node1</Set>
+ </New>
+ </Set>
+ -->
- <Call name="addHandler">
- <Arg><New class="org.mortbay.http.handler.DumpHandler"/></Arg>
- </Call>
+ <!-- =========================================================== -->
+ <!-- Set handler Collection Structure -->
+ <!-- =========================================================== -->
+ <Set name="handler">
+ <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <Set name="handlers">
+ <Array type="org.mortbay.jetty.Handler">
+ <Item>
+ <New id="Contexts" \
class="org.mortbay.jetty.handler.ContextHandlerCollection"/> + </Item>
+ <Item>
+ <New id="DefaultHandler" \
class="org.mortbay.jetty.handler.DefaultHandler"/> + </Item>
+ <Item>
+ <New id="RequestLog" \
class="org.mortbay.jetty.handler.RequestLogHandler"/> + </Item>
+ </Array>
+ </Set>
+ </New>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure the context deployer -->
+ <!-- A context deployer will deploy contexts described in -->
+ <!-- configuration files discovered in a directory. -->
+ <!-- The configuration directory can be scanned for hot -->
+ <!-- deployments at the configured scanInterval. -->
+ <!-- -->
+ <!-- This deployer is configured to deploy contexts configured -->
+ <!-- in the $JETTY_HOME/contexts directory -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.ContextDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="configurationDir"><SystemProperty name="forrest.core.webapp" \
default="." />/contexts</Set> + <Set name="scanInterval">5</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure the webapp deployer. -->
+ <!-- A webapp deployer will deploy standard webapps discovered -->
+ <!-- in a directory at startup, without the need for additional -->
+ <!-- configuration files. It does not support hot deploy or -->
+ <!-- non standard contexts (see ContextDeployer above). -->
+ <!-- -->
+ <!-- This deployer is configured to deploy webapps from the -->
+ <!-- $JETTY_HOME/webapps directory -->
+ <!-- -->
+ <!-- Normally only one type of deployer need be used. -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <!--
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="webAppDir"><SystemProperty name="forrest.core.webapp" \
default="." /></Set> + <Set name="parentLoaderPriority">false</Set>
+ <Set name="extract">true</Set>
+ <Set name="allowDuplicates">false</Set>
+ <Set name="defaultsDescriptor"><SystemProperty name="forrest.core.webapp" \
default="."/>/webdefault.xml</Set> + </New>
+ </Arg>
+ </Call>
+ -->
+
+ <!-- =========================================================== -->
+ <!-- Configure Authentication Realms -->
+ <!-- Realms may be configured for the entire server here, or -->
+ <!-- they can be configured for a specific web app in a context -->
+ <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
+ <!-- example). -->
+ <!-- =========================================================== -->
+ <!--
+ <Set name="UserRealms">
+ <Array type="org.mortbay.jetty.security.UserRealm">
+ <Item>
+ <New class="org.mortbay.jetty.security.HashUserRealm">
+ <Set name="name">Test Realm</Set>
+ <Set name="config"><SystemProperty name="jetty.home" \
default="."/>/etc/realm.properties</Set> + <Set \
name="refreshInterval">0</Set> + </New>
+ </Item>
+ </Array>
+ </Set>
+ -->
+
+ <!-- =========================================================== -->
+ <!-- Configure Request Log -->
+ <!-- Request logs may be configured for the entire server here, -->
+ <!-- or they can be configured for a specific web app in a -->
+ <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+ <!-- for an example). -->
+ <!-- =========================================================== -->
+ <!--
+ <Ref id="RequestLog">
+ <Set name="requestLog">
+ <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+ <Set name="filename"><SystemProperty name="jetty.logs" \
default="./logs"/>/yyyy_mm_dd.request.log</Set> + <Set \
name="filenameDateFormat">yyyy_MM_dd</Set> + <Set name="retainDays">90</Set>
+ <Set name="append">true</Set>
+ <Set name="extended">false</Set>
+ <Set name="logCookies">false</Set>
+ <Set name="LogTimeZone">GMT</Set>
+ </New>
+ </Set>
+ </Ref>
+ -->
+
+ <!-- =========================================================== -->
+ <!-- extra options -->
+ <!-- =========================================================== -->
+ <Set name="stopAtShutdown">true</Set>
+ <Set name="sendServerVersion">true</Set>
+ <Set name="sendDateHeader">true</Set>
+ <Set name="gracefulShutdown">1000</Set>
- <Set name="ClassPath"><SystemProperty name="jetty.home" \
default="."/>/demo/servlets/</Set>
- </Call>
- -->
</Configure>
Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=1070043&r1=1070042&r2=1070043&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Sat Feb 12 08:45:51 2011
@@ -154,6 +154,9 @@
<link href="site:upgrading_010">upgrading to v0.10-dev</link>
</action>
<!-- 2011-02 -->
+ <action context="code" type="update" dev="BMD" fixes-bug="FOR-1222">
+ Upgraded packaged Jetty to version 6.1.26 from version 4.2.19.
+ </action>
</release>
<release version="0.9" date="2011-02-07">
<action dev="DC" type="add" context="docs" importance="high">
Added: forrest/trunk/tools/jetty/jetty-6.1.26.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/jetty/jetty-6.1.26.jar?rev=1070043&view=auto
==============================================================================
Files forrest/trunk/tools/jetty/jetty-6.1.26.jar (added) and \
forrest/trunk/tools/jetty/jetty-6.1.26.jar Sat Feb 12 08:45:51 2011 differ
Added: forrest/trunk/tools/jetty/jetty-6.1.26.jar.license.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/jetty/jetty-6.1.26.jar.license.txt?rev=1070043&view=auto
==============================================================================
--- forrest/trunk/tools/jetty/jetty-6.1.26.jar.license.txt (added)
+++ forrest/trunk/tools/jetty/jetty-6.1.26.jar.license.txt Sat Feb 12 08:45:51 2011
@@ -0,0 +1,201 @@
+ 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.
\ No newline at end of file
Added: forrest/trunk/tools/jetty/jetty-util-6.1.26.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/jetty/jetty-util-6.1.26.jar?rev=1070043&view=auto
==============================================================================
Files forrest/trunk/tools/jetty/jetty-util-6.1.26.jar (added) and \
forrest/trunk/tools/jetty/jetty-util-6.1.26.jar Sat Feb 12 08:45:51 2011 differ
Added: forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar?rev=1070043&view=auto
==============================================================================
Files forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar (added) and \
forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar Sat Feb 12 08:45:51 2011 differ
Added: forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar.license.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar.license.txt?rev=1070043&view=auto
==============================================================================
--- forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar.license.txt (added)
+++ forrest/trunk/tools/jetty/servlet-api-2.5-6.1.5.jar.license.txt Sat Feb 12 \
08:45:51 2011 @@ -0,0 +1,119 @@
+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 recipients 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 writt en 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 PARTYS 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 jurisdictions 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. +
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE \
(CDDL) +The GlassFish code released under the CDDL shall be governed by the laws of \
the State of California (excluding conflict-of-law provisions). Any litigation \
relating to this License shall be subject to the jurisdiction of the Federal Courts \
of the Northern District of California and the state courts of the State of \
California, with venue lying in Santa Clara County, California. +
+
+
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic