You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/05/24 18:19:41 UTC
[1/7] cxf git commit: Update depends plugin to 1.4.0
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes eaef73a95 -> daa35eef6
Update depends plugin to 1.4.0
# Conflicts:
# osgi/itests/pom.xml
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c16054c5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c16054c5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c16054c5
Branch: refs/heads/3.1.x-fixes
Commit: c16054c5b7f299091405bb6f4e6a1734d764ff96
Parents: eaef73a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon May 8 10:53:43 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:42:05 2017 -0400
----------------------------------------------------------------------
osgi/itests/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c16054c5/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 3d2b1f2..4105d21 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -188,7 +188,7 @@
</dependencies>
<build>
<plugins>
- <!-- generate dependencies versions -->
+ <!-- generate dependencies versions for pax exam -->
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/c16054c5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 93a9be6..1110050 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -277,7 +277,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.4.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[7/7] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/daa35eef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/daa35eef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/daa35eef
Branch: refs/heads/3.1.x-fixes
Commit: daa35eef694b501449607dc30915d8216c5c2a4e
Parents: 9ae274e
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed May 24 13:49:00 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:49:00 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/daa35eef/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 61f307d..48c6114 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -141,6 +141,7 @@ B 59436eadca147ba937a24a4f4fc6ced93cc0bc7f
B 59b8615053ddcad353fbebcd9a5b1109ae0897a1
B 59b972618b40c5dbaca2772673ded17c5273e7d2
B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1
+B 5b4275ce202777828633dbb65133d3fe44f1d404
B 5d73e20b4539bfa4c8ca607b27a1c1ea1850e095
B 5e068d215b750e3211aaaf3d0b7b366d6a220fc2
B 5ea90a91d9148aa59aeb9b7e6611b58fb8da1fe4
@@ -280,13 +281,16 @@ B c194254d62b2d89a58fbd77c287b4bb106caa61d
B c1ba5d90e34993d737f0944dbb69ccda7c4bcfd1
B c1e2c973fc42ba7027fdd0ff1964bcbf8e61dbd6
B c1eaf69cb16583f672ddef646dcd7a52cfa23b5d
+B c2517eb552704a406cfbc45eba4822a84e5ca7da
B c2ccecb23ba23497c95be89f9b37f38c69faba7a
B c2daeb5b45b758e9f54ce73dc4567a69c47d9170
B c3a1392d1656c41a9bbdb24698eb27fbc757628b
B c49f7a0be25d3f99a8fe81be6209139c3c0df562
+B c4e9c63ba0a6b854c0b31b6f7bfdaacc32ba3264
B c63f06f3782148373912c1e4dc86de0d0c312229
B c6d4592a8a5d31429333c0e539ae56f517c2523f
B c783e60a8bcea76b9fecb75364b120d39c8ea28a
+B c8b3fb2fbdd8ed82dd20ca757a8e9f4bdf1cc76a
B c8e788eee8f7b5ce3a2161dfe727f3153ded607b
B c8ee5ae674f6e59b26d7b549481627d21103f7c1
B c903d27ec726f059a2b5e9ee1485202d2aa4d76c
@@ -472,6 +476,7 @@ M 4f4ce80ba2de80219e13943cbd6edbf411117234
M 5022be0c15d90800ee983fe94b07a10a54814991
M 50d3f48781cef7fdde9d4b2c4232feb2c2f4c8aa
M 52d77470228a3560f464003c68b30ffe8f1e8b9c
+M 5724e615409916ce3176d430cb91bae44f3447d9
M 574b2a9997c94011794fa2e083181e23c9936f15
M 585df048b7730ee36644a4bb7c1a20fcf977d79e
M 5954d4ce3c9713c17c3bbb8b730fad210aebfb3a
@@ -498,6 +503,7 @@ M 746914a5084f5db8d0c0f052802c7ef2217b9b6b
M 7476fc331f00a01851b5fbb66758818bef8ba2c4
M 74a5139520ac289d3a6d93da14573ef7501b8d1d
M 74b8db2dcc5fc60a513d9e73e258aeba99727a39
+M 74cba28dbb550cfa25fa833f1593677cecd316c0
M 7690a1fd087aff24ad8e8e1ab2e0722e24bf3d81
M 7aa8ebf5450c0a399e86fe5d50865fcd22849f63
M 7ace8c84cff4696e365800fbba12cc789e97971f
@@ -538,6 +544,7 @@ M 9a9e0a8a37608195c4ef6fbf386728d13d025d2d
M 9b2bda583c09861c693122ab631c4bffa2187ddd
M 9b6666816a21d8b85cc051be59a8ab6e968c5d0d
M 9c6f0b8ef0a00887d11706771c88b0a28c818b9a
+M 9cb53caf887415c1c025de9e62aa3831b9a6ff8e
M 9cd3116cbdbbfb139f40ad2d9e49cec1adf08a08
M 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
M 9d64bcedb508732cdc377312f0fb433ee1dc630e
@@ -548,6 +555,7 @@ M a2cbe758286d00b5c5d9c5fbe6be4cc9d7ecf225
M a2efc18eff09700eded186478a7c2ae8fa543eef
M a304f27b8ad9da04dde3610932266c64baa3aa7e
M a42362e397b84d335015f7f9aa07b4f0bfb49260
+M a61b4b82bea43ce695c4f51eb7cb3e9866dfae9d
M a644c5d06c0bae321e2c669efa0cecf3abdd944d
M a71508214a7682c6a569075b1395f387c31be63b
M a719adccae8500f2d7e7140a9f4cd26e20775818
@@ -577,6 +585,7 @@ M be2bf8d644887fc1853210b9b82db897c4d73dd0
M be99c53015cb37a692d2e4dbe3682c7407f29b99
M c01c68ddda10ec6db492b86d818498bec0bf4228
M c212240f696e3387df19bbcf22d1851aff320078
+M c255034b2d6eb99bb2753b3d6932af06fd6cbe16
M c2b13b7473781c3c1a4225a01c319cf8aa92cd0f
M c48c368f4622d88673dcc77c5726f5563f792b07
M c55034d9621bc904634017b552057474afb93ac2
@@ -590,6 +599,7 @@ M cd782fef123d2147a6f5cb04fb6cdfe8cf0ac81a
M cf806d5cba74e47c6e5ba3231df4228cbaad3e90
M cf8ac102e728b8745da265ec969f7b5160829fdb
M d0821bce5faa119c882a9000dbe03a124df5b033
+M d0915da312bc97841f48be2b2b2d423f0082f977
M d187ef6f3906d867a8c30a991d9074d170bca487
M d1b8ff6374a0729752948213b7a0cdb7427085d1
M d3bf494ef4987debad986cae87cfe5f095b79090
@@ -629,4 +639,5 @@ M faf461150f178f7f7ae89a3b7c345671e53b8b04
M fd6689948bc7ad153ccfd7f64554eafbf64b20d6
M fe55813cc934667664863117921ff8ea08b9ff24
M fe89bf0fb8379428667f66312e6942e906142d6f
+M ff839064e8904634eaab8edee44c537c075d94cd
M ff9e62a46c4491d6c5fc8d07b2813fa0224e61c3
[5/7] cxf git commit: Remove org.json stuff from build other than in
systests/jaxrs (need to work on that yet)
Posted by dk...@apache.org.
Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet)
# Conflicts:
# parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/072e094a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/072e094a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/072e094a
Branch: refs/heads/3.1.x-fixes
Commit: 072e094a4820c89aad7705c857230e75eb33e798
Parents: d913cdf
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed May 24 12:10:59 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:46:40 2017 -0400
----------------------------------------------------------------------
parent/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/072e094a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7394de3..dc7266e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1889,6 +1889,12 @@
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
<version>${cxf.tika.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
[6/7] cxf git commit: Remove usage of json.org stff in systests/jaxrs
Posted by dk...@apache.org.
Remove usage of json.org stff in systests/jaxrs
# Conflicts:
# systests/jaxrs/pom.xml
# systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9ae274ec
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9ae274ec
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9ae274ec
Branch: refs/heads/3.1.x-fixes
Commit: 9ae274ec5001d3a2ea55492bd1a1e47d1c33a9aa
Parents: 072e094
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed May 24 13:37:52 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:49:00 2017 -0400
----------------------------------------------------------------------
systests/jaxrs/pom.xml | 6 --
.../AbstractSwaggerServiceDescriptionTest.java | 73 ++++++++++----------
2 files changed, 36 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9ae274ec/systests/jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 9a47cad..06b049d 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -518,12 +518,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <version>1.2.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.15</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9ae274ec/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
index 354c92a..1d5b46d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
@@ -29,7 +29,6 @@ import javax.ws.rs.core.Response.Status;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
-import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
@@ -39,7 +38,6 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.junit.Ignore;
import org.junit.Test;
-import org.skyscreamer.jsonassert.JSONAssert;
public abstract class AbstractSwaggerServiceDescriptionTest extends AbstractBusClientServerTestBase {
private static final JsonObject DELETE_METHOD_SPEC = Json.createObjectBuilder()
@@ -164,24 +162,24 @@ public abstract class AbstractSwaggerServiceDescriptionTest extends AbstractBusC
final Response r = client.get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
- JSONAssert.assertEquals(
- Json.createObjectBuilder()
- .add("apiVersion", "1.0.0")
- .add("swaggerVersion", "1.2")
- .add("apis", Json.createArrayBuilder()
- .add(Json.createObjectBuilder()
- .add("path", "/bookstore")
- .add("description", "Sample JAX-RS service with Swagger documentation")
- )
+ JsonObject expected = Json.createObjectBuilder()
+ .add("apiVersion", "1.0.0")
+ .add("swaggerVersion", "1.2")
+ .add("apis", Json.createArrayBuilder()
+ .add(Json.createObjectBuilder()
+ .add("path", "/bookstore")
+ .add("description", "Sample JAX-RS service with Swagger documentation")
)
- .add("info", Json.createObjectBuilder()
- .add("title", "Sample REST Application")
- .add("description", "The Application")
- .add("contact", "users@cxf.apache.org")
- .add("license", "Apache 2.0 License")
- .add("licenseUrl", "http://www.apache.org/licenses/LICENSE-2.0.html")
- ).build().toString(),
- IOUtils.readStringFromStream((InputStream)r.getEntity()), false);
+ )
+ .add("info", Json.createObjectBuilder()
+ .add("title", "Sample REST Application")
+ .add("description", "The Application")
+ .add("contact", "users@cxf.apache.org")
+ .add("license", "Apache 2.0 License")
+ .add("licenseUrl", "http://www.apache.org/licenses/LICENSE-2.0.html")
+ ).build();
+ JsonObject received = Json.createReader((InputStream)r.getEntity()).readObject();
+ assertEquals(expected, received);
} finally {
client.close();
}
@@ -194,24 +192,25 @@ public abstract class AbstractSwaggerServiceDescriptionTest extends AbstractBusC
try {
final Response r = client.get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
-
- JSONAssert.assertEquals(
- Json.createObjectBuilder()
- .add("apiVersion", "1.0.0")
- .add("swaggerVersion", "1.2")
- .add("basePath", "http://localhost:" + getPort() + "/")
- .add("resourcePath", "/bookstore")
- .add("apis", Json.createArrayBuilder()
- .add(Json.createObjectBuilder()
- .add("path", "/bookstore/{id}")
- .add("operations", Json.createArrayBuilder()
- .add(DELETE_METHOD_SPEC)
- .add(GET_BY_ID_METHOD_SPEC)))
- .add(Json.createObjectBuilder()
- .add("path", "/bookstore")
- .add("operations", Json.createArrayBuilder().add(GET_METHOD_SPEC))))
- .add("models", BOOK_MODEL_SPEC).build().toString(),
- IOUtils.readStringFromStream((InputStream)r.getEntity()), false);
+
+ JsonObject expected = Json.createObjectBuilder()
+ .add("apiVersion", "1.0.0")
+ .add("swaggerVersion", "1.2")
+ .add("basePath", "http://localhost:" + getPort() + "/")
+ .add("resourcePath", "/bookstore")
+ .add("apis", Json.createArrayBuilder()
+ .add(Json.createObjectBuilder()
+ .add("path", "/bookstore/{id}")
+ .add("operations", Json.createArrayBuilder()
+ .add(DELETE_METHOD_SPEC)
+ .add(GET_BY_ID_METHOD_SPEC)))
+ .add(Json.createObjectBuilder()
+ .add("path", "/bookstore")
+ .add("operations", Json.createArrayBuilder().add(GET_METHOD_SPEC))))
+ .add("models", BOOK_MODEL_SPEC).build();
+
+ JsonObject received = Json.createReader((InputStream)r.getEntity()).readObject();
+ assertEquals(expected, received);
} finally {
client.close();
}
[3/7] cxf git commit: Update Jackson version
Posted by dk...@apache.org.
Update Jackson version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dcc7e935
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dcc7e935
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dcc7e935
Branch: refs/heads/3.1.x-fixes
Commit: dcc7e935754ea30768fda93fe649bb2170dd6c35
Parents: abaa6b3
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Sat May 20 09:04:24 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:44:20 2017 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dcc7e935/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1110050..7394de3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -93,7 +93,7 @@
<cxf.httpcomponents.client.version>4.5.3</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version>4.4.6</cxf.httpcomponents.core.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
- <cxf.jackson.version>2.8.7</cxf.jackson.version>
+ <cxf.jackson.version>2.8.8</cxf.jackson.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.logback.classic.version>1.0.13</cxf.logback.classic.version>
<cxf.log4j.version>1.2.17</cxf.log4j.version>
[2/7] cxf git commit: fixed JavaDoc (XPathExpressionException no
longer thrown)
Posted by dk...@apache.org.
fixed JavaDoc (XPathExpressionException no longer thrown)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/abaa6b35
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/abaa6b35
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/abaa6b35
Branch: refs/heads/3.1.x-fixes
Commit: abaa6b355efa7c27bda5f9fda8ae28994ce4d0c4
Parents: c16054c
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Mon May 15 21:55:41 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:42:26 2017 -0400
----------------------------------------------------------------------
.../ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/abaa6b35/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 499583e..f835d20 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1368,8 +1368,6 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
* force adding a wsu:Id onto the elements. Recommended for signatures.
* @return a configured list of {@code WSEncryptionPart}s suitable for
* processing by WSS4J
- * @throws XPathExpressionException
- * if a provided XPath is invalid
* @throws SOAPException
* if there is an error extracting SOAP content from the SAAJ
* model
[4/7] cxf git commit: fixed typo in log message and invalid javadocs
Posted by dk...@apache.org.
fixed typo in log message and invalid javadocs
# Conflicts:
# core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
# maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
# rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
# rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
# testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d913cdf4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d913cdf4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d913cdf4
Branch: refs/heads/3.1.x-fixes
Commit: d913cdf45b2d54136f05c4870ed643fe0b542026
Parents: dcc7e93
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Sat May 20 10:23:20 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed May 24 13:45:53 2017 -0400
----------------------------------------------------------------------
.../cxf/staxutils/StreamWriterContentHandler.java | 4 ++--
.../cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java | 8 ++++----
.../transport/http/AbstractHTTPDestination.java | 5 +++--
.../org/apache/cxf/transport/http/HTTPConduit.java | 17 ++++++-----------
.../org/apache/cxf/ws/policy/PolicyEngineImpl.java | 2 +-
.../org/apache/cxf/test/AbstractCXFSpringTest.java | 1 -
6 files changed, 16 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
index 22266b3..7b07699 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
@@ -174,9 +174,9 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
/**
* Method getPrefix.
- * @param namespaceURI
*
- * @param qname
+ * @param ns
+ * @param namespaceURI
* @return Returns String.
*/
private String getPrefix(String ns, String namespaceURI) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
index fecc18b..c56628b 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
@@ -157,8 +157,8 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
/**
* Merge WsdlOptions that point to the same file by adding the extraargs to the first option and deleting
* the second from the options list
- *
- * @param options
+ *
+ * @param effectiveWsdlOptions
*/
protected void mergeOptions(List<GenericWsdlOption> effectiveWsdlOptions) {
@@ -205,8 +205,8 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
/**
* Determine if code should be generated from the given wsdl
- *
- * @param wsdlOption
+ *
+ * @param genericWsdlOption
* @param doneFile
* @param wsdlURI
* @return
http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index e6ab823..58494cb 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -132,8 +132,9 @@ public abstract class AbstractHTTPDestination
* Constructor
*
* @param b the associated Bus
- * @param ci the associated conduit initiator
- * @param ei the endpoint info of the destination
+ * @param registry the destination registry
+ * @param ei the endpoint info of the destination
+ * @param path the path
* @param dp true for adding the default port if it is missing
* @throws IOException
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index f3e28f5..4fbaa7c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -291,7 +291,7 @@ public abstract class HTTPConduit
* Constructor
*
* @param b the associated Bus.
- * @param endpoint the endpoint info of the initiator.
+ * @param ei the endpoint info of the initiator.
* @param t the endpoint reference of the target.
* @throws IOException
*/
@@ -526,7 +526,7 @@ public abstract class HTTPConduit
needToCacheRequest = true;
isChunking = false;
LOG.log(Level.FINE,
- "Auth Supplier, but no Premeptive User Pass or Digest auth (nonce may be stale)"
+ "Auth Supplier, but no Preemptive User Pass or Digest auth (nonce may be stale)"
+ " We must cache request.");
}
if (csPolicy.isAutoRedirect()) {
@@ -786,7 +786,7 @@ public abstract class HTTPConduit
* type?
*
* @param message
- * @param headers
+ * @param currentURI
*/
protected void setHeadersByAuthorizationPolicy(
Message message,
@@ -1498,12 +1498,8 @@ public abstract class HTTPConduit
/**
* This method performs a retransmit for authorization information.
- *
- * @param connection The currently active connection.
- * @param message The outbound message.
- * @param cachedStream The cached request.
- * @return A new connection if retransmitted. If not retransmitted
- * then this method returns the same connection.
+ *
+ * @return true if there was a retransmit
* @throws IOException
*/
protected boolean authorizationRetransmit() throws IOException {
@@ -1754,8 +1750,7 @@ public abstract class HTTPConduit
*
* If trust cannot be established the Trust Decider implemenation
* throws an IOException.
- *
- * @param message The message being sent.
+ *
* @throws IOException This exception is thrown if trust cannot be
* established by the configured MessageTrustDecider.
* @see MessageTrustDecider
http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 6155a38..58e19b8 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -619,7 +619,7 @@ public class PolicyEngineImpl implements PolicyEngine, BusExtension {
* that implements the Assertor interface).
*
* @param alternative the policy alternative
- * @param Assertor the assertor
+ * @param assertor the assertor
* @return true iff the alternative can be supported
*/
public boolean supportsAlternative(Collection<? extends PolicyComponent> alternative,
http://git-wip-us.apache.org/repos/asf/cxf/blob/d913cdf4/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
index 0b6f27a..36e1351 100644
--- a/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
+++ b/testutils/src/main/java/org/apache/cxf/test/AbstractCXFSpringTest.java
@@ -42,7 +42,6 @@ public abstract class AbstractCXFSpringTest extends AbstractCXFTest {
private Class<?> configContextClass = AbstractCXFSpringTest.class;
/**
* Load up all the beans from the XML files returned by the getConfigLocations method.
- * @throws Exception
*/
protected AbstractCXFSpringTest() {
}