[sling-org-apache-sling-testing-clients] 04/37: SLING-5727 Remove o.a.s.testing.tools dependency in o.a.s.testing.serversetup and adapt http code

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-clients.git

commit 3c75f9f47a82249bdd7d5965151c42f4be5c81f0
Author: Andrei Dulvac <du...@apache.org>
AuthorDate: Wed Jun 15 15:00:53 2016 +0000

    SLING-5727 Remove o.a.s.testing.tools dependency in o.a.s.testing.serversetup and adapt http code
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1748593 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                          | 9 ++++++++-
 .../org/apache/sling/testing/clients/osgi/BundlesInstaller.java  | 2 +-
 .../org/apache/sling/testing/clients/util/poller/PathPoller.java | 6 +++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b67851d..83e0533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,14 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.apache.sling.testing.clients.*,
+                            org.apache.sling.testing.clients,
+                            org.apache.sling.testing.clients.instance,
+                            org.apache.sling.testing.clients.interceptors,
+                            org.apache.sling.testing.clients.osgi,
+                            org.apache.sling.testing.clients.util,
+                            org.apache.sling.testing.clients.util.config,
+                            org.apache.sling.testing.clients.util.poller,
+                            org.apache.sling.testing.clients.*
                         </Export-Package>
                         <Import-Package>
                             org.apache.commons.exec.*; resolution:=optional,
diff --git a/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInstaller.java b/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInstaller.java
index e99c454..8a19aa6 100644
--- a/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInstaller.java
+++ b/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInstaller.java
@@ -46,7 +46,7 @@ public class BundlesInstaller {
      * @throws IOException
      * @throws InterruptedException
      */
-    public boolean isInstalled(File bundleFile) throws ClientException, InterruptedException, IOException {
+    public boolean isInstalled(File bundleFile) throws InterruptedException, IOException {
         final String bundleSymbolicName = OsgiConsoleClient.getBundleSymbolicName(bundleFile);
         log.debug("Checking if installed: " + bundleSymbolicName);
         boolean installed = osgiConsoleClient.checkBundleInstalled(bundleSymbolicName, 1000, 1);
diff --git a/src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java b/src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java
index c7b50cb..61a1ee1 100644
--- a/src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java
+++ b/src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java
@@ -37,7 +37,11 @@ public class PathPoller extends AbstractPoller {
         super(waitInterval, waitCount);
         this.client = client;
         this.path = path;
-        this.expectedStatus = expectedStatus;
+        if (null == expectedStatus || expectedStatus.length == 0) {
+            this.expectedStatus = new int[]{200};
+        } else {
+            this.expectedStatus = expectedStatus;
+        }
     }
 
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.