[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 Authored: Mon May 8 10:53:43 2017 +0200 Committer: Daniel Kulp 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 @@ - + org.apache.servicemix.tooling depends-maven-plugin 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 @@ org.apache.servicemix.tooling depends-maven-plugin -1.2 +1.4.0 org.apache.maven.plugins
[7/7] cxf git commit: Recording .gitmergeinfo Changes
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 Authored: Wed May 24 13:49:00 2017 -0400 Committer: Daniel Kulp 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 4f4ce80ba2de80219e13943cbd6edbf47234 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 9b816a21d8b85cc051be59a8ab6e968c5d0d 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)
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 Authored: Wed May 24 12:10:59 2017 -0400 Committer: Daniel Kulp 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 @@ org.apache.tika tika-parsers ${cxf.tika.version} + + +org.json +json + + io.dropwizard.metrics
[6/7] cxf git commit: Remove usage of json.org stff in systests/jaxrs
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 Authored: Wed May 24 13:37:52 2017 -0400 Committer: Daniel Kulp 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 @@ -org.skyscreamer -jsonassert -1.2.3 -test - - org.yaml snakeyaml 1.15 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", "us...@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("contac
[3/7] cxf git commit: Update Jackson version
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 Authored: Sat May 20 09:04:24 2017 +0200 Committer: Daniel Kulp 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 @@ 4.5.3 4.4.6 [4.3,4.5.0) -2.8.7 +2.8.8 0.7.2 1.0.13 1.2.17
[2/7] cxf git commit: fixed JavaDoc (XPathExpressionException no longer thrown)
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 Authored: Mon May 15 21:55:41 2017 +0200 Committer: Daniel Kulp 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
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 Authored: Sat May 20 10:23:20 2017 +0200 Committer: Daniel Kulp 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 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
cxf git commit: Remove usage of json.org stff in systests/jaxrs
Repository: cxf Updated Branches: refs/heads/master 7f07dac41 -> 74cba28db Remove usage of json.org stff in systests/jaxrs Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/74cba28d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/74cba28d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/74cba28d Branch: refs/heads/master Commit: 74cba28dbb550cfa25fa833f1593677cecd316c0 Parents: 7f07dac Author: Daniel Kulp Authored: Wed May 24 13:37:52 2017 -0400 Committer: Daniel Kulp Committed: Wed May 24 13:37:52 2017 -0400 -- systests/jaxrs/pom.xml | 6 -- .../AbstractSwaggerServiceDescriptionTest.java | 72 ++-- 2 files changed, 36 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/74cba28d/systests/jaxrs/pom.xml -- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index d4327d6..02820f4 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -527,12 +527,6 @@ test -org.skyscreamer -jsonassert -1.2.3 -test - - org.yaml snakeyaml 1.15 http://git-wip-us.apache.org/repos/asf/cxf/blob/74cba28d/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 5f6d8df..10a2cec 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", "us...@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", "us...@cxf.apache.org") +.add("license", "Apache 2.0 License")
cxf git commit: Remove some final modifiers
Repository: cxf Updated Branches: refs/heads/master 9b2b7e812 -> 7f07dac41 Remove some final modifiers Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f07dac4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f07dac4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f07dac4 Branch: refs/heads/master Commit: 7f07dac41850cd4e858892d655babe343232cd32 Parents: 9b2b7e8 Author: Daniel Kulp Authored: Wed May 24 13:17:07 2017 -0400 Committer: Daniel Kulp Committed: Wed May 24 13:17:07 2017 -0400 -- .../main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java | 2 +- .../java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java | 2 +- .../apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7f07dac4/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java -- diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java index 5e4096c..5b3e9cb 100644 --- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java +++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java @@ -77,7 +77,7 @@ public class BraveTracerContext implements TracerContext { }; return () -> { -try (final TraceScope span = startSpan(description)) { +try (TraceScope span = startSpan(description)) { return callable.call(); } }; http://git-wip-us.apache.org/repos/asf/cxf/blob/7f07dac4/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java -- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java index 4422129..df4b65a 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java @@ -47,7 +47,7 @@ public class BookStore implements BookStoreService { @WebMethod public Collection< Book > getBooks() { final Span span = brave.tracer().nextSpan().name("Get Books").start(); -try (final SpanInScope scope = brave.tracer().withSpanInScope(span)) { +try (SpanInScope scope = brave.tracer().withSpanInScope(span)) { return Arrays.asList( new Book("Apache CXF in Action", UUID.randomUUID().toString()), new Book("Mastering Apache CXF", UUID.randomUUID().toString()) http://git-wip-us.apache.org/repos/asf/cxf/blob/7f07dac4/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java -- diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java index f05ce5e..27f6de6 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java @@ -180,7 +180,7 @@ public class BraveTracingTest extends AbstractBusClientServerTestBase { final Span span = brave.tracer().nextSpan().name("test span").start(); try { -try (final SpanInScope scope = brave.tracer().withSpanInScope(span)) { +try (SpanInScope scope = brave.tracer().withSpanInScope(span)) { assertThat(service.getBooks().size(), equalTo(2)); assertThat(brave.tracer().currentSpan(), not(nullValue()));
[1/4] cxf git commit: Improve testing of STS intermediary caching
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 310e52e97 -> f285e3808 Improve testing of STS intermediary caching # Conflicts: # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ae9c20a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ae9c20a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ae9c20a Branch: refs/heads/3.0.x-fixes Commit: 8ae9c20a32b0e654fa52bca6e5646e32302e71a6 Parents: 310e52e Author: Colm O hEigeartaigh Authored: Wed May 24 17:52:06 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 18:06:50 2017 +0100 -- .../DoubleItPortTypeImpl.java | 70 .../IntermediaryCachingPortTypeImpl.java| 6 +- .../IntermediaryTransformationCachingTest.java | 62 ++--- .../cxf-intermediary-caching.xml| 4 -- .../intermediary_transformation/cxf-service.xml | 3 +- 5 files changed, 113 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/8ae9c20a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java new file mode 100644 index 000..42c02f5 --- /dev/null +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java @@ -0,0 +1,70 @@ +/** + * 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.cxf.systest.sts.intermediary_transformation; + +import java.security.Principal; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; + +import org.apache.cxf.feature.Features; +import org.example.contract.doubleit.DoubleItPortType; +import org.junit.Assert; + +@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt";, +serviceName = "DoubleItService", +endpointInterface = "org.example.contract.doubleit.DoubleItPortType") +@Features(features = "org.apache.cxf.feature.LoggingFeature") +/** + * A PortType implementation that only allows a user call it twice. This is to test the caching logic + * of the intermediary. + */ +public class DoubleItPortTypeImpl implements DoubleItPortType { + +@Resource +WebServiceContext wsContext; + +private Map userCount = new ConcurrentHashMap<>(); + +public int doubleIt(int numberToDouble) { +Principal pr = wsContext.getUserPrincipal(); + +Assert.assertNotNull("Principal must not be null", pr); +Assert.assertNotNull("Principal.getName() must not return null", pr.getName()); + +// Test caching logic here +updateCache(pr.getName()); + +return numberToDouble * 2; +} + +private void updateCache(String user) { +if (userCount.containsKey(user)) { +if (userCount.get(user) > 2) { +throw new RuntimeException("Only two iterations allowed"); +} +userCount.put(user, userCount.get(user) + 1); +} else { +userCount.put(user, 1); +} +} +} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ae9c20a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java -- diff
[3/4] cxf git commit: Recording .gitmergeinfo Changes
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/83f0f004 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83f0f004 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83f0f004 Branch: refs/heads/3.0.x-fixes Commit: 83f0f0049608e34ff083cda600d31013498d16f7 Parents: 7a2ffb7 Author: Colm O hEigeartaigh Authored: Wed May 24 18:06:53 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 18:06:53 2017 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/83f0f004/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 6ec1553..b9b2056 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -221,6 +221,7 @@ B 205c61c48b2aad973572aa74d8c9dfa83c2dd7bd B 206738103f5d783d90695aa2e3e750736746d4c3 B 20a4f79a791cbdb5defe6a1c4c30b258c54d0fde B 20b7a7d610a00493b03c79c6f4767158ce495d45 +B 20ba06e13bd13b3edef31d04cc79d6ad8ac70040 B 20d0fa3ec41c16c52b74dcc006f9d9ea212fa80f B 20efc30eb21f5f32a1a3de1eb5ea41f8dd01776c B 211a8fb4365714b26025f6964f7542e669931969 @@ -2035,6 +2036,7 @@ M b5320827561467de7e04afdba15a6063d26493a3 M b72e2b560bcfd565946b185a9f123de0cbc2d995 M b7d33366f3311dc33c7da389f98fced6fd470c93 M b86ac6d0d12c25ca8a50e8e4fcc494db258387f1 +M b87d708115d8b3ee47020939ddbf7f7d37860aae M b9c24f41cb1cc7e4d572fa222ae5aa4f5f804ccb M b9d69e71057537863700ee5be870f36c2f2e3188 M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
[2/4] cxf git commit: Minor fix to last commit
Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a2ffb7f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a2ffb7f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a2ffb7f Branch: refs/heads/3.0.x-fixes Commit: 7a2ffb7ffaa8c21035542dcb45d0c5608744346b Parents: 8ae9c20 Author: Colm O hEigeartaigh Authored: Wed May 24 17:56:57 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 18:06:53 2017 +0100 -- .../IntermediaryTransformationCachingTest.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7a2ffb7f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java index 968d753..9a5f870 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java @@ -132,6 +132,7 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ // Make invocation for "myservicekey"...this should fail as the intermediary's STS client is disabled try { doubleIt(servicePort, 45); +fail("Expected failure on a cache retrieval failure"); } catch (SOAPFaultException ex) { // expected }
[4/4] cxf git commit: JDK 1.6 fix
JDK 1.6 fix Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f285e380 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f285e380 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f285e380 Branch: refs/heads/3.0.x-fixes Commit: f285e3808b6a83e3a8fcf861f01434d3290cc605 Parents: 83f0f00 Author: Colm O hEigeartaigh Authored: Wed May 24 18:12:59 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 18:12:59 2017 +0100 -- .../sts/intermediary_transformation/DoubleItPortTypeImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/f285e380/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java index 42c02f5..0983f42 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java @@ -43,7 +43,7 @@ public class DoubleItPortTypeImpl implements DoubleItPortType { @Resource WebServiceContext wsContext; -private Map userCount = new ConcurrentHashMap<>(); +private Map userCount = new ConcurrentHashMap(); public int doubleIt(int numberToDouble) { Principal pr = wsContext.getUserPrincipal();
cxf git commit: Minor fix to last commit
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 20ba06e13 -> eaef73a95 Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eaef73a9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eaef73a9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eaef73a9 Branch: refs/heads/3.1.x-fixes Commit: eaef73a95ffebc85d60bd0b7e0ab1884affc63a0 Parents: 20ba06e Author: Colm O hEigeartaigh Authored: Wed May 24 17:56:57 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 17:57:13 2017 +0100 -- .../IntermediaryTransformationCachingTest.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/eaef73a9/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java index 2aa6db1..d83de84 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java @@ -129,6 +129,7 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ // Make invocation for "myservicekey"...this should fail as the intermediary's STS client is disabled try { doubleIt(servicePort, 45); +fail("Expected failure on a cache retrieval failure"); } catch (SOAPFaultException ex) { // expected }
cxf git commit: Minor fix to last commit
Repository: cxf Updated Branches: refs/heads/master 07093d2f5 -> 9b2b7e812 Minor fix to last commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9b2b7e81 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9b2b7e81 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9b2b7e81 Branch: refs/heads/master Commit: 9b2b7e8129800859be814c50ec6bcd5da60a257b Parents: 07093d2 Author: Colm O hEigeartaigh Authored: Wed May 24 17:56:57 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 17:56:57 2017 +0100 -- .../IntermediaryTransformationCachingTest.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/9b2b7e81/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java index 68eab44..ef90341 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java @@ -130,6 +130,7 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ // Make invocation for "myservicekey"...this should fail as the intermediary's STS client is disabled try { doubleIt(servicePort, 45); +fail("Expected failure on a cache retrieval failure"); } catch (SOAPFaultException ex) { // expected }
[2/2] cxf git commit: Improve testing of STS intermediary caching
Improve testing of STS intermediary caching # Conflicts: # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java # services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b87d7081 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b87d7081 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b87d7081 Branch: refs/heads/3.1.x-fixes Commit: b87d708115d8b3ee47020939ddbf7f7d37860aae Parents: 6c70b02 Author: Colm O hEigeartaigh Authored: Wed May 24 17:52:06 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 17:53:31 2017 +0100 -- .../DoubleItPortTypeImpl.java | 70 .../IntermediaryCachingPortTypeImpl.java| 6 +- .../IntermediaryTransformationCachingTest.java | 62 ++--- .../cxf-intermediary-caching.xml| 4 -- .../intermediary_transformation/cxf-service.xml | 3 +- 5 files changed, 113 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b87d7081/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java new file mode 100644 index 000..42c02f5 --- /dev/null +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java @@ -0,0 +1,70 @@ +/** + * 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.cxf.systest.sts.intermediary_transformation; + +import java.security.Principal; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; + +import org.apache.cxf.feature.Features; +import org.example.contract.doubleit.DoubleItPortType; +import org.junit.Assert; + +@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt";, +serviceName = "DoubleItService", +endpointInterface = "org.example.contract.doubleit.DoubleItPortType") +@Features(features = "org.apache.cxf.feature.LoggingFeature") +/** + * A PortType implementation that only allows a user call it twice. This is to test the caching logic + * of the intermediary. + */ +public class DoubleItPortTypeImpl implements DoubleItPortType { + +@Resource +WebServiceContext wsContext; + +private Map userCount = new ConcurrentHashMap<>(); + +public int doubleIt(int numberToDouble) { +Principal pr = wsContext.getUserPrincipal(); + +Assert.assertNotNull("Principal must not be null", pr); +Assert.assertNotNull("Principal.getName() must not return null", pr.getName()); + +// Test caching logic here +updateCache(pr.getName()); + +return numberToDouble * 2; +} + +private void updateCache(String user) { +if (userCount.containsKey(user)) { +if (userCount.get(user) > 2) { +throw new RuntimeException("Only two iterations allowed"); +} +userCount.put(user, userCount.get(user) + 1); +} else { +userCount.put(user, 1); +} +} +} http://git-wip-us.apache.org/repos/asf/cxf/blob/b87d7081/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/inter
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 6c70b024d -> 20ba06e13 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/20ba06e1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/20ba06e1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/20ba06e1 Branch: refs/heads/3.1.x-fixes Commit: 20ba06e13bd13b3edef31d04cc79d6ad8ac70040 Parents: b87d708 Author: Colm O hEigeartaigh Authored: Wed May 24 17:53:31 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 17:53:31 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/20ba06e1/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index cce744d..61f307d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -392,6 +392,7 @@ M 04720d55a297aa4778a8194a766d9159ba662d33 M 048b46de4b2973bbccbaacf5effe34b06faf3e68 M 055f1d738016ae5caf3eba42e656782de8490890 M 0578e16146527b0782530c40ba2db17531756d96 +M 07093d2f50f8e37b10b45f5e24e4b1e71dec352e M 07707cd522e63cd0574db378e08f2f820882b5ec M 0865c3a85b9687f857b51d1ae56c8f8e97bdbf5b M 088b1235dd3af856fd9c2298e28d26ee685d803f
cxf git commit: Improve testing of STS intermediary caching
Repository: cxf Updated Branches: refs/heads/master c255034b2 -> 07093d2f5 Improve testing of STS intermediary caching Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/07093d2f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/07093d2f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/07093d2f Branch: refs/heads/master Commit: 07093d2f50f8e37b10b45f5e24e4b1e71dec352e Parents: c255034 Author: Colm O hEigeartaigh Authored: Wed May 24 17:52:06 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 17:52:06 2017 +0100 -- .../DoubleItPortTypeImpl.java | 70 .../IntermediaryCachingPortTypeImpl.java| 4 +- .../IntermediaryTransformationCachingTest.java | 49 +- .../cxf-intermediary-caching.xml| 4 -- .../intermediary_transformation/cxf-service.xml | 3 +- 5 files changed, 106 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/07093d2f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java new file mode 100644 index 000..42c02f5 --- /dev/null +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/DoubleItPortTypeImpl.java @@ -0,0 +1,70 @@ +/** + * 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.cxf.systest.sts.intermediary_transformation; + +import java.security.Principal; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.Resource; +import javax.jws.WebService; +import javax.xml.ws.WebServiceContext; + +import org.apache.cxf.feature.Features; +import org.example.contract.doubleit.DoubleItPortType; +import org.junit.Assert; + +@WebService(targetNamespace = "http://www.example.org/contract/DoubleIt";, +serviceName = "DoubleItService", +endpointInterface = "org.example.contract.doubleit.DoubleItPortType") +@Features(features = "org.apache.cxf.feature.LoggingFeature") +/** + * A PortType implementation that only allows a user call it twice. This is to test the caching logic + * of the intermediary. + */ +public class DoubleItPortTypeImpl implements DoubleItPortType { + +@Resource +WebServiceContext wsContext; + +private Map userCount = new ConcurrentHashMap<>(); + +public int doubleIt(int numberToDouble) { +Principal pr = wsContext.getUserPrincipal(); + +Assert.assertNotNull("Principal must not be null", pr); +Assert.assertNotNull("Principal.getName() must not return null", pr.getName()); + +// Test caching logic here +updateCache(pr.getName()); + +return numberToDouble * 2; +} + +private void updateCache(String user) { +if (userCount.containsKey(user)) { +if (userCount.get(user) > 2) { +throw new RuntimeException("Only two iterations allowed"); +} +userCount.put(user, userCount.get(user) + 1); +} else { +userCount.put(user, 1); +} +} +} http://git-wip-us.apache.org/repos/asf/cxf/blob/07093d2f/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java -- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryCachingPortTypeImpl.java index d7922a5..65cade9 100644 --- a/
cxf git commit: Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet)
Repository: cxf Updated Branches: refs/heads/master ee62e3c37 -> c255034b2 Remove org.json stuff from build other than in systests/jaxrs (need to work on that yet) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c255034b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c255034b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c255034b Branch: refs/heads/master Commit: c255034b2d6eb99bb2753b3d6932af06fd6cbe16 Parents: ee62e3c Author: Daniel Kulp Authored: Wed May 24 12:10:59 2017 -0400 Committer: Daniel Kulp Committed: Wed May 24 12:10:59 2017 -0400 -- parent/pom.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/c255034b/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 355f800..0bf6cd8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1951,6 +1951,12 @@ org.apache.tika tika-parsers ${cxf.tika.version} + + +org.json +json + + org.apache.commons @@ -1981,6 +1987,12 @@ org.qi4j.library org.qi4j.library.circuitbreaker ${cxf.zest.version} + + +org.codeartisans +org.json + + org.apache.wss4j
[3/3] cxf git commit: Recording .gitmergeinfo Changes
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/310e52e9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/310e52e9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/310e52e9 Branch: refs/heads/3.0.x-fixes Commit: 310e52e97b35cf91809e48c17a277734850b05e1 Parents: f3c1955 Author: Colm O hEigeartaigh Authored: Wed May 24 10:51:20 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:51:20 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/310e52e9/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index ef84ca3..6ec1553 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -811,6 +811,7 @@ B 73cce96fa123c8a4245269157692fb6f596dfc9b B 73dcc6d8894757341151414dae981ce23b034945 B 73f8c955d8f593928b1f00586043e14daf5d5242 B 741a74e33bc29f7ada4f5f908ec4fcbee55dc011 +B 742c38c4511d5f9794e6ef62fd449ca26bb108a9 B 742cb68a9172c968aeea5ece7146f9c3dfacde9a B 743b191f333a49c527f2e750d7d03aa0ea30af33 B 7456089088a21620ec75dc83fbb4b89ebdfd290e
[1/3] cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes eeae9d07b -> 310e52e97 CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe # Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/983f84e2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/983f84e2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/983f84e2 Branch: refs/heads/3.0.x-fixes Commit: 983f84e298c6cb20e7a5d7373fe5af1a69352705 Parents: eeae9d0 Author: Colm O hEigeartaigh Authored: Wed May 24 10:28:16 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:51:17 2017 +0100 -- .../org/apache/cxf/sts/event/map/MapEventLogger.java | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/983f84e2/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index d54ab14..dd69e14 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -37,7 +37,7 @@ public class MapEventLogger implements MapEventListener { private boolean logStacktrace; private boolean logFieldname; private Level logLevel = Level.FINE; -private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); +private String format; public MapEventLogger() { fieldOrder.add(KEYS.TIME.name()); @@ -85,6 +85,12 @@ public class MapEventLogger implements MapEventListener { if (value instanceof String) { return (String) value; } else if (value instanceof Date) { +DateFormat dateFormat = null; +if (format != null) { +dateFormat = new SimpleDateFormat(format); +} else { +dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); +} return dateFormat.format(value); } else { return (value == null) ? "" : value.toString(); @@ -114,9 +120,15 @@ public class MapEventLogger implements MapEventListener { public void setLogFieldname(boolean logFieldname) { this.logFieldname = logFieldname; } +<<< HEAD public void setDateFormat(String format) { this.dateFormat = new SimpleDateFormat(format); +=== + +public void setDateFormat(String dateFormat) { +this.format = dateFormat; +>>> ee62e3c371... CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe } public String getLogLevel() {
[2/3] cxf git commit: Fixing merge
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3c19558 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3c19558 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3c19558 Branch: refs/heads/3.0.x-fixes Commit: f3c19558cfc82c4fad28be29cda0410223b9003e Parents: 983f84e Author: Colm O hEigeartaigh Authored: Wed May 24 10:29:17 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:51:20 2017 +0100 -- .../main/java/org/apache/cxf/sts/event/map/MapEventLogger.java | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/f3c19558/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index dd69e14..080f5c2 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -120,15 +120,9 @@ public class MapEventLogger implements MapEventListener { public void setLogFieldname(boolean logFieldname) { this.logFieldname = logFieldname; } -<<< HEAD - -public void setDateFormat(String format) { -this.dateFormat = new SimpleDateFormat(format); -=== public void setDateFormat(String dateFormat) { this.format = dateFormat; ->>> ee62e3c371... CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe } public String getLogLevel() {
[2/3] cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe
CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe # Conflicts: # services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f068a29 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f068a29 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f068a29 Branch: refs/heads/3.1.x-fixes Commit: 7f068a29920db5eea935e9b363c24147feffab13 Parents: 42739ef Author: Colm O hEigeartaigh Authored: Wed May 24 10:28:16 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:28:57 2017 +0100 -- .../org/apache/cxf/sts/event/map/MapEventLogger.java | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7f068a29/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index d69f1c5..633744c 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -37,7 +37,7 @@ public class MapEventLogger implements MapEventListener { private boolean logStacktrace; private boolean logFieldname; private Level logLevel = Level.FINE; -private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); +private String format; public MapEventLogger() { fieldOrder.add(KEYS.TIME.name()); @@ -86,6 +86,12 @@ public class MapEventLogger implements MapEventListener { if (value instanceof String) { return (String) value; } else if (value instanceof Date) { +DateFormat dateFormat = null; +if (format != null) { +dateFormat = new SimpleDateFormat(format); +} else { +dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); +} return dateFormat.format(value); } else { return (value == null) ? "" : value.toString(); @@ -115,9 +121,15 @@ public class MapEventLogger implements MapEventListener { public void setLogFieldname(boolean logFieldname) { this.logFieldname = logFieldname; } +<<< HEAD public void setDateFormat(String format) { this.dateFormat = new SimpleDateFormat(format); +=== + +public void setDateFormat(String dateFormat) { +this.format = dateFormat; +>>> ee62e3c371... CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe } public String getLogLevel() {
[3/3] cxf git commit: Fixing merge
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6c70b024 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c70b024 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c70b024 Branch: refs/heads/3.1.x-fixes Commit: 6c70b024d2f4aac172114bc71683442e035674af Parents: 742c38c Author: Colm O hEigeartaigh Authored: Wed May 24 10:29:17 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:29:17 2017 +0100 -- .../main/java/org/apache/cxf/sts/event/map/MapEventLogger.java | 6 -- 1 file changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/6c70b024/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index 633744c..6eb9dd5 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -121,15 +121,9 @@ public class MapEventLogger implements MapEventListener { public void setLogFieldname(boolean logFieldname) { this.logFieldname = logFieldname; } -<<< HEAD - -public void setDateFormat(String format) { -this.dateFormat = new SimpleDateFormat(format); -=== public void setDateFormat(String dateFormat) { this.format = dateFormat; ->>> ee62e3c371... CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe } public String getLogLevel() {
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 42739ef5d -> 6c70b024d 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/742c38c4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/742c38c4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/742c38c4 Branch: refs/heads/3.1.x-fixes Commit: 742c38c4511d5f9794e6ef62fd449ca26bb108a9 Parents: 7f068a2 Author: Colm O hEigeartaigh Authored: Wed May 24 10:28:57 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:28:57 2017 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/742c38c4/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 800e47e..cce744d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -613,6 +613,7 @@ M eb14ce9206bc43371f149f9d0b1c6e8e2682e5c0 M eb31ffe4f95c4dc6ac9a2ac56e15ae89b578359e M ed9298066428c0dfc4590a556876d696a4ba13c0 M ee248ce7a4a1b04bcbddbdcef82d695ccc140160 +M ee62e3c371cd7d41796cba09f110f5cff12f5060 M f133df0f691191fac9566726db06c9b4dc7b65a6 M f3304a89a7e93e9c466ee5dbd8d97ffe2d50f50f M f40e11663072ee940dd412821c3ab98230445e5a
cxf git commit: CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe
Repository: cxf Updated Branches: refs/heads/master c2517eb55 -> ee62e3c37 CXF-7381 - DateFormat in MapEventLogger in the STS is not thread safe Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ee62e3c3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ee62e3c3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ee62e3c3 Branch: refs/heads/master Commit: ee62e3c371cd7d41796cba09f110f5cff12f5060 Parents: c2517eb Author: Colm O hEigeartaigh Authored: Wed May 24 10:28:16 2017 +0100 Committer: Colm O hEigeartaigh Committed: Wed May 24 10:28:16 2017 +0100 -- .../org/apache/cxf/sts/event/map/MapEventLogger.java| 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/ee62e3c3/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java -- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java index bc5bc2d..f321948 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/event/map/MapEventLogger.java @@ -37,7 +37,7 @@ public class MapEventLogger implements MapEventListener { private boolean logStacktrace; private boolean logFieldname; private Level logLevel = Level.FINE; -private DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); +private String format; public MapEventLogger() { fieldOrder.add(KEYS.TIME.name()); @@ -86,6 +86,12 @@ public class MapEventLogger implements MapEventListener { if (value instanceof String) { return (String) value; } else if (value instanceof Date) { +DateFormat dateFormat = null; +if (format != null) { +dateFormat = new SimpleDateFormat(format); +} else { +dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM); +} return dateFormat.format(value); } else { return (value == null) ? "" : value.toString(); @@ -116,8 +122,8 @@ public class MapEventLogger implements MapEventListener { this.logFieldname = logFieldname; } -public void setDateFormat(String format) { -this.dateFormat = new SimpleDateFormat(format); +public void setDateFormat(String dateFormat) { +this.format = dateFormat; } public String getLogLevel() {