Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Lachlan Roberts 2020-11-11 14:25:22 +11:00
parent e63f8ddfec 6934b94261
commit f0a58bcfdd
13 changed files with 130 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/demo-jndi-webapp/src/main/webapp/WEB-INF/jetty-env.xml
View File

@ -31,7 +31,7 @@
<Arg><Ref refid='wac'/></Arg>
<Arg>svr</Arg>
<Arg type="java.lang.String">
<Ref id="Server">
<Ref refid="Server">
<Get name="class">
<Get name="name"/>
</Get>

2
jetty-maven-plugin/src/it/jetty-start-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Ref id="httpConnector">
<Ref refid="httpConnector">
<Call name="addEventListener">
<Arg>
<New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">

2
jetty-maven-plugin/src/it/jetty-start-war-distro-mojo-it/jetty-simple-webapp/src/base/etc/test-jetty.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_9_3.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Ref id="httpConnector">
<Ref refid="httpConnector">
<Call name="addEventListener">
<Arg>
<New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">

6
jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http-boot-with-resources.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
<!-- ============================================================= --><!-- Configure the Jetty Server instance with an ID "Server" --><!-- by adding an HTTP connector. --><!-- This configuration must be used in conjunction with jetty.xml --><!-- ============================================================= -->
<!-- ============================================================= -->
<!-- Configure the Jetty Server instance with an ID "Server" -->
<!-- by adding an HTTP connector. -->
<!-- This configuration must be used in conjunction with jetty.xml -->
<!-- ============================================================= -->
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->

3
jetty-server/src/main/config/etc/home-base-warning.xml
View File

@ -4,5 +4,4 @@
<!-- ============================================================= -->
<!-- Display a Warning Message if {jetty.home} == {jetty.base} -->
<!-- ============================================================= -->
<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning">
</Configure>
<Configure id="homeBaseWarning" class="org.eclipse.jetty.server.HomeBaseWarning"/>

1
jetty-server/src/main/config/etc/sessions/file/session-store.xml
View File

@ -3,7 +3,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== -->
<!-- Configure a factory for FileSessionStores -->
<!-- ===================================================================== -->

12
jetty-server/src/main/config/etc/sessions/jdbc/datasource.xml
View File

@ -2,10 +2,10 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
<Set name="DatasourceName" property="jetty.session.jdbc.datasourceName"/>
<Set name="blobType" property="jetty.session.jdbc.blobType"/>
<Set name="longType" property="jetty.session.jdbc.longType"/>
<Set name="stringType" property="jetty.session.jdbc.stringType"/>
</New>
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
<Set name="DatasourceName" property="jetty.session.jdbc.datasourceName"/>
<Set name="blobType" property="jetty.session.jdbc.blobType"/>
<Set name="longType" property="jetty.session.jdbc.longType"/>
<Set name="stringType" property="jetty.session.jdbc.stringType"/>
</New>
</Configure>

18
jetty-server/src/main/config/etc/sessions/jdbc/driver.xml
View File

@ -3,14 +3,14 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
<Call name="setDriverInfo">
<Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
<Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
</Call>
<Set name="blobType" property="jetty.session.jdbc.blobType"/>
<Set name="longType" property="jetty.session.jdbc.longType"/>
<Set name="stringType" property="jetty.session.jdbc.stringType"/>
</New>
<New id="databaseAdaptor" class="org.eclipse.jetty.server.session.DatabaseAdaptor">
<Call name="setDriverInfo">
<Arg><Property name="jetty.session.jdbc.driverClass"/></Arg>
<Arg><Property name="jetty.session.jdbc.driverUrl"/></Arg>
</Call>
<Set name="blobType" property="jetty.session.jdbc.blobType"/>
<Set name="longType" property="jetty.session.jdbc.longType"/>
<Set name="stringType" property="jetty.session.jdbc.stringType"/>
</New>
</Configure>

113
jetty-server/src/main/config/etc/sessions/jdbc/session-store.xml
View File

