Merge branch 'jetty-9.4.x'

apache-jsp/src/main/config/modules/apache-jsp.mod

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

apache-jstl/src/main/config/modules/apache-jstl.mod

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

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_91.mod

@@ -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
 

jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_92.mod

@@ -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
 

jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc

@@ -246,6 +246,8 @@ The ALPN implementation, relying on modifications of OpenJDK classes, updates ev
 |1.8.0u73 |8.1.7.v20160121
 |1.8.0u74 |8.1.7.v20160121
 |1.8.0u77 |8.1.7.v20160121
+|1.8.0u91 |8.1.7.v20160121
+|1.8.0u92 |8.1.8.v20160420
 |=============================
 
 [[alpn-build]]

jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-remote.mod

@@ -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=

jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/embedded.mod

@@ -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/embedded.xml

jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/local.mod

@@ -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/local.xml

jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/sessions/gcloud/remote.mod

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

jetty-gcloud/jetty-gcloud-session-manager/src/main/config/session-store-gcloud.mod

@@ -1,14 +1,14 @@
 [description]
-Enables  GCloudDatastore session management.
+Enables GCloudDatastore session management.
 
-[name]
+[provides]
-gcloud-session-store
+session-store
 
-[depend]
+[depends]
 annotations
 webapp
 sessions
-gcloud-${type}
+sessions/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,24 @@ 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
 
+[xml]
+sessions/gcloud/session-store.xml
 
 [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 +81,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

jetty-infinispan/src/main/config/modules/infinispan-session-default.mod

@@ -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
-

jetty-infinispan/src/main/config/modules/session-store-infinispan.mod

@@ -1,12 +1,12 @@
 [description]
 Enables session data store in a remote Infinispan cache
 
-[name]
+[provides]
-infinispan-session-store
+session-store
 
 [depend]
 session
-infinispan-session-${cache-type}
+sessions/infinispan/${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

jetty-infinispan/src/main/config/modules/sessions/infinispan/default.mod

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

jetty-infinispan/src/main/config/modules/sessions/infinispan/remote.mod

@@ -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.xml
 

jetty-nosql/src/main/config/modules/session-store-mongo.mod

@@ -1,8 +1,8 @@
 [description]
 Enables NoSql session management with a MongoDB driver.
 
-[name]
+[provides]
-mongo-session-store
+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/session-store.xml
 
-
+[ini-template]
-[ini]
 #jetty.session.dbName=HttpSessions
 #jetty.session.collectionName=jettySessions
-#jetty.session.gracePeriod.seconds=3600
+#jetty.session.gracePeriod.seconds=3600

jetty-server/src/main/config/modules/default-session-cache.mod

@@ -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

jetty-server/src/main/config/modules/file-session-store.mod

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

jetty-server/src/main/config/modules/session-cache-hash.mod

@@ -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

jetty-server/src/main/config/modules/session-store-file.mod

@@ -0,0 +1,19 @@
+[description]
+Enables session persistent storage in files.
+
+[provides]
+session-store
+
+[depends]
+sessions
+
+[xml]
+etc/sessions/file/session-store.xml
+
+[files]
+sessions/
+
+[ini-template]
+jetty.session.storeDir=${jetty.base}/sessions
+#jetty.session.deleteUnrestorableFiles=false
+

jetty-server/src/main/config/modules/session-store-jdbc.mod

@@ -1,27 +1,20 @@
 [description]
-Enables JDBC session storage.
+Enables JDBC peristent/distributed session storage.
-
-
-[name]
-jdbc-session-store
-
-
-
-[xml]
-etc/jetty-jdbc-session-store.xml
 
+[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
 ##
@@ -30,15 +23,15 @@ db-connection-type=datasource
 #jetty.session.deleteUnloadables=false
 #jetty.session.loadAttempts=-1
 
+## Connection type:Datasource
+db-connection-type=datasource
+#jetty.session.datasourceName=/jdbc/sessions
+
 ## Connection type:driver
 #db-connection-type=driver
 #jetty.session.driverClass=
 #jetty.session.driverUrl=
 
-## Connection type:Datasource
-#db-connection-type=datasource
-#jetty.session.datasourceName=/jdbc/sessions
-
 ## Session table schema
 #jetty.sessionTableSchema.accessTimeColumn=accessTime
 #jetty.sessionTableSchema.contextPathColumn=contextPath
@@ -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

jetty-server/src/main/config/modules/sessions.mod

@@ -1,18 +1,17 @@
 [description]
-Enables session id management and scavenging.
+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
-[name]
+modules.  Without this module enabled, the server may still
-sessions
+use sessions, but their management cannot be configured.
-
 
+[depends]
+server
 
 [xml]
-etc/jetty-sessions.xml
+etc/sessions/id-manager.xml
-
 
 [ini-template]
-
 ## The name to uniquely identify this server instance
 #jetty.sessionIdManager.workerName=node1
 

jetty-server/src/main/config/modules/sessions/jdbc/datasource.mod

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

jetty-server/src/main/config/modules/sessions/jdbc/driver.mod

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

jetty-server/src/main/config/modules/ssl.mod

@@ -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
 

jetty-server/src/main/java/org/eclipse/jetty/server/Server.java

@@ -370,7 +370,10 @@ public class Server extends HandlerWrapper implements Attributes
 
         LOG.info("jetty-" + getVersion());
         if (!Jetty.STABLE)
+        {
             LOG.warn("THIS IS NOT A STABLE RELEASE! DO NOT USE IN PRODUCTION!");
+            LOG.warn("Download a stable release from http://download.eclipse.org/jetty/");
+        }
         
         HttpGenerator.setJettyVersion(HttpConfiguration.SERVER_VERSION);
         MultiException mex=new MultiException();

jetty-spring/src/main/config/modules/spring.mod

@@ -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
 

jetty-util/src/main/java/org/eclipse/jetty/util/Jetty.java

@@ -33,16 +33,11 @@ public class Jetty
             VERSION = pkg.getImplementationVersion();
         else
             VERSION = System.getProperty("jetty.version", "9.4.z-SNAPSHOT");
-        
+
         POWERED_BY="<a href=\"http://eclipse.org/jetty\">Powered by Jetty:// "+VERSION+"</a>";
-        
+
-        boolean stable=true;
+        // Show warning when RC# or M# is in version string
-        for (char c: VERSION.toCharArray())
+        STABLE = !VERSION.matches("^.*\\.(RC|M)[0-9]+$");
-        {
-            if (c!='.' && !Character.isDigit(c))
-                stable=false;
-        }
-        STABLE=stable;
     }
 
     private Jetty()