cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 1c1146b2d -> dd208dc7e 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/dd208dc7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dd208dc7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dd208dc7 Branch: refs/heads/2.7.x-fixes Commit: dd208dc7e5e805a01e3dc6b390ea9ce5fac0f240 Parents: 1c1146b Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:31:08 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:31:08 2015 +0100 -- .gitmergeinfo | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/dd208dc7/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 15582f0..0f471f8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -385,6 +385,7 @@ B 2816469014ec116559cd405720271457f13432b9 B 28244858cadc3596f760b37c1e1f9331441364d2 B 28b53b095af7e53e9bf6f4265ca39ff405619eee B 28dc0430fdf141960668570037b862acb1a520e9 +B 28dfd5823c055913a5ef36657eb2b5e14aaca83e B 28e7c51cfa9e2548600151669f8896af20bce293 B 2905d05f17ae6aafe2b31a542069fcd5b6e6a496 B 29186b625df55a641a139310e2133dcceee66f56 @@ -515,6 +516,7 @@ B 374c8ad502993e87763fe6dcef0f132714431d76 B 37a9b1f838670705504221aa0d7bac15957f0529 B 37c01ad36716f51935588b5f3c9a670a1dfff6c7 B 37c8e1a1078e13d578692905746932d1e6f5a693 +B 37e834fa2460f5fd33fbf9588f21451c2d2c513a B 382d6f75aec9c5fd2ba69870bbc1c2916b4a6ceb B 3832db055cbc8b7341bdb6fe4ba8ef5efb6be105 B 383328d4ff23fa6f5ae751dc684915d60a679a74 @@ -822,6 +824,7 @@ B 59f62e5593cf32a3c7bfa2e54c91e2e7c9ccd5dd B 5a0d5de27c3d83e82f18ebed908f0624c8b7585a B 5a140bb6d402976dba1e87924da86ca4d4390d2d B 5ad015a408a9a04405f25ae45f9f08a250fd4bf4 +B 5ad28ff2b3fcda25b51346b95ffac181d895142f B 5ae190595f03bab2c9d9e41c7d7d6c4cad59086e B 5ae70f42be238e5c4947d2cefc93dad1773ba0c8 B 5b6ebb9300f39192186c4b3587683c92c33645e0 @@ -1809,6 +1812,7 @@ B cbcd557e540309902de3262f6aa23b071882261b B cbd81c955e5a1f6cef71fe53e088521cdf87c936 B cc02c01f31e64bd6c01f6edac2e5f2d80a9afbeb B cc0ba3f09068df3397adf5f7c55362bdffb96174 +B cc2bb2de00d5ca985781ca00052d63cf743c22c7 B cc5172ceaffb018e3852c9ae3d9e3487cb65d80e B cc5a0385b83abf493446948267f2d1945bb4ee5c B cc674df55d596c8774d732ff537e490a159abfe5
cxf-fediz git commit: Updating XJC
Repository: cxf-fediz Updated Branches: refs/heads/1.1.x-fixes 41622e76d -> 95c59143e Updating XJC Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/95c59143 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/95c59143 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/95c59143 Branch: refs/heads/1.1.x-fixes Commit: 95c59143ebc9953642f1cc3bc9bd552ba0ba3bf0 Parents: 41622e7 Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:29:00 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:30:24 2015 +0100 -- plugins/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/95c59143/plugins/core/pom.xml -- diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml index 3b30e92..8fd7c78 100644 --- a/plugins/core/pom.xml +++ b/plugins/core/pom.xml @@ -30,7 +30,7 @@ bundle UTF-8 -3.0.5-SNAPSHOT +3.0.5
[3/3] cxf git commit: Fixing merge
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc2bb2de Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc2bb2de Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc2bb2de Branch: refs/heads/3.0.x-fixes Commit: cc2bb2de00d5ca985781ca00052d63cf743c22c7 Parents: 5ad28ff Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:30:00 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:30:00 2015 +0100 -- pom.xml | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/cc2bb2de/pom.xml -- diff --git a/pom.xml b/pom.xml index eed1558..1ae3700 100644 --- a/pom.xml +++ b/pom.xml @@ -42,15 +42,9 @@ false -<<< HEAD 3.0.0 -3.0.4 -1.6 -=== -3.1.0 3.0.5 -1.7 ->>> 2fc62cf... Updating XJC +1.6 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site
[2/3] cxf git commit: Updating XJC
Updating XJC 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/28dfd582 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/28dfd582 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/28dfd582 Branch: refs/heads/3.0.x-fixes Commit: 28dfd5823c055913a5ef36657eb2b5e14aaca83e Parents: 936c255 Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:28:09 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:29:42 2015 +0100 -- pom.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/28dfd582/pom.xml -- diff --git a/pom.xml b/pom.xml index 5c64ef2..eed1558 100644 --- a/pom.xml +++ b/pom.xml @@ -42,9 +42,15 @@ false +<<< HEAD 3.0.0 3.0.4 1.6 +=== +3.1.0 +3.0.5 +1.7 +>>> 2fc62cf... Updating XJC UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 936c25522 -> cc2bb2de0 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/5ad28ff2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ad28ff2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ad28ff2 Branch: refs/heads/3.0.x-fixes Commit: 5ad28ff2b3fcda25b51346b95ffac181d895142f Parents: 28dfd58 Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:29:42 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:29:42 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/5ad28ff2/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index bd4b6bd..0058c3d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -479,6 +479,7 @@ M 2bbdbdab92befd79e5083cf7a298f6a931a2e76e M 2cfcbbc2ce20118e06ca3ef11f08f6f106181055 M 2d3ac551c8614516cbbf288195d2a99cadb79659 M 2e701bcd1cabcc7ae4cb69346eacb8ab278e2827 +M 2fc62cf0f53912b53a93409802f43418d067faf1 M 318cfdaeb15b8d230829d120f894bec6f15bc836 M 3228637a5070a25f625fb18fc21a7dd54ce16dfd M 3348a2999d2693edfeaf1fdd62a94222774186fd
cxf-fediz git commit: Updating XJC
Repository: cxf-fediz Updated Branches: refs/heads/1.2.x-fixes ad5e91a3c -> 1056b3164 Updating XJC Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1056b316 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1056b316 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1056b316 Branch: refs/heads/1.2.x-fixes Commit: 1056b3164a375dcef85723004fb2030488afe076 Parents: ad5e91a Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:29:00 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:29:38 2015 +0100 -- plugins/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1056b316/plugins/core/pom.xml -- diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml index 0d6f2d3..ca4beb7 100644 --- a/plugins/core/pom.xml +++ b/plugins/core/pom.xml @@ -30,7 +30,7 @@ bundle UTF-8 -3.0.5-SNAPSHOT +3.0.5
cxf-fediz git commit: Updating XJC
Repository: cxf-fediz Updated Branches: refs/heads/master 17a64eb50 -> 7819861ba Updating XJC Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/7819861b Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/7819861b Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/7819861b Branch: refs/heads/master Commit: 7819861ba3c2012791f94884b4f2366b69e3c206 Parents: 17a64eb Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:29:00 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:29:00 2015 +0100 -- plugins/core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/7819861b/plugins/core/pom.xml -- diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml index ee710b4..d45af9a 100644 --- a/plugins/core/pom.xml +++ b/plugins/core/pom.xml @@ -30,7 +30,7 @@ bundle UTF-8 -3.0.5-SNAPSHOT +3.0.5
cxf git commit: Updating XJC
Repository: cxf Updated Branches: refs/heads/master d57cebc10 -> 2fc62cf0f Updating XJC Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2fc62cf0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2fc62cf0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2fc62cf0 Branch: refs/heads/master Commit: 2fc62cf0f53912b53a93409802f43418d067faf1 Parents: d57cebc Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:28:09 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:28:27 2015 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2fc62cf0/pom.xml -- diff --git a/pom.xml b/pom.xml index 993e4d8..2964cea 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ false 3.1.0 -3.0.4 +3.0.5 1.7 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.3 (Java 1.7.0_80; Linux 3.19.0-26-generic)""userId" = "coheigea""ip" = "80.169.137.63"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/cxf/xjc-utils/xjc-utils/3.0.5/xjc-utils-3.0.5.pom(SHA1: c59a636288d45b9a582f6f3bf61f03fc65c06db1)/org/apache/cxf/xjc-utils/xjc-utils/3.0.5/xjc-utils-3.0.5-source-release.zip.asc(SHA1: 2bcd31d370ecd2d131e238ab4ada59e14dd6fb38)/org/apache/cxf/xjc-utils/xjc-utils/3.0.5/xjc-utils-3.0.5-source-release.zip(SHA1: 1a9aef0305de9a6afed10dde60f88b2e67a34aa7)/org/apache/cxf/xjc-utils/xjc-utils/3.0.5/xjc-utils-3.0.5.pom.asc(SHA1: ff7b67fefe9be3d059ff3f4e261fdeb43ee0d393)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5.pom(SHA1: a7bc6c4ef6af326391f0df892a74e54eb044094b)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5.pom.asc(SHA1: 975895ef70330651c9ca7597ace3ecbbd9c6c7d0)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5.jar(SHA1: 2c283a9363ea7e0ff99e70e9a0cbcb0f37aadaa3)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5-javadoc.jar.asc(SHA1: 71f89baf923f82249d6b8f01c40755e9090da4d2)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5-sources.jar.asc(SHA1: 5b5a20afc54c3b543d99add4de746101edcf82e9)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5.jar.asc(SHA1: fafbf7bd72b6c864404238b415299425f14de1a0)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5-javadoc.jar(SHA1: 7efb131133418eb660fb7f2ecf47d9d2dcba200b)/org/apache/cxf/xjc-utils/cxf-xjc-runtime/3.0.5/cxf-xjc-runtime-3.0.5-sources.jar(SHA1: 80ae47c358656f5d7c2fd5e3fdf703f37759726c)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5-sources.jar(SHA1: 8e2e76ed4aa33098900d831bb240ff6249577440)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5.pom(SHA1: 459ac5239fda0e20ef6de55b5ab7e6d4ce091865)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5-javadoc.jar(SHA1: 95b3ae9b9fae72268fc6c9d0e1cd148ef2f13599)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5.jar(SHA1: 5e5e39d657b5cba52289f73d7fffe1355de11e04)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5.pom.asc(SHA1: b56e685848f1e92f34b1ffd865e7dacdd2d002f8)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5.jar.asc(SHA1: 5fb7476b1aad2bde44661eb414b217991720f3f3)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5-javadoc.jar.asc(SHA1: 3513e523a87aeaa88ae1ebb8a2bdf5efe0e08599)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.0.5/cxf-xjc-boolean-3.0.5-sources.jar.asc(SHA1: b338550eea441e391ce3d7b71155331884c17eca)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5.pom.asc(SHA1: 391ecda3fbf81a6c101228b9dc2d7aa3cbceb011)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5.pom(SHA1: 67ec7b37710effeafbc21928687262bcabfb73cd)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5.jar(SHA1: e710e76d67f16cc355947ba3819467ccd076aa80)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5.jar.asc(SHA1: bd01682776fa5b2114bae392f3c9a86d93dae19e)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5-sources.jar(SHA1: 86ecd365239c5361ce9dc98f4e16c43a08fbbf79)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5-javadoc.jar.asc(SHA1: e4b2ab51da9e20efe480fff3bfa1b56a71ad0b75)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5-sources.jar.asc(SHA1: 02395d91568aa8d9c135a2635f27a5c9f9448d9b)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.0.5/cxf-xjc-bug671-3.0.5-javadoc.jar(SHA1: f9cd9289b9cc52e41001eb5d10ae7218ec238b2c)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5-javadoc.jar.asc(SHA1: 0d7d079655af9c598b4540b69137f1c3dc4c5992)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5-sources.jar(SHA1: 09586ff7643e3422ef5352a095d1bbec4caeb40b)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5.jar(SHA1: c0da80e6ff84eefdd76325700f048b04cfe1b9c1)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5.pom.asc(SHA1: cb3aafcb03a0cdf7ca355ba54ce1820680677d84)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5.jar.asc(SHA1: b9d65fb2239f8d1479ad8a416dd23345e8df9c21)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5-javadoc.jar(SHA1: 31ed68789022bed9c51b79f9a8b42612b284e884)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5-sources.jar.asc(SHA1: e4f1a43134ef371bb293ae0ede12fedb738e9be4)/org/apache/cxf/xjcplugins/cxf-xjc-javadoc/3.0.5/cxf-xjc-javadoc-3.0.5.pom(SHA1: 0b8c8341f024e1dab85f5e356d254a83b126b44d)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.0.5/cxf-xjc-bug986-3.0.5-javadoc.jar(SHA1: 53bef37d3f0ebacafd7609a9656aeca020fc8058)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.0.5/cxf
[3/5] cxf-fediz git commit: Adding Apache license headers to some test config
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/spring/src/test/resources/fediz_config.xml -- diff --git a/systests/spring/src/test/resources/fediz_config.xml b/systests/spring/src/test/resources/fediz_config.xml index e74b1ef..6cce85e 100644 --- a/systests/spring/src/test/resources/fediz_config.xml +++ b/systests/spring/src/test/resources/fediz_config.xml @@ -1,4 +1,22 @@ - + + http://www.eclipse.org/jetty/configure.dtd";> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/spring/src/test/resources/rp-server.xml -- diff --git a/systests/spring/src/test/resources/rp-server.xml b/systests/spring/src/test/resources/rp-server.xml index 2792a74..f61c3c4 100644 --- a/systests/spring/src/test/resources/rp-server.xml +++ b/systests/spring/src/test/resources/rp-server.xml @@ -1,4 +1,22 @@ - + + http://www.eclipse.org/jetty/configure.dtd";> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/tomcat7/src/test/resources/fediz_config.xml -- diff --git a/systests/tomcat7/src/test/resources/fediz_config.xml b/systests/tomcat7/src/test/resources/fediz_config.xml index 507995a..dc30ea6 100644 --- a/systests/tomcat7/src/test/resources/fediz_config.xml +++ b/systests/tomcat7/src/test/resources/fediz_config.xml @@ -1,4 +1,22 @@ - + + http://www.springframework.org/schema/beans"; xmlns:cxf="http://cxf.apache.org/core"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml -- diff --git a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml index 2297ff3..851c94a 100644 --- a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml +++ b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,22 @@ + + http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/webapps/pom.xml -- diff --git a/systests/webapps/pom.xml b/systests/webapps/pom.xml index f782919..dc68e46 100644 --- a/systests/webapps/pom.xml +++ b/systests/webapps/pom.xml @@ -1,3 +1,4 @@ + http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml -- diff --git a/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml index e96423f..de8b046 100644 --- a/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml +++ b/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,22 @@ + + http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml -- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml index 3974a96..2871d19 100644 --- a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -1,5 +1,22 @@ - + http://www.springframework.org/schema/beans"; xmlns:sec="http://www.springframework.org/schema/security"; xmlns:p="http://www.springframework.org/schema/p"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/35c613b1/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml -- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml index 996e5aa..4d3bbc4 100644 --- a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml +++ b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,22 @@ + + http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
[2/5] cxf-fediz git commit: Re-enable Spring system tests!
Re-enable Spring system tests!
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6f6659b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6f6659b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6f6659b9
Branch: refs/heads/1.2.x-fixes
Commit: 6f6659b9356c4f2c871edf16117fb2a5d81d7abb
Parents: b1815d5
Author: Colm O hEigeartaigh
Authored: Fri Sep 4 16:25:00 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 4 17:14:59 2015 +0100
--
.../jetty8/src/test/resources/fediz_config.xml | 3 +
.../test/resources/fediz_config_client_cert.xml | 37 +
.../cxf/fediz/integrationtests/Spring2Test.java | 29 +++
.../spring/src/test/resources/fediz_config.xml | 3 +
.../AbstractClientCertTests.java| 7 +-
.../fediz/integrationtests/AbstractTests.java | 82 +---
.../fediz/integrationtests/HTTPTestUtils.java | 6 +-
7 files changed, 134 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f6659b9/systests/jetty8/src/test/resources/fediz_config.xml
--
diff --git a/systests/jetty8/src/test/resources/fediz_config.xml
b/systests/jetty8/src/test/resources/fediz_config.xml
index bf401cb..39e271a 100644
--- a/systests/jetty8/src/test/resources/fediz_config.xml
+++ b/systests/jetty8/src/test/resources/fediz_config.xml
@@ -53,6 +53,9 @@
1000
+
+
+
http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
urn:org:apache:cxf:fediz:fedizhelloworld
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f6659b9/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
--
diff --git a/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
b/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
index da6b126..275ec4b 100644
--- a/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
+++ b/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
@@ -40,5 +40,42 @@
/secure/logout
/index.html
+
+
+
urn:org:apache:cxf:fediz:fedizhelloworld
+
+
+
+
+
+
+
+
+
+1000
+
+
+
+http://www.w3.org/2001/XMLSchema-instance";
+xsi:type="federationProtocolType" version="1.0.0">
+urn:org:apache:cxf:fediz:fedizhelloworld
+
https://localhost:${idp.https.port}/fediz-idp/federation
+,
+
http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role
+10
+urn:org:apache:cxf:fediz:idp:realm-A
+
+http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role";
optional="false" />
+ http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname";
optional="true" />
+ http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname";
optional="true" />
+ http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress";
optional="true" />
+
+
http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/Ssl
+org.apache.cxf.fediz.integrationtests.HOKCallbackHandler
+
+/secure/logout
+/index.html
+
+
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6f6659b9/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
--
diff --git
a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
index d94bb60..3bb2aa5 100644
---
a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
+++
b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
@@ -24,6 +24,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import org.junit.Test;
public class Spring2Test extends AbstractTests {
@@ -78,4 +79,32 @@ public class Spring2Test extends AbstractTests {
public void testConcurrentRequests() throws Exception {
// super.testConcurrentRequests();
}
+
+@Test
+@Ignore("This tests is currently failing on Spring")
+@Override
+public void testAliceModifiedSignature() throws Exception {
+
+}
+
+@Test
+
[5/5] cxf-fediz git commit: Fixing failing tests
Fixing failing tests Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ad5e91a3 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ad5e91a3 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ad5e91a3 Branch: refs/heads/1.2.x-fixes Commit: ad5e91a3ccb8177e46ccb38f4d332714258f Parents: 35c613b Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:03:08 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:15:40 2015 +0100 -- services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 4 ++-- systests/jetty8/src/test/resources/rp-client-cert-server.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ad5e91a3/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml -- diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml index 572e216..d3ea403 100644 --- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml +++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml @@ -132,8 +132,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ad5e91a3/systests/jetty8/src/test/resources/rp-client-cert-server.xml -- diff --git a/systests/jetty8/src/test/resources/rp-client-cert-server.xml b/systests/jetty8/src/test/resources/rp-client-cert-server.xml index a5b38bf..d3f4c52 100644 --- a/systests/jetty8/src/test/resources/rp-client-cert-server.xml +++ b/systests/jetty8/src/test/resources/rp-client-cert-server.xml @@ -17,7 +17,6 @@ specific language governing permissions and limitations under the License. --> - http://www.eclipse.org/jetty/configure.dtd";>
[1/5] cxf-fediz git commit: [FEDIZ-106] - Spring 2 support added
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes ec4237796 -> ad5e91a3c
[FEDIZ-106] - Spring 2 support added
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b1815d5f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b1815d5f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b1815d5f
Branch: refs/heads/1.2.x-fixes
Commit: b1815d5fb8387436cad8635ec4b905ba24c461f6
Parents: ec42377
Author: Colm O hEigeartaigh
Authored: Fri Sep 4 15:09:59 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 4 17:14:51 2015 +0100
--
.../authentication/ExpiredTokenException.java | 35 ++
.../web/FederationAuthenticationEntryPoint.java | 69
.../web/FederationAuthenticationFilter.java | 106 ++-
.../src/main/webapp/WEB-INF/cxf-transport.xml | 4 +-
4 files changed, 141 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b1815d5f/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
--
diff --git
a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
new file mode 100644
index 000..42e23fe
--- /dev/null
+++
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
@@ -0,0 +1,35 @@
+/**
+ * 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.fediz.spring.authentication;
+
+import org.springframework.security.AuthenticationException;
+
+/**
+ * To be called when a token has expired
+ */
+public class ExpiredTokenException extends AuthenticationException {
+
+private static final long serialVersionUID = 7639463618762010981L;
+
+public ExpiredTokenException(String errorMessage) {
+super(errorMessage);
+}
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b1815d5f/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
--
diff --git
a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
index 3fd799f..851f253 100644
---
a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
+++
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
@@ -83,65 +83,6 @@ public class FederationAuthenticationEntryPoint implements
AuthenticationEntryPo
Assert.notNull(this.federationConfig, "FederationConfig cannot be
null.");
}
-public final void commence(final HttpServletRequest servletRequest, final
HttpServletResponse response,
-final AuthenticationException authenticationException) throws
IOException, ServletException {
-
-FedizContext fedContext = federationConfig.getFedizContext();
-LOG.debug("Federation context: {}", fedContext);
-
-if
(servletRequest.getRequestURL().indexOf(FederationConstants.METADATA_PATH_URI)
!= -1
-||
servletRequest.getRequestURL().indexOf(getMetadataURI(fedContext)) != -1) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("Metadata document requested");
-}
-response.setContentType("text/xml");
-PrintWriter out = response.getWriter();
-
-FedizProcessor wfProc =
-
FedizProcessorFactory.newFedizProcessor(fedContext.getProtocol());
-try {
-Document metadata = wfProc.getMetaData(servletRequest,
fedContext);
-out.write(DOM2Writer.nodeToString(metadata));
-
[4/5] cxf-fediz git commit: Adding Apache license headers to some test config
Adding Apache license headers to some test config Conflicts: plugins/jetty8/src/main/assembly/assembly.xml systests/tomcat8/src/test/resources/fediz_config.xml systests/tomcat8/src/test/resources/fediz_config_bad_wreq.xml systests/tomcat8/src/test/resources/fediz_config_client_cert.xml systests/tomcat8/src/test/resources/fediz_config_hok.xml systests/tomcat8/src/test/resources/fediz_config_wreq.xml Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/35c613b1 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/35c613b1 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/35c613b1 Branch: refs/heads/1.2.x-fixes Commit: 35c613b10a96ed6e8f0608b2eb50c22fdfd42f67 Parents: 6f6659b Author: Colm O hEigeartaigh Authored: Fri Sep 4 16:33:38 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:15:30 2015 +0100 -- apache-fediz/pom.xml| 1 + etc/eclipse/CXFCleanUp.xml | 18 etc/eclipse/CXFCodeFormatter.xml| 18 examples/pom.xml| 1 + .../src/main/config/fediz_config.xml| 20 +- .../src/main/webapp/META-INF/context.xml| 19 + .../src/main/webapp/WEB-INF/web.xml | 19 + .../WEB-INF/applicationContext-security.xml | 19 - .../src/main/webapp/WEB-INF/fediz_config.xml| 20 +- .../src/main/webapp/WEB-INF/web.xml | 19 + .../src/main/config/fediz_config.xml| 20 +- .../src/main/webapp/META-INF/context.xml| 19 + .../WEB-INF/applicationContext-security.xml | 19 - .../src/main/webapp/WEB-INF/web.xml | 19 + .../WEB-INF/applicationContext-security.xml | 19 - .../src/main/webapp/WEB-INF/fediz_config.xml| 20 +- .../src/main/webapp/WEB-INF/web.xml | 19 + .../src/main/config/fediz_config.xml| 20 +- .../src/main/webapp/META-INF/context.xml| 19 + .../src/main/webapp/WEB-INF/web.xml | 19 + examples/wsclientWebapp/pom.xml | 1 + .../webapp/src/main/config/fediz_config.xml | 20 +- .../webapp/src/main/webapp/META-INF/context.xml | 19 + .../main/webapp/WEB-INF/applicationContext.xml | 18 .../webapp/src/main/webapp/WEB-INF/web.xml | 19 + .../wsclientWebapp/webservice/common/pom.xml| 1 + examples/wsclientWebapp/webservice/pom.xml | 1 + .../wsclientWebapp/webservice/service/pom.xml | 1 + .../main/webapp/WEB-INF/applicationContext.xml | 18 .../service/src/main/webapp/WEB-INF/web.xml | 20 +- .../core/src/main/resources/fediz-ehcache.xml | 19 + .../test/resources/fediz_meta_test_config.xml | 20 +- .../resources/fediz_meta_test_config_saml.xml | 20 +- .../src/test/resources/fediz_test_config.xml| 20 +- .../test/resources/fediz_test_config_saml.xml | 20 +- plugins/cxf/src/main/assembly/assembly.xml | 19 + plugins/jetty/src/main/assembly/assembly.xml| 19 + plugins/pom.xml | 1 + plugins/spring/src/main/assembly/assembly.xml | 19 + plugins/spring2/src/main/assembly/assembly.xml | 19 + plugins/tomcat7/src/main/assembly/assembly.xml | 19 + .../websphere/src/main/assembly/assembly.xml| 19 + .../src/test/resources/fediz_config.xml | 20 +- .../src/test/resources/mappingSample.xml| 18 pom.xml | 1 + .../cxf/src/test/resources/fediz_config.xml | 20 +- .../src/main/webapp/WEB-INF/cxf-service.xml | 29 ++-- .../src/main/webapp/WEB-INF/web.xml | 19 + .../test/resources/fediz_config_saml_sso.xml| 20 +- .../src/test/resources/fediz_config_wsfed.xml | 20 +- .../jetty8/src/test/resources/fediz_config.xml | 20 +- .../test/resources/fediz_config_client_cert.xml | 20 +- .../jetty8/src/test/resources/idp-server.xml| 20 +- .../test/resources/rp-client-cert-server.xml| 19 + .../jetty8/src/test/resources/rp-server.xml | 20 +- .../src/test/resources/fediz_config.xml | 20 +- systests/pom.xml| 1 + systests/spring/pom.xml | 20 +- .../spring/src/test/resources/fediz_config.xml | 20 +- .../spring/src/test/resources/i
cxf git commit: Finishing JWS JSON unencoded payload test, still some work to do for JWS compact
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 37e834fa2 -> 936c25522
Finishing JWS JSON unencoded payload test, still some work to do for JWS compact
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/936c2552
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/936c2552
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/936c2552
Branch: refs/heads/3.0.x-fixes
Commit: 936c25522bdeca225645844983ae37cb82ea927e
Parents: 37e834f
Author: Sergey Beryozkin
Authored: Fri Sep 4 17:04:01 2015 +0100
Committer: Sergey Beryozkin
Committed: Fri Sep 4 17:05:17 2015 +0100
--
.../cxf/jaxrs/provider/json/JsonMapObject.java | 4 ++
.../cxf/rs/security/jose/JoseConstants.java | 4 +-
.../cxf/rs/security/jose/JoseHeaders.java | 4 ++
.../jose/jaxrs/JwsJsonWriterInterceptor.java| 23 +++-
.../jose/jwe/AbstractJweDecryption.java | 2 +-
.../jose/jwe/AbstractJweEncryption.java | 2 +-
.../cxf/rs/security/jose/jwe/JweHeaders.java| 2 +-
.../cxf/rs/security/jose/jws/JwsHeaders.java| 5 +-
.../rs/security/jose/jws/JwsJsonConsumer.java | 61
.../rs/security/jose/jws/JwsJsonProducer.java | 56 ++
.../jose/jws/JwsJsonSignatureEntry.java | 30 +-
.../jose/jws/JwsCompactReaderWriterTest.java| 14 -
.../security/jose/jws/JwsJsonConsumerTest.java | 11
.../security/jose/jws/JwsJsonProducerTest.java | 6 +-
14 files changed, 162 insertions(+), 62 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/936c2552/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
index 88094c6..5740f73 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
@@ -46,6 +46,10 @@ public class JsonMapObject {
values.put(name, value);
}
+public boolean containsProperty(String name) {
+return values.containsKey(name);
+}
+
public Object getProperty(String name) {
return values.get(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/936c2552/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
index c5f3e03..0c04791 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
@@ -36,7 +36,9 @@ public final class JoseConstants {
public static final String JWE_HEADER_KEY_ENC_ALGORITHM = HEADER_ALGORITHM;
public static final String JWE_HEADER_CONTENT_ENC_ALGORITHM = "enc";
public static final String JWE_HEADER_ZIP_ALGORITHM = "zip";
-public static final String DEFLATE_ZIP_ALGORITHM = "DEF";
+public static final String JWE_DEFLATE_ZIP_ALGORITHM = "DEF";
+
+public static final String JWS_HEADER_B64_STATUS_HEADER = "b64";
public static final String TYPE_JWT = "JWT";
public static final String TYPE_JOSE = "JOSE";
http://git-wip-us.apache.org/repos/asf/cxf/blob/936c2552/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
index fd111e6..add5408 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
@@ -172,4 +172,8 @@ public abstract class JoseHeaders extends JsonMapObject {
return getLongProperty(name);
}
+public boolean containsHeader(String name) {
+return containsProperty(name);
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/936c2552/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/s
cxf git commit: Finishing JWS JSON unencoded payload test, still some work to do for JWS compact
Repository: cxf
Updated Branches:
refs/heads/master 38a805ac4 -> d57cebc10
Finishing JWS JSON unencoded payload test, still some work to do for JWS compact
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d57cebc1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d57cebc1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d57cebc1
Branch: refs/heads/master
Commit: d57cebc10b34ae3fc8b6cca0c6e61c8fb10e0a60
Parents: 38a805a
Author: Sergey Beryozkin
Authored: Fri Sep 4 17:04:01 2015 +0100
Committer: Sergey Beryozkin
Committed: Fri Sep 4 17:04:01 2015 +0100
--
.../cxf/jaxrs/provider/json/JsonMapObject.java | 4 ++
.../cxf/rs/security/jose/JoseConstants.java | 4 +-
.../cxf/rs/security/jose/JoseHeaders.java | 4 ++
.../jose/jaxrs/JwsJsonWriterInterceptor.java| 23 +++-
.../jose/jwe/AbstractJweDecryption.java | 2 +-
.../jose/jwe/AbstractJweEncryption.java | 2 +-
.../cxf/rs/security/jose/jwe/JweHeaders.java| 2 +-
.../cxf/rs/security/jose/jws/JwsHeaders.java| 5 +-
.../rs/security/jose/jws/JwsJsonConsumer.java | 61
.../rs/security/jose/jws/JwsJsonProducer.java | 56 ++
.../jose/jws/JwsJsonSignatureEntry.java | 30 +-
.../jose/jws/JwsCompactReaderWriterTest.java| 14 -
.../security/jose/jws/JwsJsonConsumerTest.java | 11
.../security/jose/jws/JwsJsonProducerTest.java | 6 +-
14 files changed, 162 insertions(+), 62 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/d57cebc1/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
--
diff --git
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
index 88094c6..5740f73 100644
---
a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
+++
b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JsonMapObject.java
@@ -46,6 +46,10 @@ public class JsonMapObject {
values.put(name, value);
}
+public boolean containsProperty(String name) {
+return values.containsKey(name);
+}
+
public Object getProperty(String name) {
return values.get(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d57cebc1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
index c5f3e03..0c04791 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseConstants.java
@@ -36,7 +36,9 @@ public final class JoseConstants {
public static final String JWE_HEADER_KEY_ENC_ALGORITHM = HEADER_ALGORITHM;
public static final String JWE_HEADER_CONTENT_ENC_ALGORITHM = "enc";
public static final String JWE_HEADER_ZIP_ALGORITHM = "zip";
-public static final String DEFLATE_ZIP_ALGORITHM = "DEF";
+public static final String JWE_DEFLATE_ZIP_ALGORITHM = "DEF";
+
+public static final String JWS_HEADER_B64_STATUS_HEADER = "b64";
public static final String TYPE_JWT = "JWT";
public static final String TYPE_JOSE = "JOSE";
http://git-wip-us.apache.org/repos/asf/cxf/blob/d57cebc1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
index fd111e6..add5408 100644
---
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
+++
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/JoseHeaders.java
@@ -172,4 +172,8 @@ public abstract class JoseHeaders extends JsonMapObject {
return getLongProperty(name);
}
+public boolean containsHeader(String name) {
+return containsProperty(name);
+}
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d57cebc1/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwsJsonWriterInterceptor.java
--
diff --git
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jo
cxf-fediz git commit: Fixing failing tests
Repository: cxf-fediz Updated Branches: refs/heads/master 882df43d9 -> 17a64eb50 Fixing failing tests Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/17a64eb5 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/17a64eb5 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/17a64eb5 Branch: refs/heads/master Commit: 17a64eb5093862e6a396cbe4c7252a9fc299b295 Parents: 882df43 Author: Colm O hEigeartaigh Authored: Fri Sep 4 17:03:08 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 17:03:08 2015 +0100 -- services/sts/src/main/webapp/WEB-INF/cxf-transport.xml | 4 ++-- systests/jetty8/src/test/resources/rp-client-cert-server.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/17a64eb5/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml -- diff --git a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml index 572e216..d3ea403 100644 --- a/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml +++ b/services/sts/src/main/webapp/WEB-INF/cxf-transport.xml @@ -132,8 +132,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/17a64eb5/systests/jetty8/src/test/resources/rp-client-cert-server.xml -- diff --git a/systests/jetty8/src/test/resources/rp-client-cert-server.xml b/systests/jetty8/src/test/resources/rp-client-cert-server.xml index 85f79ea..eb74fe2 100644 --- a/systests/jetty8/src/test/resources/rp-client-cert-server.xml +++ b/systests/jetty8/src/test/resources/rp-client-cert-server.xml @@ -17,7 +17,6 @@ specific language governing permissions and limitations under the License. --> - http://www.eclipse.org/jetty/configure.dtd";>
[3/3] cxf-fediz git commit: Adding Apache license headers to some test config
Adding Apache license headers to some test config Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/882df43d Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/882df43d Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/882df43d Branch: refs/heads/master Commit: 882df43d9b34c2513300d5866bd2e55acf924b8b Parents: 143dcf8 Author: Colm O hEigeartaigh Authored: Fri Sep 4 16:33:38 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 16:33:38 2015 +0100 -- apache-fediz/pom.xml| 1 + etc/eclipse/CXFCleanUp.xml | 18 etc/eclipse/CXFCodeFormatter.xml| 18 examples/pom.xml| 1 + .../src/main/config/fediz_config.xml| 20 +- .../src/main/webapp/META-INF/context.xml| 19 + .../src/main/webapp/WEB-INF/web.xml | 19 + .../WEB-INF/applicationContext-security.xml | 19 - .../src/main/webapp/WEB-INF/fediz_config.xml| 20 +- .../src/main/webapp/WEB-INF/web.xml | 19 + .../src/main/config/fediz_config.xml| 20 +- .../src/main/webapp/META-INF/context.xml| 19 + .../WEB-INF/applicationContext-security.xml | 19 - .../src/main/webapp/WEB-INF/web.xml | 19 + .../WEB-INF/applicationContext-security.xml | 19 - .../src/main/webapp/WEB-INF/fediz_config.xml| 20 +- .../src/main/webapp/WEB-INF/web.xml | 19 + .../src/main/config/fediz_config.xml| 20 +- .../src/main/webapp/META-INF/context.xml| 19 + .../src/main/webapp/WEB-INF/web.xml | 19 + examples/wsclientWebapp/pom.xml | 1 + .../webapp/src/main/config/fediz_config.xml | 20 +- .../webapp/src/main/webapp/META-INF/context.xml | 19 + .../main/webapp/WEB-INF/applicationContext.xml | 18 .../webapp/src/main/webapp/WEB-INF/web.xml | 19 + .../wsclientWebapp/webservice/common/pom.xml| 1 + examples/wsclientWebapp/webservice/pom.xml | 1 + .../wsclientWebapp/webservice/service/pom.xml | 1 + .../main/webapp/WEB-INF/applicationContext.xml | 18 .../service/src/main/webapp/WEB-INF/web.xml | 20 +- .../core/src/main/resources/fediz-ehcache.xml | 19 + .../test/resources/fediz_meta_test_config.xml | 20 +- .../resources/fediz_meta_test_config_saml.xml | 20 +- .../src/test/resources/fediz_test_config.xml| 20 +- .../test/resources/fediz_test_config_saml.xml | 20 +- plugins/cxf/src/main/assembly/assembly.xml | 19 + plugins/jetty8/src/main/assembly/assembly.xml | 19 + plugins/pom.xml | 1 + plugins/spring/src/main/assembly/assembly.xml | 19 + plugins/spring2/src/main/assembly/assembly.xml | 19 + plugins/tomcat7/src/main/assembly/assembly.xml | 19 + plugins/tomcat8/src/main/assembly/assembly.xml | 19 + .../websphere/src/main/assembly/assembly.xml| 19 + .../src/test/resources/fediz_config.xml | 20 +- .../src/test/resources/mappingSample.xml| 18 pom.xml | 1 + .../cxf/src/test/resources/fediz_config.xml | 20 +- .../src/main/webapp/WEB-INF/cxf-service.xml | 29 ++-- .../src/main/webapp/WEB-INF/web.xml | 19 + .../test/resources/fediz_config_saml_sso.xml| 20 +- .../src/test/resources/fediz_config_wsfed.xml | 20 +- .../jetty8/src/test/resources/fediz_config.xml | 20 +- .../test/resources/fediz_config_client_cert.xml | 20 +- .../jetty8/src/test/resources/idp-server.xml| 20 +- .../test/resources/rp-client-cert-server.xml| 19 + .../jetty8/src/test/resources/rp-server.xml | 20 +- .../src/test/resources/fediz_config.xml | 20 +- systests/pom.xml| 1 + systests/spring/pom.xml | 20 +- .../spring/src/test/resources/fediz_config.xml | 20 +- .../spring/src/test/resources/idp-server.xml| 20 +- .../spring/src/test/resources/rp-server.xml | 20 +- .../tomcat7/src/test/resources/fediz_config.xml | 20 +- .../test/resources/fediz_config_bad_wreq.xml| 20 +- .../test/resources/fediz_config_client_cert.xml | 20 +- .../src/test/resources/f
[1/3] cxf-fediz git commit: Re-enable Spring system tests!
Repository: cxf-fediz
Updated Branches:
refs/heads/master 88bc4bc68 -> 882df43d9
Re-enable Spring system tests!
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/143dcf85
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/143dcf85
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/143dcf85
Branch: refs/heads/master
Commit: 143dcf85e1736adea72b324b39ba364e5c6e47d6
Parents: 88bc4bc
Author: Colm O hEigeartaigh
Authored: Fri Sep 4 16:25:00 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 4 16:25:00 2015 +0100
--
.../jetty8/src/test/resources/fediz_config.xml | 3 +
.../test/resources/fediz_config_client_cert.xml | 37 +
.../cxf/fediz/integrationtests/Spring2Test.java | 29 +++
.../spring/src/test/resources/fediz_config.xml | 3 +
.../AbstractClientCertTests.java| 7 +-
.../fediz/integrationtests/AbstractTests.java | 82 +---
.../fediz/integrationtests/HTTPTestUtils.java | 6 +-
7 files changed, 134 insertions(+), 33 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/143dcf85/systests/jetty8/src/test/resources/fediz_config.xml
--
diff --git a/systests/jetty8/src/test/resources/fediz_config.xml
b/systests/jetty8/src/test/resources/fediz_config.xml
index bf401cb..39e271a 100644
--- a/systests/jetty8/src/test/resources/fediz_config.xml
+++ b/systests/jetty8/src/test/resources/fediz_config.xml
@@ -53,6 +53,9 @@
1000
+
+
+
http://www.w3.org/2001/XMLSchema-instance";
xsi:type="federationProtocolType" version="1.0.0">
urn:org:apache:cxf:fediz:fedizhelloworld
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/143dcf85/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
--
diff --git a/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
b/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
index da6b126..275ec4b 100644
--- a/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
+++ b/systests/jetty8/src/test/resources/fediz_config_client_cert.xml
@@ -40,5 +40,42 @@
/secure/logout
/index.html
+
+
+
urn:org:apache:cxf:fediz:fedizhelloworld
+
+
+
+
+
+
+
+
+
+1000
+
+
+
+http://www.w3.org/2001/XMLSchema-instance";
+xsi:type="federationProtocolType" version="1.0.0">
+urn:org:apache:cxf:fediz:fedizhelloworld
+
https://localhost:${idp.https.port}/fediz-idp/federation
+,
+
http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role
+10
+urn:org:apache:cxf:fediz:idp:realm-A
+
+http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role";
optional="false" />
+ http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname";
optional="true" />
+ http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname";
optional="true" />
+ http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress";
optional="true" />
+
+
http://docs.oasis-open.org/wsfed/authorization/200706/authntypes/Ssl
+org.apache.cxf.fediz.integrationtests.HOKCallbackHandler
+
+/secure/logout
+/index.html
+
+
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/143dcf85/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
--
diff --git
a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
index d94bb60..3bb2aa5 100644
---
a/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
+++
b/systests/spring/src/test/java/org/apache/cxf/fediz/integrationtests/Spring2Test.java
@@ -24,6 +24,7 @@ import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
+import org.junit.Test;
public class Spring2Test extends AbstractTests {
@@ -78,4 +79,32 @@ public class Spring2Test extends AbstractTests {
public void testConcurrentRequests() throws Exception {
// super.testConcurrentRequests();
}
+
+@Test
+@Ignore("This tests is currently failing on Spring")
+@Override
+public void tes
[2/3] cxf-fediz git commit: Adding Apache license headers to some test config
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/pom.xml -- diff --git a/systests/pom.xml b/systests/pom.xml index 7f3aa14..46c4b54 100644 --- a/systests/pom.xml +++ b/systests/pom.xml @@ -1,3 +1,4 @@ + http://www.eclipse.org/jetty/configure.dtd";> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/spring/src/test/resources/rp-server.xml -- diff --git a/systests/spring/src/test/resources/rp-server.xml b/systests/spring/src/test/resources/rp-server.xml index 2792a74..f61c3c4 100644 --- a/systests/spring/src/test/resources/rp-server.xml +++ b/systests/spring/src/test/resources/rp-server.xml @@ -1,4 +1,22 @@ - + + http://www.eclipse.org/jetty/configure.dtd";> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/tomcat7/src/test/resources/fediz_config.xml -- diff --git a/systests/tomcat7/src/test/resources/fediz_config.xml b/systests/tomcat7/src/test/resources/fediz_config.xml index 507995a..dc30ea6 100644 --- a/systests/tomcat7/src/test/resources/fediz_config.xml +++ b/systests/tomcat7/src/test/resources/fediz_config.xml @@ -1,4 +1,22 @@ - + + http://www.springframework.org/schema/beans"; xmlns:cxf="http://cxf.apache.org/core"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml -- diff --git a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml index 2297ff3..851c94a 100644 --- a/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml +++ b/systests/webapps/cxfWebapp/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,22 @@ + + http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/webapps/pom.xml -- diff --git a/systests/webapps/pom.xml b/systests/webapps/pom.xml index 9b42a22..8d2bcf0 100644 --- a/systests/webapps/pom.xml +++ b/systests/webapps/pom.xml @@ -1,3 +1,4 @@ + http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml -- diff --git a/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml index e96423f..de8b046 100644 --- a/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml +++ b/systests/webapps/simpleWebapp/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,22 @@ + + http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml -- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml index 3974a96..2871d19 100644 --- a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -1,5 +1,22 @@ - + http://www.springframework.org/schema/beans"; xmlns:sec="http://www.springframework.org/schema/security"; xmlns:p="http://www.springframework.org/schema/p"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml -- diff --git a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml index 996e5aa..4d3bbc4 100644 --- a/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml +++ b/systests/webapps/spring2Webapp/src/main/webapp/WEB-INF/web.xml @@ -1,3 +1,22 @@ + + http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/882df43d/systests/webapps/springPreauthWebapp/src/mai
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes a55f8753a -> 37e834fa2 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/37e834fa Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/37e834fa Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/37e834fa Branch: refs/heads/3.0.x-fixes Commit: 37e834fa2460f5fd33fbf9588f21451c2d2c513a Parents: a55f875 Author: Colm O hEigeartaigh Authored: Fri Sep 4 16:09:32 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 16:09:32 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/37e834fa/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index f54cfd3..bd4b6bd 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -94,6 +94,7 @@ B 36fcf426a4946f57b051ce7a388c7190fc97aebd B 3834ba2ea50a164cf2b5ffe15229dcf512e110c6 B 384ad75433037358ea1607c4ddcb0cd978fae10c B 388d6eaf045c0215c7cffc891526a402c70625ec +B 38a805ac4dc554d2a4f32e73c0ac4007b249073b B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1 B 38d843c9717df592c5f38fc773cf6a5415e879d1 B 3913cbf504bb863e48ed5fcff25edc06e25f52c0
cxf git commit: Updating to WSS4J release
Repository: cxf Updated Branches: refs/heads/master 54723262a -> 38a805ac4 Updating to WSS4J release Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/38a805ac Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/38a805ac Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/38a805ac Branch: refs/heads/master Commit: 38a805ac4dc554d2a4f32e73c0ac4007b249073b Parents: 5472326 Author: Colm O hEigeartaigh Authored: Fri Sep 4 16:08:06 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 16:08:06 2015 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/38a805ac/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 503d7a0..f50b3eb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -147,7 +147,7 @@ 4.4.1 3.1.4 1.6.3 -2.1.3-SNAPSHOT +2.1.3 2.11.0 2.6.0 2.2.1
cxf-fediz git commit: [FEDIZ-106] - Spring 2 support added
Repository: cxf-fediz
Updated Branches:
refs/heads/master 11e4fdc18 -> 88bc4bc68
[FEDIZ-106] - Spring 2 support added
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/88bc4bc6
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/88bc4bc6
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/88bc4bc6
Branch: refs/heads/master
Commit: 88bc4bc68d8df857d6ba796005ef217873266545
Parents: 11e4fdc
Author: Colm O hEigeartaigh
Authored: Fri Sep 4 15:09:59 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 4 15:09:59 2015 +0100
--
.../authentication/ExpiredTokenException.java | 35 ++
.../web/FederationAuthenticationEntryPoint.java | 69
.../web/FederationAuthenticationFilter.java | 106 ++-
.../src/main/webapp/WEB-INF/cxf-transport.xml | 4 +-
4 files changed, 141 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88bc4bc6/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
--
diff --git
a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
new file mode 100644
index 000..42e23fe
--- /dev/null
+++
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/authentication/ExpiredTokenException.java
@@ -0,0 +1,35 @@
+/**
+ * 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.fediz.spring.authentication;
+
+import org.springframework.security.AuthenticationException;
+
+/**
+ * To be called when a token has expired
+ */
+public class ExpiredTokenException extends AuthenticationException {
+
+private static final long serialVersionUID = 7639463618762010981L;
+
+public ExpiredTokenException(String errorMessage) {
+super(errorMessage);
+}
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/88bc4bc6/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
--
diff --git
a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
index 3fd799f..851f253 100644
---
a/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
+++
b/plugins/spring2/src/main/java/org/apache/cxf/fediz/spring/web/FederationAuthenticationEntryPoint.java
@@ -83,65 +83,6 @@ public class FederationAuthenticationEntryPoint implements
AuthenticationEntryPo
Assert.notNull(this.federationConfig, "FederationConfig cannot be
null.");
}
-public final void commence(final HttpServletRequest servletRequest, final
HttpServletResponse response,
-final AuthenticationException authenticationException) throws
IOException, ServletException {
-
-FedizContext fedContext = federationConfig.getFedizContext();
-LOG.debug("Federation context: {}", fedContext);
-
-if
(servletRequest.getRequestURL().indexOf(FederationConstants.METADATA_PATH_URI)
!= -1
-||
servletRequest.getRequestURL().indexOf(getMetadataURI(fedContext)) != -1) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("Metadata document requested");
-}
-response.setContentType("text/xml");
-PrintWriter out = response.getWriter();
-
-FedizProcessor wfProc =
-
FedizProcessorFactory.newFedizProcessor(fedContext.getProtocol());
-try {
-Document metadata = wfProc.getMetaData(servletRequest,
fedContext);
-out.write(DOM2Writer.nodeToString(metadata));
-ret
svn commit: r964330 - in /websites/production/cxf/content: cache/docs.pageCache docs/jax-rs-deployment.html
Author: buildbot
Date: Fri Sep 4 13:47:02 2015
New Revision: 964330
Log:
Production update by buildbot for cxf
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-deployment.html
Modified: websites/production/cxf/content/cache/docs.pageCache
==
Binary files - no diff available.
Modified: websites/production/cxf/content/docs/jax-rs-deployment.html
==
--- websites/production/cxf/content/docs/jax-rs-deployment.html (original)
+++ websites/production/cxf/content/docs/jax-rs-deployment.html Fri Sep 4
13:47:02 2015
@@ -117,16 +117,16 @@ Apache CXF -- JAX-RS Deployment
JAX-RS :
Deployment /**/
+/*]]>*/
Servlet Containers
Tomcat
Application Servers
GlassfishJBossWebLogic
-Specifying a
WebLogic specific JSP servletCXF RuntimeDelegateSelecting Woodstox
as the default parserHow to
use CXF JAX-RS 2.0 if WebLogic ships JAX-RS 1.1
+Specifying a
WebLogic specific JSP servletCXF RuntimeDelegateSelecting Woodstox
as the default parserDowngrading Servlet
versionRemoving
myfaces-shared-impl jarHow to
use CXF JAX-RS 2.0 if WebLogic ships JAX-RS 1.1
Geronimo
CXF RuntimeDelegate
@@ -143,7 +143,31 @@ div.rbtoc1435780230830 li {margin-left:
true
-This instructs WebLogic's classloaders to look FIRST in the
JARS from the application's WEB-INF/lib directory for Service Provider
Implementations (in this case, to find
META-INF/services/javax.xml.stream.XMLInputFactory in the Woodstox JAR) rather
than to the system classloader. Please see this https://forums.oracle.com/forums/message.jspa?messageID=9953045";
rel="nofollow">thread for more information.How to use
CXF JAX-RS 2.0 if WebLogic ships JAX-RS 1.1Please see the following
email http://cxf.547215.n5.nabble.com/jaxrs-cxf-deployment-issues-on-weblogic-12c-tp5742398p5756013.html";
rel="nofollow">message.GeronimoCXF RuntimeDelegateIt has
been reported CXF RuntimeDelegate may no
t be visible after the application has been redeployed in Geronimo. Most
likely Geronimo needs to be configured similar to the way WebLogic has to to
resolve the same issue (please see the relevant section above), TODO: update
the section once we know the actual details.
+This instructs WebLogic's classloaders to look FIRST in the
JARS from the application's WEB-INF/lib directory for Service Provider
Implementations (in this case, to find
META-INF/services/javax.xml.stream.XMLInputFactory in the Woodstox JAR) rather
than to the system classloader. Please see this https://forums.oracle.com/forums/message.jspa?messageID=9953045";
rel="nofollow">thread for more information.Downgrading Servlet
versionIt was reported that downgrading a web-app descriptor version in
web.xml can help disable the native (Jersey) scanning:
+
+ ;
+
+
+ ;
+
+Removing
myfaces-shared-impl jarIt was reported if myfaces-shared-impl-4.1.0.jar
is shipped in a web application lib folder then removing it helps, with the
following descriptor being effective:
+
+ /emessaging
+
+false
+
+ javax.faces.*
+
+
+
+
+ How to use
CXF JAX-RS 2.0 if WebLogic ships JAX-RS 1.1Please see the following
email http://cxf.547215.n5.nabble.com/jaxrs-cxf-deployment-issues-on-weblogic-12c-tp5742398p5756013.html";
rel="nofollow">message.GeronimoCXF RuntimeDelegateIt has
been reported CXF RuntimeDelegate may not be visible after the application has
been redeployed in Geronimo. Most likely Geronimo needs to be configured
similar to the way WebLogic has to to resolve the same issue (please see the
relevant section above), TODO: update the s
cxf-fediz git commit: Fixing assembly
Repository: cxf-fediz Updated Branches: refs/heads/1.2.x-fixes 38c1d9939 -> ec4237796 Fixing assembly Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/ec423779 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/ec423779 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/ec423779 Branch: refs/heads/1.2.x-fixes Commit: ec423779656a43f2b48d3180a426259bd67cacde Parents: 38c1d99 Author: Colm O hEigeartaigh Authored: Fri Sep 4 14:14:53 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Sep 4 14:14:53 2015 +0100 -- apache-fediz/src/assembly/bin.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/ec423779/apache-fediz/src/assembly/bin.xml -- diff --git a/apache-fediz/src/assembly/bin.xml b/apache-fediz/src/assembly/bin.xml index 925dca3..aac9e23 100644 --- a/apache-fediz/src/assembly/bin.xml +++ b/apache-fediz/src/assembly/bin.xml @@ -133,7 +133,7 @@ org.apache.cxf.fediz:fediz-idp org.apache.cxf.fediz:fediz-idp-sts -org.apache.cxf.fediz:fediz-tomcat +org.apache.cxf.fediz:fediz-tomcat7 org.apache.cxf.fediz:fediz-cxf org.apache.cxf.fediz:fediz-spring org.apache.cxf.fediz:fediz-spring2 @@ -147,7 +147,7 @@ org.apache.cxf.fediz:fediz-idp org.apache.cxf.fediz:fediz-idp-sts -org.apache.cxf.fediz:fediz-tomcat +org.apache.cxf.fediz:fediz-tomcat7 org.apache.cxf.fediz:fediz-jetty org.apache.cxf.fediz:fediz-cxf org.apache.cxf.fediz:fediz-spring2 @@ -161,7 +161,7 @@ org.apache.cxf.fediz:fediz-idp org.apache.cxf.fediz:fediz-idp-sts -org.apache.cxf.fediz:fediz-tomcat +org.apache.cxf.fediz:fediz-tomcat7 org.apache.cxf.fediz:fediz-jetty org.apache.cxf.fediz:fediz-cxf org.apache.cxf.fediz:fediz-spring:jar @@ -175,7 +175,7 @@ org.apache.cxf.fediz:fediz-idp org.apache.cxf.fediz:fediz-idp-sts -org.apache.cxf.fediz:fediz-tomcat +org.apache.cxf.fediz:fediz-tomcat7 org.apache.cxf.fediz:fediz-jetty org.apache.cxf.fediz:fediz-spring org.apache.cxf.fediz:fediz-spring2
cxf-fediz git commit: IdP fix for incorrect view
Repository: cxf-fediz
Updated Branches:
refs/heads/master a0bc9f6bc -> 11e4fdc18
IdP fix for incorrect view
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/11e4fdc1
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/11e4fdc1
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/11e4fdc1
Branch: refs/heads/master
Commit: 11e4fdc18fc5e62992ba82ccb36bb9da2380df65
Parents: a0bc9f6
Author: Colm O hEigeartaigh
Authored: Fri Sep 4 12:08:49 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 4 12:08:49 2015 +0100
--
.../apache/cxf/fediz/service/idp/model/IDPConfig.java | 9 +++--
.../idp/src/main/webapp/WEB-INF/idp-config-realma.xml | 2 +-
.../idp/src/main/webapp/WEB-INF/views/idplist.jsp | 14 +++---
services/idp/src/test/resources/idp-config.xml| 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/11e4fdc1/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
--
diff --git
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
index 40c93c0..9b9c5cd 100644
---
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
+++
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/model/IDPConfig.java
@@ -33,7 +33,12 @@ public class IDPConfig extends Idp {
this.applications = new ArrayList<>(applications.values());
}
-public void setTrustedIDPs(Map trustedIDPs) {
-this.trustedIdpList = new ArrayList(trustedIDPs.values());
+public void setTrustedIdps(Map trustedIdps) {
+this.trustedIdpList = new ArrayList(trustedIdps.values());
+}
+
+@Deprecated
+public void setTrustedIDPs(Map trustedIdps) {
+setTrustedIdps(trustedIdps);
}
}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/11e4fdc1/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
--
diff --git a/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
b/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
index 07c9a44..f6b703d 100644
--- a/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
+++ b/services/idp/src/main/webapp/WEB-INF/idp-config-realma.xml
@@ -83,7 +83,7 @@
value="federation/clientcert" />
-
+
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/11e4fdc1/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
--
diff --git a/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
b/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
index 13b68ef..a490a12 100644
--- a/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
+++ b/services/idp/src/main/webapp/WEB-INF/views/idplist.jsp
@@ -1,7 +1,7 @@
http://www.w3.org/TR/html4/loose.dtd";>
-<%@page import="java.util.Map"%>
-<%@page import="org.apache.cxf.fediz.service.idp.model.IDPConfig"%>
-<%@page import="org.apache.cxf.fediz.service.idp.model.TrustedIDPConfig"%>
+<%@page import="java.util.List"%>
+<%@page import="org.apache.cxf.fediz.service.idp.domain.Idp"%>
+<%@page import="org.apache.cxf.fediz.service.idp.domain.TrustedIdp"%>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"; %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"; %>
@@ -13,11 +13,11 @@
Where are you from? Please, select one Identity Provider in the list
which is able to authenticate you.
-<% IDPConfig idpConfig = (IDPConfig)request.getAttribute("idpConfig");
-Map trustedIDPs =
idpConfig.getTrustedIDPs(); %>
+<% Idp idp = (Idp)request.getAttribute("idpConfig");
+List trustedIDPs = idp.getTrustedIdps(); %>
-<%=idpConfig.getServiceDescription()%>
-<% for (TrustedIDPConfig trustedIDP : trustedIDPs.values()) { %>
+<%=idp.getServiceDescription()%>
+<% for (TrustedIdp trustedIDP : trustedIDPs) { %>
<%=trustedIDP.getDescription()%>
<% } %>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/11e4fdc1/services/idp/src/test/resources/idp-config.xml
--
diff --git a/services/idp/src/test/resources/idp-config.xml
b/services/idp/src/test/resources/idp-config.xml
index ce3f60b..26145b3 100644
--- a/services/idp/src/test/resources/idp-config.xml
+++ b/services/idp/src/test/resources/idp-config.
cxf-fediz git commit: Removing deprecated interface
Repository: cxf-fediz
Updated Branches:
refs/heads/master 51c25b002 -> a0bc9f6bc
Removing deprecated interface
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a0bc9f6b
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a0bc9f6b
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a0bc9f6b
Branch: refs/heads/master
Commit: a0bc9f6bcc40681e8a22ada52932290d19cd3169
Parents: 51c25b0
Author: Colm O hEigeartaigh
Authored: Fri Sep 4 11:14:02 2015 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Sep 4 11:14:02 2015 +0100
--
examples/simpleWebapp/README.txt| 2 +-
examples/simpleWebapp/pom.xml | 2 +-
.../cxf/fediz/example/FederationServlet.java| 8 +++
examples/spring2Webapp/README.txt | 2 +-
examples/springPreauthWebapp/README.txt | 2 +-
examples/springPreauthWebapp/pom.xml| 2 +-
.../cxf/fediz/example/FederationServlet.java| 8 +++
examples/springWebapp/README.txt| 2 +-
examples/websphereWebapp/README.txt | 2 +-
examples/websphereWebapp/pom.xml| 2 +-
examples/wsclientWebapp/webapp/pom.xml | 2 +-
.../cxf/fediz/example/FederationServlet.java| 14 +--
.../cxf/fediz/core/FederationPrincipal.java | 25
.../fediz/jetty8/FederationUserPrincipal.java | 5 ++--
.../FederationAuthenticationToken.java | 5 ++--
.../FederationAuthenticationToken.java | 5 ++--
.../fediz/tomcat7/FederationPrincipalImpl.java | 5 ++--
.../fediz/tomcat8/FederationPrincipalImpl.java | 5 ++--
systests/webapps/simpleWebapp/pom.xml | 2 +-
systests/webapps/springPreauthWebapp/pom.xml| 2 +-
20 files changed, 36 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/simpleWebapp/README.txt
--
diff --git a/examples/simpleWebapp/README.txt b/examples/simpleWebapp/README.txt
index 12ac9d9..9679c3d 100644
--- a/examples/simpleWebapp/README.txt
+++ b/examples/simpleWebapp/README.txt
@@ -47,7 +47,7 @@ and can be accessed only if the browser user is
authenticated. The purpose of
the FederationServlet is to illustrate the usage of the Java Servlet Security
API to get the authenticated user and to check the roles he has. Further,
the FederationServlet shows how to access claims data (user data) which were
-stored in the SAML token by using the Fediz interface FederationPrincipal.
+stored in the SAML token by using the Fediz interface FedizPrincipal.
Beyond that, the FederationServlet illustrates how to access the SAML token
if required. The classes SecurityTokenThreadLocal.java and
FederationFilter.java
can be used to achieve that. You could get this information directly from the
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/simpleWebapp/pom.xml
--
diff --git a/examples/simpleWebapp/pom.xml b/examples/simpleWebapp/pom.xml
index a3f8bb5..06eb684 100644
--- a/examples/simpleWebapp/pom.xml
+++ b/examples/simpleWebapp/pom.xml
@@ -42,7 +42,7 @@
${servlet.version}
provided
-
+
org.apache.cxf.fediz
fediz-core
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a0bc9f6b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
--
diff --git
a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
index 3a9dd78..3c456c9 100644
---
a/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
+++
b/examples/simpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationServlet.java
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.cxf.fediz.core.Claim;
import org.apache.cxf.fediz.core.ClaimCollection;
-import org.apache.cxf.fediz.core.FederationPrincipal;
+import org.apache.cxf.fediz.core.FedizPrincipal;
import org.apache.cxf.fediz.core.SecurityTokenThreadLocal;
@@ -78,8 +78,8 @@ public class FederationServlet extends HttpServlet {
out.println("Has role '" + item + "': " +
((request.isUserInRole(item)) ? "yes" : "no") + "");
}
-if (p instanceof FederationPrincipal) {
-FederationPrincipal fp = (FederationPrincipal)p;
+if (p instanceof FedizPrincipal) {
+FedizPrincipal fp = (FedizPrincipal)p;
