mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Include jclouds properties in overrides

pull/50/head
Andrew Gaul 2015-03-18 19:18:30 -07:00
rodzic 6b5f9fd7f3
commit 81a5024bd3
2 zmienionych plików z 2 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
src/test/java/org/gaul/s3proxy/S3AwsSdkTest.java
Wyświetl plik

@ -89,12 +89,11 @@ public final class S3AwsSdkTest {
String virtualHost = s3ProxyProperties.getProperty( String virtualHost = s3ProxyProperties.getProperty(
S3ProxyConstants.PROPERTY_VIRTUAL_HOST); S3ProxyConstants.PROPERTY_VIRTUAL_HOST);
Properties properties = new Properties();
ContextBuilder builder = ContextBuilder ContextBuilder builder = ContextBuilder
.newBuilder(provider) .newBuilder(provider)
.credentials(identity, credential) .credentials(identity, credential)
.modules(ImmutableList.<Module>of(new SLF4JLoggingModule())) .modules(ImmutableList.<Module>of(new SLF4JLoggingModule()))
.overrides(properties); .overrides(s3ProxyProperties);
if (!Strings.isNullOrEmpty(endpoint)) { if (!Strings.isNullOrEmpty(endpoint)) {
builder.endpoint(endpoint); builder.endpoint(endpoint);
} }

3
src/test/java/org/gaul/s3proxy/S3ProxyTest.java
Wyświetl plik

@ -95,12 +95,11 @@ public final class S3ProxyTest {
String virtualHost = s3ProxyProperties.getProperty( String virtualHost = s3ProxyProperties.getProperty(
S3ProxyConstants.PROPERTY_VIRTUAL_HOST); S3ProxyConstants.PROPERTY_VIRTUAL_HOST);
Properties properties = new Properties();
ContextBuilder builder = ContextBuilder ContextBuilder builder = ContextBuilder
.newBuilder(provider) .newBuilder(provider)
.credentials(identity, credential) .credentials(identity, credential)
.modules(ImmutableList.<Module>of(new SLF4JLoggingModule())) .modules(ImmutableList.<Module>of(new SLF4JLoggingModule()))
.overrides(properties); .overrides(s3ProxyProperties);
if (!Strings.isNullOrEmpty(endpoint)) { if (!Strings.isNullOrEmpty(endpoint)) {
builder.endpoint(endpoint); builder.endpoint(endpoint);
} }