You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/03 16:27:40 UTC
[24/50] [abbrv] git commit: Remove unnecessary blobstore references
Remove unnecessary blobstore references
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d2f181bc
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d2f181bc
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d2f181bc
Branch: refs/heads/fix-jclouds-538
Commit: d2f181bc558ee34f43f1efacc5c94216af27bf89
Parents: 18046cd
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Tue Sep 16 09:22:56 2014 -0700
Committer: Jeremy Daggett <jd...@apache.org>
Committed: Tue Sep 16 12:50:25 2014 -0700
----------------------------------------------------------------------
apis/cloudservers/src/test/resources/log4j.xml | 17 -----------------
apis/cloudwatch/src/test/resources/log4j.xml | 17 -----------------
apis/ec2/src/test/resources/log4j.xml | 18 ------------------
apis/openstack-cinder/pom.xml | 4 +---
.../src/test/resources/logback-test.xml | 13 -------------
.../src/test/resources/logback.xml | 13 -------------
apis/sqs/src/test/resources/log4j.xml | 17 -----------------
apis/sts/src/test/resources/log4j.xml | 17 -----------------
.../src/test/resources/logback.xml | 13 -------------
.../src/test/resources/logback.xml | 13 -------------
.../src/test/resources/log4j.xml | 17 -----------------
11 files changed, 1 insertion(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/cloudservers/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/test/resources/log4j.xml b/apis/cloudservers/src/test/resources/log4j.xml
index 7527432..eff16d0 100644
--- a/apis/cloudservers/src/test/resources/log4j.xml
+++ b/apis/cloudservers/src/test/resources/log4j.xml
@@ -51,16 +51,6 @@
-->
</layout>
</appender>
- <!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log" />
- <param name="Append" value="true" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Threshold" value="TRACE" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
- </layout>
- </appender>
<!-- A time/date based rolling appender -->
<appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
@@ -122,9 +112,6 @@
<appender-ref ref="WIREFILE" />
</appender>
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE" />
- </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -147,10 +134,6 @@
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
</category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCBLOBSTORE" />
- </category>
<category name="jclouds.compute">
<priority value="TRACE" />
<appender-ref ref="ASYNCCOMPUTE" />
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/cloudwatch/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/test/resources/log4j.xml b/apis/cloudwatch/src/test/resources/log4j.xml
index 7527432..eff16d0 100644
--- a/apis/cloudwatch/src/test/resources/log4j.xml
+++ b/apis/cloudwatch/src/test/resources/log4j.xml
@@ -51,16 +51,6 @@
-->
</layout>
</appender>
- <!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log" />
- <param name="Append" value="true" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Threshold" value="TRACE" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
- </layout>
- </appender>
<!-- A time/date based rolling appender -->
<appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
@@ -122,9 +112,6 @@
<appender-ref ref="WIREFILE" />
</appender>
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE" />
- </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -147,10 +134,6 @@
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
</category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCBLOBSTORE" />
- </category>
<category name="jclouds.compute">
<priority value="TRACE" />
<appender-ref ref="ASYNCCOMPUTE" />
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/ec2/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/resources/log4j.xml b/apis/ec2/src/test/resources/log4j.xml
index 7527432..986833c 100644
--- a/apis/ec2/src/test/resources/log4j.xml
+++ b/apis/ec2/src/test/resources/log4j.xml
@@ -52,17 +52,6 @@
</layout>
</appender>
<!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log" />
- <param name="Append" value="true" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Threshold" value="TRACE" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
- </layout>
- </appender>
-
- <!-- A time/date based rolling appender -->
<appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="target/test-data/jclouds-compute.log" />
<param name="Append" value="true" />
@@ -122,9 +111,6 @@
<appender-ref ref="WIREFILE" />
</appender>
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE" />
- </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -147,10 +133,6 @@
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
</category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCBLOBSTORE" />
- </category>
<category name="jclouds.compute">
<priority value="TRACE" />
<appender-ref ref="ASYNCCOMPUTE" />
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/openstack-cinder/pom.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/pom.xml b/apis/openstack-cinder/pom.xml
index c134f1c..019bd1d 100644
--- a/apis/openstack-cinder/pom.xml
+++ b/apis/openstack-cinder/pom.xml
@@ -86,7 +86,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>live</id>
@@ -110,8 +110,6 @@
<test.openstack-cinder.identity>${test.openstack-cinder.identity}</test.openstack-cinder.identity>
<test.openstack-cinder.credential>${test.openstack-cinder.credential}</test.openstack-cinder.credential>
<test.jclouds.keystone.credential-type>${test.jclouds.keystone.credential-type}</test.jclouds.keystone.credential-type>
- <jclouds.blobstore.httpstream.url>${jclouds.blobstore.httpstream.url}</jclouds.blobstore.httpstream.url>
- <jclouds.blobstore.httpstream.md5>${jclouds.blobstore.httpstream.md5}</jclouds.blobstore.httpstream.md5>
</systemPropertyVariables>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/openstack-trove/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/resources/logback-test.xml b/apis/openstack-trove/src/test/resources/logback-test.xml
index 6559c23..d7c463a 100644
--- a/apis/openstack-trove/src/test/resources/logback-test.xml
+++ b/apis/openstack-trove/src/test/resources/logback-test.xml
@@ -34,14 +34,6 @@
</encoder>
</appender>
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
<root>
<level value="warn" />
</root>
@@ -61,9 +53,4 @@
<appender-ref ref="WIREFILE" />
</logger>
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/openstack-trove/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/test/resources/logback.xml b/apis/openstack-trove/src/test/resources/logback.xml
index 6559c23..d7c463a 100644
--- a/apis/openstack-trove/src/test/resources/logback.xml
+++ b/apis/openstack-trove/src/test/resources/logback.xml
@@ -34,14 +34,6 @@
</encoder>
</appender>
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
<root>
<level value="warn" />
</root>
@@ -61,9 +53,4 @@
<appender-ref ref="WIREFILE" />
</logger>
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/sqs/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/sqs/src/test/resources/log4j.xml b/apis/sqs/src/test/resources/log4j.xml
index 7527432..9fd717b 100644
--- a/apis/sqs/src/test/resources/log4j.xml
+++ b/apis/sqs/src/test/resources/log4j.xml
@@ -52,15 +52,6 @@
</layout>
</appender>
<!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log" />
- <param name="Append" value="true" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Threshold" value="TRACE" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
- </layout>
- </appender>
<!-- A time/date based rolling appender -->
<appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
@@ -121,10 +112,6 @@
<appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="WIREFILE" />
</appender>
-
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE" />
- </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -147,10 +134,6 @@
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
</category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCBLOBSTORE" />
- </category>
<category name="jclouds.compute">
<priority value="TRACE" />
<appender-ref ref="ASYNCCOMPUTE" />
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/apis/sts/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/apis/sts/src/test/resources/log4j.xml b/apis/sts/src/test/resources/log4j.xml
index 7527432..9fd717b 100644
--- a/apis/sts/src/test/resources/log4j.xml
+++ b/apis/sts/src/test/resources/log4j.xml
@@ -52,15 +52,6 @@
</layout>
</appender>
<!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log" />
- <param name="Append" value="true" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Threshold" value="TRACE" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
- </layout>
- </appender>
<!-- A time/date based rolling appender -->
<appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
@@ -121,10 +112,6 @@
<appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="WIREFILE" />
</appender>
-
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE" />
- </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -147,10 +134,6 @@
<priority value="DEBUG" />
<appender-ref ref="ASYNCWIRE" />
</category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG" />
- <appender-ref ref="ASYNCBLOBSTORE" />
- </category>
<category name="jclouds.compute">
<priority value="TRACE" />
<appender-ref ref="ASYNCCOMPUTE" />
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/providers/rackspace-clouddatabases-uk/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-uk/src/test/resources/logback.xml b/providers/rackspace-clouddatabases-uk/src/test/resources/logback.xml
index 6559c23..d7c463a 100644
--- a/providers/rackspace-clouddatabases-uk/src/test/resources/logback.xml
+++ b/providers/rackspace-clouddatabases-uk/src/test/resources/logback.xml
@@ -34,14 +34,6 @@
</encoder>
</appender>
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
<root>
<level value="warn" />
</root>
@@ -61,9 +53,4 @@
<appender-ref ref="WIREFILE" />
</logger>
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/providers/rackspace-clouddatabases-us/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/providers/rackspace-clouddatabases-us/src/test/resources/logback.xml b/providers/rackspace-clouddatabases-us/src/test/resources/logback.xml
index 6559c23..d7c463a 100644
--- a/providers/rackspace-clouddatabases-us/src/test/resources/logback.xml
+++ b/providers/rackspace-clouddatabases-us/src/test/resources/logback.xml
@@ -34,14 +34,6 @@
</encoder>
</appender>
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
<root>
<level value="warn" />
</root>
@@ -61,9 +53,4 @@
<appender-ref ref="WIREFILE" />
</logger>
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d2f181bc/skeletons/standalone-compute/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/test/resources/log4j.xml b/skeletons/standalone-compute/src/test/resources/log4j.xml
index b14cdd7..9d88c65 100644
--- a/skeletons/standalone-compute/src/test/resources/log4j.xml
+++ b/skeletons/standalone-compute/src/test/resources/log4j.xml
@@ -75,15 +75,6 @@
</layout>
</appender>
<!-- A time/date based rolling appender -->
- <appender name="BLOBSTOREFILE" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="target/test-data/jclouds-blobstore.log"/>
- <param name="Append" value="true"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
- <param name="Threshold" value="TRACE"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
- </layout>
- </appender>
<!-- A time/date based rolling appender -->
<appender name="COMPUTEFILE" class="org.apache.log4j.DailyRollingFileAppender">
@@ -144,10 +135,6 @@
<appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="WIREFILE"/>
</appender>
-
- <appender name="ASYNCBLOBSTORE" class="org.apache.log4j.AsyncAppender">
- <appender-ref ref="BLOBSTOREFILE"/>
- </appender>
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
@@ -170,10 +157,6 @@
<priority value="DEBUG"/>
<appender-ref ref="ASYNCWIRE"/>
</category>
- <category name="jclouds.blobstore">
- <priority value="DEBUG"/>
- <appender-ref ref="ASYNCBLOBSTORE"/>
- </category>
<category name="jclouds.compute">
<priority value="TRACE"/>
<appender-ref ref="ASYNCCOMPUTE"/>