Nexus: Staging Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.7.0_71; Mac OS X 10.10.4)""userId" = "dkulp""ip" = "66.30.110.50"Details:The following artifacts have been staged/org/apache/cxf/xjc-utils/xjc-utils/3.0.4/xjc-utils-3.0.4-source-release.zip(SHA1: 4a928a893a06181833425c15d6578887dcbd609f)/org/apache/cxf/xjc-utils/xjc-utils/3.0.4/xjc-utils-3.0.4-source-release.zip.asc(SHA1: b84341cd0fed516b33302103be5cf99f73e8b9eb)/org/apache/cxf/xjc-utils/xjc-utils/3.0.4/xjc-utils-3.0.4.pom.asc(SHA1: 1879a728b053342aa808bb7ef733a11f76ab7cf3)/org/apache/cxf/xjc-utils/xjc-utils/3.0.4/xjc-utils-3.0.4.pom(SHA1: 883233058ea4bed730a9715ea0e179d2f15d0936)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4.jar.asc(SHA1: c92c1290a2e7d34258b7d7ac7d463c406c8bdfbe)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4-sources.jar.asc(SHA1: 63c95f97a74e275d9bd2da2c00b382240f511476)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4-sources.jar(SHA1: b704a7366527a4cbea5adf09ada83d9af2019645)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4.jar(SHA1: ee04b576a02fe3f37f68c62e20a82efbf67da949)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4.pom.asc(SHA1: d089da664afba220ede6eaab953b1fb47646bbe6)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4-javadoc.jar.asc(SHA1: 84f9633f6a7a35b2be8ddadec64a2274b4f8e81f)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4-javadoc.jar(SHA1: 9661c06d766a78f6ea2cdb472f49403e026fc061)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.4/cxf-xjc-runtime-3.0.4.pom(SHA1: ca9f0ef327e90baf5de1273d21c5998ed84bf5ae)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4-javadoc.jar(SHA1: 2382e453e218577dc905aaa8256b66ea12607596)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4.jar(SHA1: e37bf3184e5762e02342bd63ca6b015f34b30d27)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4-sources.jar(SHA1: 9426489cae3f9d57008cfe8b91dba26609da6722)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4.jar.asc(SHA1: 52c873316cee4ab7c9882a1024f4828d4b37c456)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4-javadoc.jar.asc(SHA1: 6d1e421f152c45a6f0ec5224152c889fad04fcec)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4-sources.jar.asc(SHA1: eab8007091409686c4c66c68a04e621a39b4837a)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4.pom(SHA1: 787cfb3d6f61d88360c6801371fbe90a5d9613eb)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.4/cxf-xjc-boolean-3.0.4.pom.asc(SHA1: 4a93b7008d2fc32bb943de1c7b35ac34632cb8b7)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4.pom.asc(SHA1: cd114af8c031b9e89c91ebc04c5c80bccc3abe17)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4-sources.jar(SHA1: 69be763fd5ef4bffadebda3b3d0504c2eefc7a72)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4-sources.jar.asc(SHA1: 5550d8640061d74d714f93a58ec96004e2fc7e6d)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4-javadoc.jar(SHA1: 4db1f07aadcf807690e98225549640e02c64a5fa)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4.jar.asc(SHA1: bb09f1cb562baf8bc0c906447a2d819bd6725fec)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4.jar(SHA1: 425ca328b18affb24e0d2551e3ab57f6d611aa48)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4.pom(SHA1: a91fe9376e46d97b1c49a4e7554ffc50de099538)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.4/cxf-xjc-bug671-3.0.4-javadoc.jar.asc(SHA1: d15fcec36c50c8fc6ddcfd7f3096644bdc0da536)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4-javadoc.jar.asc(SHA1: 26ec108e49083a3f2de625fe062528f44cd43062)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4-sources.jar(SHA1: 0534ef33875e174a925dcd7c90f7bdbbaf6b7a3f)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4.jar(SHA1: 5e7e92d68cce760fa4f60e4890b38d28cbd52018)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4.pom(SHA1: 01f9fe0104162b61e59acbe43c262d9ac10fd913)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4.jar.asc(SHA1: fc0822b79b4e87389f328856da6f9937fed25dc4)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4-sources.jar.asc(SHA1: 2e449e54026d29e0b0dfe294ad6e5832c15785b7)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4-javadoc.jar(SHA1: 8105152dfa80fe6ce2bd5267743b0457ccffc144)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.4/cxf-xjc-javadoc-3.0.4.pom.asc(SHA1: f0befbac1b64d0c8d6f036ae298e0798cfa61893)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.0.4/cxf-xjc-bug986-3.0.4.pom.asc(SHA1: 0de9bdfa5f94fbd9358476640e1cb8ed022ae0b7)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.0.4/cxf-xjc-bug986-3.0.4-javadoc.jar.asc(SHA1: 82ccd4f6be2d54b9fcc6
cxf-xjc-utils git commit: [maven-release-plugin] prepare release xjc-utils-3.0.4
Repository: cxf-xjc-utils Updated Branches: refs/heads/master cc9f48c53 -> 2f2adbbe9 [maven-release-plugin] prepare release xjc-utils-3.0.4 Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/2f2adbbe Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/2f2adbbe Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/2f2adbbe Branch: refs/heads/master Commit: 2f2adbbe9b8bdefc51fb504b0546909218c87c4f Parents: cc9f48c Author: Daniel Kulp Authored: Thu Jul 9 17:22:13 2015 -0400 Committer: Daniel Kulp Committed: Thu Jul 9 17:22:13 2015 -0400 -- boolean-test/pom.xml | 2 +- boolean/pom.xml| 2 +- bug671/pom.xml | 2 +- bug986/pom.xml | 2 +- cxf-xjc-plugin/pom.xml | 2 +- dv-test/pom.xml| 2 +- dv/pom.xml | 2 +- javadoc/pom.xml| 2 +- pom.xml| 4 ++-- property-listener/pom.xml | 2 +- runtime/pom.xml| 2 +- ts-test/pom.xml| 2 +- ts/pom.xml | 2 +- wsdlextension-test/pom.xml | 2 +- wsdlextension/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/boolean-test/pom.xml -- diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml index 5eaeee1..f8cace8 100644 --- a/boolean-test/pom.xml +++ b/boolean-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils - 3.0.4-SNAPSHOT + 3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/boolean/pom.xml -- diff --git a/boolean/pom.xml b/boolean/pom.xml index 7bbe83a..3a60fb2 100644 --- a/boolean/pom.xml +++ b/boolean/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/bug671/pom.xml -- diff --git a/bug671/pom.xml b/bug671/pom.xml index 51b5c7c..9464b1e 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/bug986/pom.xml -- diff --git a/bug986/pom.xml b/bug986/pom.xml index 0fc27aa..b07b9d6 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/cxf-xjc-plugin/pom.xml -- diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index c3ff0d1..c02dfad 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/dv-test/pom.xml -- diff --git a/dv-test/pom.xml b/dv-test/pom.xml index 1ddaa3a..9a411cf 100644 --- a/dv-test/pom.xml +++ b/dv-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/dv/pom.xml -- diff --git a/dv/pom.xml b/dv/pom.xml index 20c1c3c..dd7d8c6 100644 --- a/dv/pom.xml +++ b/dv/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/javadoc/pom.xml -- diff --git a/javadoc/pom.xml b/javadoc/pom.xml index f70a09c..6dc21de 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4-SNAPSHOT +3.0.4 http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2f2adbbe/pom.xml -- diff --git a/pom.xml b/pom.xml index 9bc9028..c8cd7be 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.xjc-utils xjc-utils pom -3.0.4-SNAPSHOT +3.0.4 Apache
cxf-xjc-utils git commit: [maven-release-plugin] prepare for next development iteration
Repository: cxf-xjc-utils Updated Branches: refs/heads/master 2f2adbbe9 -> 2ee4c8dd4 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/2ee4c8dd Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/2ee4c8dd Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/2ee4c8dd Branch: refs/heads/master Commit: 2ee4c8dd49029a44361b95a762ae154790284ae2 Parents: 2f2adbb Author: Daniel Kulp Authored: Thu Jul 9 17:22:20 2015 -0400 Committer: Daniel Kulp Committed: Thu Jul 9 17:22:20 2015 -0400 -- boolean-test/pom.xml | 2 +- boolean/pom.xml| 2 +- bug671/pom.xml | 2 +- bug986/pom.xml | 2 +- cxf-xjc-plugin/pom.xml | 2 +- dv-test/pom.xml| 2 +- dv/pom.xml | 2 +- javadoc/pom.xml| 2 +- pom.xml| 4 ++-- property-listener/pom.xml | 2 +- runtime/pom.xml| 2 +- ts-test/pom.xml| 2 +- ts/pom.xml | 2 +- wsdlextension-test/pom.xml | 2 +- wsdlextension/pom.xml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/boolean-test/pom.xml -- diff --git a/boolean-test/pom.xml b/boolean-test/pom.xml index f8cace8..06dac7d 100644 --- a/boolean-test/pom.xml +++ b/boolean-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils - 3.0.4 + 3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/boolean/pom.xml -- diff --git a/boolean/pom.xml b/boolean/pom.xml index 3a60fb2..25bc237 100644 --- a/boolean/pom.xml +++ b/boolean/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/bug671/pom.xml -- diff --git a/bug671/pom.xml b/bug671/pom.xml index 9464b1e..8f8ef72 100644 --- a/bug671/pom.xml +++ b/bug671/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/bug986/pom.xml -- diff --git a/bug986/pom.xml b/bug986/pom.xml index b07b9d6..98adcdd 100644 --- a/bug986/pom.xml +++ b/bug986/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/cxf-xjc-plugin/pom.xml -- diff --git a/cxf-xjc-plugin/pom.xml b/cxf-xjc-plugin/pom.xml index c02dfad..d6b1a01 100644 --- a/cxf-xjc-plugin/pom.xml +++ b/cxf-xjc-plugin/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/dv-test/pom.xml -- diff --git a/dv-test/pom.xml b/dv-test/pom.xml index 9a411cf..1538d4f 100644 --- a/dv-test/pom.xml +++ b/dv-test/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/dv/pom.xml -- diff --git a/dv/pom.xml b/dv/pom.xml index dd7d8c6..9f2e1a1 100644 --- a/dv/pom.xml +++ b/dv/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/javadoc/pom.xml -- diff --git a/javadoc/pom.xml b/javadoc/pom.xml index 6dc21de..7a1046f 100644 --- a/javadoc/pom.xml +++ b/javadoc/pom.xml @@ -27,7 +27,7 @@ org.apache.cxf.xjc-utils xjc-utils -3.0.4 +3.0.5-SNAPSHOT http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/2ee4c8dd/pom.xml -- diff --git a/pom.xml b/pom.xml index c8cd7be..209bec7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.xjc-utils xjc-utils pom -3.0.4 +3.0.5-SNAPSHOT
Git Push Summary
Repository: cxf-xjc-utils Updated Tags: refs/tags/xjc-utils-3.0.4 [created] 7da906cb4
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes f1371d354 -> 626f1dcf6 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/626f1dcf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/626f1dcf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/626f1dcf Branch: refs/heads/2.7.x-fixes Commit: 626f1dcf6509bc6b25205838e9d66d2f373b33f9 Parents: f1371d3 Author: Colm O hEigeartaigh Authored: Thu Jul 9 17:44:31 2015 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jul 9 17:44:31 2015 +0100 -- .gitmergeinfo | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/626f1dcf/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 48b91bc..15962d0 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -15,6 +15,7 @@ B 006892d4d0cca3417fdf69d808b95b498373e73d B 0072de63525d9510df5482fa8d0cf2fe55fdcad2 B 007861913735815db8a2a8fa52d4d621cf54fc01 B 008f6e6d4e35d379d1ec26292e64f6fb71f9837a +B 00b97475ebf60a9abfd91925e9709ccc3d4c7c74 B 00ba1fd85cbdd0973145fcf7805722327ea18d6b B 00d6e397ea2392ae64e8087f6b35fbd6152596ac B 00db94d8498794c7848110d24958fabd7ef56edf @@ -321,6 +322,7 @@ B 2246e1393aa56ff8411efabf2d49c3ef75ffdfec B 224fa3c6412db10a451558e67bf0a6913035fa5d B 226906c48bb2c71b70172d33ea528916f8c62dff B 227bf19947e2888b8ceee53287bfbe78a1d824b8 +B 22937bb5827175d8f64e3db28bbeab3c816ca89d B 2296e119c02a1ac5d95492bb5fc4e24e0c02b979 B 229bc4ccaed5d4989b3ec363b1964cb2df00cf6e B 22ac3203afc7c5017b266e25fdde0df16c294b54 @@ -928,6 +930,7 @@ B 683fa9276cbb8f419d0a5f82427360e8a1987727 B 685eb54712e9016c4325f7ad28b395a9826c8680 B 68b030840e7cadb726f3be292b8456444e815344 B 6930413189d7f21defbb8276bba1432bc7ff5c6c +B 69aff5e6a15579ac713e9f109249e42e86623067 B 6a16e4e80352c0ca5e56737502d95f70688223bb B 6a2f8cde20745bee06698884a7552a1f65a1b0f5 B 6a4a8fb4f545a0c7a222dca22323f972d4cd9202 @@ -1535,6 +1538,7 @@ B b11ce27dcaa1180249633d3f45583949cd698ee9 B b14d56de7b5f70421531173f8f41ec89a9730c92 B b14f773634eaee65d8b8f2f1ee67d1e95c4bcb9f B b15370faae90413f215b82c9d8a7ff5923507708 +B b158ddfe1ba649a000c4952597639e93684bce9d B b174615dd9c37284f76ebdc8aa3eb92d19acc05f B b177b2331f47ead04faa81661277cdc34772bd51 B b184d9474fb8aff642822f89eba9fa6cb38ff2bd
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 00b97475e -> e063e8c17 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/e063e8c1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e063e8c1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e063e8c1 Branch: refs/heads/3.0.x-fixes Commit: e063e8c17d0ac9b3b267d07ade4e4ccd84b74e15 Parents: d2f9625 Author: Daniel Kulp Authored: Thu Jul 9 12:43:49 2015 -0400 Committer: Daniel Kulp Committed: Thu Jul 9 12:43:49 2015 -0400 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e063e8c1/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 146f51e..c46b8b1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -194,6 +194,7 @@ B 7e8d0b4b1cd868272380ca5779e67a15e46cf799 B 7e95279dd1170f5878687d7eea27f7d7f03a434b B 80014cf0e6fb1ba62ffdb3766acffd2130eef9d6 B 80d7128a3ba1944a603c73e5e908d86c9bf27648 +B 81bc682a409806567fc3485157e184e72feaf086 B 842fade62621490a407729fa1357f043216f25e6 B 857b55796dc7fc2b302e26d99f84df1712ff9c58 B 85c06fc4d6a642627434785a2d228d3c08d68768
[2/2] cxf git commit: Also fix netty
Also fix netty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2f96250
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2f96250
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2f96250
Branch: refs/heads/3.0.x-fixes
Commit: d2f9625030f8df1485b0a93a57e5c5bde7fddb35
Parents: 00b9747
Author: Daniel Kulp
Authored: Thu Jul 9 12:42:56 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:43:49 2015 -0400
--
rt/transports/http-netty/netty-server/pom.xml | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2f96250/rt/transports/http-netty/netty-server/pom.xml
--
diff --git a/rt/transports/http-netty/netty-server/pom.xml
b/rt/transports/http-netty/netty-server/pom.xml
index 3f08604..03cea80 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -145,9 +145,15 @@
generate-sources
generate-sources
+
+
org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}
+
${basedir}/target/generated/src/main/java
+
+-Xbug986
+
${basedir}/src/main/resources/schemas/configuration/http-netty-server.xsd
${basedir}/src/main/build-resources/catalog.cat
[5/5] cxf git commit: Fixing backmerge again
Fixing backmerge again
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00b97475
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00b97475
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00b97475
Branch: refs/heads/3.0.x-fixes
Commit: 00b97475ebf60a9abfd91925e9709ccc3d4c7c74
Parents: f2e1ed3
Author: Colm O hEigeartaigh
Authored: Thu Jul 9 17:43:04 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Jul 9 17:43:04 2015 +0100
--
.../org/apache/cxf/systest/ws/mtom/client.xml | 14 +++---
.../org/apache/cxf/systest/ws/mtom/server.xml | 12 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/00b97475/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml
index 003c64e..ab70a28 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/client.xml
@@ -85,19 +85,19 @@
http://www.example.org/contract/DoubleIt}DoubleItAsymmetricPort";
createdFromAPI="true">
-
-
-
-
-
+
+
+
+
+
http://www.example.org/contract/DoubleIt}DoubleItSymmetricPort";
createdFromAPI="true">
-
-
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/00b97475/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
--
diff --git
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
index 98051fb..77f9361 100644
---
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
+++
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
@@ -95,18 +95,18 @@
http://www.example.org/contract/DoubleIt";
id="Asymmetric"
address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Asymmetric";
serviceName="s:DoubleItService" endpointName="s:DoubleItAsymmetricPort"
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
-
-
-
-
+
+
+
+
http://www.example.org/contract/DoubleIt";
id="Symmetric"
address="http://localhost:${testutil.ports.mtom.Server}/DoubleItX509Symmetric";
serviceName="s:DoubleItService" endpointName="s:DoubleItSymmetricPort"
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
-
-
+
+
[1/5] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 2d6414108 -> 00b97475e 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/b158ddfe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b158ddfe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b158ddfe Branch: refs/heads/3.0.x-fixes Commit: b158ddfe1ba649a000c4952597639e93684bce9d Parents: 22937bb Author: Colm O hEigeartaigh Authored: Thu Jul 9 17:11:28 2015 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jul 9 17:11:28 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b158ddfe/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 271380d..be3ea22 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -530,6 +530,7 @@ M eb3dd938052b3e853b0cf85dacf31ef7f802af38 M eb9e13e2dd4a22b1d777095a5d92139829d550b8 M efaf05170b4f76ad61ff423e30ece58bdd226ae5 M f02b02934bf78504ffc462c364dc43e386e727b2 +M f399b9290e42726e30333f261d8d7f6abc4768cc M f74e2e060b93fbbfc05ace263fe7f4f588b63e4d M f7c884a077b7e7dc1b74d6f3bc4240baf0695510 M fb0520525f07041f42bc0562b4a15240bb757373
[3/5] cxf git commit: Fixing backmerge
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69aff5e6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69aff5e6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69aff5e6
Branch: refs/heads/3.0.x-fixes
Commit: 69aff5e6a15579ac713e9f109249e42e86623067
Parents: b158ddf
Author: Colm O hEigeartaigh
Authored: Thu Jul 9 17:36:33 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Jul 9 17:36:33 2015 +0100
--
.../cxf/ws/security/SecurityConstants.java | 12 +--
.../policyhandlers/AbstractBindingBuilder.java | 22
.../AsymmetricBindingHandler.java | 12 ---
3 files changed, 1 insertion(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/69aff5e6/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 885a9b8..fd4c090 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -244,12 +244,8 @@ public final class SecurityConstants {
* SAML Token contains Audience Restriction URIs, one of them must match
either the
* request URL or the Service QName. The default is "true".
*/
-<<< HEAD
public static final String AUDIENCE_RESTRICTION_VALIDATION =
"ws-security.validate.audience-restriction";
-===
-public static final String ENABLE_SAML_ONE_TIME_USE_CACHE =
"ws-security.enable.saml.cache";
-
/**
* Whether to store bytes (CipherData or BinarySecurityToken) in an
attachment. The default is
* true if MTOM is enabled. Set it to false to BASE-64 encode the bytes
and "inlined" them in
@@ -258,7 +254,6 @@ public final class SecurityConstants {
*/
public static final String STORE_BYTES_IN_ATTACHMENT =
"ws-security.store.bytes.in.attachment";
->>> f399b92... Support the ability to store BASE-64 encoded (encryption)
bytes in message attachments
//
// Non-boolean WS-Security Configuration parameters
//
@@ -663,13 +658,8 @@ public final class SecurityConstants {
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM,
STS_TOKEN_IMMINENT_EXPIRY_VALUE,
-<<< HEAD
KERBEROS_REQUEST_CREDENTIAL_DELEGATION,
ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL,
-AUDIENCE_RESTRICTION_VALIDATION
-===
-KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP,
-STORE_BYTES_IN_ATTACHMENT
->>> f399b92... Support the ability to store BASE-64 encoded (encryption)
bytes in message attachments
+AUDIENCE_RESTRICTION_VALIDATION, STORE_BYTES_IN_ATTACHMENT
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/69aff5e6/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 0a3734c..e0245e3 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
@@ -50,11 +50,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-<<< HEAD
import org.apache.cxf.Bus;
-===
import org.apache.cxf.attachment.AttachmentUtil;
->>> f399b92... Support the ability to store BASE-64 encoded (encryption)
bytes in message attachments
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJUtils;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -173,12 +170,8 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
protected Element bstElement;
protected Element lastEncryptedKeyElement;
-<<< HEAD
-===
-protected final CallbackLookup callbackLookup;
protected boolean storeBytesInAttachment;
->>> f399b92... Support the ability to store BASE-64 encoded (encr
[4/5] cxf git commit: Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes
Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f2e1ed38 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f2e1ed38 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f2e1ed38 Branch: refs/heads/3.0.x-fixes Commit: f2e1ed385d49f2c14643cc3b5521db0cc5f57da4 Parents: 69aff5e 2d64141 Author: Colm O hEigeartaigh Authored: Thu Jul 9 17:37:08 2015 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jul 9 17:37:08 2015 +0100 -- .gitmergeinfo | 6 ++ .../org/apache/cxf/common/jaxb/JAXBUtils.java | 65 .../apache/cxf/common/security/SimpleGroup.java | 1 + .../AbstractBPBeanDefinitionParser.java | 8 ++- .../jsse/TLSClientParametersConfig.java | 8 +-- .../spring/AbstractBeanDefinitionParser.java| 11 +++- .../configuration/spring/JAXBBeanFactory.java | 26 .../cxf/ws/addressing/VersionTransformer.java | 19 -- pom.xml | 2 +- .../org/apache/cxf/jaxb/io/DataReaderImpl.java | 31 +++--- .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 44 + .../cxf/jaxrs/provider/JAXBElementProvider.java | 4 +- .../cxf/jaxrs/provider/XSLTJaxbProvider.java| 2 + .../security/KerberosAuthenticationFilter.java | 1 + .../org/apache/cxf/jaxrs/utils/JAXBUtils.java | 16 - .../handler/AnnotationHandlerChainBuilder.java | 4 +- .../handler/logical/LogicalMessageImpl.java | 5 +- .../handler/soap/SOAPMessageContextImpl.java| 5 +- .../org/apache/cxf/jaxws/spi/ProviderImpl.java | 18 -- .../bootstrapping/SimpleXMLSettingsStorage.java | 9 ++- .../jaxrs/provider/atom/AtomPojoProvider.java | 4 +- .../cxf/jaxrs/provider/json/JSONProvider.java | 4 +- .../jose/jaxrs/JwtAuthenticationFilter.java | 1 + .../saml/authorization/SubjectPrincipal.java| 2 + rt/transports/http-jetty/pom.xml| 6 ++ .../JettyHTTPServerEngineFactoryHolder.java | 21 +++ .../NettyHttpServerEngineFactoryHolder.java | 13 ++-- .../apache/cxf/ws/addressing/soap/MAPCodec.java | 6 +- ...ndpointReferenceDomainExpressionBuilder.java | 38 +--- .../builder/jaxb/JaxbAssertionBuilder.java | 9 ++- .../apache/cxf/wsdl/JAXBExtensionHelper.java| 4 +- .../sts/token/validator/X509TokenValidator.java | 6 +- .../internal/WSDiscoveryServiceImpl.java| 3 +- .../org/apache/cxf/wsn/jms/JmsPullPoint.java| 7 ++- .../org/apache/cxf/wsn/jms/JmsSubscription.java | 12 ++-- .../common/dom/ExtendedDocumentBuilder.java | 43 +++-- .../cxf/tools/common/toolspec/ToolSpec.java | 6 +- .../toolspec/parser/CommandLineParserTest.java | 8 ++- .../validator/internal/SchemaValidator.java | 5 +- .../tools/validator/internal/ValidatorUtil.java | 2 + .../cxf/tools/wsdlto/core/PluginLoader.java | 25 ++-- .../databinding/jaxb/NamespaceContextImpl.java | 65 42 files changed, 359 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/f2e1ed38/.gitmergeinfo --
[2/5] cxf git commit: Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
Support the ability to store BASE-64 encoded (encryption) bytes in message
attachments
Conflicts:
rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/22937bb5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/22937bb5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/22937bb5
Branch: refs/heads/3.0.x-fixes
Commit: 22937bb5827175d8f64e3db28bbeab3c816ca89d
Parents: c780d3a
Author: Colm O hEigeartaigh
Authored: Thu Jul 9 17:09:12 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Jul 9 17:11:28 2015 +0100
--
.../cxf/ws/security/SecurityConstants.java | 18 +
.../policyhandlers/AbstractBindingBuilder.java | 46 +
.../AsymmetricBindingHandler.java | 17 +
.../policyhandlers/SymmetricBindingHandler.java | 4 ++
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 51 +-
.../cxf/systest/ws/mtom/DoubleItMtom.wsdl | 71
.../org/apache/cxf/systest/ws/mtom/client.xml | 43 +++-
.../org/apache/cxf/systest/ws/mtom/server.xml | 38 +++
8 files changed, 285 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/22937bb5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 0516853..885a9b8 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -244,8 +244,21 @@ public final class SecurityConstants {
* SAML Token contains Audience Restriction URIs, one of them must match
either the
* request URL or the Service QName. The default is "true".
*/
+<<< HEAD
public static final String AUDIENCE_RESTRICTION_VALIDATION =
"ws-security.validate.audience-restriction";
+===
+public static final String ENABLE_SAML_ONE_TIME_USE_CACHE =
"ws-security.enable.saml.cache";
+
+/**
+ * Whether to store bytes (CipherData or BinarySecurityToken) in an
attachment. The default is
+ * true if MTOM is enabled. Set it to false to BASE-64 encode the bytes
and "inlined" them in
+ * the message instead. Setting this to true is more efficient, as it
means that the BASE-64
+ * encoding step can be skipped. This only applies to the DOM WS-Security
stack.
+ */
+public static final String STORE_BYTES_IN_ATTACHMENT =
"ws-security.store.bytes.in.attachment";
+
+>>> f399b92... Support the ability to store BASE-64 encoded (encryption)
bytes in message attachments
//
// Non-boolean WS-Security Configuration parameters
//
@@ -650,8 +663,13 @@ public final class SecurityConstants {
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM,
STS_TOKEN_IMMINENT_EXPIRY_VALUE,
+<<< HEAD
KERBEROS_REQUEST_CREDENTIAL_DELEGATION,
ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL,
AUDIENCE_RESTRICTION_VALIDATION
+===
+KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP,
+STORE_BYTES_IN_ATTACHMENT
+>>> f399b92... Support the ability to store BASE-64 encoded (encryption)
bytes in message attachments
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/22937bb5/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 98de4de..0a3734c 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
@@ -50,7 +50,11 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.
cxf git commit: Also fix netty
Repository: cxf
Updated Branches:
refs/heads/master f399b9290 -> 332d930c5
Also fix netty
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/332d930c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/332d930c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/332d930c
Branch: refs/heads/master
Commit: 332d930c5457ad55392f568db1d6ff1f771bbc1c
Parents: f399b92
Author: Daniel Kulp
Authored: Thu Jul 9 12:42:56 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:43:23 2015 -0400
--
rt/transports/http-netty/netty-server/pom.xml | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/332d930c/rt/transports/http-netty/netty-server/pom.xml
--
diff --git a/rt/transports/http-netty/netty-server/pom.xml
b/rt/transports/http-netty/netty-server/pom.xml
index 79651a9..2f5e168 100644
--- a/rt/transports/http-netty/netty-server/pom.xml
+++ b/rt/transports/http-netty/netty-server/pom.xml
@@ -145,9 +145,15 @@
generate-sources
generate-sources
+
+
org.apache.cxf.xjcplugins:cxf-xjc-bug986:${cxf.xjc-utils.version}
+
${basedir}/target/generated/src/main/java
+
+-Xbug986
+
${basedir}/src/main/resources/schemas/configuration/http-netty-server.xsd
${basedir}/src/main/build-resources/catalog.cat
[9/9] cxf git commit: Fix X509TokenValidator with latest changes in wss4j
Fix X509TokenValidator with latest changes in wss4j
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2d641410
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2d641410
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2d641410
Branch: refs/heads/3.0.x-fixes
Commit: 2d6414108cac3ec6208e9f961d24d0d1d49289c7
Parents: b6907af
Author: Daniel Kulp
Authored: Wed Jul 8 16:39:07 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:27 2015 -0400
--
.../org/apache/cxf/sts/token/validator/X509TokenValidator.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2d641410/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
--
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
index 4c68c44..1cf2ee7 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
@@ -28,7 +28,9 @@ import javax.security.auth.callback.CallbackHandler;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.Text;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.sts.STSPropertiesMBean;
@@ -146,7 +148,9 @@ public class X509TokenValidator implements TokenValidator {
binarySecurity.setEncodingType(encodingType);
binarySecurity.setValueType(binarySecurityType.getValueType());
String data = binarySecurityType.getValue();
-((Text)binarySecurity.getElement().getFirstChild()).setData(data);
+
+Node textNode = doc.createTextNode(data);
+binarySecurity.getElement().appendChild(textNode);
} else if (validateTarget.isDOMElement()) {
try {
Document doc = DOMUtils.createDocument();
[7/9] cxf git commit: [CXF-6481] Update to use latest snapshot version of bug986 xjc plugins Set the eventHandler for the unmarshallers to null so we get a proper error if something isn't working as e
[CXF-6481] Update to use latest snapshot version of bug986 xjc plugins
Set the eventHandler for the unmarshallers to null so we get a proper error if
something isn't working as expected
# Conflicts:
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e6a3d860
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e6a3d860
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e6a3d860
Branch: refs/heads/3.0.x-fixes
Commit: e6a3d860f7b80c9a0b3563eb29509693bd817f85
Parents: 70591bf
Author: Daniel Kulp
Authored: Wed Jul 8 15:59:33 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:27 2015 -0400
--
.../org/apache/cxf/common/jaxb/JAXBUtils.java | 17 -
.../AbstractBPBeanDefinitionParser.java | 1 +
.../jsse/TLSClientParametersConfig.java | 8 +++---
.../spring/AbstractBeanDefinitionParser.java| 1 +
.../configuration/spring/JAXBBeanFactory.java | 26 +---
.../cxf/ws/addressing/VersionTransformer.java | 1 +
pom.xml | 2 +-
rt/transports/http-jetty/pom.xml| 6 +
.../JettyHTTPServerEngineFactoryHolder.java | 8 +++---
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 1 +
.../builder/jaxb/JaxbAssertionBuilder.java | 4 ++-
11 files changed, 48 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e6a3d860/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index fe3d2ed..f4e4b54 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -183,6 +183,7 @@ public final class JAXBUtils {
public static Object unmarshall(JAXBContext c, Element e) throws
JAXBException {
Unmarshaller u = c.createUnmarshaller();
try {
+u.setEventHandler(null);
return u.unmarshal(e);
} finally {
closeUnmarshaller(u);
@@ -191,6 +192,7 @@ public final class JAXBUtils {
public static JAXBElement unmarshall(JAXBContext c, Element e,
Class cls) throws JAXBException {
Unmarshaller u = c.createUnmarshaller();
try {
+u.setEventHandler(null);
return u.unmarshal(e, cls);
} finally {
closeUnmarshaller(u);
@@ -199,20 +201,33 @@ public final class JAXBUtils {
public static Object unmarshall(JAXBContext c, Source s) throws
JAXBException {
Unmarshaller u = c.createUnmarshaller();
try {
+u.setEventHandler(null);
return u.unmarshal(s);
} finally {
closeUnmarshaller(u);
}
}
-public static JAXBElement unmarshall(JAXBContext c, XMLStreamReader
reader,
+public static JAXBElement unmarshall(JAXBContext c,
+XMLStreamReader reader,
Class cls) throws
JAXBException {
Unmarshaller u = c.createUnmarshaller();
try {
+u.setEventHandler(null);
return u.unmarshal(reader, cls);
} finally {
closeUnmarshaller(u);
}
}
+public static Object unmarshall(JAXBContext c,
+XMLStreamReader reader) throws
JAXBException {
+Unmarshaller u = c.createUnmarshaller();
+try {
+u.setEventHandler(null);
+return u.unmarshal(reader);
+} finally {
+closeUnmarshaller(u);
+}
+}
public static String builtInTypeToJavaType(String type) {
return BUILTIN_DATATYPES_MAP.get(type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/e6a3d860/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
--
diff --git
a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index c211c8c..1e34cf0 100644
---
a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++
b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -378,6 +378,7 @@ public abstract class AbstractBPBeanDefinitionParser {
} catch (Exception ex) {
u = getContext(c).createUnmarshaller();
+u.setEventHandler(null);
Object obj;
[2/9] cxf git commit: Fix checkstyle
Fix checkstyle Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/19e3be79 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/19e3be79 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/19e3be79 Branch: refs/heads/3.0.x-fixes Commit: 19e3be79a2c508666985014dcecb8dfa64c10e9b Parents: 34359c9 Author: Daniel Kulp Authored: Wed Jul 1 10:08:57 2015 -0400 Committer: Daniel Kulp Committed: Thu Jul 9 12:20:26 2015 -0400 -- .../src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/19e3be79/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java -- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java index f1816d6..b5bf725 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java @@ -47,8 +47,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; - import org.apache.cxf.common.jaxb.JAXBUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
[3/9] cxf git commit: [CXF-6217] Fix a couple of the secure processing thigns
[CXF-6217] Fix a couple of the secure processing thigns
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/34359c95
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/34359c95
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/34359c95
Branch: refs/heads/3.0.x-fixes
Commit: 34359c952209dd5b66ede5255f83bcdd729b53de
Parents: e439993
Author: Daniel Kulp
Authored: Wed Jul 1 10:04:31 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:26 2015 -0400
--
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 29
.../cxf/jaxrs/provider/XSLTJaxbProvider.java| 2 ++
.../bootstrapping/SimpleXMLSettingsStorage.java | 9 +-
3 files changed, 34 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/34359c95/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index 062338d..f1816d6 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlRootElement;
@@ -39,6 +40,7 @@ import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -283,16 +285,33 @@ public class XMLSource {
private Object evaluate(String expression, Map namespaces,
QName type) {
-XPath xpath = XPathFactory.newInstance().newXPath();
+XPathFactory factory = XPathFactory.newInstance();
+try {
+factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
Boolean.TRUE);
+} catch (XPathFactoryConfigurationException e) {
+throw new RuntimeException(e);
+}
+XPath xpath = factory.newXPath();
xpath.setNamespaceContext(new NamespaceContextImpl(namespaces));
+boolean releaseDoc = false;
try {
-if (stream == null) {
-return xpath.compile(expression).evaluate(doc, type);
-} else {
-return xpath.compile(expression).evaluate(new
InputSource(stream), type);
+if (stream != null) {
+//xalan xpath evaluate parses to a DOM via a
DocumentBuilderFactory, but doesn't
+//set the SecureProcessing on that. Since a DOM is always
created, might as well
+//do it via stax and avoid the service factory performance
hits that the
+//DocumentBuilderFactory will entail as well as get the extra
security
+//that woodstox provides
+setBuffering();
+releaseDoc = true;
}
+return xpath.compile(expression).evaluate(doc, type);
} catch (XPathExpressionException ex) {
throw new IllegalArgumentException("Illegal XPath expression '" +
expression + "'", ex);
+} finally {
+if (releaseDoc) {
+//don't need to maintain the doc
+doc = null;
+}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/34359c95/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index 528ad80..bf1e13e 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -41,6 +41,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Provider;
+import javax.xml.XMLConstants;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
@@ -519,6 +520,7 @@ public class XSLTJaxbProvider extends
JAXBElementProvider {
source.setSystemId(urlStream.toExternalForm());
if (factory == null) {
factory =
(SAXTransformerFactory)Transformer
[8/9] 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/b6907af1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6907af1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6907af1 Branch: refs/heads/3.0.x-fixes Commit: b6907af15937c50e894d784c509bd4b9ca895f47 Parents: e6a3d86 Author: Daniel Kulp Authored: Thu Jul 9 08:59:57 2015 -0400 Committer: Daniel Kulp Committed: Thu Jul 9 12:20:27 2015 -0400 -- .gitmergeinfo | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b6907af1/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 271380d..de597be 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -126,8 +126,10 @@ B 5743d5e9bf547bcd0066b2369adadcbb5a8bacbd B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e B 578a51c1ba7f12b35730b0d66ac6b4ab880fb94c B 5891c0d23b776d41be02e74a3b98a3881970d08f +B 58d5200bdc0f15e99f1c624c53299120518a B 593525139909e081ae809278d301688c0ba03697 B 59b7fd7072a71498aecb1b5da6ec51ea89f7381b +B 5a1dd7723e3c21267e12d1562f4a2425049bc7ad B 5aa98c1c2391ba9ce86797119a972ae56a4a9fd0 B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23 B 5bac26a132e7999bf0bd108d4cffb674873a56ca @@ -234,6 +236,7 @@ B 9dd4194ce6af00377b0e1bdc6b15744fe03e29c9 B 9de88cce894ca9ea746abf27943635467e23c153 B 9dfb278c7739b9f4621f43b8146d057e21fafb64 B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415 +B 9fc26998d89a9f7d04d3a57a97b4c09c745b076b B 9fce658c4611f790983a3d5cef7312eec8771461 B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9 B a04a1e06f7fffc5f145e33c6832f31b04782516b @@ -390,6 +393,7 @@ M 10b043faa0652a6a06f5f020173162edef7fb0ca M 12d070f4392316cdfff03eb41abe22531ed64ee9 M 16ffa0f10dac874cd5727d312ac56a78b13e5ca9 M 1701e6c8d4e794f25d69781e3f69357723ad7fcf +M 174bd11dcfeae47998723757542abe56c792cc76 M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04 M 1946e323a0df6e5f9748af82106cff39d7b5d01f M 19e912e8d4b6d3f3a4c2b88b1d53e691496d7dc0 @@ -464,6 +468,7 @@ M 7b31a2afca1ec599100511ce1f7428160618f389 M 7b4cb818cb6276dfd3a7432c796e67e98c8c941e M 7bf10fc3fb018d533409cc444c2d7b75144b9e23 M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6 +M 81f0b461d662eccd23ac5ade7349eecdc0316ddf M 824234e627f6205129b7f97e2fde7f1cf1f17093 M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5 M 88a7cd850f0471d6e51f9045bf01f775a905cbf2 @@ -501,6 +506,7 @@ M bd1d31f195caab56fbe565fbfb63d9170a0c9406 M bd7babd656fc06f3e5839bf11e186ec12fdeb6fa M bee82ba7d1766b555d965a75b3846ead4686239e M c1c75b039df7bd1ca9f11ff21f16593fed0c8c16 +M c322ba957e09c58ccef0fe25b382497b031fdc06 M c34bf7ad6bc55b6584dfd009f49a3f4eb8ececc9 M c55664128b1223667dedacc2011ccd5945d9c8b9 M c5dbb84ac4e5bf73555e85ae1e65a5065393c602
[4/9] cxf git commit: [CXF-6458] Start work on trying to "close" the Unmarshallers that implement closeable.
[CXF-6458] Start work on trying to "close" the Unmarshallers that implement
closeable.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/37d49fb3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/37d49fb3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/37d49fb3
Branch: refs/heads/3.0.x-fixes
Commit: 37d49fb307cc83c72d2c06b9711b0d523c921d5a
Parents: c780d3a
Author: Daniel Kulp
Authored: Fri Jun 19 15:21:20 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:26 2015 -0400
--
.../org/apache/cxf/common/jaxb/JAXBUtils.java | 50
.../AbstractBPBeanDefinitionParser.java | 7 ++-
.../jsse/TLSClientParametersConfig.java | 4 +-
.../spring/AbstractBeanDefinitionParser.java| 10 +++-
.../configuration/spring/JAXBBeanFactory.java | 4 +-
.../cxf/ws/addressing/VersionTransformer.java | 18 +--
.../org/apache/cxf/jaxb/io/DataReaderImpl.java | 31
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 13 +++--
.../cxf/jaxrs/provider/JAXBElementProvider.java | 4 +-
.../org/apache/cxf/jaxrs/utils/JAXBUtils.java | 16 ++-
.../handler/AnnotationHandlerChainBuilder.java | 4 +-
.../handler/logical/LogicalMessageImpl.java | 5 +-
.../handler/soap/SOAPMessageContextImpl.java| 5 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 18 +--
.../cxf/jaxrs/provider/json/JSONProvider.java | 4 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 5 +-
...ndpointReferenceDomainExpressionBuilder.java | 38 ++-
.../builder/jaxb/JaxbAssertionBuilder.java | 5 +-
.../apache/cxf/wsdl/JAXBExtensionHelper.java| 4 +-
.../internal/WSDiscoveryServiceImpl.java| 3 +-
20 files changed, 182 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/37d49fb3/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index d4b900e..fe3d2ed 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -21,6 +21,7 @@ package org.apache.cxf.common.jaxb;
import java.io.BufferedReader;
+import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -48,10 +49,12 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.PropertyException;
import javax.xml.bind.SchemaOutputResolver;
+import javax.xml.bind.Unmarshaller;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.attachment.AttachmentMarshaller;
import javax.xml.bind.attachment.AttachmentUnmarshaller;
@@ -59,6 +62,7 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Result;
+import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamResult;
@@ -164,6 +168,52 @@ public final class JAXBUtils {
private JAXBUtils() {
}
+public static void closeUnmarshaller(Unmarshaller u) {
+if (u instanceof Closeable) {
+//need to do this to clear the ThreadLocal cache
+//see https://java.net/jira/browse/JAXB-1000
+
+try {
+((Closeable)u).close();
+} catch (IOException e) {
+//ignore
+}
+}
+}
+public static Object unmarshall(JAXBContext c, Element e) throws
JAXBException {
+Unmarshaller u = c.createUnmarshaller();
+try {
+return u.unmarshal(e);
+} finally {
+closeUnmarshaller(u);
+}
+}
+public static JAXBElement unmarshall(JAXBContext c, Element e,
Class cls) throws JAXBException {
+Unmarshaller u = c.createUnmarshaller();
+try {
+return u.unmarshal(e, cls);
+} finally {
+closeUnmarshaller(u);
+}
+}
+public static Object unmarshall(JAXBContext c, Source s) throws
JAXBException {
+Unmarshaller u = c.createUnmarshaller();
+try {
+return u.unmarshal(s);
+} finally {
+closeUnmarshaller(u);
+}
+}
+public static JAXBElement unmarshall(JAXBContext c, XMLStreamReader
reader,
+Class cls) throws
JAXBException {
+Unmarshaller u = c.createUnmarshaller();
+try {
+ret
[6/9] cxf git commit: Eliminate eclipse warnings
Eliminate eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e4399939
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e4399939
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e4399939
Branch: refs/heads/3.0.x-fixes
Commit: e439993929afec2bf416b7a24596f52bd947f1f1
Parents: 37d49fb
Author: Daniel Kulp
Authored: Wed Jul 1 08:43:17 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:26 2015 -0400
--
core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java | 1 +
.../apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java| 1 +
.../apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java | 1 +
.../cxf/rs/security/saml/authorization/SubjectPrincipal.java | 2 ++
4 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e4399939/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
b/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
index eb5e957..1d39a5e 100644
--- a/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
+++ b/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
@@ -31,6 +31,7 @@ import java.util.Set;
*/
public class SimpleGroup extends SimplePrincipal implements Group {
+private static final long serialVersionUID = 1L;
private Set members = new HashSet();
public SimpleGroup(String groupName) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/e4399939/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index c23739b..b5994d6 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -218,6 +218,7 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
}
public static class KerberosPrincipal extends SimplePrincipal {
+private static final long serialVersionUID = 1L;
private String complexName;
public KerberosPrincipal(String simpleName, String complexName) {
super(simpleName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/e4399939/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index 0c32f55..7146679 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -61,6 +61,7 @@ public class JwtAuthenticationFilter extends
AbstractJoseJwtConsumer implements
this.jweOnly = jweOnly;
}
public static class JwtPrincipal extends SimplePrincipal {
+private static final long serialVersionUID = 1L;
private JwtToken jwt;
public JwtPrincipal(JwtToken jwt) {
super(jwt.getClaims().getSubject());
http://git-wip-us.apache.org/repos/asf/cxf/blob/e4399939/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SubjectPrincipal.java
--
diff --git
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SubjectPrincipal.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SubjectPrincipal.java
index 8ed3a90..cbeecf5 100644
---
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SubjectPrincipal.java
+++
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/authorization/SubjectPrincipal.java
@@ -22,6 +22,8 @@ import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.rs.security.saml.assertion.Subject;
public class SubjectPrincipal extends SimplePrincipal {
+private static final long serialVersionUID = 1L;
+
private Subject subject;
public SubjectPrincipal(String principalName, Subject subject) {
super(principalName);
[5/9] cxf git commit: [CXF-6217] Use faster method for parsing the strings from blueprint. (use StringReader instead of ByteArrayInputStream and use StaxUtils)
[CXF-6217] Use faster method for parsing the strings from blueprint. (use
StringReader instead of ByteArrayInputStream and use StaxUtils)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c898d66
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c898d66
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c898d66
Branch: refs/heads/3.0.x-fixes
Commit: 8c898d665163ed6710067893ce999ecbe2416249
Parents: 19e3be7
Author: Daniel Kulp
Authored: Wed Jul 1 10:12:06 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:26 2015 -0400
--
.../blueprint/JettyHTTPServerEngineFactoryHolder.java | 13 -
.../blueprint/NettyHttpServerEngineFactoryHolder.java | 13 +
2 files changed, 9 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8c898d66/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index 4f0d415..d54cc2f 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.transport.http_jetty.blueprint;
-import java.io.ByteArrayInputStream;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -31,7 +31,6 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Element;
@@ -41,6 +40,7 @@ import org.apache.cxf.common.util.PackageUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.jsse.TLSServerParameters;
import org.apache.cxf.configuration.jsse.TLSServerParametersConfig;
+import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
import org.apache.cxf.transport.http_jetty.ThreadingParameters;
@@ -71,13 +71,8 @@ public class JettyHTTPServerEngineFactoryHolder {
public void init() {
try {
-
-DocumentBuilderFactory docFactory =
DocumentBuilderFactory.newInstance();
-docFactory.setNamespaceAware(true);
-
-Element element = docFactory.newDocumentBuilder()
-.parse(new
ByteArrayInputStream(parsedElement.getBytes())).getDocumentElement();
-
+Element element = StaxUtils.read(new
StringReader(parsedElement)).getDocumentElement();
+
JettyHTTPServerEngineFactoryConfigType config
= (JettyHTTPServerEngineFactoryConfigType)
getJaxbObject(element,
JettyHTTPServerEngineFactoryConfigType.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8c898d66/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
--
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
index 00786db..7700949 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
@@ -18,7 +18,7 @@
*/
package org.apache.cxf.transport.http.netty.server.blueprint;
-import java.io.ByteArrayInputStream;
+import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -26,11 +26,12 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.logging.Logger;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import javax.xml.parsers.DocumentBuilderFactory;
+
import org.w3c.dom.Elemen
[1/9] cxf git commit: [CXF-6217] More updates to use secure processing
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes c780d3a6a -> 2d6414108
[CXF-6217] More updates to use secure processing
# Conflicts:
#
rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/70591bf2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/70591bf2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/70591bf2
Branch: refs/heads/3.0.x-fixes
Commit: 70591bf2091e0406346f8afecb2f10f0e9168566
Parents: 8c898d6
Author: Daniel Kulp
Authored: Wed Jul 1 12:44:55 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:20:26 2015 -0400
--
.../jaxrs/provider/atom/AtomPojoProvider.java | 4 +-
.../org/apache/cxf/wsn/jms/JmsPullPoint.java| 7 ++-
.../org/apache/cxf/wsn/jms/JmsSubscription.java | 12 ++--
.../common/dom/ExtendedDocumentBuilder.java | 43 +++--
.../cxf/tools/common/toolspec/ToolSpec.java | 6 +-
.../toolspec/parser/CommandLineParserTest.java | 8 ++-
.../validator/internal/SchemaValidator.java | 5 +-
.../tools/validator/internal/ValidatorUtil.java | 2 +
.../cxf/tools/wsdlto/core/PluginLoader.java | 25 ++--
.../databinding/jaxb/NamespaceContextImpl.java | 65
10 files changed, 75 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/70591bf2/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
index c1c7237..0a31633 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/atom/AtomPojoProvider.java
@@ -670,9 +670,7 @@ public class AtomPojoProvider extends
AbstractConfigurableProvider
reportError("Object of type " + cls.getName() + " can not be
deserialized from Entry", ex, 400);
} finally {
try {
-if (xreader != null) {
-StaxUtils.close(xreader);
-}
+StaxUtils.close(xreader);
} catch (XMLStreamException e) {
//ignore
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/70591bf2/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
--
diff --git
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
index 1ac5c00..92d50ae 100644
---
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
+++
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPullPoint.java
@@ -35,6 +35,7 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.common.logging.LogUtils;
@@ -124,7 +125,11 @@ public class JmsPullPoint extends AbstractPullPoint {
StringReader reader = new StringReader(txtMsg.getText());
XMLStreamReader xreader =
StaxUtils.createXMLStreamReader(reader);
Notify notify = (Notify)
jaxbContext.createUnmarshaller().unmarshal(xreader);
-reader.close();
+try {
+xreader.close();
+} catch (XMLStreamException e) {
+//ignoreable
+}
messages.addAll(notify.getNotificationMessage());
}
return messages;
http://git-wip-us.apache.org/repos/asf/cxf/blob/70591bf2/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
--
diff --git
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
index a7e539e..6420400 100644
---
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
+++
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsSubscription.java
@@ -31,10 +31,10 @@ import javax.jms.MessageListener;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
+import javax.xml.XMLConstants;
import ja
cxf git commit: Support the ability to store BASE-64 encoded (encryption) bytes in message attachments
Repository: cxf
Updated Branches:
refs/heads/master 9bd52f477 -> f399b9290
Support the ability to store BASE-64 encoded (encryption) bytes in message
attachments
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f399b929
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f399b929
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f399b929
Branch: refs/heads/master
Commit: f399b9290e42726e30333f261d8d7f6abc4768cc
Parents: 9bd52f4
Author: Colm O hEigeartaigh
Authored: Thu Jul 9 17:09:12 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Thu Jul 9 17:09:34 2015 +0100
--
.../cxf/ws/security/SecurityConstants.java | 11 ++-
.../policyhandlers/AbstractBindingBuilder.java | 22 ++
.../AsymmetricBindingHandler.java | 5 ++
.../policyhandlers/SymmetricBindingHandler.java | 4 ++
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 51 +-
.../cxf/systest/ws/mtom/DoubleItMtom.wsdl | 71
.../org/apache/cxf/systest/ws/mtom/client.xml | 43 +++-
.../org/apache/cxf/systest/ws/mtom/server.xml | 38 +++
8 files changed, 241 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f399b929/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index e5e7d9c..28702ad 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -115,6 +115,14 @@ public final class SecurityConstants extends
org.apache.cxf.rt.security.Security
* else that a SAML action has been configured for the non-security-policy
case.
*/
public static final String ENABLE_SAML_ONE_TIME_USE_CACHE =
"ws-security.enable.saml.cache";
+
+/**
+ * Whether to store bytes (CipherData or BinarySecurityToken) in an
attachment. The default is
+ * true if MTOM is enabled. Set it to false to BASE-64 encode the bytes
and "inlined" them in
+ * the message instead. Setting this to true is more efficient, as it
means that the BASE-64
+ * encoding step can be skipped. This only applies to the DOM WS-Security
stack.
+ */
+public static final String STORE_BYTES_IN_ATTACHMENT =
"ws-security.store.bytes.in.attachment";
//
// Non-boolean WS-Security Configuration parameters
@@ -509,7 +517,8 @@ public final class SecurityConstants extends
org.apache.cxf.rt.security.Security
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT,
PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM,
STS_TOKEN_IMMINENT_EXPIRY_VALUE,
-KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP
+KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP,
+STORE_BYTES_IN_ATTACHMENT
}));
for (String commonProperty : COMMON_PROPERTIES) {
s.add(commonProperty);
http://git-wip-us.apache.org/repos/asf/cxf/blob/f399b929/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 f9b9348..3d910b1 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
@@ -51,6 +51,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.cxf.attachment.AttachmentUtil;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.saaj.SAAJUtils;
import org.apache.cxf.common.logging.LogUtils;
@@ -115,6 +116,7 @@ import org.apache.wss4j.policy.SPConstants.IncludeTokenType;
import org.apache.wss4j.policy.model.AbstractBinding;
import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding;
+import
org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding.ProtectionOrder;
import org.apache.wss4j.policy.model.AbstractToken;
import org.apache.wss4j.policy.model.Abstrac
cxf-xjc-utils git commit: Fix typo causing generation problem
Repository: cxf-xjc-utils
Updated Branches:
refs/heads/master 92ab73fd7 -> cc9f48c53
Fix typo causing generation problem
Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/cc9f48c5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/cc9f48c5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/cc9f48c5
Branch: refs/heads/master
Commit: cc9f48c53e4b75a200d31bd951c93cabb30baa91
Parents: 92ab73f
Author: Daniel Kulp
Authored: Thu Jul 9 12:07:15 2015 -0400
Committer: Daniel Kulp
Committed: Thu Jul 9 12:07:15 2015 -0400
--
bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/cc9f48c5/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
--
diff --git a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
index 7120355..fcc2018 100644
--- a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
+++ b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
@@ -84,7 +84,7 @@ public class Bug986Plugin {
if (sw.toString().equals("\"anySimpleType\"")) {
if
(field.type().fullName().startsWith("java.util.List")) {
//if it's a list of non-string types, we have
to remove
-if
(!!field.type().fullName().contains("")) {
+if
(!field.type().fullName().contains("")) {
toRemove.add(j);
}
} else if
(!"java.lang.String".equals(field.type().fullName())) {
[1/2] cxf git commit: untabify all pom.xml
Repository: cxf
Updated Branches:
refs/heads/master fc14aa86a -> 9bd52f477
http://git-wip-us.apache.org/repos/asf/cxf/blob/9bd52f47/services/xkms/xkms-x509-repo-ldap/pom.xml
--
diff --git a/services/xkms/xkms-x509-repo-ldap/pom.xml
b/services/xkms/xkms-x509-repo-ldap/pom.xml
index 6cdca61..2616e50 100644
--- a/services/xkms/xkms-x509-repo-ldap/pom.xml
+++ b/services/xkms/xkms-x509-repo-ldap/pom.xml
@@ -1,5 +1,5 @@
http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- 4.0.0
+4.0.0
org.apache.cxf
cxf-parent
@@ -7,28 +7,28 @@
../../../parent/pom.xml
org.apache.cxf.services.xkms
- cxf-services-xkms-x509-repo-ldap
+cxf-services-xkms-x509-repo-ldap
bundle
Apache CXF XKMS LDAP repository
http://cxf.apache.org
-
-
- org.apache.cxf.services.xkms
- cxf-services-xkms-common
- ${project.version}
-
+
+
+org.apache.cxf.services.xkms
+cxf-services-xkms-common
+${project.version}
+
-
- junit
- junit
- test
-
-
- org.easymock
- easymock
- test
-
-
-
+
+junit
+junit
+test
+
+
+org.easymock
+easymock
+test
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/9bd52f47/systests/jibx/databinding-jibx/pom.xml
--
diff --git a/systests/jibx/databinding-jibx/pom.xml
b/systests/jibx/databinding-jibx/pom.xml
index d221f3f..689f80c 100644
--- a/systests/jibx/databinding-jibx/pom.xml
+++ b/systests/jibx/databinding-jibx/pom.xml
@@ -124,39 +124,39 @@
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
-
org.jibx
-
-
maven-jibx-plugin
-
-
-
[1.2.5,)
-
-
-
test-bind
-
-
-
-
+
+
+
+org.eclipse.m2e
+lifecycle-mapping
+1.0.0
+
+
+
+
+
+org.jibx
+
+maven-jibx-plugin
+
+
+[1.2.5,)
+
+
+test-bind
+
+
+
+
false
-
-
-
-
-
-
-
+
[2/2] cxf git commit: untabify all pom.xml
untabify all pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9bd52f47
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9bd52f47
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9bd52f47
Branch: refs/heads/master
Commit: 9bd52f477b0063dfd06b98eeb59c19c5732be1d4
Parents: fc14aa8
Author: Akitoshi Yoshida
Authored: Thu Jul 9 15:43:09 2015 +0200
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 15:43:09 2015 +0200
--
core/pom.xml| 2 +-
distribution/javadoc/pom.xml| 66 ++--
.../samples/jax_rs/jaxrs_spring_boot/pom.xml| 206 ++---
.../main/release/samples/jax_rs/search/pom.xml | 14 +-
.../samples/jax_rs/spring_security/pom.xml | 2 +-
.../samples/jax_rs/tracing_htrace/pom.xml | 2 +-
.../release/samples/jaxws_spring_boot/pom.xml | 138 -
.../src/main/release/samples/logbrowser/pom.xml | 76 ++---
integration/cdi/pom.xml | 8 +-
osgi/bundle/compatible/pom.xml | 108 +++
osgi/itests-felix/pom.xml | 182 +--
osgi/itests/pom.xml | 100 +++---
pom.xml | 56 ++--
rt/features/clustering/pom.xml | 2 +-
rt/management-web/pom.xml | 86 +++---
rt/rs/client/pom.xml| 10 +-
rt/rs/extensions/search/pom.xml | 24 +-
rt/transports/http-hc/pom.xml | 2 +-
rt/transports/http-netty/netty-server/pom.xml | 4 +-
rt/transports/http/pom.xml | 66 ++--
rt/transports/jms/pom.xml | 306 +--
rt/ws/addr/pom.xml | 2 +-
rt/ws/policy/pom.xml| 2 +-
rt/ws/rm/pom.xml| 2 +-
services/ws-discovery/ws-discovery-api/pom.xml | 10 +-
services/xkms/xkms-itests/pom.xml | 82 ++---
services/xkms/xkms-service/pom.xml | 12 +-
services/xkms/xkms-x509-handlers/pom.xml| 12 +-
services/xkms/xkms-x509-repo-ldap/pom.xml | 40 +--
systests/jibx/databinding-jibx/pom.xml | 62 ++--
systests/jibx/jaxrs-jibx/pom.xml| 64 ++--
systests/wsdl_maven/java2ws/pom.xml | 66 ++--
testutils/pom.xml | 64 ++--
tools/validator/pom.xml | 18 +-
34 files changed, 948 insertions(+), 948 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/9bd52f47/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index 921b296..fbf10da 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -374,7 +374,7 @@
${cxf.osgi.dynamic.import}
- ${cxf.export.service}
+${cxf.export.service}
${cxf.bundle.activator}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9bd52f47/distribution/javadoc/pom.xml
--
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index f40ebab..c54dcc5 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -485,39 +485,39 @@
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
-
-
org.apache.maven.plugins
-
-
-
maven-antrun-plugin
-
-
-
[1.7,)
-
-
cxf git commit: [CXF-6491] Avoiding listing all the representation media types if a method is generated per every request representation
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 963f56b26 -> c780d3a6a
[CXF-6491] Avoiding listing all the representation media types if a method is
generated per every request representation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c780d3a6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c780d3a6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c780d3a6
Branch: refs/heads/3.0.x-fixes
Commit: c780d3a6acbccbb93ddbff03f946b1a782972e5c
Parents: 963f56b
Author: Sergey Beryozkin
Authored: Thu Jul 9 14:24:51 2015 +0100
Committer: Sergey Beryozkin
Committed: Thu Jul 9 14:29:07 2015 +0100
--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 28 +++-
.../jaxrs/src/test/resources/wadl/bookstore.xml | 2 +-
2 files changed, 16 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c780d3a6/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index a3a24c5..2d4bed0 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -217,7 +217,7 @@ public class SourceGenerator {
private Map schemaTypeMap = Collections.emptyMap();
private Map mediaTypesMap = Collections.emptyMap();
private Bus bus;
-private boolean supportMultipleXmlReps;
+private boolean supportMultipleRepsWithElements;
private boolean validateWadl;
private SchemaCollection schemaCollection = new SchemaCollection();
private String encoding;
@@ -231,7 +231,7 @@ public class SourceGenerator {
}
public void setSupportMultipleXmlReps(boolean support) {
-supportMultipleXmlReps = support;
+supportMultipleRepsWithElements = support;
}
public void setWadlNamespace(String ns) {
@@ -688,7 +688,7 @@ public class SourceGenerator {
List requestEls = getWadlElements(methodEl, "request");
Element firstRequestEl = requestEls.size() >= 1 ? requestEls.get(0) :
null;
List allRequestReps = getWadlElements(firstRequestEl,
"representation");
-List xmlRequestReps = getXmlReps(allRequestReps,
info.getGrammarInfo());
+List requestRepsWithElements =
getRepsWithElements(allRequestReps, info.getGrammarInfo());
final String methodNameLowerCase =
methodEl.getAttribute("name").toLowerCase();
String id = methodEl.getAttribute("id");
@@ -699,17 +699,19 @@ public class SourceGenerator {
final boolean suspendedAsync = responseRequired ? false
: isMethodMatched(suspendedAsyncMethods, methodNameLowerCase, id);
-boolean jaxpSourceRequired = xmlRequestReps.size() > 1 &&
!supportMultipleXmlReps;
-int numOfMethods = jaxpSourceRequired ? 1 : xmlRequestReps.size();
+boolean jaxpSourceRequired = requestRepsWithElements.size() > 1 &&
!supportMultipleRepsWithElements;
+int numOfMethods = jaxpSourceRequired ? 1 :
requestRepsWithElements.size();
for (int i = 0; i < numOfMethods; i++) {
-Element inXmlRep = xmlRequestReps.get(i);
-
+List requestReps = allRequestReps;
+
+Element requestRepWithElement = requestRepsWithElements.get(i);
String suffixName = "";
-if (!jaxpSourceRequired && inXmlRep != null &&
xmlRequestReps.size() > 1) {
-String value = inXmlRep.getAttribute("element");
+if (!jaxpSourceRequired && requestRepWithElement != null &&
requestRepsWithElements.size() > 1) {
+String value = requestRepWithElement.getAttribute("element");
int index = value.indexOf(":");
suffixName = value.substring(index + 1).replace("-", "");
+requestReps = Collections.singletonList(requestRepWithElement);
}
if (writeAnnotations(info.isInterfaceGenerated())) {
sbCode.append(TAB);
@@ -721,7 +723,7 @@ public class SourceGenerator {
} else {
// TODO : write a custom annotation class name based
on HttpMethod
}
-writeFormatAnnotations(allRequestReps, sbCode, imports,
true);
+writeFormatAnnotations(requestReps, sbCode, imports, true);
writeFormatAnnotations(getWadlElements(getOKResponse(responseEls
cxf git commit: [CXF-6491] Avoiding listing all the representation media types if a method is generated per every request representation
Repository: cxf
Updated Branches:
refs/heads/master 5081ed089 -> fc14aa86a
[CXF-6491] Avoiding listing all the representation media types if a method is
generated per every request representation
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fc14aa86
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fc14aa86
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fc14aa86
Branch: refs/heads/master
Commit: fc14aa86aae6a496e9461b95493af00b63b5e506
Parents: 5081ed0
Author: Sergey Beryozkin
Authored: Thu Jul 9 14:24:51 2015 +0100
Committer: Sergey Beryozkin
Committed: Thu Jul 9 14:24:51 2015 +0100
--
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 28 +++-
.../jaxrs/src/test/resources/wadl/bookstore.xml | 2 +-
2 files changed, 16 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/fc14aa86/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
--
diff --git
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 44aeda4..d74204b 100644
---
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -217,7 +217,7 @@ public class SourceGenerator {
private Map schemaTypeMap = Collections.emptyMap();
private Map mediaTypesMap = Collections.emptyMap();
private Bus bus;
-private boolean supportMultipleXmlReps;
+private boolean supportMultipleRepsWithElements;
private boolean validateWadl;
private SchemaCollection schemaCollection = new SchemaCollection();
private String encoding;
@@ -231,7 +231,7 @@ public class SourceGenerator {
}
public void setSupportMultipleXmlReps(boolean support) {
-supportMultipleXmlReps = support;
+supportMultipleRepsWithElements = support;
}
public void setWadlNamespace(String ns) {
@@ -688,7 +688,7 @@ public class SourceGenerator {
List requestEls = getWadlElements(methodEl, "request");
Element firstRequestEl = requestEls.size() >= 1 ? requestEls.get(0) :
null;
List allRequestReps = getWadlElements(firstRequestEl,
"representation");
-List xmlRequestReps = getXmlReps(allRequestReps,
info.getGrammarInfo());
+List requestRepsWithElements =
getRepsWithElements(allRequestReps, info.getGrammarInfo());
final String methodNameLowerCase =
methodEl.getAttribute("name").toLowerCase();
String id = methodEl.getAttribute("id");
@@ -699,17 +699,19 @@ public class SourceGenerator {
final boolean suspendedAsync = responseRequired ? false
: isMethodMatched(suspendedAsyncMethods, methodNameLowerCase, id);
-boolean jaxpSourceRequired = xmlRequestReps.size() > 1 &&
!supportMultipleXmlReps;
-int numOfMethods = jaxpSourceRequired ? 1 : xmlRequestReps.size();
+boolean jaxpSourceRequired = requestRepsWithElements.size() > 1 &&
!supportMultipleRepsWithElements;
+int numOfMethods = jaxpSourceRequired ? 1 :
requestRepsWithElements.size();
for (int i = 0; i < numOfMethods; i++) {
-Element inXmlRep = xmlRequestReps.get(i);
-
+List requestReps = allRequestReps;
+
+Element requestRepWithElement = requestRepsWithElements.get(i);
String suffixName = "";
-if (!jaxpSourceRequired && inXmlRep != null &&
xmlRequestReps.size() > 1) {
-String value = inXmlRep.getAttribute("element");
+if (!jaxpSourceRequired && requestRepWithElement != null &&
requestRepsWithElements.size() > 1) {
+String value = requestRepWithElement.getAttribute("element");
int index = value.indexOf(":");
suffixName = value.substring(index + 1).replace("-", "");
+requestReps = Collections.singletonList(requestRepWithElement);
}
if (writeAnnotations(info.isInterfaceGenerated())) {
sbCode.append(TAB);
@@ -721,7 +723,7 @@ public class SourceGenerator {
} else {
// TODO : write a custom annotation class name based
on HttpMethod
}
-writeFormatAnnotations(allRequestReps, sbCode, imports,
true);
+writeFormatAnnotations(requestReps, sbCode, imports, true);
writeFormatAnnotations(getWadlElements(getOKResponse(responseEls),
"repre
[3/6] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar. Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/068c2916 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/068c2916 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/068c2916 Branch: refs/heads/3.0.x-fixes Commit: 068c2916f8c7f74e5f3154c43775be74fdad5816 Parents: b2794a4 Author: reta Authored: Sun Nov 2 17:29:55 2014 -0500 Committer: Akitoshi Yoshida Committed: Thu Jul 9 13:51:22 2015 +0200 -- .../samples/jax_rs/description_swagger/pom.xml | 23 1 file changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/068c2916/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml index 541ec01..0e60fd4 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml @@ -108,20 +108,25 @@ provided + org.webjars + swagger-ui + 2.0.24 + + javassist javassist 3.12.1.GA - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.2.2 - - -com.fasterxml.jackson.core - jackson-core - 2.2.2 - + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.2.2 + + + com.fasterxml.jackson.core + jackson-core + 2.2.2 + org.apache.cxf cxf-rt-transports-http
[1/6] cxf git commit: [CXF-6476] Introduce Swagger 2.0 API to the swagger feature
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ae551918a -> 963f56b26
[CXF-6476] Introduce Swagger 2.0 API to the swagger feature
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d6e891a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d6e891a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d6e891a
Branch: refs/heads/3.0.x-fixes
Commit: 6d6e891add8ffa7204dd38cbc4dacea01c8b4bb0
Parents: ae55191
Author: Akitoshi Yoshida
Authored: Fri Jul 3 12:15:10 2015 +0200
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 13:39:19 2015 +0200
--
.../jax_rs/description_swagger2/README.txt | 23 +++
.../samples/jax_rs/description_swagger2/pom.xml | 163 +++
.../java/demo/jaxrs/swagger/server/Item.java| 49 ++
.../java/demo/jaxrs/swagger/server/Sample.java | 130 +++
.../java/demo/jaxrs/swagger/server/Server.java | 74 +
.../META-INF/cxf/org.apache.cxf.Logger | 1 +
.../webjars/swagger-ui/2.1.0/index.html | 84 ++
.../src/main/resources/logback.xml | 16 ++
parent/pom.xml | 25 +--
rt/rs/description/pom.xml | 5 +
.../jaxrs/swagger/AbstractSwaggerFeature.java | 128 +++
.../cxf/jaxrs/swagger/Swagger2Feature.java | 107
.../cxf/jaxrs/swagger/SwaggerFeature.java | 103 +---
13 files changed, 799 insertions(+), 109 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d6e891a/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
b/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
new file mode 100644
index 000..0ceee5b
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger2/README.txt
@@ -0,0 +1,23 @@
+JAX-RS Search Demo
+=
+
+The demo shows a basic usage of Swagger API documentation with REST based Web
Services using
+JAX-RS 2.0 (JSR-339). Swagger UI is available at: http://localhost:9000/
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo.
+
+
+Using either UNIX or Windows:
+
+ mvn install
+ mvn -Pserver (from one command line window)
+
+
+To remove the target dir, run mvn clean".
+
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d6e891a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
new file mode 100644
index 000..2f102cf
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/pom.xml
@@ -0,0 +1,163 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+jax_rs_description_swagger2
+JAX-RS Swagger Demo
+JAX-RS Basic Demo
+
+org.apache.cxf.samples
+cxf-samples
+3.0.6-SNAPSHOT
+../..
+
+
+
+${project.version}
+3.1
+
+
+
+
+server
+
+test
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+test
+
+java
+
+
+
demo.jaxrs.swagger.server.Server
+
+
+
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-dependency-plugin
+2.9
+
+
+generate-resources
+
+unpack
+
+
+
+
+org.webjars
+swagger-ui
+2.1.0
+
[6/6] cxf git commit: checkstyle alignment
checkstyle alignment
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/963f56b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/963f56b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/963f56b2
Branch: refs/heads/3.0.x-fixes
Commit: 963f56b262ac7050b899cb3b0f9a1110926ea984
Parents: d3fc418
Author: Akitoshi Yoshida
Authored: Thu Jul 9 14:08:56 2015 +0200
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 14:10:42 2015 +0200
--
.../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/963f56b2/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index d2b7649..9b4bcc9 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -63,7 +63,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
}
providers.add(new SwaggerSerializers());
((ServerProviderFactory)server.getEndpoint().get(
-
ServerProviderFactory.class.getName())).setUserProviders(providers);
+
ServerProviderFactory.class.getName())).setUserProviders(providers);
BeanConfig beanConfig = new BeanConfig();
beanConfig.setResourcePackage(getResourcePackage());
[4/6] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced
embedded Swagger UI with webjar.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4d4ddf08
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4d4ddf08
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4d4ddf08
Branch: refs/heads/3.0.x-fixes
Commit: 4d4ddf080feef80f7cf9b6db4ce245ed6badbbf2
Parents: 068c291
Author: reta
Authored: Sun Nov 2 17:36:24 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 13:52:00 2015 +0200
--
.../src/main/java/demo/jaxrs/swagger/server/Server.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4d4ddf08/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index 536c6a6..7d5fbb2 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -42,7 +42,8 @@ public class Server {
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
context.addServlet(servletHolder, "/*");
-
context.setResourceBase(getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
+context.setResourceBase(
+
getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
servletHolder.setInitParameter("redirects-list", "/ /index.html
/.*[.]js /css/.* /images/.* lib/.*");
servletHolder.setInitParameter("redirect-servlet-name",
staticHolder.getName());
[5/6] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Fixed test cases (systests)
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Fixed test
cases (systests)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d3fc4186
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d3fc4186
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d3fc4186
Branch: refs/heads/3.0.x-fixes
Commit: d3fc4186ad97df724c2eb8c490c622e077dcb35e
Parents: 4d4ddf0
Author: reta
Authored: Wed Jan 7 09:13:03 2015 -0800
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 14:09:49 2015 +0200
--
systests/jaxrs/pom.xml | 6 ++
.../AbstractSwaggerServiceDescriptionTest.java | 17 +
2 files changed, 15 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3fc4186/systests/jaxrs/pom.xml
--
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 6564e02..808ee0e 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -497,6 +497,12 @@
+org.skyscreamer
+jsonassert
+1.2.3
+test
+
+
org.atmosphere
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3fc4186/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 570b99f..723f680 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
@@ -39,8 +39,7 @@ import
org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.junit.Ignore;
import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.equalTo;
+import org.skyscreamer.jsonassert.JSONAssert;
public abstract class AbstractSwaggerServiceDescriptionTest extends
AbstractBusClientServerTestBase {
private static final JsonObject DELETE_METHOD_SPEC =
Json.createObjectBuilder()
@@ -165,8 +164,9 @@ public abstract class AbstractSwaggerServiceDescriptionTest
extends AbstractBusC
final Response r = client.get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
-
assertThat(IOUtils.readStringFromStream((InputStream)r.getEntity()),
-equalTo(Json.createObjectBuilder()
+JSONAssert.assertEquals(
+IOUtils.readStringFromStream((InputStream)r.getEntity()),
+Json.createObjectBuilder()
.add("apiVersion", "1.0.0")
.add("swaggerVersion", "1.2")
.add("apis", Json.createArrayBuilder()
@@ -181,7 +181,7 @@ public abstract class AbstractSwaggerServiceDescriptionTest
extends AbstractBusC
.add("contact", "commit...@apache.org")
.add("license", "Apache 2.0 License")
.add("licenseUrl",
"http://www.apache.org/licenses/LICENSE-2.0.html";)
-).build().toString()));
+).build().toString(), false);
} finally {
client.close();
}
@@ -195,8 +195,9 @@ public abstract class AbstractSwaggerServiceDescriptionTest
extends AbstractBusC
final Response r = client.get();
assertEquals(Status.OK.getStatusCode(), r.getStatus());
-
assertThat(IOUtils.readStringFromStream((InputStream)r.getEntity()),
-equalTo(Json.createObjectBuilder()
+JSONAssert.assertEquals(
+IOUtils.readStringFromStream((InputStream)r.getEntity()),
+Json.createObjectBuilder()
.add("apiVersion", "1.0.0")
.add("swaggerVersion", "1.2")
.add("basePath", "http://localhost:"; + getPort() + "/")
@@ -210,7 +211,7 @@ public abstract class AbstractSwaggerServiceDescriptionTest
extends AbstractBusC
.add(Json.createObjectBuilder()
.add("path", "/bookstore")
.add("operations",
Json.createArrayBuilder().add(GET_METHOD_SPEC
-.add("models", BOOK_MODEL_SPEC).build().toString()));
+.add("models", BOOK_MODEL_SPEC).build().toStrin
[2/6] cxf git commit: [CXF-6476] adding systests
[CXF-6476] adding systests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2794a49
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2794a49
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2794a49
Branch: refs/heads/3.0.x-fixes
Commit: b2794a49b4b7a88f7da3d940c08ee86d51661c7c
Parents: 6d6e891
Author: Akitoshi Yoshida
Authored: Wed Jul 8 19:22:57 2015 +0200
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 13:40:26 2015 +0200
--
.../cxf/jaxrs/swagger/Swagger2Feature.java | 19 +---
systests/jaxrs/pom.xml | 12 ++
.../AbstractSwagger2ServiceDescriptionTest.java | 113 +++
.../jaxrs/description/BookStoreSwagger2.java| 82 ++
.../Swagger2FilterServiceDescriptionTest.java | 45
.../Swagger2RegularServiceDescriptionTest.java | 45
.../systest/jaxrs/description/swagger2-json.txt | 52 +
7 files changed, 355 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2794a49/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index d21c559..d2b7649 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -44,9 +44,9 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
@Override
protected void addSwaggerResource(Server server) {
-ApiListingResource apiListingResource = new ApiListingResource();
if (!runAsFilter) {
List serviceBeans = new ArrayList();
+ApiListingResource apiListingResource = new ApiListingResource();
serviceBeans.add(apiListingResource);
JAXRSServiceFactoryBean sfb =
(JAXRSServiceFactoryBean)server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName());
@@ -59,11 +59,11 @@ public class Swagger2Feature extends AbstractSwaggerFeature
{
}
List providers = new ArrayList();
if (runAsFilter) {
-providers.add(new
SwaggerContainerRequestFilter(apiListingResource));
+providers.add(new SwaggerContainerRequestFilter());
}
providers.add(new SwaggerSerializers());
((ServerProviderFactory)server.getEndpoint().get(
-
ServerProviderFactory.class.getName())).setUserProviders(providers);
+
ServerProviderFactory.class.getName())).setUserProviders(providers);
BeanConfig beanConfig = new BeanConfig();
beanConfig.setResourcePackage(getResourcePackage());
@@ -78,30 +78,23 @@ public class Swagger2Feature extends AbstractSwaggerFeature
{
}
@PreMatching
-private static class SwaggerContainerRequestFilter implements
ContainerRequestFilter {
+private static class SwaggerContainerRequestFilter extends
ApiListingResource implements ContainerRequestFilter {
private static final String APIDOCS_LISTING_PATH_JSON = "swagger.json";
private static final String APIDOCS_LISTING_PATH_YAML = "swagger.yaml";
-private ApiListingResource apiListingResource;
@Context
private MessageContext mc;
-public SwaggerContainerRequestFilter(ApiListingResource
apiListingResource) {
-this.apiListingResource = apiListingResource;
-}
@Override
public void filter(ContainerRequestContext requestContext) throws
IOException {
UriInfo ui = mc.getUriInfo();
if (ui.getPath().endsWith(APIDOCS_LISTING_PATH_JSON)) {
-Response r =
-apiListingResource.getListingJson(null,
mc.getServletConfig(), mc.getHttpHeaders(), ui);
+Response r = getListingJson(null, mc.getServletConfig(),
mc.getHttpHeaders(), ui);
requestContext.abortWith(r);
} else if (ui.getPath().endsWith(APIDOCS_LISTING_PATH_YAML)) {
-Response r =
-apiListingResource.getListingYaml(null,
mc.getServletConfig(), mc.getHttpHeaders(), ui);
+Response r = getListingYaml(null, mc.getServletConfig(),
mc.getHttpHeaders(), ui);
requestContext.abortWith(r);
}
}
-
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2794a49/systests/jaxrs/pom.xml
--
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index ba64f50.
cxf git commit: checkstyle alignment
Repository: cxf
Updated Branches:
refs/heads/master 4c4ef0dd2 -> 5081ed089
checkstyle alignment
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5081ed08
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5081ed08
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5081ed08
Branch: refs/heads/master
Commit: 5081ed089504265a8fb099b2fe08f1620a36682a
Parents: 4c4ef0d
Author: Akitoshi Yoshida
Authored: Thu Jul 9 14:08:56 2015 +0200
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 14:09:16 2015 +0200
--
.../main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5081ed08/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
index d2b7649..9b4bcc9 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/Swagger2Feature.java
@@ -63,7 +63,7 @@ public class Swagger2Feature extends AbstractSwaggerFeature {
}
providers.add(new SwaggerSerializers());
((ServerProviderFactory)server.getEndpoint().get(
-
ServerProviderFactory.class.getName())).setUserProviders(providers);
+
ServerProviderFactory.class.getName())).setUserProviders(providers);
BeanConfig beanConfig = new BeanConfig();
beanConfig.setResourcePackage(getResourcePackage());
[5/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
deleted file mode 100644
index 74d0816..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
+++ /dev/null
@@ -1,2765 +0,0 @@
-var require = function (file, cwd) {
-var resolved = require.resolve(file, cwd || '/');
-var mod = require.modules[resolved];
-if (!mod) throw new Error(
-'Failed to resolve module ' + file + ', tried ' + resolved
-);
-var res = mod._cached ? mod._cached : mod();
-return res;
-}
-
-require.paths = [];
-require.modules = {};
-require.extensions = [".js",".coffee"];
-
-require._core = {
-'assert': true,
-'events': true,
-'fs': true,
-'path': true,
-'vm': true
-};
-
-require.resolve = (function () {
-return function (x, cwd) {
-if (!cwd) cwd = '/';
-
-if (require._core[x]) return x;
-var path = require.modules.path();
-var y = cwd || '.';
-
-if (x.match(/^(?:\.\.?\/|\/)/)) {
-var m = loadAsFileSync(path.resolve(y, x))
-|| loadAsDirectorySync(path.resolve(y, x));
-if (m) return m;
-}
-
-var n = loadNodeModulesSync(x, y);
-if (n) return n;
-
-throw new Error("Cannot find module '" + x + "'");
-
-function loadAsFileSync (x) {
-if (require.modules[x]) {
-return x;
-}
-
-for (var i = 0; i < require.extensions.length; i++) {
-var ext = require.extensions[i];
-if (require.modules[x + ext]) return x + ext;
-}
-}
-
-function loadAsDirectorySync (x) {
-x = x.replace(/\/+$/, '');
-var pkgfile = x + '/package.json';
-if (require.modules[pkgfile]) {
-var pkg = require.modules[pkgfile]();
-var b = pkg.browserify;
-if (typeof b === 'object' && b.main) {
-var m = loadAsFileSync(path.resolve(x, b.main));
-if (m) return m;
-}
-else if (typeof b === 'string') {
-var m = loadAsFileSync(path.resolve(x, b));
-if (m) return m;
-}
-else if (pkg.main) {
-var m = loadAsFileSync(path.resolve(x, pkg.main));
-if (m) return m;
-}
-}
-
-return loadAsFileSync(x + '/index');
-}
-
-function loadNodeModulesSync (x, start) {
-var dirs = nodeModulesPathsSync(start);
-for (var i = 0; i < dirs.length; i++) {
-var dir = dirs[i];
-var m = loadAsFileSync(dir + '/' + x);
-if (m) return m;
-var n = loadAsDirectorySync(dir + '/' + x);
-if (n) return n;
-}
-
-var m = loadAsFileSync(x);
-if (m) return m;
-}
-
-function nodeModulesPathsSync (start) {
-var parts;
-if (start === '/') parts = [ '' ];
-else parts = path.normalize(start).split('/');
-
-var dirs = [];
-for (var i = parts.length - 1; i >= 0; i--) {
-if (parts[i] === 'node_modules') continue;
-var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
-dirs.push(dir);
-}
-
-return dirs;
-}
-};
-})();
-
-require.alias = function (from, to) {
-var path = require.modules.path();
-var res = null;
-try {
-res = require.resolve(from + '/package.json', '/');
-}
-catch (err) {
-res = require.resolve(from, '/');
-}
-var basedir = path.dirname(res);
-
-var keys = (Object.keys || function (obj) {
-var res = [];
-for (var key in obj) res.push(key)
-return res;
-})(require.modules);
-
-for (var i = 0; i < keys.length; i++) {
-var key = keys[i];
-if (key.slice(0, basedir.length + 1) === basedir + '/') {
-var f = key.slice(basedir.length);
-require.modules[to + f] = require.modules[basedir + f];
-}
-else if (key === basedir) {
-require.modules[to] = require.modules[basedir];
-}
-}
-};
-
-require.define = function (filename, fn) {
-var dirname = require._co
[3/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
deleted file mode 100644
index 20b5ed2..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
+++ /dev/null
@@ -1,1678 +0,0 @@
-// swagger.js
-// version 2.0.41
-
-(function () {
-
- var __bind = function (fn, me) {
-return function () {
- return fn.apply(me, arguments);
-};
- };
-
- var log = function () {
-log.history = log.history || [];
-log.history.push(arguments);
-if (this.console) {
- console.log(Array.prototype.slice.call(arguments)[0]);
-}
- };
-
- // if you want to apply conditional formatting of parameter values
- var parameterMacro = function (value) {
-return value;
- }
-
- // if you want to apply conditional formatting of model property values
- var modelPropertyMacro = function (value) {
-return value;
- }
-
- if (!Array.prototype.indexOf) {
-Array.prototype.indexOf = function (obj, start) {
- for (var i = (start || 0), j = this.length; i < j; i++) {
-if (this[i] === obj) { return i; }
- }
- return -1;
-}
- }
-
- if (!('filter' in Array.prototype)) {
-Array.prototype.filter = function (filter, that /*opt*/) {
- var other = [], v;
- for (var i = 0, n = this.length; i < n; i++)
-if (i in this && filter.call(that, v = this[i], i, this))
- other.push(v);
- return other;
-};
- }
-
- if (!('map' in Array.prototype)) {
-Array.prototype.map = function (mapper, that /*opt*/) {
- var other = new Array(this.length);
- for (var i = 0, n = this.length; i < n; i++)
-if (i in this)
- other[i] = mapper.call(that, this[i], i, this);
- return other;
-};
- }
-
- Object.keys = Object.keys || (function () {
-var hasOwnProperty = Object.prototype.hasOwnProperty,
- hasDontEnumBug = !{ toString: null }.propertyIsEnumerable("toString"),
- DontEnums = [
- 'toString',
- 'toLocaleString',
- 'valueOf',
- 'hasOwnProperty',
- 'isPrototypeOf',
- 'propertyIsEnumerable',
- 'constructor'
- ],
-DontEnumsLength = DontEnums.length;
-
-return function (o) {
- if (typeof o != "object" && typeof o != "function" || o === null)
-throw new TypeError("Object.keys called on a non-object");
-
- var result = [];
- for (var name in o) {
-if (hasOwnProperty.call(o, name))
- result.push(name);
- }
-
- if (hasDontEnumBug) {
-for (var i = 0; i < DontEnumsLength; i++) {
- if (hasOwnProperty.call(o, DontEnums[i]))
-result.push(DontEnums[i]);
-}
- }
-
- return result;
-};
- })();
-
- var SwaggerApi = function (url, options) {
-this.isBuilt = false;
-this.url = null;
-this.debug = false;
-this.basePath = null;
-this.authorizations = null;
-this.authorizationScheme = null;
-this.info = null;
-this.useJQuery = false;
-this.modelsArray = [];
-this.isValid;
-
-options = (options || {});
-if (url)
- if (url.url)
-options = url;
- else
-this.url = url;
-else
- options = url;
-
-if (options.url != null)
- this.url = options.url;
-
-if (options.success != null)
- this.success = options.success;
-
-if (typeof options.useJQuery === 'boolean')
- this.useJQuery = options.useJQuery;
-
-this.failure = options.failure != null ? options.failure : function () { };
-this.progress = options.progress != null ? options.progress : function ()
{ };
-if (options.success != null) {
- this.build();
- this.isBuilt = true;
-}
- }
-
- SwaggerApi.prototype.build = function () {
-if (this.isBuilt)
- return this;
-var _this = this;
-this.progress('fetching resource list: ' + this.url);
-var obj = {
- useJQuery: this.useJQuery,
- url: this.url,
- method: "get",
- headers: {
-accept: "application/json,application/json;charset=\"utf-8\",*/*"
- },
- on: {
-error: function (response) {
- if (_this.url.substring(0, 4) !== 'http') {
-return _this.fail('Please specify the protocol for ' + _this.url);
- } else if (response.status === 0) {
-return _this.fail('Can\'t read from server. It may not have the
appropriate access-control-origin settings.');
- } else if (response.status === 404) {
-return _this.fail('Can\'t read swagger JSON from ' + _this.url);
- } el
[2/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
deleted file mode 100644
index d0b7c97..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
+++ /dev/null
@@ -1,2477 +0,0 @@
-// swagger-ui.js
-// version 2.1.0-alpha.3
-$(function() {
-
- // Helper function for vertically aligning DOM elements
- // http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
- $.fn.vAlign = function() {
- return this.each(function(i){
- var ah = $(this).height();
- var ph = $(this).parent().height();
- var mh = (ph - ah) / 2;
- $(this).css('margin-top', mh);
- });
- };
-
- $.fn.stretchFormtasticInputWidthToParent = function() {
- return this.each(function(i){
- var p_width = $(this).closest("form").innerWidth();
- var p_padding =
parseInt($(this).closest("form").css('padding-left') ,10) +
parseInt($(this).closest("form").css('padding-right'), 10);
- var this_padding = parseInt($(this).css('padding-left'), 10) +
parseInt($(this).css('padding-right'), 10);
- $(this).css('width', p_width - p_padding - this_padding);
- });
- };
-
- $('form.formtastic li.string input, form.formtastic
textarea').stretchFormtasticInputWidthToParent();
-
- // Vertically center these paragraphs
- // Parent may need a min-height for this to work..
- $('ul.downplayed li div.content p').vAlign();
-
- // When a sandbox form is submitted..
- $("form.sandbox").submit(function(){
-
- var error_free = true;
-
- // Cycle through the forms required inputs
- $(this).find("input.required").each(function() {
-
- // Remove any existing error styles from the input
- $(this).removeClass('error');
-
- // Tack the error style on if the input is empty..
- if ($(this).val() == '') {
- $(this).addClass('error');
- $(this).wiggle();
- error_free = false;
- }
-
- });
-
- return error_free;
- });
-
-});
-
-function clippyCopiedCallback(a) {
- $('#api_key_copied').fadeIn().delay(1000).fadeOut();
-
- // var b = $("#clippy_tooltip_" + a);
- // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"),
setTimeout(function() {
- // b.attr("title", "copy to clipboard")
- // },
- // 500))
-}
-
-// Logging function that accounts for browsers that don't have window.console
-log = function(){
- log.history = log.history || [];
- log.history.push(arguments);
- if(this.console){
-console.log( Array.prototype.slice.call(arguments)[0] );
- }
-};
-
-// Handle browsers that do console incorrectly (IE9 and below, see
http://stackoverflow.com/a/5539378/7913)
-if (Function.prototype.bind && console && typeof console.log == "object") {
-[
- "log","info","warn","error","assert","dir","clear","profile","profileEnd"
-].forEach(function (method) {
-console[method] = this.bind(console[method], console);
-}, Function.prototype.call);
-}
-
-var Docs = {
-
- shebang: function() {
-
- // If shebang has an operation nickname in it..
- // e.g. /docs/#!/words/get_search
- var fragments = $.param.fragment().split('/');
- fragments.shift(); // get rid of the bang
-
- switch (fragments.length) {
- case 1:
- // Expand all operations for the resource and
scroll to it
- var dom_id = 'resource_' + fragments[0];
-
-
Docs.expandEndpointListForResource(fragments[0]);
- $("#"+dom_id).slideto({highlight: false});
- break;
- case 2:
- // Refer to the endpoint DOM element, e.g.
#words_get_search
-
-// Expand Resource
-Docs.expandEndpointListForResource(fragments[0]);
-$("#"+dom_id).slideto({highlight: false});
-
-// Expand operation
- var li_dom_id = fragments.join('_');
- var li_content_dom_id = li_dom_id + "_content";
-
-
- Docs.expandOperation($('#'+li_con
[9/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced
embedded Swagger UI with webjar.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ae551918
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae551918
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae551918
Branch: refs/heads/3.0.x-fixes
Commit: ae551918a80b56a40c6ef2244585021f307a2a68
Parents: 47f8d20
Author: reta
Authored: Sun Nov 2 17:30:46 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 13:20:30 2015 +0200
--
.../src/main/resources/swagger/css/reset.css| 125 -
.../src/main/resources/swagger/css/screen.css | 1224
.../resources/swagger/images/explorer_icons.png | Bin 5763 -> 0 bytes
.../resources/swagger/images/logo_small.png | Bin 770 -> 0 bytes
.../resources/swagger/images/pet_store_api.png | Bin 824 -> 0 bytes
.../main/resources/swagger/images/throbber.gif | Bin 9257 -> 0 bytes
.../resources/swagger/images/wordnik_api.png| Bin 980 -> 0 bytes
.../src/main/resources/swagger/index.html | 99 -
.../main/resources/swagger/lib/backbone-min.js | 38 -
.../resources/swagger/lib/handlebars-1.0.0.js | 2278 ---
.../resources/swagger/lib/highlight.7.3.pack.js |1 -
.../resources/swagger/lib/jquery-1.8.0.min.js |2 -
.../resources/swagger/lib/jquery.ba-bbq.min.js | 18 -
.../resources/swagger/lib/jquery.slideto.min.js |1 -
.../resources/swagger/lib/jquery.wiggle.min.js |8 -
.../main/resources/swagger/lib/shred.bundle.js | 2765 --
.../main/resources/swagger/lib/shred/content.js | 193 --
.../resources/swagger/lib/swagger-client.js | 1477 --
.../main/resources/swagger/lib/swagger-oauth.js | 211 --
.../src/main/resources/swagger/lib/swagger.js | 1678 ---
.../resources/swagger/lib/underscore-min.js | 32 -
.../src/main/resources/swagger/o2c.html | 15 -
.../src/main/resources/swagger/swagger-ui.js| 2477
.../main/resources/swagger/swagger-ui.min.js|1 -
24 files changed, 12643 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/reset.css
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/reset.css
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/reset.css
deleted file mode 100644
index b2b0789..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/reset.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
- display: block;
-}
-body {
- line-height: 1;
-}
-ol,
-ul {
- list-style: none;
-}
-blockquote,
-q {
- quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
- content: '';
- content: none;
-}
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/screen.css
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/screen.css
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/screen.css
deleted file mode 100644
index 478b998..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/css/screen.css
+++ /dev/null
@@ -1,1224 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev
*/
-.swagger-section pre code {
- display: block;
- padding: 0.5em;
- background: #F0F0F0;
-}
-.swagger-section pre code,
-.
[7/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
deleted file mode 100644
index f121291..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return
p.each(a.split(s),function(a,c){b[c]=!0}),b}function
J(a,c,d){if(d===b&&a.nodeType===1){var
e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof
d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else
d=b}return d}function K(a){var b;for(b in
a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function
ba(){return!1}function bb(){return!0}function
bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do
a=a[b];while(a&&a.nodeType!==1);return a}function
bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var
e=!!b.call(a,d,a);return e===c});if(b.nodeType)return
p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var
d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return
p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(
a,b)>=0===c})}function bk(a){var
b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return
c}function bC(a,b){return
a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function
bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var
c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete
g.handle,g.events={};for(c in
h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createEle
ment)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return
bR[a]=c,c}function ch(a,b,c,d){var
e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof
e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in
b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return
function(b,c){typeof b!="string"&&(c=b,b="*");var
d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:fu
nction(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return
this.context=this[0]=a,this.length=1,this;if(typeof
a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return
c=c instanceof
p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return
d.find(a);this.length=1,this[0]=g}return
this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return
p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return
this.length},toArray:function(){return k.call(this)},get:function(a){return
a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var
d=p.merge(this.constructor(),a);return
d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?"
":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return
p.each(this,a,b)},ready:function(a){return
p.ready.promise().done(a),this},eq:function(a){return
a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return
this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return
this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return
this.pushStack(p.map(this,function(b,c)
[8/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
deleted file mode 100644
index c70f09d..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
+++ /dev/null
@@ -1,2278 +0,0 @@
-/*
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-// lib/handlebars/browser-prefix.js
-var Handlebars = {};
-
-(function(Handlebars, undefined) {
-;
-// lib/handlebars/base.js
-
-Handlebars.VERSION = "1.0.0";
-Handlebars.COMPILER_REVISION = 4;
-
-Handlebars.REVISION_CHANGES = {
- 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
- 2: '== 1.0.0-rc.3',
- 3: '== 1.0.0-rc.4',
- 4: '>= 1.0.0'
-};
-
-Handlebars.helpers = {};
-Handlebars.partials = {};
-
-var toString = Object.prototype.toString,
-functionType = '[object Function]',
-objectType = '[object Object]';
-
-Handlebars.registerHelper = function(name, fn, inverse) {
- if (toString.call(name) === objectType) {
-if (inverse || fn) { throw new Handlebars.Exception('Arg not supported
with multiple helpers'); }
-Handlebars.Utils.extend(this.helpers, name);
- } else {
-if (inverse) { fn.not = inverse; }
-this.helpers[name] = fn;
- }
-};
-
-Handlebars.registerPartial = function(name, str) {
- if (toString.call(name) === objectType) {
-Handlebars.Utils.extend(this.partials, name);
- } else {
-this.partials[name] = str;
- }
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
- if(arguments.length === 2) {
-return undefined;
- } else {
-throw new Error("Missing helper: '" + arg + "'");
- }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, options) {
- var inverse = options.inverse || function() {}, fn = options.fn;
-
- var type = toString.call(context);
-
- if(type === functionType) { context = context.call(this); }
-
- if(context === true) {
-return fn(this);
- } else if(context === false || context == null) {
-return inverse(this);
- } else if(type === "[object Array]") {
-if(context.length > 0) {
- return Handlebars.helpers.each(context, options);
-} else {
- return inverse(this);
-}
- } else {
-return fn(context);
- }
-});
-
-Handlebars.K = function() {};
-
-Handlebars.createFrame = Object.create || function(object) {
- Handlebars.K.prototype = object;
- var obj = new Handlebars.K();
- Handlebars.K.prototype = null;
- return obj;
-};
-
-Handlebars.logger = {
- DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
-
- methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
-
- // can be overridden in the host environment
- log: function(level, obj) {
-if (Handlebars.logger.level <= level) {
- var method = Handlebars.logger.methodMap[level];
- if (typeof console !== 'undefined' && console[method]) {
-console[method].call(console, obj);
- }
-}
- }
-};
-
-Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
-
-Handlebars.registerHelper('each', function(context, options) {
- var fn = options.fn, inverse = options.inverse;
- var i = 0, ret = "", data;
-
- var type = toString.call(context);
- if(type === functionType) { context = context.call(this); }
-
- if (options.data) {
-data = Handlebars.createFrame(options.data);
- }
-
- if(context && typeof context === 'object') {
-if(context instanceof Array){
- for(var j = context.length; i 2) {
-expected.push("'" + this.terminals_[p] + "'");
-
[6/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
deleted file mode 100644
index bcbf248..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var
i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function
E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return
function(){return G.apply(this,F.concat(m.call(arguments)))}}function
n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return
F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var
O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return
O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var
F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.no
Escape(",/");$.deparam=l=function(I,F){var
H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g,"
").split("&"),function(L,Q){var
K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=Mhttp://benalman.com/projects/jquery-hashchange-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,i,b){var
j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d
in i&&!h;function a(m){m=m||i[c][l];return
m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return
false}$(j.start)},teardown:function(){if(e){return
false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function
p(){o=q=function(s){return s};if(h){n=$('').hide().insertAfter("body")[0].contentWindow;q=function(){return
a(n.document[c][l])};o=function(u,s){if(u!==s){var
t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var
t=a();o||p();(function s(){var
v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return
m})()})(jQuery,this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
deleted file mode 100644
index ba32cff..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#99"},a);return
this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.wiggle.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/
[4/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
deleted file mode 100644
index b8051fe..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be
able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript
object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the
`charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either
a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
- this.body = options.body;
- this.data = options.data;
- this.type = options.type;
-};
-
-Content.prototype = {
- // Treat `toString()` as asking for the `content.body`. That is, the raw
content entity.
- //
- // toString: function() { return this.body; }
- //
- // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-
-// - **type**. Typically accessed as `content.type`, reflects the
`content-type`
-// header associated with the request or response. If not passed as an
options
-// to the constructor or set explicitly, it will infer the type the `data`
-// attribute, if possible, and, failing that, will default to `text/plain`.
- type: {
-get: function() {
- if (this._type) {
-return this._type;
- } else {
-if (this._data) {
- switch(typeof this._data) {
-case "string": return "text/plain";
-case "object": return "application/json";
- }
-}
- }
- return "text/plain";
-},
-set: function(value) {
- this._type = value;
- return this;
-},
-enumerable: true
- },
-
-// - **data**. Typically accessed as `content.data`, reflects the content
entity
-// converted into Javascript data. This can be a string, if the `type` is,
say,
-// `text/plain`, but can also be a Javascript object. The conversion applied
is
-// based on the `processor` attribute. The `data` attribute can also be set
-// directly, in which case the conversion will be done the other way, to
infer
-// the `body` attribute.
- data: {
-get: function() {
- if (this._body) {
-return this.processor.parser(this._body);
- } else {
-return this._data;
- }
-},
-set: function(data) {
- if (this._body&&data) Errors.setDataWithBody(this);
- this._data = data;
- return this;
-},
-enumerable: true
- },
-
-// - **body**. Typically accessed as `content.body`, reflects the content
entity
-// as a UTF-8 string. It is the mirror of the `data` attribute. If you set
the
-// `data` attribute, the `body` attribute will be inferred and vice-versa. If
-// you attempt to set both, an exception is raised.
- body: {
-get: function() {
- if (this._data) {
-return this.processor.stringify(this._data);
- } else {
-return this._body.toString();
- }
-},
-set: function(body) {
- if (this._data&&body) Errors.setBodyWithData(this);
- this._body = body;
- return this;
-},
-enumerable: true
- },
-
-// - **processor**. The functions that will be used to convert to/from `data`
and
-// `body` attributes. You can add processors. The two that are built-in are
for
-// `text/plain`, which is basically an identity transformation and
-// `application/json` and other JSON-based media types (including custom
media
-// types with `+json`). You can add your own processors. See below.
- processor: {
-get: function() {
- var processor = Content.processors[this.type];
- if (processor) {
-return processor;
- } else {
-// Return the first processor that matches any part of the
-// content type. ex: application/vnd.foobar.baz+json will match json.
-var main = this.type.split(";")[0];
-var parts = main.split(
[1/9] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 47f8d206c -> ae551918a
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae551918/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
deleted file mode 100644
index 7ec536a..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
+++ /dev/null
@@ -1 +0,0 @@
-$(function(){$.fn.vAlign=function(){return this.each(function(c){var
a=$(this).height();var d=$(this).parent().height();var
b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return
this.each(function(b){var d=$(this).closest("form").innerWidth();var
c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var
a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic
li.string input, form.formtastic
textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li
div.content p").vAlign();$("form.sandbox").submit(function(){var
a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return
a})});function
clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.histor
y=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments)[0])}};if(Function.prototype.bind&&console&&typeof
console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var
Docs={shebang:function(){var
b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:var
d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case
2:Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var
c=b.join("_");var
a=c+"_content";Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var
a=$("li#resource_"+Docs.escapeResourceName(b)+"
ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:fu
nction(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource
ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var
a=$("li#resource_"+b+"
ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var
b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var
a=$("li#resource_"+b+"
ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource
ul.endpoints li.operation
div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+"
li.operation
div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+"
li.operation
div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return
a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},
collapseOperation:function(a){a.slideUp()}};(function(){var
b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">=
1.0.0"];f=this.merge(f,g.helpers);j=j||{};var
i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n
";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return
o}function d(r,q){var o="",p;o+='\n ';p=(typeof
r===h?r.apply(r):r);if(p||p===0){o+=p}o+="\n";return
o}function n(p,o){return'\n application/json\n'}i+='\n\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n\n";return
i})})();(function(){var
b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(f
unction(h,n,g,m,l){this.compilerInfo=[4,">=
1.0.0"];g=this.merge(g,h.helpers);l=l||{};var
j="",c,s,i="function",k=this.escapeExpression,q=this;function f(x,w){var
t="",v,u;t+='\n '+k(((v=((v=x.info),v==null||v===false?v:v.title)),typeof
v===i?v.apply(x):v))+'\n ';u=((v=((v=x.info),v==null||v===false?v:v.description)),typeof
v===i?v.apply(x):v);if(u||u===0){t+=u}t+="\n
";
cxf git commit: [CXF-6481] Reverting the direct parsing of engine simple elements
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes f00e824ac -> 47f8d206c
[CXF-6481] Reverting the direct parsing of engine simple elements
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/47f8d206
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/47f8d206
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/47f8d206
Branch: refs/heads/3.0.x-fixes
Commit: 47f8d206c92cbc06a5033497f97c99e1ec0c4009
Parents: f00e824
Author: Sergey Beryozkin
Authored: Thu Jul 9 11:29:17 2015 +0100
Committer: Sergey Beryozkin
Committed: Thu Jul 9 11:33:08 2015 +0100
--
.../JettyHTTPServerEngineFactoryHolder.java | 30
.../JettyServerEngineFactoryParser.java | 23 +--
2 files changed, 7 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/47f8d206/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index 636835e..4f0d415 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -63,9 +63,6 @@ public class JettyHTTPServerEngineFactoryHolder {
private Map> handlersMap;
-private Map sessionSupportMap;
-private Map reuseAddressMap;
-
private JAXBContext jaxbContext;
private Set> jaxbClasses;
@@ -142,18 +139,6 @@ public class JettyHTTPServerEngineFactoryHolder {
+ engine.getPort().toString());
}
}
-if (sessionSupportMap != null) {
-Boolean sessionSupport =
sessionSupportMap.get(engine.getPort().toString());
-if (sessionSupport != null) {
-eng.setSessionSupport(sessionSupport);
-}
-}
-if (reuseAddressMap != null) {
-Boolean reuseAddress =
reuseAddressMap.get(engine.getPort().toString());
-if (reuseAddress != null) {
-eng.setReuseAddress(reuseAddress);
-}
-}
if (engine.isContinuationsEnabled() != null) {
eng.setContinuationsEnabled(engine.isContinuationsEnabled());
@@ -168,7 +153,12 @@ public class JettyHTTPServerEngineFactoryHolder {
if (engine.getPort() != null) {
eng.setPort(engine.getPort());
}
-
+if (engine.isReuseAddress() != null) {
+eng.setReuseAddress(engine.isReuseAddress());
+}
+if (engine.isSessionSupport() != null) {
+eng.setSessionSupport(engine.isSessionSupport());
+}
if (engine.getThreadingParameters() != null) {
ThreadingParametersType threads =
engine.getThreadingParameters();
ThreadingParameters rThreads = new ThreadingParameters();
@@ -221,14 +211,6 @@ public class JettyHTTPServerEngineFactoryHolder {
this.connectorMap = connectorMap;
}
-public void setSessionSupportMap(Map sessionMap) {
-this.sessionSupportMap = sessionMap;
-}
-
-public void setReuseAddressMap(Map reuseMap) {
-this.reuseAddressMap = reuseMap;
-}
-
public void setHandlersMap(Map> handlersMap) {
this.handlersMap = handlersMap;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/47f8d206/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
index 5af9f77..fe4eac6 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyServerEngineFactoryParser.java
@@ -85,8 +85,6 @@ public clas
cxf git commit: [CXF-6481] Reverting the direct parsing of engine simple elements
Repository: cxf
Updated Branches:
refs/heads/master 5a1dd7723 -> 4c4ef0dd2
[CXF-6481] Reverting the direct parsing of engine simple elements
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4c4ef0dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4c4ef0dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4c4ef0dd
Branch: refs/heads/master
Commit: 4c4ef0dd26fb038ab4c2be504639575af4922531
Parents: 5a1dd77
Author: Sergey Beryozkin
Authored: Thu Jul 9 11:29:17 2015 +0100
Committer: Sergey Beryozkin
Committed: Thu Jul 9 11:29:17 2015 +0100
--
distribution/src/main/release/samples/pom.xml | 1 +
.../JettyHTTPServerEngineFactoryHolder.java | 30
.../JettyServerEngineFactoryParser.java | 23 +--
3 files changed, 8 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c4ef0dd/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 8b5b413..d626f07 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -53,6 +53,7 @@
jax_rs/websocket
jax_rs/search
jax_rs/description_swagger
+jax_rs/description_swagger2
jax_rs/big_query
callback
wsdl_first_pure_xml
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c4ef0dd/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
--
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index 4b49d83..fdf40d3 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -63,9 +63,6 @@ public class JettyHTTPServerEngineFactoryHolder {
private Map> handlersMap;
-private Map sessionSupportMap;
-private Map reuseAddressMap;
-
private JAXBContext jaxbContext;
private Set> jaxbClasses;
@@ -137,18 +134,6 @@ public class JettyHTTPServerEngineFactoryHolder {
+ engine.getPort().toString());
}
}
-if (sessionSupportMap != null) {
-Boolean sessionSupport =
sessionSupportMap.get(engine.getPort().toString());
-if (sessionSupport != null) {
-eng.setSessionSupport(sessionSupport);
-}
-}
-if (reuseAddressMap != null) {
-Boolean reuseAddress =
reuseAddressMap.get(engine.getPort().toString());
-if (reuseAddress != null) {
-eng.setReuseAddress(reuseAddress);
-}
-}
if (engine.isContinuationsEnabled() != null) {
eng.setContinuationsEnabled(engine.isContinuationsEnabled());
@@ -163,7 +148,12 @@ public class JettyHTTPServerEngineFactoryHolder {
if (engine.getPort() != null) {
eng.setPort(engine.getPort());
}
-
+if (engine.isReuseAddress() != null) {
+eng.setReuseAddress(engine.isReuseAddress());
+}
+if (engine.isSessionSupport() != null) {
+eng.setSessionSupport(engine.isSessionSupport());
+}
if (engine.getThreadingParameters() != null) {
ThreadingParametersType threads =
engine.getThreadingParameters();
ThreadingParameters rThreads = new ThreadingParameters();
@@ -216,14 +206,6 @@ public class JettyHTTPServerEngineFactoryHolder {
this.connectorMap = connectorMap;
}
-public void setSessionSupportMap(Map sessionMap) {
-this.sessionSupportMap = sessionMap;
-}
-
-public void setReuseAddressMap(Map reuseMap) {
-this.reuseAddressMap = reuseMap;
-}
-
public void setHandlersMap(Map> handlersMap) {
this.handlersMap = handlersMap;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4c4ef0dd/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyS
cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added test cases (systests)
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 5608e3db0 -> f00e824ac
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added test
cases (systests)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f00e824a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f00e824a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f00e824a
Branch: refs/heads/3.0.x-fixes
Commit: f00e824ac240c244b907c64f94422784fa48d5e1
Parents: 5608e3d
Author: reta
Authored: Fri Jan 2 09:39:52 2015 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 11:47:08 2015 +0200
--
systests/jaxrs/pom.xml | 15 ++
.../AbstractSwaggerServiceDescriptionTest.java | 231 +++
.../jaxrs/description/BookStoreSwagger.java | 82 +++
.../SwaggerFilterServiceDescriptionTest.java| 47
.../SwaggerRegularServiceDescriptionTest.java | 47
5 files changed, 422 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f00e824a/systests/jaxrs/pom.xml
--
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index c0cdc6a..ba64f50 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -39,6 +39,21 @@
+com.wordnik
+swagger-jaxrs_2.10
+
+
+ javax.ws.rs
+ jsr311-api
+
+
+
+
+javassist
+javassist
+3.12.1.GA
+
+
javax.validation
validation-api
http://git-wip-us.apache.org/repos/asf/cxf/blob/f00e824a/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
new file mode 100644
index 000..570b99f
--- /dev/null
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java
@@ -0,0 +1,231 @@
+/**
+ * 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.jaxrs.description;
+
+import java.io.InputStream;
+import java.util.Arrays;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+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;
+import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
+import org.apache.cxf.jaxrs.swagger.SwaggerFeature;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public abstract class AbstractSwaggerServiceDescriptionTest extends
AbstractBusClientServerTestBase {
+private static final JsonObject DELETE_METHOD_SPEC =
Json.createObjectBuilder()
+.add("method", "DELETE")
+.add("summary", "Delete book")
+.add("notes", "Delete book")
+.add("type", "void")
+.add("nickname", "delete")
+.add("parameters", Json.createArrayBuilder()
+.add(Json.createObjectBuilder()
+.add("name", "id")
+.add("description", "id")
+.add("required", true)
+.add("type", "string")
+.add("paramType", "path")
+.add("allowMultiple", false)
+)
+
[14/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Refactored index, jsp to index.html
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Refactored
index,jsp to index.html
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/806a1f0a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/806a1f0a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/806a1f0a
Branch: refs/heads/3.0.x-fixes
Commit: 806a1f0a89dfb9c34812e0b2c80612facf39da75
Parents: c3f191c
Author: reta
Authored: Sun Nov 23 21:01:56 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 10:32:59 2015 +0200
--
.../samples/jax_rs/description_swagger/pom.xml | 3 +-
.../java/demo/jaxrs/swagger/server/Server.java | 3 +-
.../webjars/swagger-ui/2.0.24/index.html| 52
.../webjars/swagger-ui/2.0.24/index.jsp | 52
4 files changed, 55 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index 1b5c53f..8c2faa8 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -79,7 +79,8 @@
swagger-ui
2.0.24
true
-
${project.build.directory}/classes
+
${project.build.directory}/classes
+**/index.html
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index acf258a..536c6a6 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -41,11 +41,10 @@ public class Server {
final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
-context.setWelcomeFiles( new String[] { "index.jsp" } );
context.addServlet(servletHolder, "/*");
context.setResourceBase(getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
-servletHolder.setInitParameter("redirects-list", "/ /index.jsp
/.*[.]js /css/.* /images/.* lib/.*");
+servletHolder.setInitParameter("redirects-list", "/ /index.html
/.*[.]js /css/.* /images/.* lib/.*");
servletHolder.setInitParameter("redirect-servlet-name",
staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes",
"javax.servlet.include.request_uri");
servletHolder.setInitParameter("jaxrs.serviceClasses",
Sample.class.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
new file mode 100644
index 000..395e96e
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
@@ -0,0 +1,52 @@
+
+
+
+ Swagger UI + JAX-RS demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+$(function () {
+ window.swaggerUi = new SwaggerUi({
+ url: "/api-docs",
+ dom_id: "swagger-ui-container",
+ supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
+ onComplete:
[08/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
new file mode 100644
index 000..c70f09d
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/handlebars-1.0.0.js
@@ -0,0 +1,2278 @@
+/*
+
+Copyright (C) 2011 by Yehuda Katz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+// lib/handlebars/browser-prefix.js
+var Handlebars = {};
+
+(function(Handlebars, undefined) {
+;
+// lib/handlebars/base.js
+
+Handlebars.VERSION = "1.0.0";
+Handlebars.COMPILER_REVISION = 4;
+
+Handlebars.REVISION_CHANGES = {
+ 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+ 2: '== 1.0.0-rc.3',
+ 3: '== 1.0.0-rc.4',
+ 4: '>= 1.0.0'
+};
+
+Handlebars.helpers = {};
+Handlebars.partials = {};
+
+var toString = Object.prototype.toString,
+functionType = '[object Function]',
+objectType = '[object Object]';
+
+Handlebars.registerHelper = function(name, fn, inverse) {
+ if (toString.call(name) === objectType) {
+if (inverse || fn) { throw new Handlebars.Exception('Arg not supported
with multiple helpers'); }
+Handlebars.Utils.extend(this.helpers, name);
+ } else {
+if (inverse) { fn.not = inverse; }
+this.helpers[name] = fn;
+ }
+};
+
+Handlebars.registerPartial = function(name, str) {
+ if (toString.call(name) === objectType) {
+Handlebars.Utils.extend(this.partials, name);
+ } else {
+this.partials[name] = str;
+ }
+};
+
+Handlebars.registerHelper('helperMissing', function(arg) {
+ if(arguments.length === 2) {
+return undefined;
+ } else {
+throw new Error("Missing helper: '" + arg + "'");
+ }
+});
+
+Handlebars.registerHelper('blockHelperMissing', function(context, options) {
+ var inverse = options.inverse || function() {}, fn = options.fn;
+
+ var type = toString.call(context);
+
+ if(type === functionType) { context = context.call(this); }
+
+ if(context === true) {
+return fn(this);
+ } else if(context === false || context == null) {
+return inverse(this);
+ } else if(type === "[object Array]") {
+if(context.length > 0) {
+ return Handlebars.helpers.each(context, options);
+} else {
+ return inverse(this);
+}
+ } else {
+return fn(context);
+ }
+});
+
+Handlebars.K = function() {};
+
+Handlebars.createFrame = Object.create || function(object) {
+ Handlebars.K.prototype = object;
+ var obj = new Handlebars.K();
+ Handlebars.K.prototype = null;
+ return obj;
+};
+
+Handlebars.logger = {
+ DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
+
+ methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
+
+ // can be overridden in the host environment
+ log: function(level, obj) {
+if (Handlebars.logger.level <= level) {
+ var method = Handlebars.logger.methodMap[level];
+ if (typeof console !== 'undefined' && console[method]) {
+console[method].call(console, obj);
+ }
+}
+ }
+};
+
+Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
+
+Handlebars.registerHelper('each', function(context, options) {
+ var fn = options.fn, inverse = options.inverse;
+ var i = 0, ret = "", data;
+
+ var type = toString.call(context);
+ if(type === functionType) { context = context.call(this); }
+
+ if (options.data) {
+data = Handlebars.createFrame(options.data);
+ }
+
+ if(context && typeof context === 'object') {
+if(context instanceof Array){
+ for(var j = context.length; i 2) {
+expected.push("'" + this.terminals_[p] + "'");
+}
[05/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
new file mode 100644
index 000..74d0816
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred.bundle.js
@@ -0,0 +1,2765 @@
+var require = function (file, cwd) {
+var resolved = require.resolve(file, cwd || '/');
+var mod = require.modules[resolved];
+if (!mod) throw new Error(
+'Failed to resolve module ' + file + ', tried ' + resolved
+);
+var res = mod._cached ? mod._cached : mod();
+return res;
+}
+
+require.paths = [];
+require.modules = {};
+require.extensions = [".js",".coffee"];
+
+require._core = {
+'assert': true,
+'events': true,
+'fs': true,
+'path': true,
+'vm': true
+};
+
+require.resolve = (function () {
+return function (x, cwd) {
+if (!cwd) cwd = '/';
+
+if (require._core[x]) return x;
+var path = require.modules.path();
+var y = cwd || '.';
+
+if (x.match(/^(?:\.\.?\/|\/)/)) {
+var m = loadAsFileSync(path.resolve(y, x))
+|| loadAsDirectorySync(path.resolve(y, x));
+if (m) return m;
+}
+
+var n = loadNodeModulesSync(x, y);
+if (n) return n;
+
+throw new Error("Cannot find module '" + x + "'");
+
+function loadAsFileSync (x) {
+if (require.modules[x]) {
+return x;
+}
+
+for (var i = 0; i < require.extensions.length; i++) {
+var ext = require.extensions[i];
+if (require.modules[x + ext]) return x + ext;
+}
+}
+
+function loadAsDirectorySync (x) {
+x = x.replace(/\/+$/, '');
+var pkgfile = x + '/package.json';
+if (require.modules[pkgfile]) {
+var pkg = require.modules[pkgfile]();
+var b = pkg.browserify;
+if (typeof b === 'object' && b.main) {
+var m = loadAsFileSync(path.resolve(x, b.main));
+if (m) return m;
+}
+else if (typeof b === 'string') {
+var m = loadAsFileSync(path.resolve(x, b));
+if (m) return m;
+}
+else if (pkg.main) {
+var m = loadAsFileSync(path.resolve(x, pkg.main));
+if (m) return m;
+}
+}
+
+return loadAsFileSync(x + '/index');
+}
+
+function loadNodeModulesSync (x, start) {
+var dirs = nodeModulesPathsSync(start);
+for (var i = 0; i < dirs.length; i++) {
+var dir = dirs[i];
+var m = loadAsFileSync(dir + '/' + x);
+if (m) return m;
+var n = loadAsDirectorySync(dir + '/' + x);
+if (n) return n;
+}
+
+var m = loadAsFileSync(x);
+if (m) return m;
+}
+
+function nodeModulesPathsSync (start) {
+var parts;
+if (start === '/') parts = [ '' ];
+else parts = path.normalize(start).split('/');
+
+var dirs = [];
+for (var i = parts.length - 1; i >= 0; i--) {
+if (parts[i] === 'node_modules') continue;
+var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
+dirs.push(dir);
+}
+
+return dirs;
+}
+};
+})();
+
+require.alias = function (from, to) {
+var path = require.modules.path();
+var res = null;
+try {
+res = require.resolve(from + '/package.json', '/');
+}
+catch (err) {
+res = require.resolve(from, '/');
+}
+var basedir = path.dirname(res);
+
+var keys = (Object.keys || function (obj) {
+var res = [];
+for (var key in obj) res.push(key)
+return res;
+})(require.modules);
+
+for (var i = 0; i < keys.length; i++) {
+var key = keys[i];
+if (key.slice(0, basedir.length + 1) === basedir + '/') {
+var f = key.slice(basedir.length);
+require.modules[to + f] = require.modules[basedir + f];
+}
+else if (key === basedir) {
+require.modules[to] = require.modules[basedir];
+}
+}
+};
+
+require.define = function (filename, fn) {
+var dirname = require._core[f
[15/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added more examples.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added more
examples.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/58674d76
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/58674d76
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/58674d76
Branch: refs/heads/3.0.x-fixes
Commit: 58674d7694108440b5c81653dc1bc7339a43ddb8
Parents: 806a1f0
Author: reta
Authored: Tue Dec 2 21:17:38 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 10:42:26 2015 +0200
--
.../java/demo/jaxrs/swagger/server/Sample.java | 40 +++-
1 file changed, 39 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/58674d76/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f39a4ca..ca92e7c 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -21,15 +21,20 @@ package demo.jaxrs.swagger.server;
import java.util.Arrays;
+import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiImplicitParam;
+import com.wordnik.swagger.annotations.ApiImplicitParams;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
@@ -44,7 +49,7 @@ public class Sample {
response = Item.class,
responseContainer = "List"
)
-public Response getResponse(
+public Response getItems(
@ApiParam(value = "Page to fetch", required = true)
@QueryParam("page") @DefaultValue("1") int page) {
return Response.ok(
Arrays.asList(
@@ -53,4 +58,37 @@ public class Sample {
)
).build();
}
+
+@Produces({ MediaType.APPLICATION_JSON })
+@Path("/{name}")
+@GET
+@ApiOperation(
+value = "Get operation with type and headers",
+notes = "Get operation with type and headers",
+response = Item.class
+)
+public Item getItem(
+@ApiParam(value = "language", required = true)
@HeaderParam("Accept-Language") final String language,
+@ApiParam(value = "name", required = true) @PathParam("name") String
name) {
+return new Item("name", "Value in " + language);
+}
+
+@Path("/{name}")
+@DELETE
+@ApiOperation(
+value = "Delete operation with implicit header",
+notes = "Delete operation with implicit header"
+)
+@ApiImplicitParams(
+ @ApiImplicitParam(
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
+ paramType = "header"
+ )
+)
+public Response delete(@ApiParam(value = "name", required = true)
@PathParam("name") String name) {
+return Response.ok().build();
+}
}
[09/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/backbone-min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/backbone-min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/backbone-min.js
new file mode 100644
index 000..c1c0d4f
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/backbone-min.js
@@ -0,0 +1,38 @@
+// Backbone.js 0.9.2
+
+// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
+// Backbone may be freely distributed under the MIT license.
+// For all details and documentation:
+// http://backbonejs.org
+(function(){var
l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof
exports?exports:l.Backbone={};g.VERSION="0.9.2";var
f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var
i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return
this};g.emulateHTTP=!1;g.emulateJSON=!1;var
p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return
this;a=a.split(p);for(d=this._callbacks||(this._callbacks=
+{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return
this},off:function(a,b,c){var
d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete
this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete
e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return
this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return
this;f=d.all;a=a.split(p);for(g=
+z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return
this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var
c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent=
+{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return
f.clone(this.attributes)},get:function(a){return
this.attributes[a]},escape:function(a){var
b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return
this._escapedAttributes[a]=f.escape(null==
+b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var
d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return
this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void
0;if(!this._validate(d,c))return!1;this.idAttribute in
d&&(this.id=d[this.idAttribute]);var
b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e
in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete
g[e],(c.silent?this._silent:
+b)[e]=!0;c.unset?delete
h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete
this.changed[e],delete this._pending[e])}c.silent||this.change(c);return
this},unset:function(a,b){(b||(b={})).unset=!0;return
this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return
this.set(f.clone(this.attributes),a)},fetch:function(a){var
a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)};
+a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var
d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var
h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete
c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return
false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error,
+h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return
b},destroy:function(a){var
a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return
d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var
e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return
e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t();
+return
this.i
[04/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
new file mode 100644
index 000..b8051fe
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/shred/content.js
@@ -0,0 +1,193 @@
+
+// The purpose of the `Content` object is to abstract away the data conversions
+// to and from raw content entities as strings. For example, you want to be
able
+// to pass in a Javascript object and have it be automatically converted into a
+// JSON string if the `content-type` is set to a JSON-based media type.
+// Conversely, you want to be able to transparently get back a Javascript
object
+// in the response if the `content-type` is a JSON-based media-type.
+
+// One limitation of the current implementation is that it [assumes the
`charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
+
+// The `Content` constructor takes an options object, which *must* have either
a
+// `body` or `data` property and *may* have a `type` property indicating the
+// media type. If there is no `type` attribute, a default will be inferred.
+var Content = function(options) {
+ this.body = options.body;
+ this.data = options.data;
+ this.type = options.type;
+};
+
+Content.prototype = {
+ // Treat `toString()` as asking for the `content.body`. That is, the raw
content entity.
+ //
+ // toString: function() { return this.body; }
+ //
+ // Commented out, but I've forgotten why. :/
+};
+
+
+// `Content` objects have the following attributes:
+Object.defineProperties(Content.prototype,{
+
+// - **type**. Typically accessed as `content.type`, reflects the
`content-type`
+// header associated with the request or response. If not passed as an
options
+// to the constructor or set explicitly, it will infer the type the `data`
+// attribute, if possible, and, failing that, will default to `text/plain`.
+ type: {
+get: function() {
+ if (this._type) {
+return this._type;
+ } else {
+if (this._data) {
+ switch(typeof this._data) {
+case "string": return "text/plain";
+case "object": return "application/json";
+ }
+}
+ }
+ return "text/plain";
+},
+set: function(value) {
+ this._type = value;
+ return this;
+},
+enumerable: true
+ },
+
+// - **data**. Typically accessed as `content.data`, reflects the content
entity
+// converted into Javascript data. This can be a string, if the `type` is,
say,
+// `text/plain`, but can also be a Javascript object. The conversion applied
is
+// based on the `processor` attribute. The `data` attribute can also be set
+// directly, in which case the conversion will be done the other way, to
infer
+// the `body` attribute.
+ data: {
+get: function() {
+ if (this._body) {
+return this.processor.parser(this._body);
+ } else {
+return this._data;
+ }
+},
+set: function(data) {
+ if (this._body&&data) Errors.setDataWithBody(this);
+ this._data = data;
+ return this;
+},
+enumerable: true
+ },
+
+// - **body**. Typically accessed as `content.body`, reflects the content
entity
+// as a UTF-8 string. It is the mirror of the `data` attribute. If you set
the
+// `data` attribute, the `body` attribute will be inferred and vice-versa. If
+// you attempt to set both, an exception is raised.
+ body: {
+get: function() {
+ if (this._data) {
+return this.processor.stringify(this._data);
+ } else {
+return this._body.toString();
+ }
+},
+set: function(body) {
+ if (this._data&&body) Errors.setBodyWithData(this);
+ this._body = body;
+ return this;
+},
+enumerable: true
+ },
+
+// - **processor**. The functions that will be used to convert to/from `data`
and
+// `body` attributes. You can add processors. The two that are built-in are
for
+// `text/plain`, which is basically an identity transformation and
+// `application/json` and other JSON-based media types (including custom
media
+// types with `+json`). You can add your own processors. See below.
+ processor: {
+get: function() {
+ var processor = Content.processors[this.type];
+ if (processor) {
+return processor;
+ } else {
+// Return the first processor that matches any part of the
+// content type. ex: application/vnd.foobar.baz+json will match json.
+var main = this.type.split(";")[0];
+var parts = main.split(/\+|
[03/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
new file mode 100644
index 000..20b5ed2
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/swagger.js
@@ -0,0 +1,1678 @@
+// swagger.js
+// version 2.0.41
+
+(function () {
+
+ var __bind = function (fn, me) {
+return function () {
+ return fn.apply(me, arguments);
+};
+ };
+
+ var log = function () {
+log.history = log.history || [];
+log.history.push(arguments);
+if (this.console) {
+ console.log(Array.prototype.slice.call(arguments)[0]);
+}
+ };
+
+ // if you want to apply conditional formatting of parameter values
+ var parameterMacro = function (value) {
+return value;
+ }
+
+ // if you want to apply conditional formatting of model property values
+ var modelPropertyMacro = function (value) {
+return value;
+ }
+
+ if (!Array.prototype.indexOf) {
+Array.prototype.indexOf = function (obj, start) {
+ for (var i = (start || 0), j = this.length; i < j; i++) {
+if (this[i] === obj) { return i; }
+ }
+ return -1;
+}
+ }
+
+ if (!('filter' in Array.prototype)) {
+Array.prototype.filter = function (filter, that /*opt*/) {
+ var other = [], v;
+ for (var i = 0, n = this.length; i < n; i++)
+if (i in this && filter.call(that, v = this[i], i, this))
+ other.push(v);
+ return other;
+};
+ }
+
+ if (!('map' in Array.prototype)) {
+Array.prototype.map = function (mapper, that /*opt*/) {
+ var other = new Array(this.length);
+ for (var i = 0, n = this.length; i < n; i++)
+if (i in this)
+ other[i] = mapper.call(that, this[i], i, this);
+ return other;
+};
+ }
+
+ Object.keys = Object.keys || (function () {
+var hasOwnProperty = Object.prototype.hasOwnProperty,
+ hasDontEnumBug = !{ toString: null }.propertyIsEnumerable("toString"),
+ DontEnums = [
+ 'toString',
+ 'toLocaleString',
+ 'valueOf',
+ 'hasOwnProperty',
+ 'isPrototypeOf',
+ 'propertyIsEnumerable',
+ 'constructor'
+ ],
+DontEnumsLength = DontEnums.length;
+
+return function (o) {
+ if (typeof o != "object" && typeof o != "function" || o === null)
+throw new TypeError("Object.keys called on a non-object");
+
+ var result = [];
+ for (var name in o) {
+if (hasOwnProperty.call(o, name))
+ result.push(name);
+ }
+
+ if (hasDontEnumBug) {
+for (var i = 0; i < DontEnumsLength; i++) {
+ if (hasOwnProperty.call(o, DontEnums[i]))
+result.push(DontEnums[i]);
+}
+ }
+
+ return result;
+};
+ })();
+
+ var SwaggerApi = function (url, options) {
+this.isBuilt = false;
+this.url = null;
+this.debug = false;
+this.basePath = null;
+this.authorizations = null;
+this.authorizationScheme = null;
+this.info = null;
+this.useJQuery = false;
+this.modelsArray = [];
+this.isValid;
+
+options = (options || {});
+if (url)
+ if (url.url)
+options = url;
+ else
+this.url = url;
+else
+ options = url;
+
+if (options.url != null)
+ this.url = options.url;
+
+if (options.success != null)
+ this.success = options.success;
+
+if (typeof options.useJQuery === 'boolean')
+ this.useJQuery = options.useJQuery;
+
+this.failure = options.failure != null ? options.failure : function () { };
+this.progress = options.progress != null ? options.progress : function ()
{ };
+if (options.success != null) {
+ this.build();
+ this.isBuilt = true;
+}
+ }
+
+ SwaggerApi.prototype.build = function () {
+if (this.isBuilt)
+ return this;
+var _this = this;
+this.progress('fetching resource list: ' + this.url);
+var obj = {
+ useJQuery: this.useJQuery,
+ url: this.url,
+ method: "get",
+ headers: {
+accept: "application/json,application/json;charset=\"utf-8\",*/*"
+ },
+ on: {
+error: function (response) {
+ if (_this.url.substring(0, 4) !== 'http') {
+return _this.fail('Please specify the protocol for ' + _this.url);
+ } else if (response.status === 0) {
+return _this.fail('Can\'t read from server. It may not have the
appropriate access-control-origin settings.');
+ } else if (response.status === 404) {
+return _this.fail('Can\'t read swagger JSON from ' + _this.url);
+ } else {
[06/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
new file mode 100644
index 000..bcbf248
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.ba-bbq.min.js
@@ -0,0 +1,18 @@
+/*
+ * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
+ * http://benalman.com/projects/jquery-bbq-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,p){var
i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function
E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return
function(){return G.apply(this,F.concat(m.call(arguments)))}}function
n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return
F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var
O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return
O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var
F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.no
Escape(",/");$.deparam=l=function(I,F){var
H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g,"
").split("&"),function(L,Q){var
K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=Mhttp://benalman.com/projects/jquery-hashchange-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+(function($,i,b){var
j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d
in i&&!h;function a(m){m=m||i[c][l];return
m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return
false}$(j.start)},teardown:function(){if(e){return
false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function
p(){o=q=function(s){return s};if(h){n=$('').hide().insertAfter("body")[0].contentWindow;q=function(){return
a(n.document[c][l])};o=function(u,s){if(u!==s){var
t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var
t=a();o||p();(function s(){var
v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return
m})()})(jQuery,this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
new file mode 100644
index 000..ba32cff
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.slideto.min.js
@@ -0,0 +1 @@
+(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#99"},a);return
this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery.wiggle.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jque
[12/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added customized Swagger UI.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added
customized Swagger UI.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/56132d79
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/56132d79
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/56132d79
Branch: refs/heads/3.0.x-fixes
Commit: 56132d79a2f861ea9d9a894654d280857a0e34de
Parents: 8e38a00
Author: reta
Authored: Wed Nov 12 13:37:12 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 10:31:52 2015 +0200
--
.../samples/jax_rs/description_swagger/pom.xml | 117 ---
.../webjars/swagger-ui/2.0.24/index.html| 60 ++
2 files changed, 134 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/56132d79/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index fa49ef0..0faab16 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -39,42 +39,73 @@
server
test
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- test
-
- java
-
-
-
demo.jaxrs.swagger.server.Server
-
-
-
-
-
-
-
-
-
+
+
+org.codehaus.mojo
+exec-maven-plugin
+
+
+test
+
+java
+
+
+
demo.jaxrs.swagger.server.Server
+
+
+
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-dependency-plugin
+2.9
+
+
+generate-resources
+
+unpack
+
+
+
+
+org.webjars
+swagger-ui
+2.0.24
+true
+
${project.build.directory}/classes
+**/index.html
+
+
+
+
+
+
+
+
+
-
+
com.wordnik
- swagger-jaxrs_2.10
-
-
-javax.ws.rs
+swagger-jaxrs_2.10
+
+
+ javax.ws.rs
jsr311-api
-
-
+
+
- org.webjars
- swagger-ui
- 2.0.24
+ org.webjars
+ swagger-ui
+ 2.0.24
+ provided
javassist
@@ -82,15 +113,15 @@
3.12.1.GA
- com.fasterxml.jackson.jaxrs
- jackson-jaxrs-json-provider
- 2.2.2
-
-
- com.fasterxml.jackson.core
- jackson-core
- 2.2.2
-
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-json-provider
+ 2.2.2
+
+
+com.fasterxml.jackson.core
+
[10/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial
demo skeleton.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5b8e2082
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5b8e2082
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5b8e2082
Branch: refs/heads/3.0.x-fixes
Commit: 5b8e2082fd5e5f537b24ee862a2065bf5d68c28b
Parents: 3d81ed6
Author: reta
Authored: Wed Oct 29 08:38:29 2014 -0400
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 10:29:01 2015 +0200
--
.../jax_rs/description_swagger/README.txt | 23 +
.../samples/jax_rs/description_swagger/pom.xml | 122 +
.../java/demo/jaxrs/swagger/server/Item.java| 49 +
.../java/demo/jaxrs/swagger/server/Sample.java | 56 +
.../java/demo/jaxrs/swagger/server/Server.java | 72 +
.../META-INF/cxf/org.apache.cxf.Logger |1 +
.../src/main/resources/logback.xml | 16 +
.../src/main/resources/swagger/css/reset.css| 125 +
.../src/main/resources/swagger/css/screen.css | 1224
.../resources/swagger/images/explorer_icons.png | Bin 0 -> 5763 bytes
.../resources/swagger/images/logo_small.png | Bin 0 -> 770 bytes
.../resources/swagger/images/pet_store_api.png | Bin 0 -> 824 bytes
.../main/resources/swagger/images/throbber.gif | Bin 0 -> 9257 bytes
.../resources/swagger/images/wordnik_api.png| Bin 0 -> 980 bytes
.../src/main/resources/swagger/index.html | 99 +
.../main/resources/swagger/lib/backbone-min.js | 38 +
.../resources/swagger/lib/handlebars-1.0.0.js | 2278 +++
.../resources/swagger/lib/highlight.7.3.pack.js |1 +
.../resources/swagger/lib/jquery-1.8.0.min.js |2 +
.../resources/swagger/lib/jquery.ba-bbq.min.js | 18 +
.../resources/swagger/lib/jquery.slideto.min.js |1 +
.../resources/swagger/lib/jquery.wiggle.min.js |8 +
.../main/resources/swagger/lib/shred.bundle.js | 2765 ++
.../main/resources/swagger/lib/shred/content.js | 193 ++
.../resources/swagger/lib/swagger-client.js | 1477 ++
.../main/resources/swagger/lib/swagger-oauth.js | 211 ++
.../src/main/resources/swagger/lib/swagger.js | 1678 +++
.../resources/swagger/lib/underscore-min.js | 32 +
.../src/main/resources/swagger/o2c.html | 15 +
.../src/main/resources/swagger/swagger-ui.js| 2477
.../main/resources/swagger/swagger-ui.min.js|1 +
distribution/src/main/release/samples/pom.xml |1 +
32 files changed, 12983 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt
b/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt
new file mode 100644
index 000..0ceee5b
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt
@@ -0,0 +1,23 @@
+JAX-RS Search Demo
+=
+
+The demo shows a basic usage of Swagger API documentation with REST based Web
Services using
+JAX-RS 2.0 (JSR-339). Swagger UI is available at: http://localhost:9000/
+
+Building and running the demo using Maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the Maven pom.xml file can be used to build and run the demo.
+
+
+Using either UNIX or Windows:
+
+ mvn install
+ mvn -Pserver (from one command line window)
+
+
+To remove the target dir, run mvn clean".
+
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
new file mode 100644
index 000..b099f61
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -0,0 +1,122 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+jax_rs_description_swagger
+JAX-RS Swagger Demo
+JAX-RS Basic Demo
+
+org.apache.cxf.samples
+cxf-samples
+3.1.0-SNAPSHOT
+../..
+
+
+
+${project.version}
+3.1
+
+
+
+
+server
+
+test
+
+
+
[02/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
new file mode 100644
index 000..d0b7c97
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.js
@@ -0,0 +1,2477 @@
+// swagger-ui.js
+// version 2.1.0-alpha.3
+$(function() {
+
+ // Helper function for vertically aligning DOM elements
+ // http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
+ $.fn.vAlign = function() {
+ return this.each(function(i){
+ var ah = $(this).height();
+ var ph = $(this).parent().height();
+ var mh = (ph - ah) / 2;
+ $(this).css('margin-top', mh);
+ });
+ };
+
+ $.fn.stretchFormtasticInputWidthToParent = function() {
+ return this.each(function(i){
+ var p_width = $(this).closest("form").innerWidth();
+ var p_padding =
parseInt($(this).closest("form").css('padding-left') ,10) +
parseInt($(this).closest("form").css('padding-right'), 10);
+ var this_padding = parseInt($(this).css('padding-left'), 10) +
parseInt($(this).css('padding-right'), 10);
+ $(this).css('width', p_width - p_padding - this_padding);
+ });
+ };
+
+ $('form.formtastic li.string input, form.formtastic
textarea').stretchFormtasticInputWidthToParent();
+
+ // Vertically center these paragraphs
+ // Parent may need a min-height for this to work..
+ $('ul.downplayed li div.content p').vAlign();
+
+ // When a sandbox form is submitted..
+ $("form.sandbox").submit(function(){
+
+ var error_free = true;
+
+ // Cycle through the forms required inputs
+ $(this).find("input.required").each(function() {
+
+ // Remove any existing error styles from the input
+ $(this).removeClass('error');
+
+ // Tack the error style on if the input is empty..
+ if ($(this).val() == '') {
+ $(this).addClass('error');
+ $(this).wiggle();
+ error_free = false;
+ }
+
+ });
+
+ return error_free;
+ });
+
+});
+
+function clippyCopiedCallback(a) {
+ $('#api_key_copied').fadeIn().delay(1000).fadeOut();
+
+ // var b = $("#clippy_tooltip_" + a);
+ // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"),
setTimeout(function() {
+ // b.attr("title", "copy to clipboard")
+ // },
+ // 500))
+}
+
+// Logging function that accounts for browsers that don't have window.console
+log = function(){
+ log.history = log.history || [];
+ log.history.push(arguments);
+ if(this.console){
+console.log( Array.prototype.slice.call(arguments)[0] );
+ }
+};
+
+// Handle browsers that do console incorrectly (IE9 and below, see
http://stackoverflow.com/a/5539378/7913)
+if (Function.prototype.bind && console && typeof console.log == "object") {
+[
+ "log","info","warn","error","assert","dir","clear","profile","profileEnd"
+].forEach(function (method) {
+console[method] = this.bind(console[method], console);
+}, Function.prototype.call);
+}
+
+var Docs = {
+
+ shebang: function() {
+
+ // If shebang has an operation nickname in it..
+ // e.g. /docs/#!/words/get_search
+ var fragments = $.param.fragment().split('/');
+ fragments.shift(); // get rid of the bang
+
+ switch (fragments.length) {
+ case 1:
+ // Expand all operations for the resource and
scroll to it
+ var dom_id = 'resource_' + fragments[0];
+
+
Docs.expandEndpointListForResource(fragments[0]);
+ $("#"+dom_id).slideto({highlight: false});
+ break;
+ case 2:
+ // Refer to the endpoint DOM element, e.g.
#words_get_search
+
+// Expand Resource
+Docs.expandEndpointListForResource(fragments[0]);
+$("#"+dom_id).slideto({highlight: false});
+
+// Expand operation
+ var li_dom_id = fragments.join('_');
+ var li_content_dom_id = li_dom_id + "_content";
+
+
+ Docs.expandOperation($('#'+li_content
[07/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
new file mode 100644
index 000..f121291
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/lib/jquery-1.8.0.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
+(function(a,b){function G(a){var b=F[a]={};return
p.each(a.split(s),function(a,c){b[c]=!0}),b}function
J(a,c,d){if(d===b&&a.nodeType===1){var
e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof
d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else
d=b}return d}function K(a){var b;for(b in
a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function
ba(){return!1}function bb(){return!0}function
bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do
a=a[b];while(a&&a.nodeType!==1);return a}function
bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var
e=!!b.call(a,d,a);return e===c});if(b.nodeType)return
p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var
d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return
p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(
a,b)>=0===c})}function bk(a){var
b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return
c}function bC(a,b){return
a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function
bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var
c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete
g.handle,g.events={};for(c in
h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createEle
ment)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return
bR[a]=c,c}function ch(a,b,c,d){var
e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof
e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in
b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return
function(b,c){typeof b!="string"&&(c=b,b="*");var
d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:fu
nction(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return
this.context=this[0]=a,this.length=1,this;if(typeof
a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return
c=c instanceof
p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return
d.find(a);this.length=1,this[0]=g}return
this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return
p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return
this.length},toArray:function(){return k.call(this)},get:function(a){return
a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var
d=p.merge(this.constructor(),a);return
d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?"
":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return
p.each(this,a,b)},ready:function(a){return
p.ready.promise().done(a),this},eq:function(a){return
a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return
this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return
this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return
this.pushStack(p.map(this,function(b,c){ret
[01/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added initial demo skeleton.
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 3d81ed643 -> 5608e3db0
http://git-wip-us.apache.org/repos/asf/cxf/blob/5b8e2082/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
new file mode 100644
index 000..7ec536a
--- /dev/null
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/swagger/swagger-ui.min.js
@@ -0,0 +1 @@
+$(function(){$.fn.vAlign=function(){return this.each(function(c){var
a=$(this).height();var d=$(this).parent().height();var
b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return
this.each(function(b){var d=$(this).closest("form").innerWidth();var
c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var
a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic
li.string input, form.formtastic
textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li
div.content p").vAlign();$("form.sandbox").submit(function(){var
a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return
a})});function
clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.histor
y=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments)[0])}};if(Function.prototype.bind&&console&&typeof
console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var
Docs={shebang:function(){var
b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:var
d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case
2:Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var
c=b.join("_");var
a=c+"_content";Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var
a=$("li#resource_"+Docs.escapeResourceName(b)+"
ul.endpoints");if(a.is(":visible")){Docs.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:fu
nction(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource
ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var
a=$("li#resource_"+b+"
ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var
b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var
a=$("li#resource_"+b+"
ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource
ul.endpoints li.operation
div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+"
li.operation
div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+"
li.operation
div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(a){return
a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},
collapseOperation:function(a){a.slideUp()}};(function(){var
b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">=
1.0.0"];f=this.merge(f,g.helpers);j=j||{};var
i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n
";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return
o}function d(r,q){var o="",p;o+='\n ';p=(typeof
r===h?r.apply(r):r);if(p||p===0){o+=p}o+="\n";return
o}function n(p,o){return'\n application/json\n'}i+='\n\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n\n";return
i})})();(function(){var
b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(f
unction(h,n,g,m,l){this.compilerInfo=[4,">=
1.0.0"];g=this.merge(g,h.helpers);l=l||{};var
j="",c,s,i="function",k=this.escapeExpression,q=this;function f(x,w){var
t="",v,u;t+='\n '+k(((v=((v=x.info),v==null||v===false?v:v.title)),typeof
v===i?v.apply(x):v))+'\n ';u=((v=((v=x.info),v==null||v===false?v:v.description)),typeof
v===i?v.apply(x):v);if(u||u===0){t+=u}t+="\n
";u=g[
[13/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added customized Swagger UI using index.jsp.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added
customized Swagger UI using index.jsp.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c3f191ca
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c3f191ca
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c3f191ca
Branch: refs/heads/3.0.x-fixes
Commit: c3f191ca81c071065f2567c730d5bbef810289d6
Parents: 56132d7
Author: reta
Authored: Thu Nov 20 15:32:11 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 10:32:32 2015 +0200
--
.../samples/jax_rs/description_swagger/pom.xml | 3 +-
.../java/demo/jaxrs/swagger/server/Server.java | 3 +-
.../webjars/swagger-ui/2.0.24/index.html| 60
.../webjars/swagger-ui/2.0.24/index.jsp | 52 +
4 files changed, 55 insertions(+), 63 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/c3f191ca/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index 0faab16..1b5c53f 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -79,8 +79,7 @@
swagger-ui
2.0.24
true
-
${project.build.directory}/classes
-**/index.html
+
${project.build.directory}/classes
http://git-wip-us.apache.org/repos/asf/cxf/blob/c3f191ca/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index 536c6a6..acf258a 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -41,10 +41,11 @@ public class Server {
final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
+context.setWelcomeFiles( new String[] { "index.jsp" } );
context.addServlet(servletHolder, "/*");
context.setResourceBase(getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
-servletHolder.setInitParameter("redirects-list", "/ /index.html
/.*[.]js /css/.* /images/.* lib/.*");
+servletHolder.setInitParameter("redirects-list", "/ /index.jsp
/.*[.]js /css/.* /images/.* lib/.*");
servletHolder.setInitParameter("redirect-servlet-name",
staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes",
"javax.servlet.include.request_uri");
servletHolder.setInitParameter("jaxrs.serviceClasses",
Sample.class.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/c3f191ca/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
deleted file mode 100644
index 5d18b8b..000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- Swagger UI
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-$(function () {
- window.swaggerUi = new SwaggerUi({
- url: "http://localhost:9000/api-docs";,
- dom_id: "swagger-ui-container",
- supportedSubmitMethods: ['get
[17/17] cxf git commit: adjust the swagger sample pom.xml after the merge
adjust the swagger sample pom.xml after the merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5608e3db Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5608e3db Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5608e3db Branch: refs/heads/3.0.x-fixes Commit: 5608e3db084754ce8fe7f735f4863b6f0f12d726 Parents: 514dfea Author: Akitoshi Yoshida Authored: Thu Jul 9 11:03:40 2015 +0200 Committer: Akitoshi Yoshida Committed: Thu Jul 9 11:03:40 2015 +0200 -- .../src/main/release/samples/jax_rs/description_swagger/pom.xml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/5608e3db/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml -- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml index 8c2faa8..541ec01 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml @@ -25,7 +25,7 @@ org.apache.cxf.samples cxf-samples -3.1.0-SNAPSHOT +3.0.6-SNAPSHOT ../..
[16/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added more examples into demo.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added more
examples into demo.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/514dfeaa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/514dfeaa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/514dfeaa
Branch: refs/heads/3.0.x-fixes
Commit: 514dfeaa75577cef74dbd41f001a3d0cb4ed4bfe
Parents: 58674d7
Author: reta
Authored: Thu Jan 15 21:15:07 2015 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 11:02:12 2015 +0200
--
.../java/demo/jaxrs/swagger/server/Sample.java | 36
1 file changed, 36 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/514dfeaa/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index ca92e7c..545d804 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -21,16 +21,22 @@ package demo.jaxrs.swagger.server;
import java.util.Arrays;
+import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiImplicitParam;
@@ -73,6 +79,36 @@ public class Sample {
return new Item("name", "Value in " + language);
}
+@Consumes({ MediaType.APPLICATION_JSON })
+@POST
+@ApiOperation(
+value = "Post operation with entity in a body",
+notes = "Post operation with entity in a body",
+response = Item.class
+)
+public Response createItem(
+@Context final UriInfo uriInfo,
+@ApiParam(value = "item", required = true) final Item item) {
+
+return Response
+.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
+.entity(item).build();
+}
+
+@Produces({ MediaType.APPLICATION_JSON })
+@Path("/{name}")
+@PUT
+@ApiOperation(
+value = "Put operation with form parameter",
+notes = "Put operation with form parameter",
+response = Item.class
+)
+public Item updateItem(
+@ApiParam(value = "name", required = true) @PathParam("name") String
name,
+@ApiParam(value = "value", required = true) @FormParam("value") String
value) {
+return new Item(name, value);
+}
+
@Path("/{name}")
@DELETE
@ApiOperation(
[11/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced
embedded Swagger UI with webjar.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e38a004
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e38a004
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e38a004
Branch: refs/heads/3.0.x-fixes
Commit: 8e38a0043b7212903b18a8c68966cbd5a5922b60
Parents: 5b8e208
Author: reta
Authored: Sun Nov 2 17:29:55 2014 -0500
Committer: Akitoshi Yoshida
Committed: Thu Jul 9 10:31:21 2015 +0200
--
.../release/samples/jax_rs/description_swagger/pom.xml| 10 ++
.../src/main/java/demo/jaxrs/swagger/server/Server.java | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e38a004/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index b099f61..fa49ef0 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -72,6 +72,16 @@
+ org.webjars
+ swagger-ui
+ 2.0.24
+
+
+javassist
+javassist
+3.12.1.GA
+
+
com.fasterxml.jackson.jaxrs
jackson-jaxrs-json-provider
2.2.2
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e38a004/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index 8f849ea..536c6a6 100644
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++
b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -42,7 +42,7 @@ public class Server {
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
context.addServlet(servletHolder, "/*");
-
context.setResourceBase(getClass().getResource("/swagger").toURI().toString());
+
context.setResourceBase(getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
servletHolder.setInitParameter("redirects-list", "/ /index.html
/.*[.]js /css/.* /images/.* lib/.*");
servletHolder.setInitParameter("redirect-servlet-name",
staticHolder.getName());