@ -1,72 +1,69 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<?xml version="1.0"?><!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== -->
<!-- Configure a factory for JDBCSessionStores -->
<!-- ===================================================================== -->
<Call name="addBean">
<Arg>
<New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory">
<Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
<Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set>
<Set name="databaseAdaptor">
<Ref id="databaseAdaptor"/>
</Set>
<Set name="sessionTableSchema">
<New
class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
<Set name="accessTimeColumn">
<Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
</Set>
<Set name="contextPathColumn">
<Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
</Set>
<Set name="cookieTimeColumn">
<Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
</Set>
<Set name="createTimeColumn">
<Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
</Set>
<Set name="expiryTimeColumn">
<Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
</Set>
<Set name="lastAccessTimeColumn">
<Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
</Set>
<Set name="lastSavedTimeColumn">
<Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
</Set>
<Set name="idColumn">
<Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
</Set>
<Set name="lastNodeColumn">
<Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
</Set>
<Set name="virtualHostColumn">
<Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
</Set>
<Set name="maxIntervalColumn">
<Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
</Set>
<Set name="mapColumn">
<Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
</Set>
<Arg>
<New id="sessionDataStoreFactory" class="org.eclipse.jetty.server.session.JDBCSessionDataStoreFactory">
<Set name="gracePeriodSec"><Property name="jetty.session.gracePeriod.seconds" default="3600" /></Set>
<Set name="savePeriodSec"><Property name="jetty.session.savePeriod.seconds" default="0" /></Set>
<Set name="databaseAdaptor">
<Ref refid="databaseAdaptor" />
</Set>
<Set name="sessionTableSchema">
<New class="org.eclipse.jetty.server.session.JDBCSessionDataStore$SessionTableSchema">
<Set name="accessTimeColumn">
<Property name="jetty.session.jdbc.schema.accessTimeColumn" default="accessTime" />
</Set>
<Set name="contextPathColumn">
<Property name="jetty.session.jdbc.schema.contextPathColumn" default="contextPath" />
</Set>
<Set name="cookieTimeColumn">
<Property name="jetty.session.jdbc.schema.cookieTimeColumn" default="cookieTime" />
</Set>
<Set name="createTimeColumn">
<Property name="jetty.session.jdbc.schema.createTimeColumn" default="createTime" />
</Set>
<Set name="expiryTimeColumn">
<Property name="jetty.session.jdbc.schema.expiryTimeColumn" default="expiryTime" />
</Set>
<Set name="lastAccessTimeColumn">
<Property name="jetty.session.jdbc.schema.lastAccessTimeColumn" default="lastAccessTime" />
</Set>
<Set name="lastSavedTimeColumn">
<Property name="jetty.session.jdbc.schema.lastSavedTimeColumn" default="lastSavedTime" />
</Set>
<Set name="idColumn">
<Property name="jetty.session.jdbc.schema.idColumn" default="sessionId" />
</Set>
<Set name="lastNodeColumn">
<Property name="jetty.session.jdbc.schema.lastNodeColumn" default="lastNode" />
</Set>
<Set name="virtualHostColumn">
<Property name="jetty.session.jdbc.schema.virtualHostColumn" default="virtualHost" />
</Set>
<Set name="maxIntervalColumn">
<Property name="jetty.session.jdbc.schema.maxIntervalColumn" default="maxInterval" />
</Set>
<Set name="mapColumn">
<Property name="jetty.session.jdbc.schema.mapColumn" default="map" />
</Set>
<Set name="schemaName">
<Property name="jetty.session.jdbc.schema.schemaName" />
<Property name="jetty.session.jdbc.schema.schemaName" />
</Set>
<Set name="catalogName">
<Property name="jetty.session.jdbc.schema.catalogName" />
<Property name="jetty.session.jdbc.schema.catalogName" />
</Set>
<Set name="tableName">
<Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
</Set>
</New>
</Set>
</New>
</Arg>
<Set name="tableName">
<Property name="jetty.session.jdbc.schema.table" default="JettySessions" />
</Set>
</New>
</Set>
</New>
</Arg>
</Call>
</Configure>

21
jetty-server/src/main/config/etc/sessions/session-cache-hash.xml
View File

@ -3,21 +3,20 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== -->
<!-- Configure a factory for DefaultSessionCache -->
<!-- ===================================================================== -->
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
<Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
<Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
<Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
<Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
<Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
<Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
</New>
</Arg>
<Arg>
<New class="org.eclipse.jetty.server.session.DefaultSessionCacheFactory">
<Set name="evictionPolicy"><Property name="jetty.session.evictionPolicy" default="-1" /></Set>
<Set name="saveOnInactiveEvict"><Property name="jetty.session.saveOnInactiveEvict" default="false" /></Set>
<Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
<Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
<Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
<Set name="invalidateOnShutdown"><Property name="jetty.session.invalidateOnShutdown" default="false"/></Set>
</New>
</Arg>
</Call>
</Configure>

15
jetty-server/src/main/config/etc/sessions/session-cache-null.xml
View File

@ -3,18 +3,17 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- ===================================================================== -->
<!-- Configure a factory for NullSessionCache -->
<!-- ===================================================================== -->
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
<Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
<Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
<Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false"/></Set>
</New>
</Arg>
<Arg>
<New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
<Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
<Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false" /></Set>
<Set name="flushOnResponseCommit"><Property name="jetty.session.flushOnResponseCommit" default="false" /></Set>
</New>
</Arg>
</Call>
</Configure>

2
jetty-server/src/main/config/etc/sessions/session-data-cache/session-caching-store.xml
View File

@ -13,8 +13,6 @@
</Arg>
</Call>
<Call name="addBean">
<Arg>
<New class="org.eclipse.jetty.server.session.CachingSessionDataStoreFactory">

68
jetty-server/src/main/config/modules/inetaccess/jetty-inetaccess.xml
View File

@ -2,38 +2,38 @@
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler">
<Arg>
<New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
<Call name="include">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.include" default=""/></Arg>
</Call>
</Arg>
</Call>
<Call name="exclude">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.exclude" default=""/></Arg>
</Call>
</Arg>
</Call>
<Call name="includeConnectors">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.includeConnectors" default=""/></Arg>
</Call>
</Arg>
</Call>
<Call name="excludeConnectors">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.excludeConnectors" default=""/></Arg>
</Call>
</Arg>
</Call>
</New>
</Arg>
</Call>
<Call name="insertHandler">
<Arg>
<New id="InetAccessHandler" class="org.eclipse.jetty.server.handler.InetAccessHandler">
<Call name="include">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.include" default="" /></Arg>
</Call>
</Arg>
</Call>
<Call name="exclude">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.exclude" default="" /></Arg>
</Call>
</Arg>
</Call>
<Call name="includeConnectors">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.includeConnectors" default="" /></Arg>
</Call>
</Arg>
</Call>
<Call name="excludeConnectors">
<Arg>
<Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
<Arg><Property name="jetty.inetaccess.excludeConnectors" default="" /></Arg>
</Call>
</Arg>
</Call>
</New>
</Arg>
</Call>
</Configure>