You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by de...@apache.org on 2016/02/23 12:30:52 UTC
jclouds git commit: Move html responses to a subfolder for cleaner
rat plugin exclude
Repository: jclouds
Updated Branches:
refs/heads/master d5b74179a -> 9a8b4d074
Move html responses to a subfolder for cleaner rat plugin exclude
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9a8b4d07
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9a8b4d07
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9a8b4d07
Branch: refs/heads/master
Commit: 9a8b4d074b50727e98f508a549550037322bcbd0
Parents: d5b7417
Author: Reijhanniel Jearl Campos <de...@apache.org>
Authored: Sat Feb 20 00:30:16 2016 +0800
Committer: Reijhanniel Jearl Campos <de...@apache.org>
Committed: Tue Feb 23 19:30:03 2016 +0800
----------------------------------------------------------------------
.gitignore | 4 +-
project/pom.xml | 3 +-
...omPayloadHttpCommandExecutorServiceTest.java | 4 +-
.../src/test/resources/fault-401.html | 43 -------------
.../src/test/resources/html/fault-401.html | 43 +++++++++++++
.../test/resources/html/maintenance-503.html | 67 ++++++++++++++++++++
.../src/test/resources/maintenance-503.html | 67 --------------------
7 files changed, 115 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index eb8b9db..ba8aea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,5 @@ atlassian-ide-plugin.xml
.factorypath
.apt_generated
.checkstyle
-*nb-configuration.xml
-*nbactions.xml
\ No newline at end of file
+nb-configuration.xml
+nbactions.xml
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 8631a38..d5bc5ba 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -463,8 +463,7 @@
<exclude>**/src/test/resources/**/*.gz</exclude>
<exclude>**/src/test/resources/**/*.xml</exclude>
<exclude>**/src/test/resources/**/*.crt</exclude>
- <exclude>**/src/test/resources/fault-401.html</exclude>
- <exclude>**/src/test/resources/maintenance-503.html</exclude>
+ <exclude>src/test/resources/html/*.html</exclude>
<!-- META-INF/services files -->
<exclude>**/services/*LoggingModule</exclude>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java
----------------------------------------------------------------------
diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java
index bb92109..1913aba 100644
--- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java
+++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/http/ResponseStatusFromPayloadHttpCommandExecutorServiceTest.java
@@ -86,7 +86,7 @@ public class ResponseStatusFromPayloadHttpCommandExecutorServiceTest extends Bas
@Test
public void testUnauthorized() throws Exception {
MockWebServer server = mockWebServer();
- server.enqueue(new MockResponse().setResponseCode(401).setBody(payloadFromResource("/fault-401.html")));
+ server.enqueue(new MockResponse().setResponseCode(401).setBody(payloadFromResource("/html/fault-401.html")));
ProfitBricksApi pbApi = api(server.getUrl("/"));
DataCenterApi api = pbApi.dataCenterApi();
@@ -131,7 +131,7 @@ public class ResponseStatusFromPayloadHttpCommandExecutorServiceTest extends Bas
public void testServiceUnderMaintenance() throws Exception {
MockWebServer server = mockWebServer();
for (int i = 0; i <= MAX_RETRIES; i++) // jclouds retries 5 times
- server.enqueue(new MockResponse().setResponseCode(503).setBody(payloadFromResource("/maintenance-503.html")));
+ server.enqueue(new MockResponse().setResponseCode(503).setBody(payloadFromResource("/html/maintenance-503.html")));
ProfitBricksApi pbApi = api(server.getUrl("/"));
DataCenterApi api = pbApi.dataCenterApi();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/providers/profitbricks/src/test/resources/fault-401.html
----------------------------------------------------------------------
diff --git a/providers/profitbricks/src/test/resources/fault-401.html b/providers/profitbricks/src/test/resources/fault-401.html
deleted file mode 100644
index ecadab1..0000000
--- a/providers/profitbricks/src/test/resources/fault-401.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" lang="en"/>
- <title>Profitbricks | 401 Unauthorized</title>
- <base href="/"/>
- <link rel="stylesheet" type="text/css" href="css/style.css"/>
- <link rel="stylesheet" type="text/css" href="css/content.css"/>
- <link rel="stylesheet" type="text/css" href="css/recent_additions.css"/>
- <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
- </head>
- <body>
- <div class="head1 h_bg"/>
- <div class="head2 h_bg"/>
- <div class="head3 h_bg"/>
- <div id="wrapper">
- <div class="wrapper_inner">
- <div id="header">
- <a id="logo" href="#">
- <img alt="Profitbricks" src="img/logo.png"/>
- </a>
- </div>
- <div id="main">
- <div id="right" style="min-height: 550px;">
- <div class="article msg">
- <h1>Unauthorized</h1>
- <img title="" alt="message error" src="img/msg_error.png" class="msg_sign" style="margin: 10px;" height="49" width="49"/>
- <div class="container" style="margin:20px 80px !important;">
- <p class="bigmargin">This request requires authentication.</p>
- </div>
- </div>
- </div>
- <br class="clear"/>
- </div>
- </div>
- </div>
- <div id="footer">
- <div class="bottom">
- <div class="inner"></div>
- </div>
- </div>
- </body>
-</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/providers/profitbricks/src/test/resources/html/fault-401.html
----------------------------------------------------------------------
diff --git a/providers/profitbricks/src/test/resources/html/fault-401.html b/providers/profitbricks/src/test/resources/html/fault-401.html
new file mode 100644
index 0000000..ecadab1
--- /dev/null
+++ b/providers/profitbricks/src/test/resources/html/fault-401.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" lang="en"/>
+ <title>Profitbricks | 401 Unauthorized</title>
+ <base href="/"/>
+ <link rel="stylesheet" type="text/css" href="css/style.css"/>
+ <link rel="stylesheet" type="text/css" href="css/content.css"/>
+ <link rel="stylesheet" type="text/css" href="css/recent_additions.css"/>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"/>
+ </head>
+ <body>
+ <div class="head1 h_bg"/>
+ <div class="head2 h_bg"/>
+ <div class="head3 h_bg"/>
+ <div id="wrapper">
+ <div class="wrapper_inner">
+ <div id="header">
+ <a id="logo" href="#">
+ <img alt="Profitbricks" src="img/logo.png"/>
+ </a>
+ </div>
+ <div id="main">
+ <div id="right" style="min-height: 550px;">
+ <div class="article msg">
+ <h1>Unauthorized</h1>
+ <img title="" alt="message error" src="img/msg_error.png" class="msg_sign" style="margin: 10px;" height="49" width="49"/>
+ <div class="container" style="margin:20px 80px !important;">
+ <p class="bigmargin">This request requires authentication.</p>
+ </div>
+ </div>
+ </div>
+ <br class="clear"/>
+ </div>
+ </div>
+ </div>
+ <div id="footer">
+ <div class="bottom">
+ <div class="inner"></div>
+ </div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/providers/profitbricks/src/test/resources/html/maintenance-503.html
----------------------------------------------------------------------
diff --git a/providers/profitbricks/src/test/resources/html/maintenance-503.html b/providers/profitbricks/src/test/resources/html/maintenance-503.html
new file mode 100644
index 0000000..bbc1b1f
--- /dev/null
+++ b/providers/profitbricks/src/test/resources/html/maintenance-503.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta lang="en" http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Profitbricks | Maintenance</title>
+ <link rel="stylesheet" type="text/css" href="css/style.css" />
+ <link rel="stylesheet" type="text/css" href="css/content.css" />
+ <link rel="stylesheet" type="text/css" href="css/recent_additions.css" />
+ <link rel="shortcut icon" href="https://my.profitbricks.com/errorpages/favicon.ico" type="image/x-icon" />
+ </head>
+
+ <body>
+ <div class="head1 h_bg"></div>
+ <div class="head2 h_bg"></div>
+ <div class="head3 h_bg"></div>
+
+ <div id="wrapper">
+ <div class="wrapper_inner">
+
+ <div id="header">
+ <a id="logo" href="#"><img alt="Profitbricks" src="img/logo.png" /></a>
+ </div>
+
+ <div id="main">
+ <div id="right" style="min-height: 550px;">
+ <div class="article msg">
+ <h1>Maintenance</h1>
+ <img width="49" height="49" title="" alt="message error" src="Profitbricks%20%7C%20Maintenance_files/msg_error.png" class="msg_sign" style="margin: 10px;" />
+ <div class="container" style="margin:20px 80px !important;">
+ <div class="bigmargin">
+ <h2>Dear ProfitBricks users,</h2>
+ <p>actually we are carrying out maintenance work right now.</p>
+ <p>For urgent matters please contact:<br /><a href="mailto:support@profitbricks.com">support@profitbricks.com</a>.</p>
+ <br />
+ <p>We ask for your understanding and your patience.</p>
+ <p>Your ProfitBricks Team</p>
+ </div>
+
+ <div class="bigmargin">
+ <h2>Sehr geehrte(r) ProfitBricks Nutzerin/Nutzer,</h2>
+ <p>zur Zeit führen wir Wartungsarbeiten durch.</p>
+ <p>Bei dringenden Angelegenheiten wenden Sie sich bitte an:<br />
+ <a href="mailto:support@profitbricks.com">support@profitbricks.com</a>
+ </p>
+ <br />
+ <p>Wir bitten Sie um Ihr Verständnis und um etwas Geduld.</p>
+ <p>Ihr ProfitBricks Team</p>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ <br class="clear" />
+ </div>
+
+ </div>
+ </div>
+
+ <div id="footer">
+ <div class="bottom">
+ <div class="inner">
+ </div>
+ </div>
+ </div>
+
+ </body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/9a8b4d07/providers/profitbricks/src/test/resources/maintenance-503.html
----------------------------------------------------------------------
diff --git a/providers/profitbricks/src/test/resources/maintenance-503.html b/providers/profitbricks/src/test/resources/maintenance-503.html
deleted file mode 100644
index bbc1b1f..0000000
--- a/providers/profitbricks/src/test/resources/maintenance-503.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta lang="en" http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Profitbricks | Maintenance</title>
- <link rel="stylesheet" type="text/css" href="css/style.css" />
- <link rel="stylesheet" type="text/css" href="css/content.css" />
- <link rel="stylesheet" type="text/css" href="css/recent_additions.css" />
- <link rel="shortcut icon" href="https://my.profitbricks.com/errorpages/favicon.ico" type="image/x-icon" />
- </head>
-
- <body>
- <div class="head1 h_bg"></div>
- <div class="head2 h_bg"></div>
- <div class="head3 h_bg"></div>
-
- <div id="wrapper">
- <div class="wrapper_inner">
-
- <div id="header">
- <a id="logo" href="#"><img alt="Profitbricks" src="img/logo.png" /></a>
- </div>
-
- <div id="main">
- <div id="right" style="min-height: 550px;">
- <div class="article msg">
- <h1>Maintenance</h1>
- <img width="49" height="49" title="" alt="message error" src="Profitbricks%20%7C%20Maintenance_files/msg_error.png" class="msg_sign" style="margin: 10px;" />
- <div class="container" style="margin:20px 80px !important;">
- <div class="bigmargin">
- <h2>Dear ProfitBricks users,</h2>
- <p>actually we are carrying out maintenance work right now.</p>
- <p>For urgent matters please contact:<br /><a href="mailto:support@profitbricks.com">support@profitbricks.com</a>.</p>
- <br />
- <p>We ask for your understanding and your patience.</p>
- <p>Your ProfitBricks Team</p>
- </div>
-
- <div class="bigmargin">
- <h2>Sehr geehrte(r) ProfitBricks Nutzerin/Nutzer,</h2>
- <p>zur Zeit führen wir Wartungsarbeiten durch.</p>
- <p>Bei dringenden Angelegenheiten wenden Sie sich bitte an:<br />
- <a href="mailto:support@profitbricks.com">support@profitbricks.com</a>
- </p>
- <br />
- <p>Wir bitten Sie um Ihr Verständnis und um etwas Geduld.</p>
- <p>Ihr ProfitBricks Team</p>
- </div>
-
- </div>
- </div>
- </div>
- <br class="clear" />
- </div>
-
- </div>
- </div>
-
- <div id="footer">
- <div class="bottom">
- <div class="inner">
- </div>
- </div>
- </div>
-
- </body>
-</html>
\ No newline at end of file