Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
be0f030c
Commit
be0f030c
authored
Jan 19, 2016
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move shared package under eureka
parent
b46dab30
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
10 deletions
+15
-10
spring-cloud-netflix.adoc
docs/src/main/asciidoc/spring-cloud-netflix.adoc
+1
-1
EurekaInstanceConfigBean.java
...mework/cloud/netflix/eureka/EurekaInstanceConfigBean.java
+1
-0
DiscoveryClientConfigServiceAutoConfiguration.java
...config/DiscoveryClientConfigServiceAutoConfiguration.java
+1
-1
DiscoveryClientConfigServiceBootstrapConfiguration.java
...g/DiscoveryClientConfigServiceBootstrapConfiguration.java
+1
-1
EurekaClientConfigServerAutoConfiguration.java
...eka/config/EurekaClientConfigServerAutoConfiguration.java
+1
-1
spring.factories
...ureka-client/src/main/resources/META-INF/spring.factories
+3
-3
DiscoveryClientConfigServiceAutoConfigurationTests.java
...g/DiscoveryClientConfigServiceAutoConfigurationTests.java
+3
-1
DiscoveryClientConfigServiceBootstrapConfigurationTests.java
...coveryClientConfigServiceBootstrapConfigurationTests.java
+2
-1
EurekaClientConfigServerAutoConfigurationTests.java
...onfig/EurekaClientConfigServerAutoConfigurationTests.java
+2
-1
No files found.
docs/src/main/asciidoc/spring-cloud-netflix.adoc
View file @
be0f030c
...
...
@@ -1078,7 +1078,7 @@ and the serviceId independently:
This
means
that
http
calls
to
"/myusers"
get
forwarded
to
the
"users_service"
service
.
The
route
has
to
have
a
"path"
which
can
be
specified
as
an
ant
-
style
pattern
,
so
"/myusers/
\*
"
only
matches
one
specified
as
an
ant
-
style
pattern
,
so
"/myusers/
{asterisk}
"
only
matches
one
level
,
but
"/myusers/{all}"
matches
hierarchically
.
The
location
of
the
backend
can
be
specified
as
either
a
"serviceId"
...
...
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java
View file @
be0f030c
...
...
@@ -277,6 +277,7 @@ public class EurekaInstanceConfigBean implements CloudEurekaInstanceConfig {
return
getHostName
(
false
);
}
@SuppressWarnings
(
"unused"
)
private
EurekaInstanceConfigBean
()
{
}
...
...
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfiguration.java
→
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/
eureka/
config/DiscoveryClientConfigServiceAutoConfiguration.java
View file @
be0f030c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
config
;
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
config
;
import
javax.annotation.PostConstruct
;
...
...
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java
→
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/
eureka/
config/DiscoveryClientConfigServiceBootstrapConfiguration.java
View file @
be0f030c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
config
;
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
config
;
import
java.util.List
;
...
...
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/config/EurekaClientConfigServerAutoConfiguration.java
→
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/
eureka/
config/EurekaClientConfigServerAutoConfiguration.java
View file @
be0f030c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
config
;
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
config
;
import
javax.annotation.PostConstruct
;
...
...
spring-cloud-netflix-eureka-client/src/main/resources/META-INF/spring.factories
View file @
be0f030c
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.cloud.netflix.config.EurekaClientConfigServerAutoConfiguration,\
org.springframework.cloud.netflix.config.DiscoveryClientConfigServiceAutoConfiguration,\
org.springframework.cloud.netflix.
eureka.
config.EurekaClientConfigServerAutoConfiguration,\
org.springframework.cloud.netflix.
eureka.
config.DiscoveryClientConfigServiceAutoConfiguration,\
org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration,\
org.springframework.cloud.netflix.ribbon.eureka.RibbonEurekaAutoConfiguration
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
org.springframework.cloud.netflix.config.DiscoveryClientConfigServiceBootstrapConfiguration
org.springframework.cloud.netflix.
eureka.
config.DiscoveryClientConfigServiceBootstrapConfiguration
org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceAutoConfigurationTests.java
→
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/
eureka/
config/DiscoveryClientConfigServiceAutoConfigurationTests.java
View file @
be0f030c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
config
;
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
config
;
import
org.junit.After
;
import
org.junit.Test
;
...
...
@@ -24,6 +24,8 @@ import org.springframework.boot.test.EnvironmentTestUtils;
import
org.springframework.cloud.config.client.ConfigClientProperties
;
import
org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration
;
import
org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration
;
import
org.springframework.cloud.netflix.eureka.config.DiscoveryClientConfigServiceAutoConfiguration
;
import
org.springframework.cloud.netflix.eureka.config.DiscoveryClientConfigServiceBootstrapConfiguration
;
import
org.springframework.cloud.util.UtilAutoConfiguration
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Bean
;
...
...
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfigurationTests.java
→
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/
eureka/
config/DiscoveryClientConfigServiceBootstrapConfigurationTests.java
View file @
be0f030c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
config
;
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
config
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
mockito
.
BDDMockito
.
given
;
...
...
@@ -27,6 +27,7 @@ import org.mockito.Mockito;
import
org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration
;
import
org.springframework.boot.test.EnvironmentTestUtils
;
import
org.springframework.cloud.config.client.ConfigClientProperties
;
import
org.springframework.cloud.netflix.eureka.config.DiscoveryClientConfigServiceBootstrapConfiguration
;
import
org.springframework.cloud.util.UtilAutoConfiguration
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
...
...
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/config/EurekaClientConfigServerAutoConfigurationTests.java
→
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/
eureka/
config/EurekaClientConfigServerAutoConfigurationTests.java
View file @
be0f030c
...
...
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package
org
.
springframework
.
cloud
.
netflix
.
config
;
package
org
.
springframework
.
cloud
.
netflix
.
eureka
.
config
;
import
org.junit.After
;
import
org.junit.Test
;
...
...
@@ -22,6 +22,7 @@ import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfigurati
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.config.server.config.ConfigServerProperties
;
import
org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean
;
import
org.springframework.cloud.netflix.eureka.config.EurekaClientConfigServerAutoConfiguration
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment