You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/06/18 09:48:57 UTC
[sling-whiteboard] branch master updated (c871005 -> 34da23e)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from c871005 Simplify child classes by passing a CtClass instance instead of a class name
new 323339b Include OK HTTP in the README
new 1053783 Update artifactId
new a6b8d69 Remove Agent-Class from manifest
new 34da23e Tweak comments in pom.xml
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
url-connection-agent/README.md | 14 ++++++++------
url-connection-agent/pom.xml | 5 ++---
2 files changed, 10 insertions(+), 9 deletions(-)
[sling-whiteboard] 04/04: Tweak comments in pom.xml
Posted by 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-whiteboard.git
commit 34da23ea6caa3388d1b7d3c78eda66081851ec14
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jun 18 11:39:36 2019 +0200
Tweak comments in pom.xml
---
url-connection-agent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/url-connection-agent/pom.xml b/url-connection-agent/pom.xml
index 3a51c61..2a6416e 100644
--- a/url-connection-agent/pom.xml
+++ b/url-connection-agent/pom.xml
@@ -76,7 +76,7 @@
</configuration>
</plugin>
<plugin>
- <!-- Run certain ITs in the integration-test phase, once the agent jar is packaged -->
+ <!-- Run ITs in the integration-test phase, once the agent jar is packaged -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
[sling-whiteboard] 01/04: Include OK HTTP in the README
Posted by 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-whiteboard.git
commit 323339b5f2645fd205297a162127aba6909012b9
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jun 18 10:59:19 2019 +0200
Include OK HTTP in the README
---
url-connection-agent/README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/url-connection-agent/README.md b/url-connection-agent/README.md
index 1efcc94..23a1692 100644
--- a/url-connection-agent/README.md
+++ b/url-connection-agent/README.md
@@ -11,6 +11,7 @@ It currently supports setting timeouts for HTTP connections done using:
* [java.net.URL](https://docs.oracle.com/javase/7/docs/api/java/net/URL.html) and/or [java.net.URLConnection](https://docs.oracle.com/javase/7/docs/api/java/net/URLConnection.html)
* [Apache Commons HttpClient 3.x](https://hc.apache.org/httpclient-3.x/)
* [Apache HttpComponents Client 4.x](https://hc.apache.org/httpcomponents-client-ga/)
+* [OK Http](https://square.github.io/okhttp/)
## Validation
@@ -23,7 +24,7 @@ Build the project with `mvn clean package` and then run a simple connection test
- `<connect-timeout>` - connection timeout in milliseconds
- `<read-timeout>`- read timeout in milliseconds
- `<url>` - the URL to access
- - `<client-type>` - the client type, either `JavaNet` for java.net.URL-based connections ,`HC3` for Apache Commons HttpClient 3.x or `HC4` for Apache Commons HttpClient 4.x
+ - `<client-type>` - the client type, either `JavaNet` for java.net.URL-based connections ,`HC3` for Apache Commons HttpClient 3.x, `HC4` for Apache Commons HttpClient 4.x or `OkHttp` for OK HTTP.
For a test that always fails, set one of the timeouts to 1. Both executions listed below will typically fail:
@@ -46,4 +47,5 @@ To use this in your own project you should
* openjdk version "1.8.0_212"
* openjdk version "11.0.2" 2019-01-15
* commons-httpclient 3.1
-* httpclient 4.5.4
\ No newline at end of file
+* httpclient 4.5.4
+* okhttp 3.14.2
\ No newline at end of file
[sling-whiteboard] 02/04: Update artifactId
Posted by 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-whiteboard.git
commit 1053783de614c62b27d12dc92367254523f72250
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jun 18 11:35:54 2019 +0200
Update artifactId
---
url-connection-agent/README.md | 8 ++++----
url-connection-agent/pom.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/url-connection-agent/README.md b/url-connection-agent/README.md
index 23a1692..96995aa 100644
--- a/url-connection-agent/README.md
+++ b/url-connection-agent/README.md
@@ -17,7 +17,7 @@ It currently supports setting timeouts for HTTP connections done using:
Build the project with `mvn clean package` and then run a simple connection test with
- java -javaagent:target/url-connection-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=<connect-timeout>,<read-timeout> -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher <url> <client-type>
+ java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=<connect-timeout>,<read-timeout> -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher <url> <client-type>
The parameters are as follows:
@@ -30,14 +30,14 @@ Build the project with `mvn clean package` and then run a simple connection test
For a test that always fails, set one of the timeouts to 1. Both executions listed below will typically fail:
```
-java -javaagent:target/url-connection-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
-java -javaagent:target/url-connection-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
```
In contrast, the execution below should succeed:
```
-java -javaagent:target/url-connection-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
+java -javaagent:target/org.apache.sling.connection-timeout-agent-0.0.1-SNAPSHOT-jar-with-dependencies.jar=1000,1000 -cp target/test-classes:target/it-dependencies/* org.apache.sling.uca.impl.HttpClientLauncher https://sling.apache.org JavaNet
```
To use this in your own project you should
diff --git a/url-connection-agent/pom.xml b/url-connection-agent/pom.xml
index d37503b..07f5a39 100644
--- a/url-connection-agent/pom.xml
+++ b/url-connection-agent/pom.xml
@@ -26,7 +26,7 @@
<version>35</version>
<relativePath/>
</parent>
- <artifactId>url-connection-agent</artifactId>
+ <artifactId>org.apache.sling.connection-timeout-agent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<build>
[sling-whiteboard] 03/04: Remove Agent-Class from manifest
Posted by 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-whiteboard.git
commit a6b8d6971f32bc3a249009fcefb449b217942057
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Jun 18 11:38:16 2019 +0200
Remove Agent-Class from manifest
The agent does not support starting after the VM itself has started, so don't advertise is in the manifest.
---
url-connection-agent/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/url-connection-agent/pom.xml b/url-connection-agent/pom.xml
index 07f5a39..3a51c61 100644
--- a/url-connection-agent/pom.xml
+++ b/url-connection-agent/pom.xml
@@ -45,7 +45,6 @@
<archiveBaseDirectory>${project.basedir}</archiveBaseDirectory>
<archive>
<manifestEntries>
- <Agent-Class>org.apache.sling.uca.impl.Agent</Agent-Class>
<Premain-Class>org.apache.sling.uca.impl.Agent</Premain-Class>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>