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
826d5ff3
Commit
826d5ff3
authored
Oct 14, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tidy (mostly pom warnings)
parent
5bded8aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
ArchaiusAutoConfiguration.java
...ork/cloud/netflix/archaius/ArchaiusAutoConfiguration.java
+3
-3
pom.xml
spring-cloud-netflix-zuul/pom.xml
+0
-3
No files found.
spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java
View file @
826d5ff3
...
...
@@ -3,6 +3,7 @@ package org.springframework.cloud.netflix.archaius;
import
com.netflix.config.ConcurrentCompositeConfiguration
;
import
com.netflix.config.ConfigurationManager
;
import
com.netflix.config.DynamicURLConfiguration
;
import
org.apache.commons.configuration.EnvironmentConfiguration
;
import
org.apache.commons.configuration.SystemConfiguration
;
import
org.slf4j.Logger
;
...
...
@@ -16,8 +17,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import
static
com
.
netflix
.
config
.
ConfigurationBasedDeploymentContext
.
DEPLOYMENT_APPLICATION_ID_PROPERTY
;
import
static
com
.
netflix
.
config
.
ConfigurationManager
.*;
import
static
com
.
netflix
.
config
.
ConfigurationManager
.
APPLICATION_PROPERTIES
;
import
static
com
.
netflix
.
config
.
ConfigurationManager
.
ENV_CONFIG_NAME
;
/**
* @author Spencer Gibb
...
...
@@ -38,7 +37,8 @@ public class ArchaiusAutoConfiguration {
return
envConfig
;
}
protected
void
configureArchaius
(
ConfigurableEnvironmentConfiguration
envConfig
)
{
@SuppressWarnings
(
"deprecation"
)
protected
void
configureArchaius
(
ConfigurableEnvironmentConfiguration
envConfig
)
{
if
(
initialized
.
compareAndSet
(
false
,
true
))
{
String
appName
=
env
.
getProperty
(
"spring.application.name"
);
if
(
appName
==
null
)
{
...
...
spring-cloud-netflix-zuul/pom.xml
View file @
826d5ff3
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix-zuul
</artifactId>
<version>
1.0.0.BUILD-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<name>
Spring Cloud Netflix Zuul
</name>
<url>
http://projects.spring.io/spring-cloud/
</url>
...
...
@@ -53,7 +51,6 @@
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix-core
</artifactId>
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
...
...
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