svn commit: r1795326 - in /sling/trunk/testing/http/clients/src: main/java/org/apache/sling/testing/clients/util/poller/ test/java/org/apache/sling/testing/clients/ test/java/org/apache/sling/testing/

[dulvac]

Author: dulvac
Date: Tue May 16 15:03:12 2017
New Revision: 1795326

URL: http://svn.apache.org/viewvc?rev=1795326=rev
Log:
SLING-6853 Fixed incomplete patch.

Added:

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/Polling.java

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/HttpServerRule.java

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/SlingClientDoGetJsonTest.java

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/SlingClientWaitExistsTest.java

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/util/

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/util/poller/

sling/trunk/testing/http/clients/src/test/java/org/apache/sling/testing/clients/util/poller/PollingTest.java

Added: 
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/Polling.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/Polling.java?rev=1795326=auto
==
--- 
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/Polling.java
 (added)
+++ 
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/Polling.java
 Tue May 16 15:03:12 2017
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations 
under
+ * the License.
+ */
+package org.apache.sling.testing.clients.util.poller;
+
+import org.apache.sling.testing.timeouts.TimeoutsProvider;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Helper for repeating a call until it returns true, with timeout 
capabilities.
+ * Subclasses should override the {@link #call()} method.
+ * Can be used with lambda expressions, using the constructor {@link 
#Polling(Callable c)}.
+ *
+ * @since 1.1.0
+ */
+public class Polling implements Callable {
+
+/**
+ * Optional object to be used by the default implementation of call()
+ */
+protected final Callable c;
+
+/**
+ * Holder for the last exception thrown by call(), to be used for logging
+ */
+protected Exception lastException;
+
+/**
+ * Default constructor to be used in subclasses that override the {@link 
#call()} method.
+ * Should not be used directly on {@code Polling} instances, but only on 
extended classes.
+ * If used directly to get a {@code Polling} instance, executing {@link 
#poll(long timeout, long delay)}
+ * will be equivalent to {@code Thread.sleep(timeout)}
+ */
+public Polling() {
+this.c = null;
+this.lastException = null;
+}
+
+/**
+ * Creates a new instance that uses the {@code Callable} parameter for 
polling
+ *
+ * @param c object whose {@code call()} method will be polled
+ */
+public Polling(Callable c) {
+this.c = c;
+this.lastException = null;
+}
+
+/**
+ * Method to be called by {@link #poll(long timeout, long delay)}, 
potentially multiple times,
+ * until it returns true or timeout is reached.
+ * Subclasses can override it to change the check accordingly. The method 
should return true
+ * only when the call was successful.
+ * It can return false or throw any {@code Exception} to make the poller 
try again later.
+ *
+ * The default implementation delegates the call to the {@code Callable 
c} instance.
+ *
+ * @return {@code true} to end polling
+ * @throws Exception if unable to compute a result
+ */
+@Override
+public Boolean call() throws Exception {
+if (c != null) {
+return c.call();
+} else {
+return false;
+}
+}
+
+/**
+ * Tries to execute {@link #call()} until it returns true or until 
{@code timeout} is reached.
+ * Between retries, it waits using {@code Thread.sleep(delay)}. It means 
the retry is not at a fixed 

Jenkins build became unstable: sling-bundles-jcr-oak-server-1.7 #328

[Apache Jenkins Server]

See 

Jenkins build is back to normal : sling-bundles-extensions-healthcheck-it-1.8 #9

[Apache Jenkins Server]

See 

svn commit: r1795302 - /sling/trunk/bundles/extensions/healthcheck/it/pom.xml

[cziegeler]

Author: cziegeler
Date: Tue May 16 12:18:02 2017
New Revision: 1795302

URL: http://svn.apache.org/viewvc?rev=1795302=rev
Log:
Correct versions

Modified:
sling/trunk/bundles/extensions/healthcheck/it/pom.xml

Modified: sling/trunk/bundles/extensions/healthcheck/it/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it/pom.xml?rev=1795302=1795301=1795302=diff
==
--- sling/trunk/bundles/extensions/healthcheck/it/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/it/pom.xml Tue May 16 12:18:02 
2017
@@ -42,9 +42,9 @@
 
INFO
 false
 1.0.7-SNAPSHOT
-0.0.99-SNAPSHOT
-1.2.7-SNAPSHOT
-0.1.0-SNAPSHOT
+1.0.1-SNAPSHOT
+1.2.9-SNAPSHOT
+1.0.0
 
 
 

svn commit: r1795303 - in /sling/trunk/testing/http/clients: ./ src/main/java/org/apache/sling/testing/clients/ src/main/java/org/apache/sling/testing/clients/html/ src/main/java/org/apache/sling/test

[dulvac]

Author: dulvac
Date: Tue May 16 12:34:17 2017
New Revision: 1795303

URL: http://svn.apache.org/viewvc?rev=1795303=rev
Log:
SLING-6853 Improve polling capabilities in o.a.s.testing.clients
thanks @volteanu for the contribution!

Modified:
sling/trunk/testing/http/clients/pom.xml

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/SlingClient.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/html/package-info.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/BundlesInstaller.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/OsgiConsoleClient.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/OsgiInstanceConfig.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/osgi/package-info.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/package-info.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/TimeoutsProvider.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfig.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/config/impl/InstanceConfigCacheImpl.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/AbstractPoller.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/Poller.java

sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java

Modified: sling/trunk/testing/http/clients/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/pom.xml?rev=1795303=1795302=1795303=diff
==
--- sling/trunk/testing/http/clients/pom.xml (original)
+++ sling/trunk/testing/http/clients/pom.xml Tue May 16 12:34:17 2017
@@ -28,7 +28,7 @@
 
 
 org.apache.sling.testing.clients
-1.0.2-SNAPSHOT
+1.1.0-SNAPSHOT
 bundle
 
 Apache Sling Testing Clients
@@ -149,5 +149,12 @@
 org.apache.sling.hapi.client
 1.0.0
 
+
+org.apache.httpcomponents
+httpclient
+4.5.3
+tests
+test
+
 
 

Modified: 
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/SlingClient.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/SlingClient.java?rev=1795303=1795302=1795303=diff
==
--- 
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/SlingClient.java
 (original)
+++ 
sling/trunk/testing/http/clients/src/main/java/org/apache/sling/testing/clients/SlingClient.java
 Tue May 16 12:34:17 2017
@@ -30,19 +30,20 @@ import org.apache.http.entity.ContentTyp
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
-
 import org.apache.sling.testing.clients.interceptors.DelayRequestInterceptor;
 import 
org.apache.sling.testing.clients.interceptors.TestDescriptionInterceptor;
 import org.apache.sling.testing.clients.util.FormEntityBuilder;
 import org.apache.sling.testing.clients.util.HttpUtils;
 import org.apache.sling.testing.clients.util.JsonUtils;
 import org.apache.sling.testing.clients.util.poller.AbstractPoller;
+import org.apache.sling.testing.clients.util.poller.Polling;
 import org.codehaus.jackson.JsonNode;
 
 import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 import static org.apache.http.HttpStatus.SC_CREATED;
 import static org.apache.http.HttpStatus.SC_OK;
@@ -212,12 +213,16 @@ public class SlingClient extends Abstrac
 /**
  * Checks whether a path exists or not by making a GET request to that 
path with the {@code json extension} 
  * It polls the server and waits until the path exists 
+ *
+ * @deprecated use {@link #waitExists(String, long, long)} instead.
+ *
  * @param path path to be checked
  * @param waitMillis time to wait between retries
  * @param retryCount number of retries before throwing an exception
  * @throws ClientException if the path was not found
  * @throws InterruptedException to mark this operation as "waiting"
  */
+@Deprecated
 public void waitUntilExists(final String path, final long waitMillis, int 
retryCount)
 throws ClientException, 

Jenkins build is back to normal : sling-bundles-extensions-healthcheck-it-1.7 #9

[Apache Jenkins Server]

See 

svn commit: r1795288 - /sling/trunk/bundles/extensions/adapter/pom.xml

[cziegeler]

Author: cziegeler
Date: Tue May 16 09:59:43 2017
New Revision: 1795288

URL: http://svn.apache.org/viewvc?rev=1795288=rev
Log:
Remove duplicate dependency

Modified:
sling/trunk/bundles/extensions/adapter/pom.xml

Modified: sling/trunk/bundles/extensions/adapter/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1795288=1795287=1795288=diff
==
--- sling/trunk/bundles/extensions/adapter/pom.xml (original)
+++ sling/trunk/bundles/extensions/adapter/pom.xml Tue May 16 09:59:43 2017
@@ -127,12 +127,6 @@
 provided
 
 
-org.apache.sling
-org.apache.sling.commons.osgi
-2.1.0
-provided
-
-
 org.osgi
 org.osgi.service.component
 1.3.0

svn commit: r1795287 - /sling/trunk/README.txt

[cziegeler]

Author: cziegeler
Date: Tue May 16 09:58:55 2017
New Revision: 1795287

URL: http://svn.apache.org/viewvc?rev=1795287=rev
Log:
Update readme to java 8

Modified:
sling/trunk/README.txt

Modified: sling/trunk/README.txt
URL: 
http://svn.apache.org/viewvc/sling/trunk/README.txt?rev=1795287=1795286=1795287=diff
==
--- sling/trunk/README.txt (original)
+++ sling/trunk/README.txt Tue May 16 09:58:55 2017
@@ -22,7 +22,7 @@ See http://sling.apache.org for more inf
 Getting started
 ---
 
-You need a Java 7 (or higher) JDK and Maven 3 (http://maven.apache.org/,
+You need a Java 8 (or higher) JDK and Maven 3 (http://maven.apache.org/,
 version 3.3.9 or higher) to build Sling.
 
 Once you have everything in place, run

Build failed in Jenkins: sling-testing-http-clients-1.8 #8

[Apache Jenkins Server]

See 


Changes:

[dulvac] SLING-6853 Improve polling capabilities in o.a.s.testing.clients
thanks @volteanu for the contribution!

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H18 (ubuntu xenial) in workspace 

Checking out a fresh workspace because there's no workspace at 

Cleaning local Directory .
Checking out https://svn.apache.org/repos/asf/sling/trunk/testing/http/clients 
at revision '2017-05-16T12:47:11.145 +'
A src
A src/test
A src/test/java
A src/test/java/org
A src/test/java/org/apache
A src/test/java/org/apache/sling
A src/test/java/org/apache/sling/testing
A 
src/test/java/org/apache/sling/testing/DelayRequestInterceptorTest.java
A 
src/test/java/org/apache/sling/testing/AbstractSlingClientGetServerUrlTest.java
A 
src/test/java/org/apache/sling/testing/AbstractSlingClientGetPathTest.java
A src/test/java/org/apache/sling/testing/util
A src/test/java/org/apache/sling/testing/util/UniquePathsTest.java
A src/test/java/org/apache/sling/testing/util/poller
A 
src/test/java/org/apache/sling/testing/util/poller/AbstractPollerTest.java
A 
src/test/java/org/apache/sling/testing/AbstractSlingClientGetUrlTest.java
A src/main
A src/main/java
A src/main/java/org
A src/main/java/org/apache
A src/main/java/org/apache/sling
A src/main/java/org/apache/sling/testing
A src/main/java/org/apache/sling/testing/clients
A src/main/java/org/apache/sling/testing/clients/html
A src/main/java/org/apache/sling/testing/clients/html/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/html/MicrodataClient.java
A src/main/java/org/apache/sling/testing/clients/instance
A 
src/main/java/org/apache/sling/testing/clients/instance/InstanceConfiguration.java
A 
src/main/java/org/apache/sling/testing/clients/instance/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/instance/InstanceSetup.java
A src/main/java/org/apache/sling/testing/clients/package-info.java
A src/main/java/org/apache/sling/testing/clients/SlingClient.java
A src/main/java/org/apache/sling/testing/clients/SlingHttpResponse.java
A src/main/java/org/apache/sling/testing/clients/Constants.java
A src/main/java/org/apache/sling/testing/clients/ClientException.java
A src/main/java/org/apache/sling/testing/clients/util
A src/main/java/org/apache/sling/testing/clients/util/UniquePaths.java
A 
src/main/java/org/apache/sling/testing/clients/util/FormEntityBuilder.java
A 
src/main/java/org/apache/sling/testing/clients/util/InputStreamBodyWithLength.java
A src/main/java/org/apache/sling/testing/clients/util/JsonUtils.java
A 
src/main/java/org/apache/sling/testing/clients/util/URLParameterBuilder.java
A 
src/main/java/org/apache/sling/testing/clients/util/SlingParameter.java
A src/main/java/org/apache/sling/testing/clients/util/poller
A 
src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java
A src/main/java/org/apache/sling/testing/clients/util/poller/Poller.java
A 
src/main/java/org/apache/sling/testing/clients/util/poller/AbstractPoller.java
A src/main/java/org/apache/sling/testing/clients/util/XSSUtils.java
A src/main/java/org/apache/sling/testing/clients/util/HttpUtils.java
A 
src/main/java/org/apache/sling/testing/clients/util/TimeoutsProvider.java
A src/main/java/org/apache/sling/testing/clients/util/package-info.java
A src/main/java/org/apache/sling/testing/clients/util/PortAllocator.java
A src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java
A src/main/java/org/apache/sling/testing/clients/util/config
A 
src/main/java/org/apache/sling/testing/clients/util/config/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfigException.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfig.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfigCache.java
A src/main/java/org/apache/sling/testing/clients/util/config/impl
A 
src/main/java/org/apache/sling/testing/clients/util/config/impl/InstanceConfigCacheImpl.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java
A 

Build failed in Jenkins: sling-testing-http-clients-1.7 #8

[Apache Jenkins Server]

See 


Changes:

[dulvac] SLING-6853 Improve polling capabilities in o.a.s.testing.clients
thanks @volteanu for the contribution!

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on qnode3 (ubuntu) in workspace 

Checking out a fresh workspace because there's no workspace at 

Cleaning local Directory .
Checking out https://svn.apache.org/repos/asf/sling/trunk/testing/http/clients 
at revision '2017-05-16T12:48:12.082 +'
A src
A src/main
A src/main/java
A src/main/java/org
A src/main/java/org/apache
A src/main/java/org/apache/sling
A src/main/java/org/apache/sling/testing
A src/main/java/org/apache/sling/testing/timeouts
A src/main/java/org/apache/sling/testing/timeouts/TimeoutsProvider.java
A src/main/java/org/apache/sling/testing/clients
A src/main/java/org/apache/sling/testing/clients/html
A 
src/main/java/org/apache/sling/testing/clients/html/MicrodataClient.java
A src/main/java/org/apache/sling/testing/clients/html/package-info.java
A src/main/java/org/apache/sling/testing/clients/instance
A 
src/main/java/org/apache/sling/testing/clients/instance/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/instance/InstanceSetup.java
A 
src/main/java/org/apache/sling/testing/clients/instance/InstanceConfiguration.java
A src/main/java/org/apache/sling/testing/clients/package-info.java
A src/main/java/org/apache/sling/testing/clients/SlingClient.java
A src/main/java/org/apache/sling/testing/clients/SlingHttpResponse.java
A src/main/java/org/apache/sling/testing/clients/Constants.java
A src/main/java/org/apache/sling/testing/clients/ClientException.java
A src/main/java/org/apache/sling/testing/clients/util
A 
src/main/java/org/apache/sling/testing/clients/util/FormEntityBuilder.java
A 
src/main/java/org/apache/sling/testing/clients/util/InputStreamBodyWithLength.java
A src/main/java/org/apache/sling/testing/clients/util/JsonUtils.java
A 
src/main/java/org/apache/sling/testing/clients/util/URLParameterBuilder.java
A 
src/main/java/org/apache/sling/testing/clients/util/SlingParameter.java
A src/main/java/org/apache/sling/testing/clients/util/poller
A 
src/main/java/org/apache/sling/testing/clients/util/poller/AbstractPoller.java
A 
src/main/java/org/apache/sling/testing/clients/util/poller/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/util/poller/PathPoller.java
A src/main/java/org/apache/sling/testing/clients/util/poller/Poller.java
A src/main/java/org/apache/sling/testing/clients/util/XSSUtils.java
A src/main/java/org/apache/sling/testing/clients/util/HttpUtils.java
A 
src/main/java/org/apache/sling/testing/clients/util/TimeoutsProvider.java
A src/main/java/org/apache/sling/testing/clients/util/package-info.java
A src/main/java/org/apache/sling/testing/clients/util/PortAllocator.java
A src/main/java/org/apache/sling/testing/clients/util/ResourceUtil.java
A src/main/java/org/apache/sling/testing/clients/util/config
A 
src/main/java/org/apache/sling/testing/clients/util/config/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfigException.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfig.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/InstanceConfigCache.java
A src/main/java/org/apache/sling/testing/clients/util/config/impl
A 
src/main/java/org/apache/sling/testing/clients/util/config/impl/package-info.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/impl/EmptyInstanceConfig.java
A 
src/main/java/org/apache/sling/testing/clients/util/config/impl/InstanceConfigCacheImpl.java
A src/main/java/org/apache/sling/testing/clients/util/UniquePaths.java
A 
src/main/java/org/apache/sling/testing/clients/AbstractSlingClient.java
A src/main/java/org/apache/sling/testing/clients/SlingClientConfig.java
A src/main/java/org/apache/sling/testing/clients/interceptors
A 
src/main/java/org/apache/sling/testing/clients/interceptors/StickyCookieSpec.java
A 
src/main/java/org/apache/sling/testing/clients/interceptors/StickyCookieHolder.java
A 
src/main/java/org/apache/sling/testing/clients/interceptors/StickyCookieInterceptor.java
A 
src/main/java/org/apache/sling/testing/clients/interceptors/TestDescriptionHolder.java
A