iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
tschiman
2017-02-02 21:18:46 -07:00
parent fb950e2dfa a44ea9588f
commit 775d9c3551
95 changed files with 6897 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud/spring-cloud-rest/application-config/spring-cloud-rest-server.properties → spring-cloud/spring-cloud-rest/application-config/discovery.properties
+1 -1
View File
@@ -1,4 +1,4 @@
spring.application.name=spring-cloud-rest-server
spring.application.name=discovery
server.port=8761
#### cloud
spring-cloud/spring-cloud-rest/pom.xml
+2 -2
View File
@@ -7,8 +7,8 @@
<artifactId>spring-cloud-rest</artifactId>
<version>1.0.0-SNAPSHOT</version>
<modules>
<module>spring-cloud-rest-config</module>
<module>spring-cloud-rest-server</module>
<module>spring-cloud-rest-config-server</module>
<module>spring-cloud-rest-discovery-server</module>
<module>spring-cloud-rest-books-api</module>
<module>spring-cloud-rest-reviews-api</module>
</modules>
spring-cloud/spring-cloud-rest/spring-cloud-rest-config/.gitignore → spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml → spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml
+2 -2
View File
@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId>
<artifactId>spring-cloud-rest-config</artifactId>
<artifactId>spring-cloud-rest-config-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>spring-cloud-rest-config</name>
<name>spring-cloud-rest-config-server</name>
<description>Spring Cloud REST configuration server</description>
<parent>
spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java → spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/org/baeldung/SpringCloudRestConfigApplication.java
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties → spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/test/java/org/baeldung/SpringCloudRestConfigIntegrationTest.java → spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringCloudRestConfigIntegrationTest.java
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-server/.gitignore → spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-server/pom.xml → spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml
+2 -2
View File
@@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.baeldung</groupId>
<artifactId>spring-cloud-rest-server</artifactId>
<artifactId>spring-cloud-rest-discovery-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>spring-cloud-rest-server</name>
<name>spring-cloud-rest-discovery-server</name>
<description>Spring Cloud REST server</description>
<parent>
spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/java/org/baeldung/SessionConfig.java → spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/org/baeldung/SessionConfig.java
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/java/org/baeldung/SpringCloudRestServerApplication.java → spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/org/baeldung/SpringCloudRestServerApplication.java
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties
+4
View File
@@ -0,0 +1,4 @@
spring.cloud.config.name=discovery
spring.cloud.config.uri=http://localhost:8081
spring.cloud.config.username=configUser
spring.cloud.config.password=configPassword
spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/test/java/org/baeldung/SpringCloudRestServerIntegrationTest.java → spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/org/baeldung/SpringCloudRestServerIntegrationTest.java
View File
spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
-4
View File
@@ -1,4 +0,0 @@
spring.cloud.config.name=spring-cloud-rest-server
spring.cloud.config.uri=http://localhost:8081
spring.cloud.config.username=configUser
spring.cloud.config.password=configPassword