436520 - Start / Allow https and file urls in jetty-start's module download mechanism
+ Work to enable this mostly performed in Bug #436524 + Some minor work to add more tests for this new syntax.
This commit is contained in:
parent
05575774a1
commit
d31811f067
|
@ -124,7 +124,7 @@ public class ConfigurationAssert
|
||||||
{
|
{
|
||||||
if (darg.uri != null)
|
if (darg.uri != null)
|
||||||
{
|
{
|
||||||
actualDownloads.add(String.format("%s:%s",darg.uri,darg.location));
|
actualDownloads.add(String.format("%s|%s",darg.uri,darg.location));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assertContainsUnordered("Downloads",expectedDownloads,actualDownloads);
|
assertContainsUnordered("Downloads",expectedDownloads,actualDownloads);
|
||||||
|
|
|
@ -31,7 +31,7 @@ PROP|jetty.truststore.password=sundae
|
||||||
PROP|java.version=1.7.0_21
|
PROP|java.version=1.7.0_21
|
||||||
|
|
||||||
# The Downloads
|
# The Downloads
|
||||||
DOWNLOAD|http://central.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
|
DOWNLOAD|http://central.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
|
||||||
|
|
||||||
# The Bootlib
|
# The Bootlib
|
||||||
BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
# The XMLs we expect (order is important)
|
# The XMLs we expect (order is important)
|
||||||
XML|${jetty.home}/etc/jetty-logging.xml
|
|
||||||
XML|${jetty.home}/etc/jetty.xml
|
XML|${jetty.home}/etc/jetty.xml
|
||||||
XML|${jetty.home}/etc/jetty-http.xml
|
XML|${jetty.home}/etc/jetty-http.xml
|
||||||
|
|
||||||
|
@ -24,3 +23,10 @@ PROP|jetty.port=9090
|
||||||
# Other File References
|
# Other File References
|
||||||
FILE|logs/
|
FILE|logs/
|
||||||
FILE|resources/
|
FILE|resources/
|
||||||
|
|
||||||
|
# Downloads
|
||||||
|
DOWNLOAD|http://central.maven.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar|lib/logging/slf4j-api-1.6.6.jar
|
||||||
|
DOWNLOAD|http://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.0.7/logback-core-1.0.7.jar|lib/logging/logback-core-1.0.7.jar
|
||||||
|
DOWNLOAD|http://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.0.7/logback-classic-1.0.7.jar|lib/logging/logback-classic-1.0.7.jar
|
||||||
|
DOWNLOAD|https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/logback.xml|resources/logback.xml
|
||||||
|
DOWNLOAD|https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/jetty-logging.properties|resources/jetty-logging.properties
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
#
|
||||||
|
# Jetty with logback logging
|
||||||
|
#
|
||||||
|
|
||||||
|
[depend]
|
||||||
|
resources
|
||||||
|
|
||||||
|
[files]
|
||||||
|
logs/
|
||||||
|
resources/
|
||||||
|
http://central.maven.org/maven2/org/slf4j/slf4j-api/1.6.6/slf4j-api-1.6.6.jar|lib/logging/slf4j-api-1.6.6.jar
|
||||||
|
http://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.0.7/logback-core-1.0.7.jar|lib/logging/logback-core-1.0.7.jar
|
||||||
|
http://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.0.7/logback-classic-1.0.7.jar|lib/logging/logback-classic-1.0.7.jar
|
||||||
|
https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/logback.xml|resources/logback.xml
|
||||||
|
https://raw.githubusercontent.com/jetty-project/logging-modules/master/logback/jetty-logging.properties|resources/jetty-logging.properties
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
lib/logging/**.jar
|
||||||
|
resources/
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
# Configure Jetty for SLf4j Logging
|
||||||
|
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
|
Loading…
Reference in New Issue