From 725e405dace78d62a895141aa35f0c6aef34a5ae Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 22 Aug 2013 11:53:58 -0500 Subject: [PATCH 1/6] first pass for mod files for distribution --- .../src/main/config/modules/annotations.mod | 14 + jetty-client/pom.xml | 288 +++++++++--------- .../src/main/config/modules/client.mod | 6 + .../src/main/config/modules/deploy.mod | 9 + jetty-distribution/pom.xml | 5 + jetty-jaas/src/main/config/modules/jaas.mod | 9 + jetty-jmx/src/main/config/modules/jmx.mod | 9 + jetty-jndi/pom.xml | 17 ++ jetty-jndi/src/main/config/modules/jndi.mod | 12 + .../src/main/config/modules/monitor.mod | 10 + jetty-nosql/pom.xml | 17 ++ jetty-nosql/src/main/config/modules/nosql.mod | 7 + .../src/main/config/modules/overlay.mod | 10 + jetty-plus/src/main/config/modules/plus.mod | 10 + jetty-proxy/src/main/config/modules/proxy.mod | 10 + .../src/main/config/modules/rewrite.mod | 10 + jetty-server/src/main/config/modules/base.mod | 6 + .../src/main/config/modules/debug.mod | 7 + jetty-server/src/main/config/modules/http.mod | 7 + .../src/main/config/modules/https.mod | 8 + .../src/main/config/modules/ipaccess.mod | 7 + .../src/main/config/modules/lowresources.mod | 7 + .../src/main/config/modules/requestlog.mod | 7 + .../src/main/config/modules/server.mod | 14 + .../src/main/config/modules/stats.mod | 7 + .../src/main/config/modules/xinetd.mod | 7 + jetty-server/src/main/config/modules/xml.mod | 8 + jetty-webapp/pom.xml | 17 ++ .../src/main/config/modules/webapp.mod | 7 + 29 files changed, 413 insertions(+), 139 deletions(-) create mode 100644 jetty-annotations/src/main/config/modules/annotations.mod create mode 100644 jetty-client/src/main/config/modules/client.mod create mode 100644 jetty-deploy/src/main/config/modules/deploy.mod create mode 100644 jetty-jaas/src/main/config/modules/jaas.mod create mode 100644 jetty-jmx/src/main/config/modules/jmx.mod create mode 100644 jetty-jndi/src/main/config/modules/jndi.mod create mode 100644 jetty-monitor/src/main/config/modules/monitor.mod create mode 100644 jetty-nosql/src/main/config/modules/nosql.mod create mode 100644 jetty-overlay-deployer/src/main/config/modules/overlay.mod create mode 100644 jetty-plus/src/main/config/modules/plus.mod create mode 100644 jetty-proxy/src/main/config/modules/proxy.mod create mode 100644 jetty-rewrite/src/main/config/modules/rewrite.mod create mode 100644 jetty-server/src/main/config/modules/base.mod create mode 100644 jetty-server/src/main/config/modules/debug.mod create mode 100644 jetty-server/src/main/config/modules/http.mod create mode 100644 jetty-server/src/main/config/modules/https.mod create mode 100644 jetty-server/src/main/config/modules/ipaccess.mod create mode 100644 jetty-server/src/main/config/modules/lowresources.mod create mode 100644 jetty-server/src/main/config/modules/requestlog.mod create mode 100644 jetty-server/src/main/config/modules/server.mod create mode 100644 jetty-server/src/main/config/modules/stats.mod create mode 100644 jetty-server/src/main/config/modules/xinetd.mod create mode 100644 jetty-server/src/main/config/modules/xml.mod create mode 100644 jetty-webapp/src/main/config/modules/webapp.mod diff --git a/jetty-annotations/src/main/config/modules/annotations.mod b/jetty-annotations/src/main/config/modules/annotations.mod new file mode 100644 index 00000000000..3470bf75c79 --- /dev/null +++ b/jetty-annotations/src/main/config/modules/annotations.mod @@ -0,0 +1,14 @@ +# +# Jetty Annotation Scanning Module +# + +# Annotations needs plus, and jndi features +DEPEND=plus + +# Annotations needs jetty annotation jars +LIB=lib/jetty-annotations-${jetty.version}.jar +# Need annotation processing jars too +LIB=lib/annotations/*.jar + +# Enable annotation scanning webapp configurations +etc/jetty-annotations.xml diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index a7cd736f1ed..b2ccc2cf64a 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -1,144 +1,154 @@ - - - org.eclipse.jetty - jetty-project - 9.1.0-SNAPSHOT - + + + org.eclipse.jetty + jetty-project + 9.1.0-SNAPSHOT + - 4.0.0 - jetty-client - Jetty :: Asynchronous HTTP Client - http://www.eclipse.org/jetty - - ${project.groupId}.client - target/test-policy - - - - - org.apache.felix - maven-bundle-plugin - true - - - - manifest - - - - javax.net.*,* - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.codehaus.mojo - findbugs-maven-plugin - - org.eclipse.jetty.client.* - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - generate-test-resources - - unpack - - - - - org.eclipse.jetty.toolchain - jetty-test-policy - ${jetty-test-policy-version} - jar - true - **/*.keystore,**/*.pem - ${jetty.test.policy.loc} - - - - - - - - + 4.0.0 + jetty-client + Jetty :: Asynchronous HTTP Client + http://www.eclipse.org/jetty + + ${project.groupId}.client + target/test-policy + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + config + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + manifest + + + + javax.net.*,* + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.client.* + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + generate-test-resources + + unpack + + + + + org.eclipse.jetty.toolchain + jetty-test-policy + ${jetty-test-policy-version} + jar + true + **/*.keystore,**/*.pem + ${jetty.test.policy.loc} + + + + + + + + - - - org.eclipse.jetty - jetty-http - ${project.version} - - - org.eclipse.jetty - jetty-io - ${project.version} - - - org.eclipse.jetty.spdy - spdy-client - ${project.version} - + + + org.eclipse.jetty + jetty-http + ${project.version} + + + org.eclipse.jetty + jetty-io + ${project.version} + + + org.eclipse.jetty.spdy + spdy-client + ${project.version} + - - org.eclipse.jetty - jetty-server - ${project.version} - test - - - org.eclipse.jetty - jetty-security - ${project.version} - test - - - org.eclipse.jetty - jetty-servlet - ${project.version} - test - - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - + + org.eclipse.jetty + jetty-server + ${project.version} + test + + + org.eclipse.jetty + jetty-security + ${project.version} + test + + + org.eclipse.jetty + jetty-servlet + ${project.version} + test + + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + - - com.ning - async-http-client - 1.7.5 - test - - - org.apache.httpcomponents - httpclient - 4.2.1 - test - - + + com.ning + async-http-client + 1.7.5 + test + + + org.apache.httpcomponents + httpclient + 4.2.1 + test + + diff --git a/jetty-client/src/main/config/modules/client.mod b/jetty-client/src/main/config/modules/client.mod new file mode 100644 index 00000000000..f434cdc0870 --- /dev/null +++ b/jetty-client/src/main/config/modules/client.mod @@ -0,0 +1,6 @@ +# +# Client Feature +# + +# Client jars +LIB=lib/jetty-client-${jetty.version}.jar diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod new file mode 100644 index 00000000000..5705ac61d91 --- /dev/null +++ b/jetty-deploy/src/main/config/modules/deploy.mod @@ -0,0 +1,9 @@ +# +# Deploy Feature +# + +# Deploy jars +LIB=lib/jetty-deploy-${jetty.version}.jar + +# Deploy configuration +etc/jetty-deploy.xml diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index e55ebe97928..bf9aac223e6 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -612,6 +612,11 @@ jetty-proxy ${project.version} + + org.eclipse.jetty + jetty-overlay-deployer + ${project.version} + org.eclipse.jetty jetty-jaas diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod new file mode 100644 index 00000000000..d0d6f0fa463 --- /dev/null +++ b/jetty-jaas/src/main/config/modules/jaas.mod @@ -0,0 +1,9 @@ +# +# JAAS Feature +# + +# JAAS jars +LIB=lib/jetty-jaas-${jetty.version}.jar + +# JAAS configuration +etc/jetty-jaas.xml diff --git a/jetty-jmx/src/main/config/modules/jmx.mod b/jetty-jmx/src/main/config/modules/jmx.mod new file mode 100644 index 00000000000..2a7922690e9 --- /dev/null +++ b/jetty-jmx/src/main/config/modules/jmx.mod @@ -0,0 +1,9 @@ +# +# JMX Feature +# + +# JMX jars (as defined in start.config) +LIB=lib/jetty-jmx-${jetty.version}.jar + +# JMX configuration +etc/jetty-jmx.xml diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index dbd3fbcbdd4..0f088b669e3 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -14,6 +14,23 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + config + + + + + org.apache.felix maven-bundle-plugin diff --git a/jetty-jndi/src/main/config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod new file mode 100644 index 00000000000..de3087bd26f --- /dev/null +++ b/jetty-jndi/src/main/config/modules/jndi.mod @@ -0,0 +1,12 @@ +# +# JNDI Support +# + +DEPEND=server +DEPEND=plus + +LIB=lib/jetty-jndi-${jetty.version}.jar +LIB=lib/jndi/*.jar + +# Annotations needs annotations configuration +etc/jetty-server.xml diff --git a/jetty-monitor/src/main/config/modules/monitor.mod b/jetty-monitor/src/main/config/modules/monitor.mod new file mode 100644 index 00000000000..249ccef15d1 --- /dev/null +++ b/jetty-monitor/src/main/config/modules/monitor.mod @@ -0,0 +1,10 @@ +# +# Jetty Monitor module +# + +DEPEND=server +DEPEND=client + +LIB=lib/jetty-monitor-${jetty.version}.jar + +etc/jetty-monitor.xml \ No newline at end of file diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index e06a15b9cbb..ebfa3c9d392 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -14,6 +14,23 @@ install + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + config + + + + + org.apache.felix maven-bundle-plugin diff --git a/jetty-nosql/src/main/config/modules/nosql.mod b/jetty-nosql/src/main/config/modules/nosql.mod new file mode 100644 index 00000000000..3d8b099ed0e --- /dev/null +++ b/jetty-nosql/src/main/config/modules/nosql.mod @@ -0,0 +1,7 @@ +# +# Jetty Nosql module +# + +DEPEND=webapp + +LIB=lib/jetty-nosql-${jetty.version}.jar \ No newline at end of file diff --git a/jetty-overlay-deployer/src/main/config/modules/overlay.mod b/jetty-overlay-deployer/src/main/config/modules/overlay.mod new file mode 100644 index 00000000000..a006476a60d --- /dev/null +++ b/jetty-overlay-deployer/src/main/config/modules/overlay.mod @@ -0,0 +1,10 @@ +# +# Jetty Overlay module +# + +DEPEND=deploy + +LIB=lib/jetty-overlay-deployer-${jetty.version}.jar + +# Plus requires configuration +etc/jetty-overlay.xml diff --git a/jetty-plus/src/main/config/modules/plus.mod b/jetty-plus/src/main/config/modules/plus.mod new file mode 100644 index 00000000000..31d8e76b95c --- /dev/null +++ b/jetty-plus/src/main/config/modules/plus.mod @@ -0,0 +1,10 @@ +# +# Jetty Proxy module +# + +DEPEND=server + +LIB=lib/jetty-plus-${jetty.version}.jar + +# Plus requires configuration +etc/jetty-plus.xml diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod new file mode 100644 index 00000000000..9e2bc46db8c --- /dev/null +++ b/jetty-proxy/src/main/config/modules/proxy.mod @@ -0,0 +1,10 @@ +# +# Jetty Proxy module +# + +DEPEND=server + +LIB=lib/jetty-proxy-${jetty.version}.jar + +# Proxy requires configuration +etc/jetty-proxy.xml diff --git a/jetty-rewrite/src/main/config/modules/rewrite.mod b/jetty-rewrite/src/main/config/modules/rewrite.mod new file mode 100644 index 00000000000..d5ccf960410 --- /dev/null +++ b/jetty-rewrite/src/main/config/modules/rewrite.mod @@ -0,0 +1,10 @@ +# +# Jetty Rewrite module +# + +DEPEND=server + +LIB=lib/jetty-rewrite-${jetty.version}.jar + +# Annotations needs annotations configuration +etc/jetty-rewrite.xml diff --git a/jetty-server/src/main/config/modules/base.mod b/jetty-server/src/main/config/modules/base.mod new file mode 100644 index 00000000000..f85269aa64c --- /dev/null +++ b/jetty-server/src/main/config/modules/base.mod @@ -0,0 +1,6 @@ +# +# Base Module +# + +LIB=lib/jetty-util-${jetty.version}.jar +LIB=lib/jetty-io-${jetty.version}.jar diff --git a/jetty-server/src/main/config/modules/debug.mod b/jetty-server/src/main/config/modules/debug.mod new file mode 100644 index 00000000000..8cdf5b94ab6 --- /dev/null +++ b/jetty-server/src/main/config/modules/debug.mod @@ -0,0 +1,7 @@ +# +# Debug module +# + +DEPEND=server + +etc/jetty-debug.xml diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod new file mode 100644 index 00000000000..94eed962e9b --- /dev/null +++ b/jetty-server/src/main/config/modules/http.mod @@ -0,0 +1,7 @@ +# +# Jetty HTTP Server +# + +DEPEND=server + +etc/jetty-http.xml diff --git a/jetty-server/src/main/config/modules/https.mod b/jetty-server/src/main/config/modules/https.mod new file mode 100644 index 00000000000..5e930e934f7 --- /dev/null +++ b/jetty-server/src/main/config/modules/https.mod @@ -0,0 +1,8 @@ +# +# Jetty HTTP Server +# + +DEPEND=server + +etc/jetty-ssl.xml +etc/jetty-https.xml diff --git a/jetty-server/src/main/config/modules/ipaccess.mod b/jetty-server/src/main/config/modules/ipaccess.mod new file mode 100644 index 00000000000..f99f26ec3e3 --- /dev/null +++ b/jetty-server/src/main/config/modules/ipaccess.mod @@ -0,0 +1,7 @@ +# +# IPAccess module +# + +DEPEND=server + +etc/jetty-ipaccess.xml diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod new file mode 100644 index 00000000000..578d8165edd --- /dev/null +++ b/jetty-server/src/main/config/modules/lowresources.mod @@ -0,0 +1,7 @@ +# +# Low Resources module +# + +DEPEND=server + +etc/jetty-lowresources.xml diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod new file mode 100644 index 00000000000..060ca9f0a22 --- /dev/null +++ b/jetty-server/src/main/config/modules/requestlog.mod @@ -0,0 +1,7 @@ +# +# Request Log module +# + +DEPEND=server + +etc/jetty-requestlog.xml diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod new file mode 100644 index 00000000000..06bf6772f5b --- /dev/null +++ b/jetty-server/src/main/config/modules/server.mod @@ -0,0 +1,14 @@ +# +# Base server +# + +DEPEND=base + +LIB=lib/servlet-api-3.1.jar +LIB=lib/jetty-schemas-3.1.jar +LIB=lib/jetty-http-${jetty.version}.jar +LIB=lib/jetty-continuation-${jetty.version}.jar +LIB=lib/jetty-server-${jetty.version}.jar + +# Annotations needs annotations configuration +etc/jetty.xml diff --git a/jetty-server/src/main/config/modules/stats.mod b/jetty-server/src/main/config/modules/stats.mod new file mode 100644 index 00000000000..cd56d5b4d7b --- /dev/null +++ b/jetty-server/src/main/config/modules/stats.mod @@ -0,0 +1,7 @@ +# +# Stats module +# + +DEPEND=server + +etc/jetty-stats.xml diff --git a/jetty-server/src/main/config/modules/xinetd.mod b/jetty-server/src/main/config/modules/xinetd.mod new file mode 100644 index 00000000000..c93064ad767 --- /dev/null +++ b/jetty-server/src/main/config/modules/xinetd.mod @@ -0,0 +1,7 @@ +# +# Stats module +# + +DEPEND=server + +etc/jetty-xinetd.xml diff --git a/jetty-server/src/main/config/modules/xml.mod b/jetty-server/src/main/config/modules/xml.mod new file mode 100644 index 00000000000..949e2057117 --- /dev/null +++ b/jetty-server/src/main/config/modules/xml.mod @@ -0,0 +1,8 @@ +# +# Jetty XML Configuration +# + +DEPEND=base + +LIB=lib/jetty-xml-${jetty.version}.jar + diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index b5d5aeffa77..167f1392840 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -27,6 +27,23 @@ + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + + config + + + + + org.apache.maven.plugins maven-assembly-plugin diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod new file mode 100644 index 00000000000..187db774b69 --- /dev/null +++ b/jetty-webapp/src/main/config/modules/webapp.mod @@ -0,0 +1,7 @@ +# +# Base server +# + +DEPEND=deploy + +LIB=lib/jetty-webapp-${jetty.version}.jar From 8efba9fb401b519d951ebf9d134cd199dbfb5dca Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 22 Aug 2013 11:59:07 -0500 Subject: [PATCH 2/6] bring back start.ini --- .../src/main/resources/start.ini | 237 ++++++++++++++++++ 1 file changed, 237 insertions(+) create mode 100644 jetty-distribution/src/main/resources/start.ini diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini new file mode 100644 index 00000000000..3d7646db818 --- /dev/null +++ b/jetty-distribution/src/main/resources/start.ini @@ -0,0 +1,237 @@ +#=========================================================== +# Jetty start.jar arguments +# +# The contents of this file, together with the start.ini +# fragments found in start.d directory are used to build +# the classpath and command line on a call to +# java -jar start.jar [arg...] +# +# Use the following command to see more options +# java -jar start.jar --help +# +# Each line in this file is prepended to the command line +# as arguments, which may be either: +# + A property like: name=value +# + A file of properties like: /etc/myjetty.properties +# + A classpath option like: OPTION=jmx +# + An XML configuration file like: etc/jetty-feature.xml +# + A start.jar option like: --dry-run +# +# If --exec or --exec-print are used, then this file may also +# contain lines with: +# + A JVM option like: -Xmx2000m +# + A System Property like: -Dcom.sun.management.jmxremote +# +#----------------------------------------------------------- +# +# NOTE: The lines in this file may be uncommented to activate +# features. Alternately, the lines may be copied to a ini file +# in the start.d directory to enabled configuration without +# editing this file. See start.d/900-demo.ini for an example. +# +# Future releases will switch start.d style configuration for +# all features. +#=========================================================== + + + +#=========================================================== +# Configure JVM arguments. +# If JVM args are include in an ini file then --exec is needed +# to start a new JVM from start.jar with the extra args. +# If you wish to avoid an extra JVM running, place JVM args +# on the normal command line and do not use --exec +#----------------------------------------------------------- +# --exec +# -Xmx2000m +# -Xmn512m +# -XX:+UseConcMarkSweepGC +# -XX:ParallelCMSThreads=2 +# -XX:+CMSClassUnloadingEnabled +# -XX:+UseCMSCompactAtFullCollection +# -XX:CMSInitiatingOccupancyFraction=80 +# -verbose:gc +# -XX:+PrintGCDateStamps +# -XX:+PrintGCTimeStamps +# -XX:+PrintGCDetails +# -XX:+PrintTenuringDistribution +# -XX:+PrintCommandLineFlags +# -XX:+DisableExplicitGC + +# -Dorg.apache.jasper.compiler.disablejsr199=true + + + +#=========================================================== +# Default Server Options +# Use the core server jars with websocket on the classpath +# Add the contents of the resources directory to the classpath +# Add jars discovered in lib/ext to the classpath +# Include the core jetty configuration file +#----------------------------------------------------------- +OPTIONS=Server,websocket,resources,ext +threads.min=10 +threads.max=200 +threads.timeout=60000 +#jetty.host=myhost.com +jetty.dump.start=false +jetty.dump.stop=false + +etc/jetty.xml + +#=========================================================== +# JMX Management +# To enable remote JMX access uncomment jmxremote and +# enable --exec +#----------------------------------------------------------- +OPTIONS=jmx +# jetty.jmxrmihost=localhost +# jetty.jmxrmiport=1099 +# -Dcom.sun.management.jmxremote +etc/jetty-jmx.xml + +#=========================================================== +# Java Server Pages +#----------------------------------------------------------- +OPTIONS=jsp + +#=========================================================== +# Request logger +# Will add a handler to log all HTTP requests to a standard +# request log format file. +#----------------------------------------------------------- +# requestlog.retain=90 +# requestlog.append=true +# requestlog.extended=true +# etc/jetty-requestlog.xml + + +#=========================================================== +# stderr/stdout logging. +# The following configuration will redirect stderr and stdout +# to file which is rolled over daily. +#----------------------------------------------------------- +# jetty.log.retain=90 +# etc/jetty-logging.xml + + +#=========================================================== +# Enable SetUID +# The default user and group is 'jetty' and if you are +# starting as root you must change the run privledged to true +#----------------------------------------------------------- +# OPTIONS=setuid +# jetty.startServerAsPrivileged=false +# jetty.username=jetty +# jetty.groupname=jetty +# jetty.umask=002 +# etc/jetty-setuid.xml + + +#=========================================================== +# HTTP Connector +#----------------------------------------------------------- +jetty.port=8080 +http.timeout=30000 +etc/jetty-http.xml + + +#=========================================================== +# SSL Context +# Create the keystore and trust store for use by +# HTTPS and SPDY +#----------------------------------------------------------- +# jetty.keystore=etc/keystore +# jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +# jetty.truststore=etc/keystore +# jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# jetty.secure.port=8443 +# etc/jetty-ssl.xml + + +#=========================================================== +# HTTPS Connector +# Must be used with jetty-ssl.xml +#----------------------------------------------------------- +# jetty.https.port=8443 +# etc/jetty-https.xml + + +#=========================================================== +# NPN Next Protocol Negotiation +# +# The SPDY and HTTP/2.0 connectors require NPN. The jar for +# NPN cannot be downloaded from eclipse. So the --download +# option is used to install the NPN jar if it does not already +# exist +# +#----------------------------------------------------------- +# --exec +# --download=http://repo1.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar:lib/npn/npn-boot-1.1.5.v20130313.jar +# -Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar + + +#=========================================================== +# SPDY Connector +# Requires SSL Context and NPN from above +#----------------------------------------------------------- +# OPTIONS=spdy +# jetty.spdy.port=8443 +# etc/jetty-spdy.xml + + +#=========================================================== +# Webapplication Deployer +#----------------------------------------------------------- +etc/jetty-deploy.xml + + +# =========================================================== +# Enable JAAS +# ----------------------------------------------------------- +# OPTIONS=jaas +# jaas.login.conf=etc/login.conf +# etc/jetty-jaas.xml + +# =========================================================== +# Enable JNDI +# ----------------------------------------------------------- +# OPTIONS=jndi + +# =========================================================== +# Enable additional webapp environment configurators +# ----------------------------------------------------------- +# OPTIONS=plus +# etc/jetty-plus.xml + +# =========================================================== +# Enable servlet 3.1 annotations +# ----------------------------------------------------------- +# OPTIONS=annotations +# etc/jetty-annotations.xml + +#=========================================================== +# Other server features +#----------------------------------------------------------- +# etc/jetty-debug.xml +# etc/jetty-ipaccess.xml +# etc/jetty-stats.xml + + +#=========================================================== +# Low resource managment +#----------------------------------------------------------- +# lowresources.period=1050 +# lowresources.lowResourcesIdleTimeout=200 +# lowresources.monitorThreads=true +# lowresources.maxConnections=0 +# lowresources.maxMemory=0 +# lowresources.maxLowResourcesTime=5000 +# etc/jetty-lowresources.xml + + +#=========================================================== +# The start.d directory contains the active start.ini fragments +start.d/ + From 6ef6841a2e05f8840e4c0db4e2f7456cd85dd4a5 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 22 Aug 2013 12:04:11 -0500 Subject: [PATCH 3/6] add modules directory --- jetty-distribution/src/main/resources/modules/.donotdelete | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 jetty-distribution/src/main/resources/modules/.donotdelete diff --git a/jetty-distribution/src/main/resources/modules/.donotdelete b/jetty-distribution/src/main/resources/modules/.donotdelete new file mode 100644 index 00000000000..e69de29bb2d From e7d33f52a4b895ebc604cb9a54166a4cf24e434a Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 22 Aug 2013 12:07:51 -0500 Subject: [PATCH 4/6] add security mod --- jetty-security/src/main/config/modules/security.mod | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 jetty-security/src/main/config/modules/security.mod diff --git a/jetty-security/src/main/config/modules/security.mod b/jetty-security/src/main/config/modules/security.mod new file mode 100644 index 00000000000..5a3c4a368a6 --- /dev/null +++ b/jetty-security/src/main/config/modules/security.mod @@ -0,0 +1,7 @@ +# +# Jetty Security Module +# + +DEPEND=server + +LIB=lib/jetty-security-${jetty.version}.jar From 450cdb3ef43b8ea4c8f11ac2d897995451110ff9 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 22 Aug 2013 12:21:52 -0500 Subject: [PATCH 5/6] add servlet/s mod --- jetty-proxy/src/main/config/modules/proxy.mod | 1 + jetty-servlet/src/main/config/modules/servlet.mod | 7 +++++++ jetty-servlets/src/main/config/modules/servlets.mod | 7 +++++++ jetty-webapp/src/main/config/modules/webapp.mod | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 jetty-servlet/src/main/config/modules/servlet.mod create mode 100644 jetty-servlets/src/main/config/modules/servlets.mod diff --git a/jetty-proxy/src/main/config/modules/proxy.mod b/jetty-proxy/src/main/config/modules/proxy.mod index 9e2bc46db8c..5ab6e70a880 100644 --- a/jetty-proxy/src/main/config/modules/proxy.mod +++ b/jetty-proxy/src/main/config/modules/proxy.mod @@ -3,6 +3,7 @@ # DEPEND=server +DEPEND=client LIB=lib/jetty-proxy-${jetty.version}.jar diff --git a/jetty-servlet/src/main/config/modules/servlet.mod b/jetty-servlet/src/main/config/modules/servlet.mod new file mode 100644 index 00000000000..a427eed5478 --- /dev/null +++ b/jetty-servlet/src/main/config/modules/servlet.mod @@ -0,0 +1,7 @@ +# +# Jetty Servlet Module +# + +DEPEND=server + +LIB=lib/jetty-servlet-${jetty.version}.jar diff --git a/jetty-servlets/src/main/config/modules/servlets.mod b/jetty-servlets/src/main/config/modules/servlets.mod new file mode 100644 index 00000000000..3d471891dab --- /dev/null +++ b/jetty-servlets/src/main/config/modules/servlets.mod @@ -0,0 +1,7 @@ +# +# Jetty Servlets Module +# + +DEPEND=servlet + +LIB=lib/jetty-servlets-${jetty.version}.jar diff --git a/jetty-webapp/src/main/config/modules/webapp.mod b/jetty-webapp/src/main/config/modules/webapp.mod index 187db774b69..c39d5aae063 100644 --- a/jetty-webapp/src/main/config/modules/webapp.mod +++ b/jetty-webapp/src/main/config/modules/webapp.mod @@ -2,6 +2,6 @@ # Base server # -DEPEND=deploy +DEPEND=servlet LIB=lib/jetty-webapp-${jetty.version}.jar From 5c87965ff1aebb49c760940246c8bd4a3c2c1ff4 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Thu, 22 Aug 2013 12:23:29 -0500 Subject: [PATCH 6/6] server depends on xml.. --- jetty-server/src/main/config/modules/server.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod index 06bf6772f5b..aa6cad6b0e6 100644 --- a/jetty-server/src/main/config/modules/server.mod +++ b/jetty-server/src/main/config/modules/server.mod @@ -3,6 +3,7 @@ # DEPEND=base +DEPEND=xml LIB=lib/servlet-api-3.1.jar LIB=lib/jetty-schemas-3.1.jar