Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Joakim Erdfelt 2014-06-04 11:13:17 -07:00
parent 05575774a1
commit d31811f067
5 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
View File

@ -124,7 +124,7 @@ public class ConfigurationAssert
{
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);

2
jetty-start/src/test/resources/usecases/assert-enable-spdy.txt
View File

@ -31,7 +31,7 @@ PROP|jetty.truststore.password=sundae
PROP|java.version=1.7.0_21
# 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
BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar

10
jetty-start/src/test/resources/usecases/assert-logging.txt
View File

@ -1,5 +1,4 @@
# 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-http.xml
@ -23,4 +22,11 @@ PROP|jetty.port=9090
# Other File References
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

20
jetty-start/src/test/resources/usecases/base.logging/modules/logging.mod Normal file
View File

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

2
jetty-start/src/test/resources/usecases/base.logging/resources/jetty-logging.properties Normal file
View File

@ -0,0 +1,2 @@
# Configure Jetty for SLf4j Logging
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog