Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Tomcat 8.5.11

Browse Source
This commit is contained in:
Brian Clozel
2017-01-20 09:55:33 +01:00
parent 78a23be9bc
commit 35b67a54d2
930 changed files with 32832 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
classes/test/spring-web-reactive/log4j2-test.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
</Console>
</Appenders>
<Loggers>
<Logger name="org.springframework.http" level="debug" />
<Logger name="org.springframework.web" level="debug" />
<Logger name="reactor" level="info" />
<Logger name="io.reactivex" level="info" />
<Root level="error">
<AppenderRef ref="Console" />
</Root>
</Loggers>
</Configuration>

1
classes/test/spring-web-reactive/org/springframework/web/reactive/config/testStylesheet.css Normal file
View File

@@ -0,0 +1 @@
test stylesheet content

2
classes/test/spring-web-reactive/org/springframework/web/reactive/function/response.txt Normal file
View File

@@ -0,0 +1,2 @@
Hello World
This is a sample response text file.

2
classes/test/spring-web-reactive/org/springframework/web/reactive/function/server/child/response.txt Normal file
View File

@@ -0,0 +1,2 @@
Hello World
This is a sample response text file.

2
classes/test/spring-web-reactive/org/springframework/web/reactive/function/server/response.txt Normal file
View File

@@ -0,0 +1,2 @@
Hello World
This is a sample response text file.

40
classes/test/spring-web-reactive/org/springframework/web/reactive/handler/map.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="mapping" class="org.springframework.web.reactive.handler.SimpleUrlHandlerMapping">
<property name="urlDecode" value="true" />
<property name="mappings">
<value>
welcome.html=mainController
/**/pathmatchingTest.html=mainController
/**/pathmatching??.html=mainController
/**/path??matching.html=mainController
/**/??path??matching.html=mainController
/**/*.jsp=mainController
/administrator/**/pathmatching.html=mainController
/administrator/**/testlast*=mainController
/administrator/another/bla.xml=mainController
/administrator/testing/longer/**/**/**/**/**=mainController
/administrator/testing/longer2/**/**/bla/**=mainController
/*test*.jpeg=mainController
/*/test.jpeg=mainController
/outofpattern*yeah=mainController
/anotherTest*=mainController
/stillAnotherTestYeah=mainController
/shortpattern/testing=mainController
/show123.html=mainController
/sho*=mainController
/bookseats.html=mainController
/reservation.html=mainController
/payment.html=mainController
/confirmation.html=mainController
/test%26t%20est/path%26m%20atching.html=mainController
</value>
</property>
</bean>
<bean id="mainController" class="java.lang.Object"/>
</beans>

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/bar.css Normal file
View File

@@ -0,0 +1 @@
h2 { color:white; }

4
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/error.appcache Normal file
View File

@@ -0,0 +1,4 @@
THIS DOES NOT START WITH "CACHE MANIFEST"
CACHE:
bar.css

3
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/external.css Normal file
View File

@@ -0,0 +1,3 @@
@import url("http://example.org/fonts/css");
body { background: url("file:///home/spring/image.png") }
figure { background: url("//example.org/style.css")}

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/foo-e36d2e05253c6c7085a91522ce43a0b4.css Normal file
View File

@@ -0,0 +1 @@
h1 { color:red; }

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/foo.css Normal file
View File

@@ -0,0 +1 @@
h1 { color:red; }

10
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/foo.html Normal file
View File

@@ -0,0 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Foo</title>
</head>
<body>
</body>
</html>

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/foo.txt Normal file
View File

@@ -0,0 +1 @@
Some text.

BIN
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/images/image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 B

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/js/bar.js Normal file
View File

@@ -0,0 +1 @@
function foo() { console.log("hello bar"); }

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/js/foo.js Normal file
View File

@@ -0,0 +1 @@
function foo() { console.log("hello world"); }

9
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/main.css Normal file
View File

@@ -0,0 +1,9 @@
@import url("bar.css");
@import url('bar.css');
@import url(bar.css);
@import "foo.css";
@import 'foo.css';
body { background: url("images/image.png") }

17
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/test/test.appcache Normal file
View File

@@ -0,0 +1,17 @@
CACHE MANIFEST
# this is a comment
CACHE:
bar.css
foo.css
//example.org/style.css
NETWORK:
*
CACHE:
js/bar.js
http://example.org/image.png
FALLBACK:
/main /static.html

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/testalternatepath/bar.css Normal file
View File

@@ -0,0 +1 @@
fail

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/testalternatepath/baz.css Normal file
View File

@@ -0,0 +1 @@
h1 { color:red; }

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/testalternatepath/js/baz.js Normal file
View File

@@ -0,0 +1 @@
function foo() { console.log("hello world"); }

1
classes/test/spring-web-reactive/org/springframework/web/reactive/resource/testsecret/secret.txt Normal file
View File

@@ -0,0 +1 @@
big secret

BIN
classes/test/spring-web-reactive/org/springframework/web/reactive/result/method/annotation/logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 KiB

1
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/freemarker/test.ftl Normal file
View File

@@ -0,0 +1 @@
<html><body>${hello}</body></html>

0
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/empty.txt Normal file
View File

20
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/jruby/render.rb Normal file
View File

@@ -0,0 +1,20 @@
require 'erb'
require 'ostruct'
require 'java'
# Renders an ERB template against a hashmap of variables.
def render(template, variables, url)
context = OpenStruct.new(variables).instance_eval do
variables.each do |k, v|
instance_variable_set(k, v) if k[0] == '@'
end
def partial(partial_name, options={})
new_variables = marshal_dump.merge(options[:locals] || {})
Java::Pavo::ERB.render(partial_name, new_variables)
end
binding
end
ERB.new(template).result(context);
end

1
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/jruby/template.erb Normal file
View File

@@ -0,0 +1 @@
<html><head><title><%= title %></title></head><body><p><%= body %></p></body></html>

5
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/jython/render.py Normal file
View File

@@ -0,0 +1,5 @@
from string import Template
def render(template, model, url):
s = Template(template)
return s.substitute(model)

1
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/jython/template.html Normal file
View File

@@ -0,0 +1 @@
<html><head><title>$title</title></head><body><p>$body</p></body></html>

10
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/kotlin/render.kts Normal file
View File

@@ -0,0 +1,10 @@
import javax.script.*
// TODO Use engine.eval(String, Bindings) when https://youtrack.jetbrains.com/issue/KT-15450 will be fixed
fun render(template: String, model: Map<String, Any>, url: String): String {
val engine = ScriptEngineManager().getEngineByName("kotlin")
val bindings = SimpleBindings()
bindings.putAll(model)
engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE)
return engine.eval(template) as String
}

1
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/kotlin/template.kts Normal file
View File

@@ -0,0 +1 @@
"""<html><head><title>${bindings["title"]}</title></head><body><p>${bindings["body"]}</p></body></html>"""

7
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/nashorn/render.js Normal file
View File

@@ -0,0 +1,7 @@
function render(template, model) {
return template.replace("{{title}}", model.title).replace("{{body}}", model.body);
}
function renderWithUrl(template, model, url) {
return template.replace("{{title}}", "Check url parameter").replace("{{body}}", url);
}

1
classes/test/spring-web-reactive/org/springframework/web/reactive/result/view/script/nashorn/template.html Normal file
View File

@@ -0,0 +1 @@
<html><head><title>{{title}}</title></head><body><p>{{body}}</p></body></html>