new default files for the jetty config
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jdbcRealm.properties b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jdbcRealm.properties
deleted file mode 100644
index 48104d8..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jdbcRealm.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# This is a sample properties file for the org.eclipse.jetty.security.JDBCLoginService
-# implemtation of the UserRealm interface. This allows Jetty users authentication
-# to work from a database.
-#
-# +-------+ +------------+ +-------+
-# | users | | user_roles | | roles |
-# +-------+ +------------+ +-------+
-# | id | /| user_id |\ | id |
-# | user -------| role_id |------- role |
-# | pwd | \| |/ | |
-# +-------+ +------------+ +-------+
-#
-#
-# 'cachetime' is a time in seconds to cache positive database
-# lookups in internal hash table. Set to 0 to disable caching.
-#
-#
-# For MySQL:
-# create a MYSQL user called "jetty" with password "jetty"
-#
-# Create the tables:
-# create table users
-# (
-# id integer primary key,
-# username varchar(100) not null unique key,
-# pwd varchar(20) not null
-# );
-#
-# create table roles
-# (
-# id integer primary key,
-# role varchar(100) not null unique key
-# );
-#
-# create table user_roles
-# (
-# user_id integer not null,
-# role_id integer not null,
-# unique key (user_id, role_id),
-# index(user_id)
-# );
-#
-# I'm not sure unique key with a first component of user_id will be
-# user by MySQL in query, so additional index wouldn't hurt.
-#
-# To test JDBC implementation:
-#
-# mysql> insert into users values (1, 'admin', 'password');
-# mysql> insert into roles values (1, 'server-administrator');
-# mysql> insert into roles values (2, 'content-administrator');
-# mysql> insert into user_roles values (1, 1);
-# mysql> insert into user_roles values (1, 2);
-#
-# Replace HashUserRealm in etc/admin.xml with JDBCUserRealm and
-# set path to properties file.
-#
-jdbcdriver = org.gjt.mm.mysql.Driver
-url = jdbc:mysql://localhost/jetty
-username = jetty
-password = jetty
-usertable = users
-usertablekey = id
-usertableuserfield = username
-usertablepasswordfield = pwd
-roletable = roles
-roletablekey = id
-roletablerolefield = role
-userroletable = user_roles
-userroletableuserkey = user_id
-userroletablerolekey = role_id
-cachetime = 300
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-ajp.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-ajp.xml
deleted file mode 100644
index 04a775e..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-ajp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- Add a AJP listener on port 8009 -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.ajp.Ajp13SocketConnector">
- <Set name="port">8009</Set>
- </New>
- </Arg>
- </Call>
-
-</Configure>
-
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-bio-ssl.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-bio-ssl.xml
deleted file mode 100644
index 9c075e4..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-bio-ssl.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure SSL for the Jetty Server -->
-<!-- this configuration file should be used in combination with -->
-<!-- other configuration files. e.g. -->
-<!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ssl.SslSocketConnector">
- <Set name="Port">9443</Set>
- <Set name="maxIdleTime">30000</Set>
- <Set name="Keystore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
- <Set name="truststore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- </New>
- </Arg>
- </Call>
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-bio.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-bio.xml
deleted file mode 100644
index 66950ee..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-bio.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Mixin configuration for Block socket connector -->
-<!-- -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- Use this connector if NIO is not available. -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.bio.SocketConnector">
- <Set name="port"><Property name="jetty.bio.port" default="8081"/></Set>
- <Set name="maxIdleTime">50000</Set>
- <Set name="lowResourceMaxIdleTime">1500</Set>
- </New>
- </Arg>
- </Call>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-debug.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-debug.xml
deleted file mode 100644
index 0ffccb6..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-debug.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Mixin the DebugHandler -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <Get id="oldhandler" name="handler"/>
- <Set name="handler">
- <New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler">
- <Set name="handler"><Ref id="oldhandler"/></Set>
- <Set name="outputStream">
- <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
- <Arg type="String"><Property name="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg>
- <Arg type="boolean">true</Arg> <!-- append -->
- <Arg type="int">90</Arg> <!-- retain days -->
- </New>
- </Set>
- </New>
- </Set>
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-deployer.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-deployer.xml
new file mode 100644
index 0000000..5a4fce4
--- /dev/null
+++ b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-deployer.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+ <!-- =========================================================== -->
+ <!-- Configure the deployment manager -->
+ <!-- =========================================================== -->
+ <Call name="addBean">
+ <Arg>
+ <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
+ <Set name="useStandardBindings">false</Set>
+ <Set name="lifeCycleBindings">
+ <Array type="org.eclipse.jetty.deploy.AppLifeCycle$Binding">
+ <Item>
+ <New class="org.eclipse.jetty.osgi.boot.OSGiDeployer"/>
+ </Item>
+ <Item>
+ <New class="org.eclipse.jetty.deploy.bindings.StandardStarter"/>
+ </Item>
+ <Item>
+ <New class="org.eclipse.jetty.deploy.bindings.StandardStopper"/>
+ </Item>
+ <Item>
+ <New class="org.eclipse.jetty.osgi.boot.OSGiUndeployer"/>
+ </Item>
+ </Array>
+ </Set>
+ <Set name="contexts">
+ <Ref id="Contexts" />
+ </Set>
+ <Call name="setContextAttribute">
+ <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
+ <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
+ </Call>
+ <!-- Providers of OSGi Apps -->
+ <!-- Call name="addAppProvider" -->
+ <!-- Arg -->
+ <!-- New class="org.eclipse.jetty.osgi.boot.OSGiAppProvider" -->
+ <!--
+ <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+ -->
+ <!--
+ <Set name="scanInterval">5</Set>
+ <Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
+ -->
+ <!-- comma separated list of bundle symbolic names that contain custom tag libraries (*.tld files) -->
+ <!-- if those bundles don't exist or can't be loaded no errors or warning will be issued! -->
+ <!-- This default value plugs in the tld files of the reference implementation of JSF -->
+ <!--
+ <Set name="tldBundles"><Property name="org.eclipse.jetty.osgi.tldbundles" default="javax.faces.jsf-impl" /></Set>
+ </New>
+ </Arg>
+ </Call>
+ -->
+ </New>
+ </Arg>
+ </Call>
+
+</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-fileserver.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-fileserver.xml
deleted file mode 100644
index de15b38..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-fileserver.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-
-<Configure id="FileServer" class="org.eclipse.jetty.server.Server">
-
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="port">8080</Set>
- </New>
- </Arg>
- </Call>
-
- <Set name="handler">
- <New class="org.eclipse.jetty.server.handler.HandlerList">
- <Set name="handlers">
- <Array type="org.eclipse.jetty.server.Handler">
- <Item>
- <New class="org.eclipse.jetty.server.handler.ResourceHandler">
- <Set name="directoriesListed">true</Set>
- <Set name="welcomeFiles">
- <Array type="String"><Item>index.html</Item></Array>
- </Set>
- <Set name="resourceBase">.</Set>
- </New>
- </Item>
- <Item>
- <New class="org.eclipse.jetty.server.handler.DefaultHandler">
- </New>
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-jaas.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-jaas.xml
deleted file mode 100644
index 7513edb..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-jaas.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
-
- <!-- ======================================================== -->
- <!-- java.security.auth.login.config System property -->
- <!-- This is usually a runtime parameter to the jvm, but -->
- <!-- it is placed here for convenience. -->
- <!-- ======================================================== -->
- <Call class="java.lang.System" name="setProperty">
- <Arg>java.security.auth.login.config</Arg>
- <Arg><Property name="jetty.home" default="." />/etc/login.conf</Arg>
- </Call>
-
-
- <!-- ======================================================== -->
- <!-- An example JAAS realm setup -->
- <!-- For more information see the jetty wiki at -->
- <!-- http://http://docs.codehaus.org/display/JETTY/JAAS -->
- <!-- ======================================================== -->
- <Set name="UserRealms">
- <Array type="org.mortbay.jetty.security.UserRealm">
- <Item>
- <New class="org.mortbay.jetty.plus.jaas.JAASUserRealm">
- <Set name="Name">Test JAAS Realm</Set>
- <Set name="LoginModuleName">xyz</Set>
- </New>
- </Item>
- </Array>
- </Set>
-
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-jmx.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-jmx.xml
deleted file mode 100644
index 2d48b6c..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-jmx.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure the JVM JMX Server -->
-<!-- this configuration file should be used in combination with -->
-<!-- other configuration files. e.g. -->
-<!-- java -DOPTIONS=jmx -jar start.jar etc/jetty-jmx.xml etc/jetty.xml -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Initialize an mbean server -->
- <!-- =========================================================== -->
- <Call id="MBeanServer" class="java.lang.management.ManagementFactory" name="getPlatformMBeanServer"/>
-
- <!-- =========================================================== -->
- <!-- Initialize the Jetty MBean container -->
- <!-- =========================================================== -->
- <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
- <Arg><Ref id="MBeanServer"/></Arg>
- </New>
-
- <!-- Add to the Server to listen for object events -->
- <Get id="Container" name="container">
- <Call name="addEventListener">
- <Arg><Ref id="MBeanContainer"/></Arg>
- </Call>
- </Get>
-
- <!-- Add to the Server as a lifecycle -->
- <!-- Only do this if you know you will only have a single jetty server -->
- <Call name="addBean">
- <Arg><Ref id="MBeanContainer"/></Arg>
- </Call>
-
- <!-- Add the static log -->
- <Get id="Logger" class="org.eclipse.jetty.util.log.Log" name="log"/>
- <Ref id="MBeanContainer">
- <Call name="addBean">
- <Arg><Ref id="Logger"/></Arg>
- </Call>
- </Ref>
-
- <!-- optionally add a remote JMX connector
- <Call id="jmxConnector" class="javax.management.remote.JMXConnectorServerFactory" name="newJMXConnectorServer">
- <Arg>
- <New class="javax.management.remote.JMXServiceURL">
- <Arg>service:jmx:rmi:///jndi/rmi:///jettymbeanserver</Arg>
- </New>
- </Arg>
- <Arg/>
- <Arg><Ref id="MBeanServer"/></Arg>
- <Call name="start"/>
- </Call>
- -->
-
-</Configure>
-
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-logging.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-logging.xml
deleted file mode 100644
index adfe6d8..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-logging.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-
-<!-- =============================================================== -->
-<!-- Configure stderr and stdout to a Jetty rollover log file -->
-<!-- this configuration file should be used in combination with -->
-<!-- other configuration files. e.g. -->
-<!-- java -jar start.jar etc/jetty-logging.xml etc/jetty.xml -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <New id="ServerLog" class="java.io.PrintStream">
- <Arg>
- <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
- <Arg><Property name="jetty.home" default="."/>/logs/yyyy_mm_dd.stderrout.log</Arg>
- <Arg type="boolean">false</Arg>
- <Arg type="int">90</Arg>
- <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
- <Get id="ServerLogName" name="datedFilename"/>
- </New>
- </Arg>
- </New>
-
- <Call class="org.eclipse.jetty.util.log.Log" name="info"><Arg>Redirecting stderr/stdout to <Ref id="ServerLogName"/></Arg></Call>
- <Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
- <Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>
-
-</Configure>
-
-
-
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-nested.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-nested.xml
new file mode 100644
index 0000000..c11cec1
--- /dev/null
+++ b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-nested.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server Nested inside another -->
+<!-- Servlet Container. -->
+<!-- -->
+<!-- Documentation of this file format can be found at: -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax -->
+<!-- -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+ <Call name="addConnector">
+ <Arg>
+ <New id="NestedConnector" class="org.eclipse.jetty.nested.NestedConnector">
+ <Set name="statsOn">false</Set>
+ <Set name="forwarded">true</Set>
+ <Set name="forwardedHostHeader">x-forwarded_for</Set>
+ <Set name="forwardedCipherSuiteHeader">sslclientcipher</Set>
+ <Set name="forwardedSslSessionIdHeader">sslsessionid</Set>
+ <Call name="addLifeCycleListener">
+ <Arg>
+ <New class="org.eclipse.jetty.osgi.nested.NestedConnectorListener" id="NestedConnectorListener">
+ <Set name="nestedConnector"><Ref id="NestedConnector"/></Set>
+ </New>
+ </Arg>
+ </Call>
+ </New>
+ </Arg>
+ </Call>
+
+</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-osgi-nested.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-osgi-nested.xml
deleted file mode 100644
index 67d84e9..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-osgi-nested.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server Nested -->
-<!-- inside another Servlet Container -->
-<!-- -->
-<!-- Documentation of this file format can be found at: -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
-<!-- -->
-<!-- =============================================================== -->
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <Call name="addConnector">
- <Arg>
- <New id="NestedConnector" class="org.eclipse.jetty.nested.NestedConnector">
- <Set name="statsOn">false</Set>
- <Set name="forwarded">true</Set>
- <Set name="forwardedHostHeader">x-forwarded_for</Set>
- <Set name="forwardedCipherSuiteHeader">sslclientcipher</Set>
- <Set name="forwardedSslSessionIdHeader">sslsessionid</Set>
- <Call name="addLifeCycleListener">
- <Arg>
- <New class="org.eclipse.jetty.osgi.nested.NestedConnectorListener" id="NestedConnectorListener">
- <Set name="nestedConnector"><Ref id="NestedConnector"/></Set>
- </New>
- </Arg>
- </Call>
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- Set handler Collection Structure -->
- <!-- =========================================================== -->
- <Set name="handler">
- <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
- <Set name="handlers">
- <Array type="org.eclipse.jetty.server.Handler">
- <Item>
- <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
- </Item>
- <Item>
- <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
- </Item>
- <Item>
- <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-
- <!-- =========================================================== -->
- <!-- Configure the deployment manager -->
- <!-- -->
- <!-- Sets up 2 monitored dir app providers that are configured -->
- <!-- to behave in a similaraly to the legacy ContextDeployer -->
- <!-- and WebAppDeployer from previous versions of Jetty. -->
- <!-- =========================================================== -->
- <Call name="addBean">
- <Arg>
- <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
- <Set name="contexts">
- <Ref id="Contexts" />
- </Set>
- <Call name="setContextAttribute">
- <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
- </Call>
- <!-- Providers of OSGi Apps -->
- <Call name="addAppProvider">
- <Arg>
- <New class="org.eclipse.jetty.osgi.boot.OSGiAppProvider">
- <!--
- <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
- -->
- <Set name="scanInterval">5</Set>
- <Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
- <!-- comma separated list of bundle symbolic names that
- contain custom tag libraries (*.tld files)
- if those bundles don't exist or can't be loaded no errors or warning will be issued!
- this default value is to plug the tld files of the reference implementation of JSF -->
- <Set name="tldBundles"><Property name="org.eclipse.jetty.osgi.tldsbundles"
- default="javax.faces.jsf-impl" /></Set>
- </New>
- </Arg>
- </Call>
-
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- extra options -->
- <!-- =========================================================== -->
- <Set name="stopAtShutdown">true</Set>
- <Set name="sendServerVersion">true</Set>
- <Set name="sendDateHeader">true</Set>
- <Set name="gracefulShutdown">1000</Set>
-
- <!-- jetty-jndi by default -->
- <Call class="java.lang.System" name="setProperty">
- <Arg>java.naming.factory.initial</Arg>
- <Arg><Property name="java.naming.factory.initial" default="org.eclipse.jetty.jndi.InitialContextFactory"/></Arg>
- </Call>
- <Call class="java.lang.System" name="setProperty">
- <Arg>java.naming.factory.url.pkgs</Arg>
- <Arg><Property name="java.naming.factory.url.pkgs" default="org.eclipse.jetty.jndi"/></Arg>
- </Call>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-plus.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-plus.xml
deleted file mode 100644
index 7430d6f..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-plus.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure Jetty Plus features -->
-<!-- -->
-<!-- This file sets up a WebAppDeployer to automatically deploy all -->
-<!-- webapps in $jetty.home/webapps-plus at startup time, and to -->
-<!-- enable all of them with Plus features (jndi etc). -->
-<!-- -->
-<!-- You can instead configure individual webapps with Jetty Plus -->
-<!-- features by using the ContextDeployer (configured in -->
-<!-- $jetty.home/etc/jetty.xml), and ensuring that you set the -->
-<!-- same set of classes listed below in the "plusConfig" as the -->
-<!-- webapp's configurationClasses. -->
-<!-- -->
-<!-- For more information about Jetty Plus, see the Jetty wiki at -->
-<!-- http://docs.codehaus.org/display/JETTY/Jetty+Wiki -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Example JAAS realm setup. -->
- <!-- The LoginModuleName must be exactly the same as in the -->
- <!-- login.conf file, and the realm Name must be the same as in -->
- <!-- the web.xml file. -->
- <!-- =========================================================== -->
- <!--
- <Call name="addLoginService">
- <Arg>
- <New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
- <Set name="name">xyzrealm</Set>
- <Set name="LoginModuleName">xyz</Set>
- </New>
- </Arg>
- </Call>
- -->
-
- <!-- =========================================================== -->
- <!-- Configurations for WebAppContexts -->
- <!-- Sequence of configurations to enable Plus features. -->
- <!-- =========================================================== -->
- <Array id="plusConfig" type="java.lang.String">
- <Item>org.eclipse.jetty.webapp.WebInfConfiguration</Item>
- <Item>org.eclipse.jetty.webapp.WebXmlConfiguration</Item>
- <Item>org.eclipse.jetty.webapp.MetaInfConfiguration</Item>
- <Item>org.eclipse.jetty.webapp.FragmentConfiguration</Item>
- <Item>org.eclipse.jetty.plus.webapp.EnvConfiguration</Item>
- <Item>org.eclipse.jetty.plus.webapp.Configuration</Item>
- <Item>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</Item>
- <Item>org.eclipse.jetty.webapp.TagLibConfiguration</Item>
- </Array>
-
- <!-- =========================================================== -->
- <!-- Deploy all webapps in webapps-plus -->
- <!-- =========================================================== -->
- <!-- Uncomment the following to set up a WebAppDeployer that will -->
- <!-- deploy webapps from a directory called webapps-plus. Note -->
- <!-- that you will need to create this directory first! -->
- <!--
- <Call name="addLifeCycle">
- <Arg>
- <New class="org.eclipse.jetty.deploy.WebAppDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="webAppDir"><Property name="jetty.home" default="."/>/webapps-plus</Set>
- <Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
- <Set name="allowDuplicates">false</Set>
- <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
- <Set name="configurationClasses"><Ref id="plusConfig"/></Set>
- <Call name="setAttribute">
- <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
- </Call>
- </New>
- </Arg>
- </Call>
- -->
-
-</Configure>
-
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-proxy.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-proxy.xml
deleted file mode 100644
index 5bc46c3..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-proxy.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!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 -->
-<!-- -->
-<!-- =============================================================== -->
-
-
-<Configure id="Proxy" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Server Thread Pool -->
- <!-- =========================================================== -->
- <Set name="ThreadPool">
- <!-- Default queued blocking threadpool
- -->
- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">50</Set>
- </New>
- </Set>
-
-
- <!-- =========================================================== -->
- <!-- Set connectors -->
- <!-- =========================================================== -->
-
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="host"><Property name="jetty.host" /></Set>
- <Set name="port"><Property name="jetty.port" default="8888"/></Set>
- <Set name="maxIdleTime">300000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="lowResourcesConnections">20000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <Set name="handler">
- <New id="Servlets" class="org.eclipse.jetty.servlet.ServletHandler">
- <Call name="addServletWithMapping">
- <Arg>org.eclipse.jetty.servlets.ProxyServlet</Arg>
- <Arg>/</Arg>
- </Call>
- </New>
- </Set>
-
- <!-- =========================================================== -->
- <!-- extra options -->
- <!-- =========================================================== -->
- <Set name="stopAtShutdown">true</Set>
- <Set name="sendServerVersion">true</Set>
- <Set name="sendDateHeader">true</Set>
- <Set name="gracefulShutdown">1000</Set>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-rewrite.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-rewrite.xml
deleted file mode 100644
index da0eb7b..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-rewrite.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Mixin the RewriteHandler -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- configure rewrite handler -->
- <!-- =========================================================== -->
- <Get id="oldhandler" name="handler"/>
-
- <Set name="handler">
- <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
- <Set name="handler"><Ref id="oldhandler"/></Set>
- <Set name="rewriteRequestURI">true</Set>
- <Set name="rewritePathInfo">false</Set>
- <Set name="originalPathAttribute">requestedPath</Set>
-
- <!-- Add rule to protect against IE ssl bug -->
- <Call name="addRule">
- <Arg>
- <New class="org.eclipse.jetty.rewrite.handler.MsieSslRule"/>
- </Arg>
- </Call>
-
- <!-- protect favicon handling -->
- <Call name="addRule">
- <Arg>
- <New class="org.eclipse.jetty.rewrite.handler.HeaderPatternRule">
- <Set name="pattern">/favicon.ico</Set>
- <Set name="name">Cache-Control</Set>
- <Set name="value">Max-Age=3600,public</Set>
- <Set name="terminating">true</Set>
- </New>
- </Arg>
- </Call>
-
-
- <!-- use legacy API for some rewrites -->
- <Call name="addRewriteRule">
- <Arg>/some/old/context/*</Arg>
- <Arg>/test/dump/newcontext</Arg>
- </Call>
- <Call name="addRewriteRule">
- <Arg>/test/dump/rewrite/*</Arg>
- <Arg>/test/dump/rewritten</Arg>
- </Call>
- <Call name="addRewriteRule">
- <Arg>/test/dump/rewrite/protect/*</Arg>
- <Arg/>
- </Call>
- <Call name="addRewriteRule">
- <Arg>/test/*</Arg>
- <Arg/>
- </Call>
- <Call name="addRewriteRule">
- <Arg>/*</Arg>
- <Arg>/test</Arg>
- </Call>
-
- <!-- add a regex rule -->
- <Call name="addRule">
- <Arg>
- <New class="org.eclipse.jetty.rewrite.handler.RewriteRegexRule">
- <Set name="regex">/test/dump/regex/([^/]*)/(.*)</Set>
- <Set name="replacement">/test/dump/$2/$1</Set>
- </New>
- </Arg>
- </Call>
- </New>
- </Set>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-selector.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-selector.xml
new file mode 100644
index 0000000..dc1b264
--- /dev/null
+++ b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-selector.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+
+ <!-- =========================================================== -->
+ <!-- Add connector -->
+ <!-- =========================================================== -->
+
+ <Call name="addConnector">
+ <Arg>
+ <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">20000</Set>
+ <Set name="lowResourcesMaxIdleTime">5000</Set>
+ </New>
+ </Arg>
+ </Call>
+
+</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-setuid.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-setuid.xml
deleted file mode 100644
index 9a30af7..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-setuid.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty SetUIDServer -->
-<!-- this configuration file should be used in combination with -->
-<!-- other configuration files. e.g. -->
-<!-- java -jar start.jar etc/jetty-setuid.xml etc/jetty.xml -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.setuid.SetUIDServer">
- <Set name="startServerAsPrivileged">false</Set>
- <Set name="umask">2</Set>
- <Set name="uid">jetty</Set>
- <Set name="gid">jetty</Set>
-</Configure>
-
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-ssl.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-ssl.xml
deleted file mode 100644
index f2ec1a4..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-ssl.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure SSL for the Jetty Server -->
-<!-- this configuration file should be used in combination with -->
-<!-- other configuration files. e.g. -->
-<!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- if NIO is not available, use org.eclipse.jetty.server.ssl.SslSocketConnector -->
-
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
- <Set name="Port"><Property name="jetty.port.ssl" default="8443" /></Set>
- <Set name="maxIdleTime">30000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="AcceptQueueSize">100</Set>
- <Set name="Keystore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
- <Set name="truststore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- </New>
- </Arg>
- </Call>
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-sslengine.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-sslengine.xml
deleted file mode 100644
index 9e787b0..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-sslengine.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure SSL for the Jetty Server -->
-<!-- this configuration file should be used in combination with -->
-<!-- other configuration files. e.g. -->
-<!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
- <Call name="addConnector">
- <Arg>
- <New class="org.mortbay.jetty.security.SslSelectChannelConnector">
- <Set name="Port">8444</Set>
- <Set name="maxIdleTime">30000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="AcceptQueueSize">100</Set>
- <Set name="Keystore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
- </New>
- </Arg>
- </Call>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-stats.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-stats.xml
deleted file mode 100644
index e0a0c7f..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-stats.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Mixin the Statistics Handler -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <Get id="oldhandler" name="handler"/>
-
- <Set name="handler">
- <New id="StatsHandler" class="org.eclipse.jetty.server.handler.StatisticsHandler">
- <Set name="handler"><Ref id="oldhandler"/></Set>
- </New>
- </Set>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-win32-service.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-win32-service.xml
deleted file mode 100644
index 20287ce..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-win32-service.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!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 id="Server" class="org.mortbay.jetty.Server">
-
-
- <Call name="addLifeCycle">
- <Arg>
- <New class="org.mortbay.jetty.win32service.Win32Service">
- <Set name="server"><Ref id="Server"/></Set>
- </New>
- </Arg>
- </Call>
-
- <Set name="stopAtShutdown">true</Set>
- <!-- ensure/prevent Server: header being sent to browsers -->
- <Set name="sendServerVersion">true</Set>
-
-</Configure>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-xinetd.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-xinetd.xml
deleted file mode 100644
index c2fbaa2..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty-xinetd.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configuration for starting up Jetty using inetd/xinetd -->
-<!-- This feature requires at least Java 5 -->
-<!-- -->
-<!-- Making it a mixin for convenience, but note that if used -->
-<!-- with jetty.xml, Jetty will use multiple connectors -->
-<!-- =============================================================== -->
-
-<!-- Sample xinetd configuration (restart xinetd after adding the configuration file)
-
-service jetty
-{
- disable = no
-
- id = jetty
- type = UNLISTED
- wait = yes
- socket_type = stream
-
- # change this
- user = username
- group = groupname
- port = 2001
-
- # sample script for running jetty as a service
- # replace $JETTY_HOME with /path/to/jetty_home/
- server = $JETTY_HOME/bin/jetty-xinetd.sh
-}
-
--->
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <Call name="addConnector">
- <Arg>
- <!-- Inherited channel (from inetd/xinetd) -->
- <New class="org.eclipse.jetty.server.nio.InheritedChannelConnector">
-
-
- <!-- Optional. Fallback in case System.inheritedChannel() does not give a ServerSocketChannel
- <Set name="port"><Property name="jetty.service.port" default="8082"/></Set>
- -->
-
- <!-- sane defaults -->
- <Set name="maxIdleTime">300000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="lowResourcesConnections">20000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
- </Call>
-</Configure>
-
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty.xml b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty.xml
index 21164c4..30f8ea9 100644
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty.xml
+++ b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/jetty.xml
@@ -1,95 +1,29 @@
<?xml version="1.0"?>
<!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 -->
<!-- =============================================================== -->
-
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<!-- =========================================================== -->
<Set name="ThreadPool">
- <!-- Default queued blocking threadpool
- -->
+ <!-- Default queued blocking threadpool -->
<New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<Set name="minThreads">10</Set>
<Set name="maxThreads">200</Set>
+ <Set name="detailedDump">false</Set>
</New>
-
- <!-- Optional Java 5 bounded threadpool with job queue
- <New class="org.eclipse.jetty.util.thread.ExecutorThreadPool">
- <Arg name="coreSize" type="int">25</Arg>
- <Arg name="maxSize" type="int">50</Arg>
- <Arg name="maxIdleMs" type="long">30000</Arg>
- </New>
- -->
</Set>
-
- <!-- =========================================================== -->
- <!-- Set connectors -->
- <!-- =========================================================== -->
-
- <Call name="addConnector">
- <Arg>
- <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">20000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- To add a HTTPS SSL connector -->
- <!-- mixin jetty-ssl.xml: -->
- <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
- <Set name="Port"><Property name="jetty.port.ssl" default="8443" /></Set>
- <Set name="maxIdleTime">30000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="AcceptQueueSize">100</Set>
- <Set name="Keystore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="Password">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- <Set name="KeyPassword">OBF:1u2u1wml1z7s1z7a1wnl1u2g</Set>
- <Set name="truststore"><Property name="jetty.home" default="." />/etc/keystore</Set>
- <Set name="trustPassword">OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4</Set>
- </New>
- </Arg>
- </Call>
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- To add a HTTP blocking connector -->
- <!-- mixin jetty-bio.xml: -->
- <!-- java -jar start.jar etc/jetty.xml etc/jetty-bio.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. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
@@ -111,93 +45,6 @@
</New>
</Set>
- <!-- =========================================================== -->
- <!-- Configure the deployment manager -->
- <!-- -->
- <!-- Sets up 2 monitored dir app providers that are configured -->
- <!-- to behave in a similaraly to the legacy ContextDeployer -->
- <!-- and WebAppDeployer from previous versions of Jetty. -->
- <!-- =========================================================== -->
- <Call name="addBean">
- <Arg>
- <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
- <Set name="contexts">
- <Ref id="Contexts" />
- </Set>
- <Call name="setContextAttribute">
- <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
- </Call>
- <!-- Providers of Apps via Context XML files.
- Configured to behave similar to the legacy ContextDeployer -->
- <Call name="addAppProvider">
- <Arg>
- <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
- <Set name="monitoredDirName"><Property name="jetty.home" default="." />/contexts</Set>
- <Set name="scanInterval">5</Set>
- </New>
- </Arg>
- </Call>
- <!-- Providers of OSGi Apps.
- Also deploys webapps in the webapps folder -->
- <Call name="addAppProvider">
- <Arg>
- <New class="org.eclipse.jetty.osgi.boot.OSGiAppProvider">
- <Set name="monitoredDirName"><Property name="jetty.home" default="." />/webapps</Set>
- <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
- <Set name="scanInterval">5</Set>
- <Set name="contextXmlDir"><Property name="jetty.home" default="." />/contexts</Set>
- <!-- comma separated list of bundle symbolic names that
- contain custom tag libraries (*.tld files)
- if those bundles don't exist or can't be loaded no errors or warning will be issued!
- this default value is to plug the tld files of the reference implementation of JSF -->
- <Set name="tldBundles"><Property name="org.eclipse.jetty.osgi.tldsbundles"
- default="javax.faces.jsf-impl" /></Set>
- </New>
- </Arg>
- </Call>
-
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- Configure Authentication Login Service -->
- <!-- 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). -->
- <!-- =========================================================== -->
- <Call name="addBean">
- <Arg>
- <New class="org.eclipse.jetty.security.HashLoginService">
- <Set name="name">Test Realm</Set>
- <Set name="config"><Property name="jetty.home" default="."/>/etc/realm.properties</Set>
- <Set name="refreshInterval">0</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.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename"><Property name="jetty.home" 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 -->
@@ -206,8 +53,13 @@
<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>
+
- <!-- jetty-jndi by default -->
+ <!-- =========================================================== -->
+ <!-- jetty-jndi by default -->
+ <!-- =========================================================== -->
<Call class="java.lang.System" name="setProperty">
<Arg>java.naming.factory.initial</Arg>
<Arg><Property name="java.naming.factory.initial" default="org.eclipse.jetty.jndi.InitialContextFactory"/></Arg>
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/keystore b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/keystore
deleted file mode 100644
index 08f6cda..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/keystore
+++ /dev/null
Binary files differ
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/login.conf b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/login.conf
deleted file mode 100644
index 731956c..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/login.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-xyz {
-org.mortbay.jetty.plus.jaas.spi.PropertyFileLoginModule required
-debug="true"
-file="${jetty.home}/etc/login.properties";
-};
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/login.properties b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/login.properties
deleted file mode 100644
index 61e3203..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/login.properties
+++ /dev/null
@@ -1 +0,0 @@
-me=me,me,roleA
diff --git a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/realm.properties b/jetty-features/org.eclipse.jetty.product/jettyhome/etc/realm.properties
deleted file mode 100644
index cbf905d..0000000
--- a/jetty-features/org.eclipse.jetty.product/jettyhome/etc/realm.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# This file defines users passwords and roles for a HashUserRealm
-#
-# The format is
-# <username>: <password>[,<rolename> ...]
-#
-# Passwords may be clear text, obfuscated or checksummed. The class
-# org.eclipse.util.Password should be used to generate obfuscated
-# passwords or password checksums
-#
-# If DIGEST Authentication is used, the password must be in a recoverable
-# format, either plain text or OBF:.
-#
-jetty: MD5:164c88b302622e17050af52c89945d44,user
-admin: CRYPT:adpexzg3FUZAk,server-administrator,content-administrator,admin
-other: OBF:1xmk1w261u9r1w1c1xmq,user
-plain: plain,user
-user: password,user
-
-# This entry is for digest auth. The credential is a MD5 hash of username:realmname:password
-digest: MD5:6e120743ad67abfbc385bc2bb754e297,user
