From 9d475a624b63be731c0318b0b71030d82a46dea5 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 13 Oct 2016 10:06:17 +1100 Subject: [PATCH] Normalize tags #998 --- .../src/main/config/modules/gcloud-datastore.mod | 2 +- .../src/main/config/modules/gcloud.mod | 2 +- .../src/main/config/modules/session-store-gcloud.mod | 2 +- jetty-home/src/main/resources/modules/hawtio.mod | 2 +- jetty-home/src/main/resources/modules/jamon.mod | 2 +- jetty-home/src/main/resources/modules/jminix.mod | 2 +- jetty-home/src/main/resources/modules/jolokia.mod | 2 +- jetty-http2/http2-server/src/main/config/modules/http2.mod | 2 +- jetty-http2/http2-server/src/main/config/modules/http2c.mod | 2 +- .../main/config/modules/session-store-infinispan-embedded.mod | 2 +- .../src/main/config/modules/session-store-infinispan-remote.mod | 2 +- .../config/modules/sessions/session-data-cache/xmemcached.mod | 2 +- jetty-nosql/src/main/config/modules/session-store-mongo.mod | 2 +- jetty-server/src/main/config/modules/debug.mod | 2 +- jetty-server/src/main/config/modules/debuglog.mod | 2 +- jetty-server/src/main/config/modules/ext.mod | 2 +- jetty-server/src/main/config/modules/gzip.mod | 2 +- jetty-server/src/main/config/modules/http-forwarded.mod | 2 +- jetty-server/src/main/config/modules/http.mod | 2 +- jetty-server/src/main/config/modules/https.mod | 2 +- jetty-server/src/main/config/modules/ipaccess.mod | 2 +- jetty-server/src/main/config/modules/logback-access.mod | 2 +- jetty-server/src/main/config/modules/proxy-protocol-ssl.mod | 2 +- jetty-server/src/main/config/modules/requestlog.mod | 2 +- jetty-server/src/main/config/modules/resources.mod | 2 +- jetty-server/src/main/config/modules/session-cache-hash.mod | 2 +- jetty-server/src/main/config/modules/session-cache-null.mod | 2 +- jetty-server/src/main/config/modules/session-store-cache.mod | 2 +- jetty-server/src/main/config/modules/session-store-file.mod | 2 +- jetty-server/src/main/config/modules/session-store-jdbc.mod | 2 +- jetty-server/src/main/config/modules/sessions.mod | 2 +- jetty-server/src/main/config/modules/ssl.mod | 2 +- jetty-server/src/main/config/modules/stats.mod | 2 +- jetty-server/src/main/config/modules/threadlimit.mod | 2 +- .../src/main/config/modules/unixsocket-forwarded.mod | 2 +- jetty-unixsocket/src/main/config/modules/unixsocket-http.mod | 2 +- jetty-unixsocket/src/main/config/modules/unixsocket-http2c.mod | 2 +- .../src/main/config/modules/unixsocket-proxy-protocol.mod | 2 +- jetty-unixsocket/src/main/config/modules/unixsocket-secure.mod | 2 +- jetty-unixsocket/src/main/config/modules/unixsocket.mod | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod index 43d1ea6e7b2..0a8019a762c 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud-datastore.mod @@ -1,7 +1,7 @@ [description] Enables GCloud Datastore API and implementation -[Tags] +[tags] 3rdparty gcloud diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud.mod index 2039280ee34..305d996804b 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/gcloud.mod @@ -1,7 +1,7 @@ [description] Control GCloud API classpath -[Tags] +[tags] 3rdparty gcloud diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod index c5e933032fa..ce632fd5315 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod +++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/config/modules/session-store-gcloud.mod @@ -1,7 +1,7 @@ [description] Enables GCloudDatastore session management. -[Tags] +[tags] session gcloud diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod index 2191e37595c..20a27dd53dd 100644 --- a/jetty-home/src/main/resources/modules/hawtio.mod +++ b/jetty-home/src/main/resources/modules/hawtio.mod @@ -1,7 +1,7 @@ [description] Deploys the Hawtio console as a webapplication. -[Tags] +[tags] 3rdparty [depend] diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod index 5fe87c68754..c8207f9af82 100644 --- a/jetty-home/src/main/resources/modules/jamon.mod +++ b/jetty-home/src/main/resources/modules/jamon.mod @@ -1,7 +1,7 @@ [description] Deploys the JAMon webapplication -[Tags] +[tags] 3rdparty [depend] diff --git a/jetty-home/src/main/resources/modules/jminix.mod b/jetty-home/src/main/resources/modules/jminix.mod index 6310834a283..cac1e831960 100644 --- a/jetty-home/src/main/resources/modules/jminix.mod +++ b/jetty-home/src/main/resources/modules/jminix.mod @@ -1,7 +1,7 @@ [description] Deploys the Jminix JMX Console within the server -[Tags] +[tags] 3rdparty [depend] diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod index a5d21a86ba4..1edc38668a2 100644 --- a/jetty-home/src/main/resources/modules/jolokia.mod +++ b/jetty-home/src/main/resources/modules/jolokia.mod @@ -1,7 +1,7 @@ [description] Deploys the Jolokia console as a web application. -[Tags] +[tags] 3rdparty [depend] diff --git a/jetty-http2/http2-server/src/main/config/modules/http2.mod b/jetty-http2/http2-server/src/main/config/modules/http2.mod index 5927f571279..e1e700ba372 100644 --- a/jetty-http2/http2-server/src/main/config/modules/http2.mod +++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod @@ -2,7 +2,7 @@ Enables HTTP2 protocol support on the TLS(SSL) Connector, using the ALPN extension to select which protocol to use. -[Tags] +[tags] connector http2 http diff --git a/jetty-http2/http2-server/src/main/config/modules/http2c.mod b/jetty-http2/http2-server/src/main/config/modules/http2c.mod index b0fee130af5..228d5a8ca31 100644 --- a/jetty-http2/http2-server/src/main/config/modules/http2c.mod +++ b/jetty-http2/http2-server/src/main/config/modules/http2c.mod @@ -2,7 +2,7 @@ Enables the HTTP2C protocol on the HTTP Connector The connector will accept both HTTP/1 and HTTP/2 connections. -[Tags] +[tags] connector http2 http diff --git a/jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded.mod b/jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded.mod index bd0bb80ea10..ba186c8345d 100644 --- a/jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded.mod +++ b/jetty-infinispan/src/main/config/modules/session-store-infinispan-embedded.mod @@ -1,7 +1,7 @@ [description] Enables session data store in a local Infinispan cache -[Tags] +[tags] session [provides] diff --git a/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod b/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod index 70c62076d94..6f1cda62374 100644 --- a/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod +++ b/jetty-infinispan/src/main/config/modules/session-store-infinispan-remote.mod @@ -1,7 +1,7 @@ [description] Enables session data store in a remote Infinispan cache -[Tags] +[tags] session [provides] diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod index 48c589ae00c..e1e71817158 100644 --- a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod +++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod @@ -1,7 +1,7 @@ [description] Memcache cache for SessionData -[Tags] +[tags] session [depends] diff --git a/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-nosql/src/main/config/modules/session-store-mongo.mod index c1ffb5c755e..64e8c59f566 100644 --- a/jetty-nosql/src/main/config/modules/session-store-mongo.mod +++ b/jetty-nosql/src/main/config/modules/session-store-mongo.mod @@ -1,7 +1,7 @@ [description] Enables NoSql session management with a MongoDB driver. -[Tags] +[tags] session [provides] diff --git a/jetty-server/src/main/config/modules/debug.mod b/jetty-server/src/main/config/modules/debug.mod index 9e0ae040b9f..9462422ff3c 100644 --- a/jetty-server/src/main/config/modules/debug.mod +++ b/jetty-server/src/main/config/modules/debug.mod @@ -3,7 +3,7 @@ Enables the DebugListener to generate additional logging regarding detailed request handling events. Renames threads to include request URI. -[Tags] +[tags] debug [depend] diff --git a/jetty-server/src/main/config/modules/debuglog.mod b/jetty-server/src/main/config/modules/debuglog.mod index 81db4894c71..28e6d8c725d 100644 --- a/jetty-server/src/main/config/modules/debuglog.mod +++ b/jetty-server/src/main/config/modules/debuglog.mod @@ -2,7 +2,7 @@ Deprecated Debug Log using the DebugHandle. Replaced with the debug module. -[Tags] +[tags] debug [depend] diff --git a/jetty-server/src/main/config/modules/ext.mod b/jetty-server/src/main/config/modules/ext.mod index 63081e550dd..3834181a301 100644 --- a/jetty-server/src/main/config/modules/ext.mod +++ b/jetty-server/src/main/config/modules/ext.mod @@ -2,7 +2,7 @@ Adds all jar files discovered in $JETTY_HOME/lib/ext and $JETTY_BASE/lib/ext to the servers classpath. -[Tags] +[tags] classpath [lib] diff --git a/jetty-server/src/main/config/modules/gzip.mod b/jetty-server/src/main/config/modules/gzip.mod index 50db40b156e..6cad4037b32 100644 --- a/jetty-server/src/main/config/modules/gzip.mod +++ b/jetty-server/src/main/config/modules/gzip.mod @@ -2,7 +2,7 @@ Enable GzipHandler for dynamic gzip compression for the entire server. -[Tags] +[tags] handler [depend] diff --git a/jetty-server/src/main/config/modules/http-forwarded.mod b/jetty-server/src/main/config/modules/http-forwarded.mod index 2797bc29d3b..b84ca7ce3b1 100644 --- a/jetty-server/src/main/config/modules/http-forwarded.mod +++ b/jetty-server/src/main/config/modules/http-forwarded.mod @@ -2,7 +2,7 @@ Adds a forwarded request customizer to the HTTP Connector to process forwarded-for style headers from a proxy. -[Tags] +[tags] connector [depend] diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod index caf104cb9b4..fa13822fff5 100644 --- a/jetty-server/src/main/config/modules/http.mod +++ b/jetty-server/src/main/config/modules/http.mod @@ -3,7 +3,7 @@ Enables a HTTP connector on the server. By default HTTP/1 is support, but HTTP2C can be added to the connector with the http2c module. -[Tags] +[tags] connector http diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod index 9ff301e58d5..ad13224e2f8 100644 --- a/jetty-server/src/main/config/modules/https.mod +++ b/jetty-server/src/main/config/modules/https.mod @@ -1,7 +1,7 @@ [description] Adds HTTPS protocol support to the TLS(SSL) Connector -[Tags] +[tags] connector https http diff --git a/jetty-server/src/main/config/modules/ipaccess.mod b/jetty-server/src/main/config/modules/ipaccess.mod index 5afd05e0a11..0a985c917d9 100644 --- a/jetty-server/src/main/config/modules/ipaccess.mod +++ b/jetty-server/src/main/config/modules/ipaccess.mod @@ -2,7 +2,7 @@ Enable the ipaccess handler to apply a white/black list control of the remote IP of requests. -[Tags] +[tags] handler [depend] diff --git a/jetty-server/src/main/config/modules/logback-access.mod b/jetty-server/src/main/config/modules/logback-access.mod index 0cb8bd0de45..77bccff40f2 100644 --- a/jetty-server/src/main/config/modules/logback-access.mod +++ b/jetty-server/src/main/config/modules/logback-access.mod @@ -1,7 +1,7 @@ [description] Enables logback request log. -[Tags] +[tags] requestlog logging logback diff --git a/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod b/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod index 4b41e935bb6..a33efe84a99 100644 --- a/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod +++ b/jetty-server/src/main/config/modules/proxy-protocol-ssl.mod @@ -5,7 +5,7 @@ This allows a Proxy operating in TCP mode to transport details of the proxied connection to the server. Both V1 and V2 versions of the protocol are supported. -[Tags] +[tags] connector ssl diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod index 0bf60edcdc0..3fdb93bd3ab 100644 --- a/jetty-server/src/main/config/modules/requestlog.mod +++ b/jetty-server/src/main/config/modules/requestlog.mod @@ -1,7 +1,7 @@ [description] Enables a NCSA style request log. -[Tags] +[tags] requestlog [depend] diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod index 4e0bd35b43a..00a5de93ba1 100644 --- a/jetty-server/src/main/config/modules/resources.mod +++ b/jetty-server/src/main/config/modules/resources.mod @@ -3,7 +3,7 @@ Adds the $JETTY_HOME/resources and/or $JETTY_BASE/resources directory to the server classpath. Useful for configuration property files (eg jetty-logging.properties) -[Tags] +[tags] classpath [lib] diff --git a/jetty-server/src/main/config/modules/session-cache-hash.mod b/jetty-server/src/main/config/modules/session-cache-hash.mod index 1f257867b25..2236405fc55 100644 --- a/jetty-server/src/main/config/modules/session-cache-hash.mod +++ b/jetty-server/src/main/config/modules/session-cache-hash.mod @@ -4,7 +4,7 @@ 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. -[Tags] +[tags] session [provides] diff --git a/jetty-server/src/main/config/modules/session-cache-null.mod b/jetty-server/src/main/config/modules/session-cache-null.mod index 70c9e97fa37..1574ffdd73a 100644 --- a/jetty-server/src/main/config/modules/session-cache-null.mod +++ b/jetty-server/src/main/config/modules/session-cache-null.mod @@ -1,7 +1,7 @@ [description] A trivial SessionCache that does not actually cache sessions. -[Tags] +[tags] session [provides] diff --git a/jetty-server/src/main/config/modules/session-store-cache.mod b/jetty-server/src/main/config/modules/session-store-cache.mod index cac19d1207d..182384066f4 100644 --- a/jetty-server/src/main/config/modules/session-store-cache.mod +++ b/jetty-server/src/main/config/modules/session-store-cache.mod @@ -1,7 +1,7 @@ [description] Enables caching of SessionData in front of a SessionDataStore. -[Tags] +[tags] session diff --git a/jetty-server/src/main/config/modules/session-store-file.mod b/jetty-server/src/main/config/modules/session-store-file.mod index d644f67dddd..0cd4658c77b 100644 --- a/jetty-server/src/main/config/modules/session-store-file.mod +++ b/jetty-server/src/main/config/modules/session-store-file.mod @@ -1,7 +1,7 @@ [description] Enables session persistent storage in files. -[Tags] +[tags] session [provides] diff --git a/jetty-server/src/main/config/modules/session-store-jdbc.mod b/jetty-server/src/main/config/modules/session-store-jdbc.mod index 69bf3125bd0..fd8edd96c5f 100644 --- a/jetty-server/src/main/config/modules/session-store-jdbc.mod +++ b/jetty-server/src/main/config/modules/session-store-jdbc.mod @@ -1,7 +1,7 @@ [description] Enables JDBC peristent/distributed session storage. -[Tags] +[tags] session [provides] diff --git a/jetty-server/src/main/config/modules/sessions.mod b/jetty-server/src/main/config/modules/sessions.mod index 4ce1cde856e..ee3d734df69 100644 --- a/jetty-server/src/main/config/modules/sessions.mod +++ b/jetty-server/src/main/config/modules/sessions.mod @@ -5,7 +5,7 @@ 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. -[Tags] +[tags] session [depends] diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod index db92f255bb2..e8edec6d7d1 100644 --- a/jetty-server/src/main/config/modules/ssl.mod +++ b/jetty-server/src/main/config/modules/ssl.mod @@ -3,7 +3,7 @@ Enables a TLS(SSL) Connector on the server. This may be used for HTTPS and/or HTTP2 by enabling the associated support modules. -[Tags] +[tags] connector ssl diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod index 2b4d3d32f8b..e807d2cedff 100644 --- a/jetty-server/src/main/config/modules/stats.mod +++ b/jetty-server/src/main/config/modules/stats.mod @@ -2,7 +2,7 @@ Enable detailed statistics collection for the server, available via JMX. -[Tags] +[tags] handler [depend] diff --git a/jetty-server/src/main/config/modules/threadlimit.mod b/jetty-server/src/main/config/modules/threadlimit.mod index b6d41dc1480..80ec54c873b 100644 --- a/jetty-server/src/main/config/modules/threadlimit.mod +++ b/jetty-server/src/main/config/modules/threadlimit.mod @@ -3,7 +3,7 @@ # Applies ThreadLimiteHandler to entire server # -[Tags] +[tags] handler [depend] diff --git a/jetty-unixsocket/src/main/config/modules/unixsocket-forwarded.mod b/jetty-unixsocket/src/main/config/modules/unixsocket-forwarded.mod index cb14381ebae..3af8240d7c2 100644 --- a/jetty-unixsocket/src/main/config/modules/unixsocket-forwarded.mod +++ b/jetty-unixsocket/src/main/config/modules/unixsocket-forwarded.mod @@ -4,7 +4,7 @@ by the Unix Domain Socket connector, for use when behind a proxy operating in HTTP mode that adds forwarded-for style HTTP headers. Typically this is an alternate to the Proxy Protocol used mostly for TCP mode. -[Tags] +[tags] connector [depend] diff --git a/jetty-unixsocket/src/main/config/modules/unixsocket-http.mod b/jetty-unixsocket/src/main/config/modules/unixsocket-http.mod index 1605722f685..d86002780f3 100644 --- a/jetty-unixsocket/src/main/config/modules/unixsocket-http.mod +++ b/jetty-unixsocket/src/main/config/modules/unixsocket-http.mod @@ -4,7 +4,7 @@ It should be used when a proxy is forwarding either HTTP or decrypted HTTPS traffic to the connector and may be used with the unix-socket-http2c modules to upgrade to HTTP/2. -[Tags] +[tags] connector http diff --git a/jetty-unixsocket/src/main/config/modules/unixsocket-http2c.mod b/jetty-unixsocket/src/main/config/modules/unixsocket-http2c.mod index 6e112221cfe..396fdc1f609 100644 --- a/jetty-unixsocket/src/main/config/modules/unixsocket-http2c.mod +++ b/jetty-unixsocket/src/main/config/modules/unixsocket-http2c.mod @@ -3,7 +3,7 @@ Adds a HTTP2C connetion factory to the Unix Domain Socket Connector It can be used when either the proxy forwards direct HTTP/2C (unecrypted) or decrypted HTTP/2 traffic. -[Tags] +[tags] connector http2 diff --git a/jetty-unixsocket/src/main/config/modules/unixsocket-proxy-protocol.mod b/jetty-unixsocket/src/main/config/modules/unixsocket-proxy-protocol.mod index cfa3c726fb7..a8186366ba8 100644 --- a/jetty-unixsocket/src/main/config/modules/unixsocket-proxy-protocol.mod +++ b/jetty-unixsocket/src/main/config/modules/unixsocket-proxy-protocol.mod @@ -8,7 +8,7 @@ SSL properties may be interpreted by the unixsocket-secure module to indicate secure HTTPS traffic. Typically this is an alternate to the forwarded module. -[Tags] +[tags] connector [depend] diff --git a/jetty-unixsocket/src/main/config/modules/unixsocket-secure.mod b/jetty-unixsocket/src/main/config/modules/unixsocket-secure.mod index 8d099b539fa..4284943804b 100644 --- a/jetty-unixsocket/src/main/config/modules/unixsocket-secure.mod +++ b/jetty-unixsocket/src/main/config/modules/unixsocket-secure.mod @@ -5,7 +5,7 @@ This looks for a secure scheme transported either by the unixsocket-forwarded, unixsocket-proxy-protocol or in a HTTP2 request. -[Tags] +[tags] connector [depend] diff --git a/jetty-unixsocket/src/main/config/modules/unixsocket.mod b/jetty-unixsocket/src/main/config/modules/unixsocket.mod index f4defea923c..2bdb57df920 100644 --- a/jetty-unixsocket/src/main/config/modules/unixsocket.mod +++ b/jetty-unixsocket/src/main/config/modules/unixsocket.mod @@ -7,7 +7,7 @@ needless fragmentation and have better dispatch behaviours. When enabled with corresponding support modules, the connector can accept HTTP, HTTPS or HTTP2C traffic. -[Tags] +[tags] connector [depend]