Merge branch '2.1.x'
This commit is contained in:
Phillip Webb
commit
d306b31ce9
7
pom.xml
7
pom.xml
|
|
@ -25,6 +25,7 @@
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<spring-javaformat.version>0.0.9</spring-javaformat.version>
|
<spring-javaformat.version>0.0.9</spring-javaformat.version>
|
||||||
|
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
|
||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
@ -43,6 +44,11 @@
|
||||||
<artifactId>spring-javaformat-checkstyle</artifactId>
|
<artifactId>spring-javaformat-checkstyle</artifactId>
|
||||||
<version>${spring-javaformat.version}</version>
|
<version>${spring-javaformat.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.spring.nohttp</groupId>
|
||||||
|
<artifactId>nohttp-checkstyle</artifactId>
|
||||||
|
<version>${nohttp-checkstyle.version}</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
|
@ -54,6 +60,7 @@
|
||||||
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
|
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
|
||||||
<includeTestSourceDirectory>true</includeTestSourceDirectory>
|
<includeTestSourceDirectory>true</includeTestSourceDirectory>
|
||||||
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
|
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
|
||||||
|
<resourceIncludes>**\/*.*</resourceIncludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>check</goal>
|
<goal>check</goal>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
DROP TABLE IF EXISTS TEST;
|
DROP TABLE IF EXISTS TEST;
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
DROP TABLE IF EXISTS TEST;
|
DROP TABLE IF EXISTS TEST;
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||||
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK,
|
Context attrs = new Context(Locale.UK,
|
||||||
Collections.singletonMap("foo", "bar"));
|
Collections.singletonMap("foo", "bar"));
|
||||||
String result = engine.process("template", attrs);
|
String result = engine.process("template", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html>bar</html>");
|
assertThat(result).isEqualTo("<html>bar</html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -210,7 +210,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||||
.getBean(ISpringWebFluxTemplateEngine.class);
|
.getBean(ISpringWebFluxTemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK,
|
Context attrs = new Context(Locale.UK,
|
||||||
Collections.singletonMap("foo", "bar"));
|
Collections.singletonMap("foo", "bar"));
|
||||||
String result = engine.process("data-dialect", attrs);
|
String result = engine.process("data-dialect", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
|
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -221,7 +221,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||||
ISpringWebFluxTemplateEngine engine = context
|
ISpringWebFluxTemplateEngine engine = context
|
||||||
.getBean(ISpringWebFluxTemplateEngine.class);
|
.getBean(ISpringWebFluxTemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK);
|
Context attrs = new Context(Locale.UK);
|
||||||
String result = engine.process("java8time-dialect", attrs);
|
String result = engine.process("java8time-dialect", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
|
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -251,7 +251,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||||
.getBean(ISpringWebFluxTemplateEngine.class);
|
.getBean(ISpringWebFluxTemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK,
|
Context attrs = new Context(Locale.UK,
|
||||||
Collections.singletonMap("foo", "bar"));
|
Collections.singletonMap("foo", "bar"));
|
||||||
String result = engine.process("home", attrs);
|
String result = engine.process("home", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html><body>bar</body></html>");
|
assertThat(result).isEqualTo("<html><body>bar</body></html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||||
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK,
|
Context attrs = new Context(Locale.UK,
|
||||||
Collections.singletonMap("foo", "bar"));
|
Collections.singletonMap("foo", "bar"));
|
||||||
String result = engine.process("template.html", attrs);
|
String result = engine.process("template.html", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html>bar</html>");
|
assertThat(result).isEqualTo("<html>bar</html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -225,7 +225,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||||
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK,
|
Context attrs = new Context(Locale.UK,
|
||||||
Collections.singletonMap("foo", "bar"));
|
Collections.singletonMap("foo", "bar"));
|
||||||
String result = engine.process("data-dialect", attrs);
|
String result = engine.process("data-dialect", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
|
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -235,7 +235,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||||
this.contextRunner.run((context) -> {
|
this.contextRunner.run((context) -> {
|
||||||
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK);
|
Context attrs = new Context(Locale.UK);
|
||||||
String result = engine.process("java8time-dialect", attrs);
|
String result = engine.process("java8time-dialect", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
|
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -265,7 +265,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||||
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
TemplateEngine engine = context.getBean(TemplateEngine.class);
|
||||||
Context attrs = new Context(Locale.UK,
|
Context attrs = new Context(Locale.UK,
|
||||||
Collections.singletonMap("foo", "bar"));
|
Collections.singletonMap("foo", "bar"));
|
||||||
String result = engine.process("home", attrs);
|
String result = engine.process("home", attrs).trim();
|
||||||
assertThat(result).isEqualTo("<html><body>bar</body></html>");
|
assertThat(result).isEqualTo("<html><body>bar</body></html>");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,4 +15,4 @@
|
||||||
</basic>
|
</basic>
|
||||||
</attributes>
|
</attributes>
|
||||||
</entity>
|
</entity>
|
||||||
</entity-mappings>
|
</entity-mappings>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
|
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
|
||||||
SUP top
|
SUP top
|
||||||
AUXILIARY
|
AUXILIARY
|
||||||
MAY exampleAttributeName
|
MAY exampleAttributeName
|
||||||
X-ORIGIN 'Managing Schema Document' )
|
X-ORIGIN 'Managing Schema Document' )
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
custom
|
custom
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
yield "custom"
|
yield "custom"
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
custom
|
custom
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
INSERT INTO BAR VALUES (1, 'Andy');
|
INSERT INTO BAR VALUES (1, 'Andy');
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
|
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
|
||||||
|
|
|
||||||
|
|
@ -23,4 +23,4 @@
|
||||||
</expiry>
|
</expiry>
|
||||||
</cache>
|
</cache>
|
||||||
|
|
||||||
</config>
|
</config>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<include resource="org/springframework/boot/logging/logback/base.xml"/>
|
<include resource="org/springframework/boot/logging/logback/base.xml"/>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Hello {{World}}
|
Hello {{World}}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -6,4 +6,4 @@
|
||||||
<h2>A Message</h2>
|
<h2>A Message</h2>
|
||||||
<div>{{message}} at {{time}}</div>
|
<div>{{message}} at {{time}}</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
|
<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="jumbotron">{{>content}}</div>
|
<div class="jumbotron">{{>content}}</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
CREATE TABLE SPAM (
|
CREATE TABLE SPAM (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
INSERT INTO FOO VALUES (1, 'Andy');
|
INSERT INTO FOO VALUES (1, 'Andy');
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
INSERT INTO BAR(id, name) VALUES (1, 'bar');
|
INSERT INTO BAR(id, name) VALUES (1, 'bar');
|
||||||
INSERT INTO BAR(id, name) VALUES (2, 'ばー');
|
INSERT INTO BAR(id, name) VALUES (2, 'ばー');
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
CREATE TABLE FOO (
|
CREATE TABLE FOO (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
404 page
|
404 page
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
4xx page
|
4xx page
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
CREATE TABLE BAR (
|
CREATE TABLE BAR (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<html><body data:foo="${foo}"></body></html>
|
<html><body data:foo="${foo}"></body></html>
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
<html>
|
<html>
|
||||||
<body>
|
<body>
|
||||||
<ul>
|
<ul>
|
||||||
<li>status: {{status}}</li>
|
<li>status: {{status}}</li>
|
||||||
<li>message: {{message}}</li>
|
<li>message: {{message}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
home
|
home
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<html><body th:text="${foo}">Home</body></html>
|
<html><body th:text="${foo}">Home</body></html>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
home
|
home
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
|
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Message: ${greeting}
|
Message: ${greeting}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
|
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Message: ${greeting}
|
Message: ${greeting}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
prefixed
|
prefixed
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
yield "prefixed"
|
yield "prefixed"
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
prefixed
|
prefixed
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
suffixed
|
suffixed
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
<html th:text="${foo}">foo</html>
|
<html th:text="${foo}">foo</html>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
|
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
|
||||||
<head>
|
<head>
|
||||||
<title layout:fragment="title">Content</title>
|
<title layout:fragment="title">Content</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
@ -7,4 +7,4 @@
|
||||||
<span th:text="${foo}">foo</span>
|
<span th:text="${foo}">foo</span>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
|
<wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
|
||||||
xmlns:tns="http://www.springframework.org/spring-ws/wsdl"
|
xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
|
||||||
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
|
xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
|
||||||
<wsdl:types>
|
<wsdl:types>
|
||||||
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
<xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
|
||||||
elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
|
elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
|
||||||
<xsd:element name="request" type="xsd:string" />
|
<xsd:element name="request" type="xsd:string" />
|
||||||
<xsd:element name="response" type="xsd:string" />
|
<xsd:element name="response" type="xsd:string" />
|
||||||
</xsd:schema>
|
</xsd:schema>
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
</wsdl:portType>
|
</wsdl:portType>
|
||||||
<wsdl:binding name="binding" type="tns:portType">
|
<wsdl:binding name="binding" type="tns:portType">
|
||||||
<wsdlsoap:binding style="document"
|
<wsdlsoap:binding style="document"
|
||||||
transport="http://schemas.xmlsoap.org/soap/http/" />
|
transport="https://schemas.xmlsoap.org/soap/http/" />
|
||||||
<wsdl:operation name="operation">
|
<wsdl:operation name="operation">
|
||||||
<wsdlsoap:operation soapAction="" />
|
<wsdlsoap:operation soapAction="" />
|
||||||
<wsdl:input name="request">
|
<wsdl:input name="request">
|
||||||
|
|
@ -40,4 +40,3 @@
|
||||||
</wsdl:port>
|
</wsdl:port>
|
||||||
</wsdl:service>
|
</wsdl:service>
|
||||||
</wsdl:definitions>
|
</wsdl:definitions>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<schema xmlns="http://www.w3.org/2001/XMLSchema"
|
<schema xmlns="http://www.w3.org/2001/XMLSchema"
|
||||||
elementFormDefault="qualified"
|
elementFormDefault="qualified"
|
||||||
targetNamespace="http://www.springframework.org/spring-ws/wsdl/schemas">
|
targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
|
||||||
<element name="request" type="string" />
|
<element name="request" type="string" />
|
||||||
<element name="response" type="string" />
|
<element name="response" type="string" />
|
||||||
</schema>
|
</schema>
|
||||||
|
|
|
||||||
|
|
@ -30,4 +30,4 @@
|
||||||
</proxy>
|
</proxy>
|
||||||
</proxies>
|
</proxies>
|
||||||
|
|
||||||
</settings>
|
</settings>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
<settingsSecurity>
|
<settingsSecurity>
|
||||||
<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
|
<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
|
||||||
</settingsSecurity>
|
</settingsSecurity>
|
||||||
|
|
|
||||||
|
|
@ -28,4 +28,4 @@
|
||||||
</proxy>
|
</proxy>
|
||||||
</proxies>
|
</proxies>
|
||||||
|
|
||||||
</settings>
|
</settings>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
CREATE TABLE FOO (
|
CREATE TABLE FOO (
|
||||||
id INTEGER IDENTITY PRIMARY KEY,
|
id INTEGER IDENTITY PRIMARY KEY,
|
||||||
name VARCHAR(30),
|
name VARCHAR(30),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -22,4 +22,4 @@
|
||||||
2012 2:17:16 PM CDT</div>
|
2012 2:17:16 PM CDT</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A <a href="http://livereload.com">livereload</a> server.
|
* A <a href="https://github.com/livereload">livereload</a> server.
|
||||||
*
|
*
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
* @since 1.3.0
|
* @since 1.3.0
|
||||||
* @see <a href="http://livereload.com">livereload.com</a>
|
|
||||||
*/
|
*/
|
||||||
public class LiveReloadServer {
|
public class LiveReloadServer {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
test:
|
test:
|
||||||
foo:
|
foo:
|
||||||
bar: value
|
bar: value
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
create table example (id int, name varchar);
|
create table example (id int, name varchar);
|
||||||
|
|
|
||||||
|
|
@ -62,4 +62,4 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,4 +35,4 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
"foo": "bar"
|
"foo": "bar"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,4 +56,4 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,4 @@
|
||||||
"sourceType": "org.acme.Foo2"
|
"sourceType": "org.acme.Foo2"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,4 +5,4 @@
|
||||||
"sourceType": "org.acme.Invalid"
|
"sourceType": "org.acme.Invalid"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,4 +76,4 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,4 +8,4 @@
|
||||||
"name": "spring.root2.name"
|
"name": "spring.root2.name"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,4 @@
|
||||||
|
|
||||||
public void setExtra(String extra) {
|
public void setExtra(String extra) {
|
||||||
this.extra = extra;
|
this.extra = extra;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
FOO=BAR
|
FOO=BAR
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
|
||||||
|
|
@ -62,7 +62,7 @@ public class MustacheViewTests {
|
||||||
view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML,
|
view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML,
|
||||||
this.exchange).block(Duration.ofSeconds(30));
|
this.exchange).block(Duration.ofSeconds(30));
|
||||||
assertThat(this.exchange.getResponse().getBodyAsString()
|
assertThat(this.exchange.getResponse().getBodyAsString()
|
||||||
.block(Duration.ofSeconds(30))).isEqualTo("Hello Spring");
|
.block(Duration.ofSeconds(30)).trim()).isEqualTo("Hello Spring");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ public class MustacheViewTests {
|
||||||
view.setApplicationContext(this.context);
|
view.setApplicationContext(this.context);
|
||||||
view.render(Collections.singletonMap("World", "Spring"), this.request,
|
view.render(Collections.singletonMap("World", "Spring"), this.request,
|
||||||
this.response);
|
this.response);
|
||||||
assertThat(this.response.getContentAsString()).isEqualTo("Hello Spring");
|
assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
org.springframework.boot.env.PropertySourceLoader=\
|
org.springframework.boot.env.PropertySourceLoader=\
|
||||||
org.springframework.boot.context.config.TestPropertySourceLoader1,\
|
org.springframework.boot.context.config.TestPropertySourceLoader1,\
|
||||||
org.springframework.boot.context.config.TestPropertySourceLoader2
|
org.springframework.boot.context.config.TestPropertySourceLoader2
|
||||||
|
|
|
||||||
|
|
@ -8,4 +8,4 @@ version: B
|
||||||
---
|
---
|
||||||
spring.profiles: C
|
spring.profiles: C
|
||||||
version: C
|
version: C
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
spring.main.web-application-type: reactive
|
spring.main.web-application-type: reactive
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
foo: ${fooValue}
|
foo: ${fooValue}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Hello {{World}}
|
Hello {{World}}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Hello {{World}}
|
Hello {{World}}
|
||||||
|
|
|
||||||
|
|
@ -17,4 +17,4 @@ spring:
|
||||||
profiles: "!other"
|
profiles: "!other"
|
||||||
my:
|
my:
|
||||||
property: fromnototherprofile
|
property: fromnototherprofile
|
||||||
notother: foo
|
notother: foo
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@ spring:
|
||||||
profiles: (dev | other) & another
|
profiles: (dev | other) & another
|
||||||
my:
|
my:
|
||||||
property: devorotherandanother
|
property: devorotherandanother
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@ my:
|
||||||
spring:
|
spring:
|
||||||
profiles: other
|
profiles: other
|
||||||
my:
|
my:
|
||||||
property: fromotherprofile
|
property: fromotherprofile
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@ my:
|
||||||
spring:
|
spring:
|
||||||
profiles: other
|
profiles: other
|
||||||
my:
|
my:
|
||||||
property: fromotherprofile
|
property: fromotherprofile
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
---
|
---
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: dev,healthcheck
|
active: dev,healthcheck
|
||||||
|
|
|
||||||
|
|
@ -3,4 +3,4 @@ spring:
|
||||||
profiles:
|
profiles:
|
||||||
active:
|
active:
|
||||||
- dev
|
- dev
|
||||||
- healthcheck
|
- healthcheck
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
---
|
---
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: dev, healthcheck
|
active: dev, healthcheck
|
||||||
|
|
|
||||||
|
|
@ -8,4 +8,4 @@ my:
|
||||||
spring:
|
spring:
|
||||||
profiles: dev
|
profiles: dev
|
||||||
my:
|
my:
|
||||||
property: fromdevprofile
|
property: fromdevprofile
|
||||||
|
|
|
||||||
|
|
@ -18,4 +18,4 @@
|
||||||
<AppenderRef ref="Console"/>
|
<AppenderRef ref="Console"/>
|
||||||
</Root>
|
</Root>
|
||||||
</Loggers>
|
</Loggers>
|
||||||
</Configuration>
|
</Configuration>
|
||||||
|
|
|
||||||
|
|
@ -11,4 +11,4 @@
|
||||||
<jsr107:mbeans enable-statistics="true"/>
|
<jsr107:mbeans enable-statistics="true"/>
|
||||||
</cache>
|
</cache>
|
||||||
|
|
||||||
</config>
|
</config>
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,4 @@ CREATE TABLE PERSON (
|
||||||
|
|
||||||
create sequence person_sequence start with 1 increment by 1;
|
create sequence person_sequence start with 1 increment by 1;
|
||||||
|
|
||||||
insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
|
insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
DROP ALL OBJECTS;
|
DROP ALL OBJECTS;
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,4 @@ insert into note_tags(notes_id, tags_id) values (1, 3)
|
||||||
insert into note_tags(notes_id, tags_id) values (2, 3)
|
insert into note_tags(notes_id, tags_id) values (2, 3)
|
||||||
insert into note_tags(notes_id, tags_id) values (3, 3)
|
insert into note_tags(notes_id, tags_id) values (3, 3)
|
||||||
insert into note_tags(notes_id, tags_id) values (4, 2)
|
insert into note_tags(notes_id, tags_id) values (4, 2)
|
||||||
insert into note_tags(notes_id, tags_id) values (4, 3)
|
insert into note_tags(notes_id, tags_id) values (4, 3)
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
hello: Bonjour
|
hello: Bonjour
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,4 @@ name: Phil
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
profiles: goodbye,dev
|
profiles: goodbye,dev
|
||||||
name: Everyone
|
name: Everyone
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
insert into users (username, password, enabled) values ('user', '{noop}user', true);
|
insert into users (username, password, enabled) values ('user', '{noop}user', true);
|
||||||
|
|
||||||
insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
|
insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,4 @@ create table users (
|
||||||
create table authorities (
|
create table authorities (
|
||||||
username varchar(256),
|
username varchar(256),
|
||||||
authority varchar(256)
|
authority varchar(256)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,4 @@ create table users (
|
||||||
create table authorities (
|
create table authorities (
|
||||||
username varchar(256),
|
username varchar(256),
|
||||||
authority varchar(256)
|
authority varchar(256)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -31,4 +31,4 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
|
||||||
|
|
@ -23,4 +23,4 @@
|
||||||
<xs:element name="LastName" type="xs:string"/>
|
<xs:element name="LastName" type="xs:string"/>
|
||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:schema>
|
</xs:schema>
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue