You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/10/17 12:05:39 UTC
svn commit: r1399173 [2/2] - in /continuum/trunk: ./
continuum-buildagent/continuum-buildagent-jetty/
continuum-buildagent/continuum-buildagent-jetty/src/main/assembly/
continuum-buildagent/continuum-buildagent-jetty/src/main/conf/
continuum-buildagent...
Modified: continuum/trunk/continuum-jetty/src/main/conf/jetty.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/conf/jetty.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/conf/jetty.xml (original)
+++ continuum/trunk/continuum-jetty/src/main/conf/jetty.xml Wed Oct 17 10:05:38 2012
@@ -1,200 +1,70 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-<!--
- ~ 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 "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
<!-- -->
<!-- Documentation of this file format can be found at: -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax -->
<!-- -->
+<!-- Additional configuration files are available in $JETTY_HOME/etc -->
+<!-- and can be mixed in. For example: -->
+<!-- java -jar start.jar etc/jetty-ssl.xml -->
+<!-- -->
+<!-- See start.ini file for the default configuraton files -->
<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<!-- =========================================================== -->
<Set name="ThreadPool">
- <!-- Default bounded blocking threadpool
- -->
- <New class="org.mortbay.thread.BoundedThreadPool">
+ <!-- Default queued blocking threadpool -->
+ <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<Set name="minThreads">10</Set>
- <Set name="maxThreads">250</Set>
- <Set name="lowThreads">25</Set>
- </New>
-
- <!-- Optional Java 5 bounded threadpool with job queue
- <New class="org.mortbay.thread.concurrent.ThreadPool">
- <Set name="corePoolSize">250</Set>
- <Set name="maximumPoolSize">250</Set>
+ <Set name="maxThreads">200</Set>
+ <Set name="detailedDump">false</Set>
</New>
- -->
</Set>
-
-
<!-- =========================================================== -->
<!-- Set connectors -->
<!-- =========================================================== -->
- <!-- One of each type! -->
- <!-- =========================================================== -->
- <!-- Use this connector for many frequently idle connections
- and for threadless continuations.
- -->
- <!-- START SNIPPET: jetty_port -->
<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="8080"/></Set>
- <Set name="maxIdleTime">30000</Set>
+ <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <Set name="host"><Property name="jetty.host" /></Set>
+ <Set name="port"><Property name="jetty.port" default="8080"/></Set>
+ <Set name="maxIdleTime">300000</Set>
<Set name="Acceptors">2</Set>
<Set name="statsOn">false</Set>
<Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">5000</Set>
+ <Set name="lowResourcesConnections">20000</Set>
<Set name="lowResourcesMaxIdleTime">5000</Set>
</New>
</Arg>
</Call>
- <!-- END SNIPPET: jetty_port -->
-
- <!-- 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 -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- =========================================================== -->
- <!-- Set up global session ID manager -->
- <!-- =========================================================== -->
- <!--
- <Set name="sessionIdManager">
- <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
- <Set name="workerName">node1</Set>
- </New>
- </Set>
- -->
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
<Set name="handler">
- <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
<Set name="handlers">
- <Array type="org.mortbay.jetty.Handler">
+ <Array type="org.eclipse.jetty.server.Handler">
<Item>
- <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
</Item>
<Item>
- <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
- </Item>
- <Item>
- <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
</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="jetty.home" default="."/>/contexts</Set>
- <Set name="scanInterval">1</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="jetty.home" default="."/>/apps</Set>
- <Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
- <Set name="allowDuplicates">false</Set>
- <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/conf/webdefault.xml</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- 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">true</Set>
- <Set name="logCookies">false</Set>
- <Set name="LogTimeZone">GMT</Set>
- </New>
- </Set>
- </Ref>
<!-- =========================================================== -->
<!-- extra options -->
@@ -203,142 +73,7 @@
<Set name="sendServerVersion">true</Set>
<Set name="sendDateHeader">true</Set>
<Set name="gracefulShutdown">1000</Set>
+ <Set name="dumpAfterStart">false</Set>
+ <Set name="dumpBeforeStop">false</Set>
-
-
- <!-- =========================================================== -->
- <!-- JNDI java:comp/env -->
- <!-- To use JNDI with Jetty, you will need to tell your -->
- <!-- WebAppContext to process the naming related items in -->
- <!-- web.xml. For an example of how to do that, see the test -->
- <!-- webapp below. More information can be found at -->
- <!-- http://docs.codehaus.org/display/JETTY/Jetty+Wiki -->
- <!-- =========================================================== -->
-
-
- <!-- Configuring <resource-ref> and <resource-env-ref>s -->
- <!-- -->
- <!-- The following are examples of setting up a resource that -->
- <!-- can be referenced in a web.xml file as a <resource-ref> or -->
- <!-- a <resource-env-ref>. The first argument is the name of the -->
- <!-- resource relative to java:comp/env and must be the SAME as -->
- <!-- the <res-ref-name> or <resource-env-ref-name> in web.xml. -->
- <!-- The second argument is the construction of the resource -->
- <!-- object. Any object at all can be configured. -->
-
-
- <!-- These examples set up a javax.sql.DataSource around an -->
- <!-- XADataSource that is provided by the Derby relational db. -->
- <!-- The DataSource wrapper that is registered in JNDI is -->
- <!-- provided by Atomikos, and works with the Atomikos -->
- <!-- transaction manager configured further below. To use these -->
- <!-- examples, download Atomikos http://www.atomikos.com and -->
- <!-- Derby http://db.apache.org/derby -->
-
-
- <!-- Configuring Transactions -->
- <!-- -->
- <!-- The following is a example of a setting up a JTA -->
- <!-- transaction manager that can be referenced by looking up -->
- <!-- java:comp/UserTransaction. Note that this is just an -->
- <!-- example and if you uncomment it, you will need to download -->
- <!-- the atomikos jar (see http://www.atomikos.com/download.html)-->
- <!-- You can configure any transaction manager that implements -->
- <!-- javax.transaction.UserTransaction. -->
-
-
-
- <!-- =========================================================== -->
- <!-- Configurations for WebAppContexts -->
- <!-- Sequence of configurations to be applied to a webapp. -->
- <!-- =========================================================== -->
- <Array id="plusConfig" type="java.lang.String">
- <Item>org.mortbay.jetty.webapp.WebInfConfiguration</Item>
- <Item>org.mortbay.jetty.plus.webapp.EnvConfiguration</Item>
- <Item>org.mortbay.jetty.plus.webapp.Configuration</Item>
- <Item>org.mortbay.jetty.webapp.JettyWebXmlConfiguration</Item>
- <Item>org.mortbay.jetty.webapp.TagLibConfiguration</Item>
- </Array>
-
- <!-- =========================================================== -->
- <!-- Deploy all webapps in webapps-plus -->
- <!-- =========================================================== -->
- <Call class="org.mortbay.jetty.webapp.WebAppContext" name="addWebApplications">
- <Arg><Ref id="Contexts"/></Arg>
- <Arg>./apps</Arg>
- <Arg>org/mortbay/jetty/webapp/webdefault.xml</Arg>
- <Arg><Ref id="plusConfig"/></Arg>
- <Arg type="boolean">True</Arg>
- <Arg type="boolean">False</Arg>
- </Call>
-
-
- <!-- continuum configuration -->
- <!-- START SNIPPET: mail -->
- <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>mail/Session</Arg>
- <Arg>
- <New class="org.mortbay.naming.factories.MailSessionReference">
- <Set name="user"></Set>
- <Set name="password"></Set>
- <Set name="properties">
- <New class="java.util.Properties">
- <Put name="mail.smtp.host">localhost</Put>
- </New>
- </Set>
- </New>
- </Arg>
- </New>
- <!-- END SNIPPET: mail -->
-
- <!-- START SNIPPET: datasources -->
- <!-- continuum database -->
-
- <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuum</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/continuum</Set>
- <Set name="user">sa</Set>
- <Set name="createDatabase">create</Set>
- </New>
- </Arg>
- </New>
-
- <New id="continuumShutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuumShutdown</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/continuum</Set>
- <Set name="user">sa</Set>
- <Set name="shutdownDatabase">shutdown</Set>
- </New>
- </Arg>
- </New>
-
- <!-- Users / Security Database -->
-
- <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
- <Set name="user">sa</Set>
- <Set name="createDatabase">create</Set>
- </New>
- </Arg>
- </New>
-
- <New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/usersShutdown</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName"><SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
- <Set name="user">sa</Set>
- <Set name="shutdownDatabase">shutdown</Set>
- </New>
- </Arg>
- </New>
-
- <!-- END SNIPPET: datasources -->
</Configure>
Modified: continuum/trunk/continuum-jetty/src/main/conf/webdefault.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/conf/webdefault.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/conf/webdefault.xml (original)
+++ continuum/trunk/continuum-jetty/src/main/conf/webdefault.xml Wed Oct 17 10:05:38 2012
@@ -1,132 +1,126 @@
-<?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.
--->
-
-<!-- ===================================================================== -->
-<!-- This file contains the default descriptor for web applications. -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The intent of this descriptor is to include jetty specific or common -->
-<!-- configuration for all webapps. If a context has a webdefault.xml -->
-<!-- descriptor, it is applied before the contexts own web.xml file -->
-<!-- -->
-<!-- A context may be assigned a default descriptor by: -->
-<!-- + Calling WebApplicationContext.setDefaultsDescriptor -->
-<!-- + Passed an arg to addWebApplications -->
-<!-- -->
-<!-- This file is used both as the resource within the jetty.jar (which is -->
-<!-- used as the default if no explicit defaults descriptor is set) and it -->
-<!-- is copied to the etc directory of the Jetty distro and explicitly -->
-<!-- by the jetty.xml file. -->
-<!-- -->
-<!-- ===================================================================== -->
-<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">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+ <!-- ===================================================================== -->
+ <!-- This file contains the default descriptor for web applications. -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- The intent of this descriptor is to include jetty specific or common -->
+ <!-- configuration for all webapps. If a context has a webdefault.xml -->
+ <!-- descriptor, it is applied before the contexts own web.xml file -->
+ <!-- -->
+ <!-- A context may be assigned a default descriptor by: -->
+ <!-- + Calling WebApplicationContext.setDefaultsDescriptor -->
+ <!-- + Passed an arg to addWebApplications -->
+ <!-- -->
+ <!-- This file is used both as the resource within the jetty.jar (which is -->
+ <!-- used as the default if no explicit defaults descriptor is set) and it -->
+ <!-- is copied to the etc directory of the Jetty distro and explicitly -->
+ <!-- by the jetty.xml file. -->
+ <!-- -->
+ <!-- ===================================================================== -->
+<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"
+>
<description>
Default web.xml file.
This file is applied to a Web application before it's own WEB_INF/web.xml file
</description>
+ <!-- ==================================================================== -->
+ <!-- Removes static references to beans from javax.el.BeanELResolver to -->
+ <!-- ensure webapp classloader can be released on undeploy -->
+ <!-- ==================================================================== -->
+ <listener>
+ <listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class>
+ </listener>
+
+ <!-- ==================================================================== -->
+ <!-- Removes static cache of Methods from java.beans.Introspector to -->
+ <!-- ensure webapp classloader can be released on undeploy -->
+ <!-- ==================================================================== -->
+ <listener>
+ <listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class>
+ </listener>
+
<!-- ==================================================================== -->
<!-- Context params to control Session Cookies -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- UNCOMMENT TO ACTIVATE
- <context-param>
- <param-name>org.mortbay.jetty.servlet.SessionDomain</param-name>
- <param-value>127.0.0.1</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
- <param-value>/</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.mortbay.jetty.servlet.MaxAge</param-name>
- <param-value>-1</param-value>
- </context-param>
+ <!--
+ UNCOMMENT TO ACTIVATE <context-param> <param-name>org.eclipse.jetty.servlet.SessionDomain</param-name> <param-value>127.0.0.1</param-value> </context-param> <context-param>
+ <param-name>org.eclipse.jetty.servlet.SessionPath</param-name> <param-value>/</param-value> </context-param> <context-param> <param-name>org.eclipse.jetty.servlet.MaxAge</param-name>
+ <param-value>-1</param-value> </context-param>
-->
- <context-param>
- <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
- <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
- </context-param>
-
-
-
<!-- ==================================================================== -->
<!-- The default servlet. -->
<!-- This servlet, normally mapped to /, provides the handling for static -->
<!-- content, OPTIONS and TRACE methods for the context. -->
<!-- The following initParameters are supported: -->
- <!-- -->
- <!-- acceptRanges If true, range requests and responses are -->
- <!-- supported -->
- <!-- -->
- <!-- dirAllowed If true, directory listings are returned if no -->
- <!-- welcome file is found. Else 403 Forbidden. -->
- <!-- -->
- <!-- redirectWelcome If true, redirect welcome file requests -->
- <!-- else use request dispatcher forwards -->
- <!-- -->
- <!-- gzip If set to true, then static content will be served-->
- <!-- as gzip content encoded if a matching resource is -->
- <!-- found ending with ".gz" -->
- <!-- -->
- <!-- resoureBase Can be set to replace the context resource base -->
- <!-- -->
- <!-- relativeResourceBase -->
- <!-- Set with a pathname relative to the base of the -->
- <!-- servlet context root. Useful for only serving -->
- <!-- static content from only specific subdirectories. -->
- <!-- -->
- <!-- useFileMappedBuffer -->
- <!-- If set to true (the default), a memory mapped -->
- <!-- file buffer will be used to serve static content -->
- <!-- when using an NIO connector. Setting this value -->
- <!-- to false means that a direct buffer will be used -->
- <!-- instead. If you are having trouble with Windows -->
- <!-- file locking, set this to false. -->
- <!-- -->
- <!-- cacheControl If set, all static content will have this value -->
- <!-- set as the cache-control header. -->
- <!-- -->
- <!-- maxCacheSize Maximum size of the static resource cache -->
- <!-- -->
- <!-- maxCachedFileSize Maximum size of any single file in the cache -->
- <!-- -->
- <!-- maxCachedFiles Maximum number of files in the cache -->
- <!-- -->
- <!-- cacheType "nio", "bio" or "both" to determine the type(s) -->
- <!-- of resource cache. A bio cached buffer may be used-->
- <!-- by nio but is not as efficient as a nio buffer. -->
- <!-- An nio cached buffer may not be used by bio. -->
- <!-- -->
+ <!--
+ * acceptRanges If true, range requests and responses are
+ * supported
+ *
+ * dirAllowed If true, directory listings are returned if no
+ * welcome file is found. Else 403 Forbidden.
+ *
+ * welcomeServlets If true, attempt to dispatch to welcome files
+ * that are servlets, but only after no matching static
+ * resources could be found. If false, then a welcome
+ * file must exist on disk. If "exact", then exact
+ * servlet matches are supported without an existing file.
+ * Default is true.
+ *
+ * This must be false if you want directory listings,
+ * but have index.jsp in your welcome file list.
+ *
+ * redirectWelcome If true, welcome files are redirected rather than
+ * forwarded to.
+ *
+ * gzip If set to true, then static content will be served as
+ * gzip content encoded if a matching resource is
+ * found ending with ".gz"
+ *
+ * resourceBase Set to replace the context resource base
+ *
+ * resourceCache If set, this is a context attribute name, which the servlet
+ * will use to look for a shared ResourceCache instance.
+ *
+ * relativeResourceBase
+ * Set with a pathname relative to the base of the
+ * servlet context root. Useful for only serving static content out
+ * of only specific subdirectories.
+ *
+ * aliases If True, aliases of resources are allowed (eg. symbolic
+ * links and caps variations). May bypass security constraints.
+ *
+ * maxCacheSize The maximum total size of the cache or 0 for no cache.
+ * maxCachedFileSize The maximum size of a file to cache
+ * maxCachedFiles The maximum number of files to cache
+ *
+ * useFileMappedBuffer
+ * If set to true, it will use mapped file buffer to serve static content
+ * when using NIO connector. Setting this value to false means that
+ * a direct buffer will be used instead of a mapped file buffer.
+ * By default, this is set to true.
+ *
+ * cacheControl If set, all static content will have this value set as the cache-control
+ * header.
+ -->
+
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<servlet>
<servlet-name>default</servlet-name>
- <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
+ <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
+ <init-param>
+ <param-name>aliases</param-name>
+ <param-value>false</param-value>
+ </init-param>
<init-param>
<param-name>acceptRanges</param-name>
<param-value>true</param-value>
@@ -136,6 +130,10 @@ under the License.
<param-value>true</param-value>
</init-param>
<init-param>
+ <param-name>welcomeServlets</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
<param-name>redirectWelcome</param-name>
<param-value>false</param-value>
</init-param>
@@ -145,15 +143,11 @@ under the License.
</init-param>
<init-param>
<param-name>maxCachedFileSize</param-name>
- <param-value>10000000</param-value>
+ <param-value>200000000</param-value>
</init-param>
<init-param>
<param-name>maxCachedFiles</param-name>
- <param-value>1000</param-value>
- </init-param>
- <init-param>
- <param-name>cacheType</param-name>
- <param-value>both</param-value>
+ <param-value>2048</param-value>
</init-param>
<init-param>
<param-name>gzip</param-name>
@@ -162,7 +156,13 @@ under the License.
<init-param>
<param-name>useFileMappedBuffer</param-name>
<param-value>true</param-value>
- </init-param>
+ </init-param>
+ <!--
+ <init-param>
+ <param-name>resourceCache</param-name>
+ <param-value>resourceCache</param-value>
+ </init-param>
+ -->
<!--
<init-param>
<param-name>cacheControl</param-name>
@@ -170,10 +170,13 @@ under the License.
</init-param>
-->
<load-on-startup>0</load-on-startup>
- </servlet>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
- <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping>
-
<!-- ==================================================================== -->
<!-- JSP Servlet -->
@@ -260,20 +263,22 @@ under the License.
<!-- If you get an error reporting that jikes can't use UTF-8 encoding, -->
<!-- try setting the init parameter "javaEncoding" to "ISO-8859-1". -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <servlet id="jsp">
+ <servlet
+ id="jsp"
+ >
<servlet-name>jsp</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
<init-param>
- <param-name>logVerbosityLevel</param-name>
- <param-value>DEBUG</param-value>
+ <param-name>logVerbosityLevel</param-name>
+ <param-value>DEBUG</param-value>
</init-param>
<init-param>
- <param-name>fork</param-name>
- <param-value>false</param-value>
+ <param-name>fork</param-name>
+ <param-value>false</param-value>
</init-param>
<init-param>
- <param-name>xpoweredBy</param-name>
- <param-value>false</param-value>
+ <param-name>xpoweredBy</param-name>
+ <param-value>false</param-value>
</init-param>
<!--
<init-param>
@@ -284,18 +289,18 @@ under the License.
<load-on-startup>0</load-on-startup>
</servlet>
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jsp</url-pattern>
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>*.jsp</url-pattern>
<url-pattern>*.jspf</url-pattern>
<url-pattern>*.jspx</url-pattern>
<url-pattern>*.xsp</url-pattern>
- <url-pattern>*.JSP</url-pattern>
+ <url-pattern>*.JSP</url-pattern>
<url-pattern>*.JSPF</url-pattern>
<url-pattern>*.JSPX</url-pattern>
<url-pattern>*.XSP</url-pattern>
</servlet-mapping>
-
+
<!-- ==================================================================== -->
<!-- Dynamic Servlet Invoker. -->
<!-- This servlet invokes anonymous servlets that have not been defined -->
@@ -315,26 +320,11 @@ under the License.
<!-- * All other parameters are copied to the -->
<!-- each dynamic servlet as init parameters -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Uncomment for dynamic invocation
- <servlet>
- <servlet-name>invoker</servlet-name>
- <servlet-class>org.mortbay.jetty.servlet.Invoker</servlet-class>
- <init-param>
- <param-name>verbose</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>nonContextServlets</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>dynamicParam</param-name>
- <param-value>anyValue</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping> <servlet-name>invoker</servlet-name> <url-pattern>/servlet/*</url-pattern> </servlet-mapping>
+ <!--
+ Uncomment for dynamic invocation <servlet> <servlet-name>invoker</servlet-name> <servlet-class>org.eclipse.jetty.servlet.Invoker</servlet-class> <init-param> <param-name>verbose</param-name>
+ <param-value>false</param-value> </init-param> <init-param> <param-name>nonContextServlets</param-name> <param-value>false</param-value> </init-param> <init-param>
+ <param-name>dynamicParam</param-name> <param-value>anyValue</param-value> </init-param> <load-on-startup>0</load-on-startup> </servlet> <servlet-mapping> <servlet-name>invoker</servlet-name>
+ <url-pattern>/servlet/*</url-pattern> </servlet-mapping>
-->
@@ -347,7 +337,7 @@ under the License.
<!-- ==================================================================== -->
<!-- Default MIME mappings -->
<!-- The default MIME mappings are provided by the mime.properties -->
- <!-- resource in the org.mortbay.jetty.jar file. Additional or modified -->
+ <!-- resource in the org.eclipse.jetty.server.jar file. Additional or modified -->
<!-- mappings may be specified here -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- UNCOMMENT TO ACTIVATE
@@ -366,47 +356,164 @@ under the License.
<!-- ==================================================================== -->
<locale-encoding-mapping-list>
- <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
- <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ar</locale>
+ <encoding>ISO-8859-6</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>be</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>bg</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ca</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>cs</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>da</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>de</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>el</locale>
+ <encoding>ISO-8859-7</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>en</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>es</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>et</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>fi</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>fr</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>hr</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>hu</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>is</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>it</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>iw</locale>
+ <encoding>ISO-8859-8</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ja</locale>
+ <encoding>Shift_JIS</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ko</locale>
+ <encoding>EUC-KR</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>lt</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>lv</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>mk</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>nl</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>no</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>pl</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>pt</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ro</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>ru</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sh</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sk</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sl</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sq</locale>
+ <encoding>ISO-8859-2</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sr</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>sv</locale>
+ <encoding>ISO-8859-1</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>tr</locale>
+ <encoding>ISO-8859-9</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>uk</locale>
+ <encoding>ISO-8859-5</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>zh</locale>
+ <encoding>GB2312</encoding>
+ </locale-encoding-mapping>
+ <locale-encoding-mapping>
+ <locale>zh_TW</locale>
+ <encoding>Big5</encoding>
+ </locale-encoding-mapping>
</locale-encoding-mapping-list>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Disable TRACE</web-resource-name>
@@ -415,6 +522,6 @@ under the License.
</web-resource-collection>
<auth-constraint/>
</security-constraint>
-
+
</web-app>
Added: continuum/trunk/continuum-jetty/src/main/contexts/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/contexts/continuum.xml?rev=1399173&view=auto
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/contexts/continuum.xml (added)
+++ continuum/trunk/continuum-jetty/src/main/contexts/continuum.xml Wed Oct 17 10:05:38 2012
@@ -0,0 +1,65 @@
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
+
+ <Set name="contextPath">/continuum</Set>
+ <Set name="war"><Property name="jetty.home" default="."/>/apps/continuum</Set>
+
+ <Set name="extractWAR">false</Set>
+ <Set name="copyWebDir">false</Set>
+
+ <!-- START SNIPPET: mail -->
+ <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg><Ref id="wac"/></Arg>
+ <Arg>mail/Session</Arg>
+ <Arg>
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+ <Set name="user"></Set>
+ <Set name="password"></Set>
+ <Set name="properties">
+ <New class="java.util.Properties">
+ <Put name="mail.smtp.host">localhost</Put>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </New>
+ <!-- END SNIPPET: mail -->
+
+ <!-- START SNIPPET: datasources -->
+ <!-- continuum database -->
+
+ <New id="continuum" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg><Ref id="wac"/></Arg>
+ <Arg>jdbc/continuum</Arg>
+ <Arg>
+ <New class="org.apache.commons.dbcp.BasicDataSource">
+ <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
+ <Set name="url">jdbc:derby:<Property name="appserver.base" default="."/>/data/databases/continuum;create=true</Set>
+ <Set name="username">SA</Set>
+ <Set name="password"></Set>
+ <Set name="testOnBorrow">true</Set>
+ <Set name="validationQuery">SELECT count(*) FROM SYS.SYSTABLES</Set>
+ </New>
+ </Arg>
+ </New>
+
+ <!-- Users / Security Database -->
+
+ <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg><Ref id="wac"/></Arg>
+ <Arg>jdbc/users</Arg>
+ <Arg>
+ <New class="org.apache.commons.dbcp.BasicDataSource">
+ <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
+ <Set name="url">jdbc:derby:<Property name="appserver.base" default="."/>/data/databases/users;create=true</Set>
+ <Set name="username">SA</Set>
+ <Set name="password"></Set>
+ <Set name="testOnBorrow">true</Set>
+ <Set name="validationQuery">SELECT count(*) FROM SYS.SYSTABLES</Set>
+ </New>
+ </Arg>
+ </New>
+
+ <!-- END SNIPPET: datasources -->
+</Configure>
Added: continuum/trunk/continuum-jetty/src/main/tmp/.gitignore
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/tmp/.gitignore?rev=1399173&view=auto
==============================================================================
(empty)
Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Wed Oct 17 10:05:38 2012
@@ -206,18 +206,15 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<configuration>
<webAppConfig>
<contextPath>/</contextPath>
- <baseResource implementation="org.mortbay.resource.ResourceCollection">
- <resourcesAsCSV>src/main/webapp,target/continuum,target/redback</resourcesAsCSV>
- </baseResource>
+ <jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>
</webAppConfig>
<scanIntervalSeconds>10</scanIntervalSeconds>
- <jettyEnvXml>${basedir}/src/jetty-env.xml</jettyEnvXml>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9090</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -236,6 +233,8 @@
<value>${project.build.directory}/appserver-base/logs</value>
</systemProperty>
</systemProperties>
+ <stopKey>stopkey</stopKey>
+ <stopPort>9099</stopPort>
</configuration>
<dependencies>
<dependency>
Modified: continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-mysql.xml Wed Oct 17 10:05:38 2012
@@ -1,59 +1,32 @@
<?xml version="1.0"?>
-<!--
- ~ 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">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
-
- <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>
+ <Ref id="wac"/>
+ </Arg>
<Arg>mail/Session</Arg>
<Arg>
- <New class="org.mortbay.naming.factories.MailSessionReference">
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="user"></Set>
<Set name="password"></Set>
<Set name="properties">
<New class="java.util.Properties">
<Put name="mail.smtp.host">localhost</Put>
- <Put name="mail.from">continuum@localhost</Put>
- <Put name="mail.senderName">Continuum</Put>
- <Put name="mail.debug">true</Put>
</New>
</Set>
</New>
</Arg>
</New>
- <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuum</Arg>
+ <New id="continuum" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
- <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
- <Set name="serverName">localhost</Set>
- <Set name="databaseName">continuum</Set>
- <Set name="user">root</Set>
- <Set name="password"></Set>
- </New>
+ <Ref id="wac"/>
</Arg>
- </New>
- <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuum_shutdown</Arg>
+ <Arg>jdbc/continuum</Arg>
<Arg>
<New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
<Set name="serverName">localhost</Set>
@@ -63,19 +36,14 @@
</New>
</Arg>
</New>
- <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users</Arg>
+
+ <!-- Users / Security Database -->
+
+ <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
- <New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
- <Set name="serverName">localhost</Set>
- <Set name="databaseName">users</Set>
- <Set name="user">root</Set>
- <Set name="password"></Set>
- </New>
+ <Ref id="wac"/>
</Arg>
- </New>
- <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users_shutdown</Arg>
+ <Arg>jdbc/users</Arg>
<Arg>
<New class="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource">
<Set name="serverName">localhost</Set>
@@ -85,6 +53,5 @@
</New>
</Arg>
</New>
-
</Configure>
Modified: continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env-postgres.xml Wed Oct 17 10:05:38 2012
@@ -1,40 +1,21 @@
<?xml version="1.0"?>
-<!--
- ~ 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">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
-
- <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>
+ <Ref id="wac"/>
+ </Arg>
<Arg>mail/Session</Arg>
<Arg>
- <New class="org.mortbay.naming.factories.MailSessionReference">
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="user"></Set>
<Set name="password"></Set>
<Set name="properties">
<New class="java.util.Properties">
<Put name="mail.smtp.host">localhost</Put>
- <Put name="mail.from">continuum@localhost</Put>
- <Put name="mail.senderName">Continuum</Put>
- <Put name="mail.debug">true</Put>
</New>
</Set>
</New>
@@ -48,30 +29,26 @@
<Set name="password">sparky</Set>
</New>
- <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuum</Arg>
+ <New id="continuum" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
- <Ref id="continuumDataSource"/>
+ <Ref id="wac"/>
</Arg>
- </New>
- <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuum_shutdown</Arg>
+ <Arg>jdbc/continuum</Arg>
<Arg>
<Ref id="continuumDataSource"/>
</Arg>
</New>
- <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users</Arg>
+
+ <!-- Users / Security Database -->
+
+ <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
- <Ref id="continuumDataSource"/>
+ <Ref id="wac"/>
</Arg>
- </New>
- <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users_shutdown</Arg>
+ <Arg>jdbc/users</Arg>
<Arg>
<Ref id="continuumDataSource"/>
</Arg>
</New>
-
</Configure>
Modified: continuum/trunk/continuum-webapp/src/jetty-env.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/jetty-env.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/jetty-env.xml (original)
+++ continuum/trunk/continuum-webapp/src/jetty-env.xml Wed Oct 17 10:05:38 2012
@@ -1,46 +1,31 @@
<?xml version="1.0"?>
-<!--
- ~ 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">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
- <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="validation_mail" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>
+ <Ref id="wac"/>
+ </Arg>
<Arg>mail/Session</Arg>
<Arg>
- <New class="org.mortbay.naming.factories.MailSessionReference">
+ <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
<Set name="user"></Set>
<Set name="password"></Set>
<Set name="properties">
<New class="java.util.Properties">
<Put name="mail.smtp.host">localhost</Put>
- <Put name="mail.from">continuum@localhost</Put>
- <Put name="mail.senderName">Continuum</Put>
- <Put name="mail.debug">true</Put>
</New>
</Set>
</New>
</Arg>
</New>
- <New id="continuum" class="org.mortbay.jetty.plus.naming.Resource">
+ <New id="continuum" class="org.eclipse.jetty.plus.jndi.Resource">
+ <Arg>
+ <Ref id="wac"/>
+ </Arg>
<Arg>jdbc/continuum</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
@@ -50,17 +35,13 @@
</New>
</Arg>
</New>
- <New id="continuum_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/continuum_shutdown</Arg>
+
+ <!-- Users / Security Database -->
+
+ <New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName">../continuum_database</Set>
- <Set name="user">sa</Set>
- <Set name="shutdownDatabase">shutdown</Set>
- </New>
+ <Ref id="wac"/>
</Arg>
- </New>
- <New id="users" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>jdbc/users</Arg>
<Arg>
<New class="org.apache.derby.jdbc.EmbeddedDataSource">
@@ -70,16 +51,5 @@
</New>
</Arg>
</New>
- <New id="users_shutdown" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>jdbc/users_shutdown</Arg>
- <Arg>
- <New class="org.apache.derby.jdbc.EmbeddedDataSource">
- <Set name="DatabaseName">../users_database</Set>
- <Set name="user">sa</Set>
- <Set name="shutdownDatabase">shutdown</Set>
- </New>
- </Arg>
- </New>
-
</Configure>
Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1399173&r1=1399172&r2=1399173&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Wed Oct 17 10:05:38 2012
@@ -40,7 +40,7 @@
</prerequisites>
<properties>
- <jetty.version>6.1.19</jetty.version>
+ <jetty.version>8.1.7.v20120910</jetty.version>
<continuumWebappVersion>${project.version}</continuumWebappVersion>
<maven.version>2.0.9</maven.version>
<spring.version>2.5.6</spring.version>
@@ -197,7 +197,7 @@
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
</plugin>
</plugins>
@@ -1557,34 +1557,52 @@
<version>1.0.1</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>start</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-deploy</artifactId>
+ <version>${jetty.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-start</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-naming</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
<version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jsp</artifactId>
<version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>${jetty.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-annotations</artifactId>
+ <version>${jetty.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.code.cli-parser</groupId>
<artifactId>cli</artifactId>
<version>7</version>