Issue #515 Alternate start modules

Used alternate modules for new session architecture
This commit is contained in:
Greg Wilkins 2016-04-30 09:19:38 +10:00
parent 7b7d9e58c5
commit 66f242191c
38 changed files with 105 additions and 139 deletions

View File

@ -1,9 +1,6 @@
[description]
Enables use of the apache implementation of JSP
[name]
apache-jsp
[lib]
lib/apache-jsp/*.jar

View File

@ -1,8 +1,5 @@
[description]
Enables the apache version of JSTL
[name]
apache-jstl
[lib]
lib/apache-jstl/*.jar

View File

@ -1,6 +1,3 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.7.v20160121/alpn-boot-8.1.7.v20160121.jar|lib/alpn/alpn-boot-8.1.7.v20160121.jar

View File

@ -1,6 +1,3 @@
[name]
protonego-boot
[files]
http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.8.v20160420/alpn-boot-8.1.8.v20160420.jar|lib/alpn/alpn-boot-8.1.8.v20160420.jar

View File

@ -1,15 +0,0 @@
[description]
Enables session storage on a remote GCloudDataStore service.
[name]
gcloud-remote
[xml]
etc/jetty-gcloud-remote.xml
[ini-template]
#jetty.gcloudSession.projectId=
#jetty.gcloudSession.p12File=
#jetty.gcloudSession.serviceAccount=
#jetty.gcloudSession.password=

View File

@ -1,14 +1,14 @@
[description]
Enables GCloudDatastore session management.
Enables GCloudDatastore session management.
[name]
gcloud-session-store
[provides]
session-store
[depend]
[depends]
annotations
webapp
sessions
gcloud-${type}
sessions/gcloud/gcloud-${type}
[files]
maven://com.google.gcloud/gcloud-java-datastore/0.0.7|lib/gcloud/gcloud-java-datastore-0.0.7.jar
@ -47,23 +47,21 @@ maven://com.google.apis/google-api-services-datastore/v1beta2-rev23-1.19.0|lib/g
lib/jetty-gcloud-session-manager-${jetty.version}.jar
lib/gcloud/*.jar
[license]
GCloudDatastore is an open source project hosted on Github and released under the Apache 2.0 license.
https://github.com/GoogleCloudPlatform/gcloud-java
http://www.apache.org/licenses/LICENSE-2.0.html
[ini]
type=remote
[ini-template]
#type=local
#type=embedded
## GCloudDatastore Session config
## Remote datastore
type=remote
## The gcloud projectId
## Set this property to connect to remote gcloud datastore.
## Or, set the DATASTORE_DATASET System property/env variable instead.
@ -80,3 +78,11 @@ type=remote
## The password (can be obfuscated).
## Set this property only when connecting to remote gcloud datastore
#jetty.gcloudSession.password=
## Local datastore
#type=local
## Embedded datastore
#type=embedded

View File

@ -1,9 +1,5 @@
[description]
Enables session storage when running inside the cloud.
[name]
gcloud-embedded
[xml]
etc/jetty-gcloud-embedded.xml
etc/sessions/gcloud/gcloud-embedded.xml

View File

@ -1,9 +1,5 @@
[description]
Enables session storage on a local GCloudDataStore dev server.
[name]
gcloud-local
[xml]
etc/jetty-gcloud-local.xml
etc/sessions/gcloud/gcloud-local.xml

View File

@ -0,0 +1,6 @@
[description]
Enables session storage on a remote GCloudDataStore service.
[xml]
etc/sessions/gcloud/gcloud-remote.xml

View File

@ -1,10 +0,0 @@
[description]
Enable use of DefaultCache for session data storage
[name]
infinispan-session-default
[xml]
etc/jetty-default-infinispan-session-store.xml

View File

@ -1,12 +1,12 @@
[description]
Enables session data store in a remote Infinispan cache
[name]
infinispan-session-store
[provides]
session-store
[depend]
session
infinispan-session-${cache-type}
sessions/infinispan/infinispan-session-${cache-type}
[files]
maven://org.infinispan/infinispan-core/7.1.1.Final|lib/infinispan/infinispan-core-7.1.1.Final.jar
@ -19,7 +19,6 @@ maven://org.jboss.logging/jboss-logging/3.1.2.GA|lib/infinispan/jboss-logging-3.
lib/jetty-infinispan-${jetty.version}.jar
lib/infinispan/*.jar
[license]
Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.
http://infinispan.org/
@ -30,6 +29,8 @@ http://www.apache.org/licenses/LICENSE-2.0.html
cache-type=default
[ini-template]
cache-type=default
#cache-type=remote
#jetty.session.remoteInfinispanCache.name=sessions
#jetty.session.infinispanIdleTimeout.seconds=0

View File

@ -0,0 +1,6 @@
[description]
Enable use of DefaultCache for session data storage
[xml]
etc/sessions/infinispan/default-store.xml

View File

@ -1,12 +1,9 @@
[description]
Enable use of HotRod remote cache for session data storage
[name]
infinispan-session-remote
[files]
https://raw.githubusercontent.com/eclipse/jetty.project/master/jetty-infinispan/src/main/infinispan-resources/hotrod-client.properties?id=${jetty.tag.version}|resources/hotrod-client.properties
[xml]
etc/jetty-remote-infinispan-session-store.xml
etc/sessions/infinispan/remote-store.xml

View File

@ -1,8 +1,8 @@
[description]
Enables NoSql session management with a MongoDB driver.
[name]
mongo-session-store
[provides]
session-store
[depend]
sessions
@ -14,18 +14,15 @@ maven://org.mongodb/mongo-java-driver/2.6.1|lib/nosql/mongo-java-driver-2.6.1.ja
lib/jetty-nosql-${jetty.version}.jar
lib/nosql/*.jar
[license]
The java driver for the MongoDB document-based database system is hosted on GitHub and released under the Apache 2.0 license.
http://www.mongodb.org/
http://www.apache.org/licenses/LICENSE-2.0.html
[xml]
etc/jetty-mongo-session-store.xml
etc/sessions/mongo/mongo-session-store.xml
[ini]
[ini-template]
#jetty.session.dbName=HttpSessions
#jetty.session.collectionName=jettySessions
#jetty.session.gracePeriod.seconds=3600
#jetty.session.gracePeriod.seconds=3600

View File

@ -1,16 +0,0 @@
[description]
Always in memory session objects.
[name]
default-session-cache
[xml]
etc/jetty-default-session-cache.xml
[ini-template]
#jetty.session.idlePassivationTimeout.seconds=0
#jetty.session.passivateOnComplete=false

View File

@ -1,21 +1,16 @@
[description]
Enables session storage in files.
[name]
file-session-store
Enables session persistent storage in files.
[provides]
session-store
[depends]
sessions
[xml]
etc/jetty-file-session-store.xml
[depend]
sessions
etc/sessions/file-session-store.xml
[ini-template]
#jetty.session.storeDir=
#jetty.session.deleteUnrestorableFiles=false

View File

@ -0,0 +1,18 @@
[description]
Enable first level session cache in ConcurrentHashMap.
If not enabled, sessions will use a HashSessionCache by default, so enabling
via this module is only needed if the configuration properties need to be
changed.
[provides]
session-cache
[depends]
sessions
[xml]
etc/sessions/hash-session-cache.xml
[ini-template]
#jetty.session.idlePassivationTimeout.seconds=0
#jetty.session.passivateOnComplete=false

View File

@ -1,27 +1,20 @@
[description]
Enables JDBC session storage.
[name]
jdbc-session-store
[xml]
etc/jetty-jdbc-session-store.xml
Enables JDBC peristent/distributed session storage.
[provides]
session-store
[depend]
sessions
sessions/jdbc/${db-connection-type}
[xml]
etc/sessions/jdbc-session-store.xml
[ini]
db-connection-type=datasource
[ini-template]
##
##JDBC Session properties
##
@ -47,7 +40,7 @@ db-connection-type=datasource
#jetty.sessionTableSchema.expiryTimeColumn=expiryTime
#jetty.sessionTableSchema.lastAccessTimeColumn=lastAccessTime
#jetty.sessionTableSchema.lastSavedTimeColumn=lastSavedTime
#jetty.sessionTableSchema.idColumn="sessionId
#jetty.sessionTableSchema.idColumn=sessionId
#jetty.sessionTableSchema.lastNodeColumn=lastNode
#jetty.sessionTableSchema.virtualHostColumn=virtualHost
#jetty.sessionTableSchema.maxIntervalColumn=maxInterval

View File

@ -0,0 +1,11 @@
[description]
The default session cache. This module is typically never
explictly enabled and is only used transitively when no other
session cache module is enabled. It does not configure anything
and defers the default behaviour to the SessionHandler
[provides]
session-cache
[depends]
sessions

View File

@ -0,0 +1,12 @@
[description]
The default session store. This module is typically never
explictly enabled and is only used transitively when no other
session store module is enabled. It does not configure anything
and defers the default behaviour to the SessionHandler
[provides]
session-store
[depends]
sessions

View File

@ -1,18 +1,17 @@
[description]
Enables session id management and scavenging.
[name]
sessions
The session management. By enabling this module, it allows
session management to be configured via the ini templates
created or by enabling other session-cache or session-store
modules. Without this module enabled, the server may still
use sessions, but their management cannot be configured.
[depends]
server
[xml]
etc/jetty-sessions.xml
etc/sessions/session-id-manager.xml
[ini-template]
## The name to uniquely identify this server instance
#jetty.sessionIdManager.workerName=node1

View File

@ -1,9 +1,5 @@
[description]
JDBC Datasource connections for session storage
[name]
datasource
[xml]
etc/jetty-jdbc-session-store-datasource.xml
etc/sessions/jdbc/session-store-datasource.xml

View File

@ -1,9 +1,5 @@
[description]
JDBC Driver connections for session storage
[name]
driver
[xml]
etc/jetty-jdbc-session-store-driver.xml
etc/sessions/jdbc/session-store-driver.xml

View File

@ -3,9 +3,6 @@ Enables a TLS(SSL) Connector on the server.
This may be used for HTTPS and/or HTTP2 by enabling
the associated support modules.
[name]
ssl
[depend]
server

View File

@ -2,9 +2,6 @@
Enable spring configuration processing so all jetty style
xml files can optionally be written as spring beans
[name]
spring
[depend]
server