cxf git commit: Fixing LDAP tests

2016-01-14 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master bceee342b -> e65036355


Fixing LDAP tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e6503635
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e6503635
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e6503635

Branch: refs/heads/master
Commit: e65036355fdbc5c51df2cd727f185703897759c0
Parents: bceee34
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:25:14 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:25:14 2016 +

--
 .../java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e6503635/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 6d2045e..112ad81 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -79,7 +79,7 @@ import org.springframework.util.Assert;
 
 @CreateLdapServer(
 transports = {
-@CreateTransport(protocol = "LDAP")
+@CreateTransport(protocol = "LDAP", address = "127.0.0.1")
 }
 )

cxf git commit: Fixing LDAP tests

2016-01-14 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e0f8164c7 -> e9bb1d30d


Fixing LDAP tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e9bb1d30
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9bb1d30
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9bb1d30

Branch: refs/heads/3.1.x-fixes
Commit: e9bb1d30d982ff3372b793b64cf82634e7176b86
Parents: e0f8164
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:25:14 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:31:22 2016 +

--
 .../java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e9bb1d30/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 6d2045e..112ad81 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -79,7 +79,7 @@ import org.springframework.util.Assert;
 
 @CreateLdapServer(
 transports = {
-@CreateTransport(protocol = "LDAP")
+@CreateTransport(protocol = "LDAP", address = "127.0.0.1")
 }
 )

[2/2] cxf git commit: Fixing LDAP tests

2016-01-14 Thread coheigea 
Fixing LDAP tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f1a70d41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f1a70d41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f1a70d41

Branch: refs/heads/3.0.x-fixes
Commit: f1a70d4165caa9af53e3b2127f1da6714ef4e9c6
Parents: a4f2eb7
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:25:14 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:33:55 2016 +

--
 .../java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f1a70d41/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
index 182ad91..b365ae3 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap/LDAPClaimsTest.java
@@ -78,7 +78,7 @@ import org.springframework.util.Assert;
 
 @CreateLdapServer(
 transports = {
-@CreateTransport(protocol = "LDAP")
+@CreateTransport(protocol = "LDAP", address = "127.0.0.1")
 }
 )

[1/2] cxf git commit: Recording .gitmergeinfo Changes

2016-01-14 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a4f2eb71a -> 6c9624a0c


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/6c9624a0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6c9624a0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6c9624a0

Branch: refs/heads/3.0.x-fixes
Commit: 6c9624a0c201aeeea78d5290d2e793d24e529115
Parents: f1a70d4
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:33:55 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:33:55 2016 +

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6c9624a0/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5b5a597..0a8b1bc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -25,6 +25,7 @@ B 0ab9416fda31298e485f2a6864c263447e4b32de
 B 0ac5dde071c9c2731fca757a2108f5dd698f8af5
 B 0ba19453f17be19aa2e46848b1908f776a6abb64
 B 0c0555f4ac850ec8e38302d73207170affe4376a
+B 0cad194ee50841f1c740097430780044fa1e9eaf
 B 0d0bc938103b0ea9311c3b73f6c385aa3e12260c
 B 0de0309f28e1543660c763c158f4353d6d2189be
 B 0e639399027b2b43ece5b21f73effa6381a5bf0c
@@ -515,6 +516,7 @@ B de88ed19bd937440fa891a852582a2d9ea971e3b
 B df947cb1ca2b9e375f99e199ec65b1afece1c963
 B dfa59762b50f26263716bae769bc4078d4059c37
 B dfecaa60ea6082fda8f2959c083ba2f2f7a03112
+B e0f8164c747d2120b882e565782aab0097290209
 B e1246b3d0c00c9fe9489c0aacb683bf1de15d66b
 B e1e3b2c7ab2f808fdd7849ba7f3622e945296d02
 B e242307ad8bbe53788f3e03e9e2f0ca977d01340

cxf git commit: [CXF-6729] Updating CookieHeaderProvider too

2016-01-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master e65036355 -> f0d6854a8


[CXF-6729] Updating CookieHeaderProvider too


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f0d6854a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f0d6854a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f0d6854a

Branch: refs/heads/master
Commit: f0d6854a8c9e9cf20ec50daa86ae2c5396f365b7
Parents: e650363
Author: Sergey Beryozkin 
Authored: Thu Jan 14 17:23:03 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 17:23:03 2016 +

--
 .../cxf/jaxrs/impl/CookieHeaderProvider.java| 22 
 .../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 17 +++
 .../jaxrs/impl/CookieHeaderProviderTest.java|  8 +++
 3 files changed, 30 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f0d6854a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
index fd35af5..f0a3b3e 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
@@ -29,8 +29,6 @@ public class CookieHeaderProvider implements 
HeaderDelegate {
 private static final String PATH = "$Path";
 private static final String DOMAIN = "$Domain";
 
-private static final String DOUBLE_QUOTE = "\""; 
-
 public Cookie fromString(String c) {
 
 if (c == null) {
@@ -48,16 +46,18 @@ public class CookieHeaderProvider implements 
HeaderDelegate {
 for (String token : tokens) {
 String theToken = token.trim();
 if (theToken.startsWith(VERSION)) {
-version = 
Integer.parseInt(stripQuotes(theToken.substring(VERSION.length() + 1)));
+version = Integer.parseInt(
+
NewCookieHeaderProvider.stripQuotes(theToken.substring(VERSION.length() + 1)));
 } else if (theToken.startsWith(PATH)) {
-path = stripQuotes(theToken.substring(PATH.length() + 1));
+path = 
NewCookieHeaderProvider.stripQuotes(theToken.substring(PATH.length() + 1));
 } else if (theToken.startsWith(DOMAIN)) {
-domain = stripQuotes(theToken.substring(DOMAIN.length() + 1));
+domain = 
NewCookieHeaderProvider.stripQuotes(theToken.substring(DOMAIN.length() + 1));
 } else {
 int i = theToken.indexOf('=');
 if (i != -1) {
 name = theToken.substring(0, i);
-value = i == theToken.length()  + 1 ? "" : 
stripQuotes(theToken.substring(i + 1));
+value = i == theToken.length()  + 1 ? "" 
+: 
NewCookieHeaderProvider.stripQuotes(theToken.substring(i + 1));
 }
 }
 }
@@ -69,22 +69,18 @@ public class CookieHeaderProvider implements 
HeaderDelegate {
 return new Cookie(name, value, path, domain, version);
 }
 
-private String stripQuotes(String value) {
-return value.replaceAll(DOUBLE_QUOTE, "");
-}
-
 public String toString(Cookie c) {
 StringBuilder sb = new StringBuilder();
 
 if (c.getVersion() != 0) {
 sb.append(VERSION).append('=').append(c.getVersion()).append(';');
 }
-sb.append(c.getName()).append('=').append(c.getValue());
+
sb.append(c.getName()).append('=').append(NewCookieHeaderProvider.maybeQuote(c.getValue()));
 if (c.getPath() != null) {
-sb.append(';').append(PATH).append('=').append(c.getPath());
+
sb.append(';').append(PATH).append('=').append(NewCookieHeaderProvider.maybeQuote(c.getPath()));
 }
 if (c.getDomain() != null) {
-sb.append(';').append(DOMAIN).append('=').append(c.getDomain());
+
sb.append(';').append(DOMAIN).append('=').append(NewCookieHeaderProvider.maybeQuote(c.getDomain()));
 }
 return sb.toString();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f0d6854a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
index 5a5a472..4bcfd5e

cxf git commit: [CXF-6729] Updating CookieHeaderProvider too

2016-01-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e9bb1d30d -> dac3e9e25


[CXF-6729] Updating CookieHeaderProvider too


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dac3e9e2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dac3e9e2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dac3e9e2

Branch: refs/heads/3.1.x-fixes
Commit: dac3e9e2567dbd8e007f0d08afe252097c9f035a
Parents: e9bb1d3
Author: Sergey Beryozkin 
Authored: Thu Jan 14 17:23:03 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 17:23:59 2016 +

--
 .../cxf/jaxrs/impl/CookieHeaderProvider.java| 22 
 .../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 17 +++
 .../jaxrs/impl/CookieHeaderProviderTest.java|  8 +++
 3 files changed, 30 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/dac3e9e2/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
index fd35af5..f0a3b3e 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
@@ -29,8 +29,6 @@ public class CookieHeaderProvider implements 
HeaderDelegate {
 private static final String PATH = "$Path";
 private static final String DOMAIN = "$Domain";
 
-private static final String DOUBLE_QUOTE = "\""; 
-
 public Cookie fromString(String c) {
 
 if (c == null) {
@@ -48,16 +46,18 @@ public class CookieHeaderProvider implements 
HeaderDelegate {
 for (String token : tokens) {
 String theToken = token.trim();
 if (theToken.startsWith(VERSION)) {
-version = 
Integer.parseInt(stripQuotes(theToken.substring(VERSION.length() + 1)));
+version = Integer.parseInt(
+
NewCookieHeaderProvider.stripQuotes(theToken.substring(VERSION.length() + 1)));
 } else if (theToken.startsWith(PATH)) {
-path = stripQuotes(theToken.substring(PATH.length() + 1));
+path = 
NewCookieHeaderProvider.stripQuotes(theToken.substring(PATH.length() + 1));
 } else if (theToken.startsWith(DOMAIN)) {
-domain = stripQuotes(theToken.substring(DOMAIN.length() + 1));
+domain = 
NewCookieHeaderProvider.stripQuotes(theToken.substring(DOMAIN.length() + 1));
 } else {
 int i = theToken.indexOf('=');
 if (i != -1) {
 name = theToken.substring(0, i);
-value = i == theToken.length()  + 1 ? "" : 
stripQuotes(theToken.substring(i + 1));
+value = i == theToken.length()  + 1 ? "" 
+: 
NewCookieHeaderProvider.stripQuotes(theToken.substring(i + 1));
 }
 }
 }
@@ -69,22 +69,18 @@ public class CookieHeaderProvider implements 
HeaderDelegate {
 return new Cookie(name, value, path, domain, version);
 }
 
-private String stripQuotes(String value) {
-return value.replaceAll(DOUBLE_QUOTE, "");
-}
-
 public String toString(Cookie c) {
 StringBuilder sb = new StringBuilder();
 
 if (c.getVersion() != 0) {
 sb.append(VERSION).append('=').append(c.getVersion()).append(';');
 }
-sb.append(c.getName()).append('=').append(c.getValue());
+
sb.append(c.getName()).append('=').append(NewCookieHeaderProvider.maybeQuote(c.getValue()));
 if (c.getPath() != null) {
-sb.append(';').append(PATH).append('=').append(c.getPath());
+
sb.append(';').append(PATH).append('=').append(NewCookieHeaderProvider.maybeQuote(c.getPath()));
 }
 if (c.getDomain() != null) {
-sb.append(';').append(DOMAIN).append('=').append(c.getDomain());
+
sb.append(';').append(DOMAIN).append('=').append(NewCookieHeaderProvider.maybeQuote(c.getDomain()));
 }
 return sb.toString();
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/dac3e9e2/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
index

buildbot failure in ASF Buildbot on cxf-site-production

2016-01-14 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/4763

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf-fediz git commit: More tests

2016-01-14 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master b63d8dd0c -> de6f9870f


More 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/de6f9870
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/de6f9870
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/de6f9870

Branch: refs/heads/master
Commit: de6f9870f772fb43318f71d00684077bcc13100a
Parents: b63d8dd
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 17:30:46 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 17:30:46 2016 +

--
 .../src/main/webapp/WEB-INF/views/client.jsp| 10 ++--
 .../cxf/fediz/systests/oidc/OIDCTest.java   | 53 +++-
 2 files changed, 56 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/de6f9870/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
index 90dd1de..750bae0 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
@@ -69,7 +69,7 @@
 
 <%= client.getApplicationName() %>
 
-
+
 <%
SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM  
HH:mm", Locale.US);
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -117,9 +117,9 @@
 if (client.getClientSecret() != null) {
 %>
 
-" 
method="POST">
+" method="POST">

-   Reset Secret
+   Reset Secret

 
 
@@ -127,9 +127,9 @@
 }
 %>
 
-" 
method="POST">
+" method="POST">

-   Delete Client
+   Delete Client

 
 

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/de6f9870/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
--
diff --git 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index d8f20af..8b4b0ec 100644
--- 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -161,7 +161,15 @@ public class OIDCTest {
 }
 
 @AfterClass
-public static void cleanup() {
+public static void cleanup() throws Exception {
+try {
+loginToClientsPageAndDeleteClient(rpHttpsPort, idpHttpsPort);
+} finally {
+shutdownServers();
+}
+}
+
+private static void shutdownServers() {
 try {
 if (idpServer.getServer() != null
 && idpServer.getServer().getState() != 
LifecycleState.DESTROYED) {
@@ -199,7 +207,7 @@ public class OIDCTest {
 return "fedizhelloworld";
 }
 
-// Login to the OIDC Clients page + create a new client
+// Runs as BeforeClass: Login to the OIDC Clients page + create a new 
client
 private static void loginToClientsPage(String rpPort, String idpPort) 
throws Exception {
 String url = "https://localhost:; + rpPort + "/fediz-oidc/clients";
 String user = "alice";
@@ -233,6 +241,40 @@ public class OIDCTest {
 webClient.close();
 }
 
+// Runs as AfterClass: Login to the OIDC Clients page + delete the created 
client!
+private static void loginToClientsPageAndDeleteClient(String rpPort, 
String idpPort) throws Exception {
+String url = "https://localhost:; + rpPort + "/fediz-oidc/clients";
+String user = "alice";
+String password = "ecila";
+
+// Login to the client page successfully
+WebClient webClient = setupWebClient(user, password, idpPort);
+HtmlPage loginPage = login(url, webClient);
+final String bodyTextContent = loginPage.getBody().getTextContent();
+Assert.assertTrue(bodyTextContent.contains("Registered Clients"));
+
+// Get the client identifier
+HtmlTable table = loginPage.getHtmlElementById("registered_clients");
+String clientId = table.getCellAt(1, 1).asText().trim();
+Assert.assertNotNull(clientId);
+
+// Now go to the specific client page
+HtmlPage clientPage = webClient.getPage(url + "/" + clientId);
+
+final HtmlForm deleteForm = clientPage.getFormByName("deleteForm");
+Assert.assertNotNull(deleteForm);
+
+// Delete the client
+final HtmlButton button =

cxf git commit: [CXF-6748]the qop, nc, algorithm parameter in http auth header must not be enclosed between doble quotation

2016-01-14 Thread ffang 
Repository: cxf
Updated Branches:
  refs/heads/master f17f92319 -> bf4f4c89b


[CXF-6748]the qop,nc,algorithm parameter in http auth header must not be 
enclosed between doble quotation


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf4f4c89
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf4f4c89
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf4f4c89

Branch: refs/heads/master
Commit: bf4f4c89b61640faa41dbac68cf591cb923eb144
Parents: f17f923
Author: Freeman Fang 
Authored: Thu Jan 14 17:23:43 2016 +0800
Committer: Freeman Fang 
Committed: Thu Jan 14 17:23:43 2016 +0800

--
 .../cxf/transport/http/auth/HttpAuthHeader.java | 26 +---
 1 file changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bf4f4c89/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index f9e96d9..0b331ed 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -84,7 +84,13 @@ public final class HttpAuthHeader {
 if (!first) {
 builder.append(", ");
 }
-builder.append(entry.getKey() + "=\"" + param + "\"");
+if (entry.getKey().equals("nc") 
+|| entry.getKey().equals("qop")
+|| entry.getKey().equals("algorithm")) {
+builder.append(entry.getKey() + "=" + param + "");
+} else {
+builder.append(entry.getKey() + "=\"" + param + "\"");
+}
 first = false;
 }
 }
@@ -99,14 +105,28 @@ public final class HttpAuthHeader {
 tok.quoteChar('\'');
 tok.whitespaceChars('=', '=');
 tok.whitespaceChars(',', ',');
-
+
 while (tok.nextToken() != StreamTokenizer.TT_EOF) {
 String key = tok.sval;
 if (tok.nextToken() == StreamTokenizer.TT_EOF) {
 map.put(key, null);
 return map;
 }
-String value = tok.sval;
+String value = null;
+if ("nc".equals(key)) {
+//nc is a 8 length HEX number so need get it as number
+value = String.valueOf(tok.nval);
+if (value.indexOf(".") > 0) {
+value = value.substring(0, value.indexOf("."));
+}
+String pad = "";
+for (int i = 0; i < 8 - value.length(); i++) {
+pad = pad + "0";
+}
+value = pad + value;
+} else {
+value = tok.sval;
+}
 map.put(key, value);
 }
 } catch (IOException ex) {

cxf git commit: Minor update to the way OAuth2 client is deleted

2016-01-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master bf4f4c89b -> 988fcce01


Minor update to the way OAuth2 client is deleted


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/988fcce0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/988fcce0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/988fcce0

Branch: refs/heads/master
Commit: 988fcce01796a42b926a39a43522711da504e922
Parents: bf4f4c8
Author: Sergey Beryozkin 
Authored: Thu Jan 14 10:41:27 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 10:41:27 2016 +

--
 .../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java | 5 ++---
 .../oauth2/provider/DefaultEHCacheOAuthDataProvider.java   | 6 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/988fcce0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 2b0e651..9c0216c 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -57,10 +57,9 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 }
 
 @Override
-public Client removeClient(String clientId) {
-Client c = super.removeClient(clientId);
+protected Client doRemoveClient(Client c) {
 removeClientCodeGrants(c);
-return c;
+return super.doRemoveClient(c);
 }
 
 protected void removeClientCodeGrants(Client c) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/988fcce0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index 176bd7e..1f6ac00 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -83,8 +83,12 @@ public class DefaultEHCacheOAuthDataProvider extends 
AbstractOAuthDataProvider {
 @Override
 public Client removeClient(String clientId) {
 Client c = getClient(clientId);
-clientCache.remove(clientId);
+return doRemoveClient(c);
+}
+
+protected Client doRemoveClient(Client c) {
 removeClientTokens(c);
+clientCache.remove(c.getClientId());
 return c;
 }

cxf git commit: Minor update to the way OAuth2 client is deleted

2016-01-14 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 64966a365 -> d5cbce130


Minor update to the way OAuth2 client is deleted


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d5cbce13
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d5cbce13
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d5cbce13

Branch: refs/heads/3.1.x-fixes
Commit: d5cbce1303076be91f66340e42e0218cdef3e954
Parents: 64966a3
Author: Sergey Beryozkin 
Authored: Thu Jan 14 10:41:27 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 10:44:01 2016 +

--
 .../oauth2/grants/code/DefaultEHCacheCodeDataProvider.java | 5 ++---
 .../oauth2/provider/DefaultEHCacheOAuthDataProvider.java   | 6 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d5cbce13/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
index 2b0e651..9c0216c 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/DefaultEHCacheCodeDataProvider.java
@@ -57,10 +57,9 @@ public class DefaultEHCacheCodeDataProvider extends 
DefaultEHCacheOAuthDataProvi
 }
 
 @Override
-public Client removeClient(String clientId) {
-Client c = super.removeClient(clientId);
+protected Client doRemoveClient(Client c) {
 removeClientCodeGrants(c);
-return c;
+return super.doRemoveClient(c);
 }
 
 protected void removeClientCodeGrants(Client c) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d5cbce13/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index 176bd7e..1f6ac00 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -83,8 +83,12 @@ public class DefaultEHCacheOAuthDataProvider extends 
AbstractOAuthDataProvider {
 @Override
 public Client removeClient(String clientId) {
 Client c = getClient(clientId);
-clientCache.remove(clientId);
+return doRemoveClient(c);
+}
+
+protected Client doRemoveClient(Client c) {
 removeClientTokens(c);
+clientCache.remove(c.getClientId());
 return c;
 }

buildbot failure in ASF Buildbot on cxf-site-production

2016-01-14 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/4754

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf-fediz git commit: Presenting access and refresh tokens in the same screen, they will be typically linked so UI experience can be optimized, etc

2016-01-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 0d11fba7b -> 1813605d1


Presenting access and refresh tokens in the same screen, they will be typically 
linked so UI experience can be optimized, etc


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1813605d
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1813605d
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1813605d

Branch: refs/heads/master
Commit: 1813605d1fd62f3f5c3ce9e3a5c5b2106d048e47
Parents: 0d11fba
Author: Sergey Beryozkin 
Authored: Thu Jan 14 12:30:00 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 12:30:00 2016 +

--
 .../fediz/service/oidc/ClientAccessTokens.java  |  48 ---
 .../fediz/service/oidc/ClientRefreshTokens.java |  48 ---
 .../service/oidc/ClientRegistrationService.java |  40 +++---
 .../cxf/fediz/service/oidc/ClientTokens.java|  48 +++
 .../src/main/webapp/WEB-INF/views/client.jsp|   7 +-
 .../webapp/WEB-INF/views/clientAccessTokens.jsp |  92 -
 .../WEB-INF/views/clientRefreshTokens.jsp   |  92 -
 .../main/webapp/WEB-INF/views/clientTokens.jsp  | 133 +++
 8 files changed, 204 insertions(+), 304 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1813605d/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientAccessTokens.java
--
diff --git 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientAccessTokens.java
 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientAccessTokens.java
deleted file mode 100644
index 061e61d..000
--- 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientAccessTokens.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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.service.oidc;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.cxf.rs.security.oauth2.common.Client;
-import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
-
-public class ClientAccessTokens {
-private Client client;
-private List accessTokens = new 
LinkedList();
-public ClientAccessTokens(Client c, List accessTokens) {
-this.client = c;
-this.accessTokens = accessTokens;
-}
-public Client getClient() {
-return client;
-}
-public void setClient(Client client) {
-this.client = client;
-}
-public List getAccessTokens() {
-return accessTokens;
-}
-public void setAccessTokens(List accessTokens) {
-this.accessTokens = accessTokens;
-}
-
-
-}

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1813605d/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRefreshTokens.java
--
diff --git 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRefreshTokens.java
 
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRefreshTokens.java
deleted file mode 100644
index 12f246f..000
--- 
a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/ClientRefreshTokens.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * 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

cxf git commit: Recording .gitmergeinfo Changes

2016-01-14 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes d5cbce130 -> e0f8164c7


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/e0f8164c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e0f8164c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e0f8164c

Branch: refs/heads/3.1.x-fixes
Commit: e0f8164c747d2120b882e565782aab0097290209
Parents: d5cbce1
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 12:03:04 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 12:03:04 2016 +

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e0f8164c/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d365b95..c5cb047 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -11,6 +11,7 @@ B 8a4e85b24d6d5b438ceb28257c53773d46b5816d
 B 8b92fe57dd9a661dab382da7d556b1972f513a93
 B a261507ebd3104b1a00298801ec9815ed1e7a728
 B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
+B bceee342b32f3704ca75176d06067f90c6d3fbdc
 B ced98c6e937bd93f92dac9043fa0406c696bfd84
 B f0e08b7bea2660542e18294d490e68c7b14aaa4b
 B f1b56150d6520e73d2ade2296c3b2f13839e63e5

cxf git commit: Some updates from WSS4J

2016-01-14 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master 988fcce01 -> bceee342b


Some updates from WSS4J


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bceee342
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bceee342
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bceee342

Branch: refs/heads/master
Commit: bceee342b32f3704ca75176d06067f90c6d3fbdc
Parents: 988fcce
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 11:57:59 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 11:57:59 2016 +

--
 .../security/trust/STSStaxTokenValidator.java   | 14 +++---
 .../security/wss4j/WSS4JStaxInInterceptor.java  | 14 +++---
 .../cxf/ws/security/wss4j/WSS4JUtils.java   |  2 +-
 .../AbstractStaxBindingHandler.java | 20 ++--
 .../StaxAsymmetricBindingHandler.java   |  4 ++--
 .../StaxSymmetricBindingHandler.java|  4 ++--
 6 files changed, 29 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/bceee342/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
index a51a6f1..b70fdcf 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
@@ -160,11 +160,11 @@ public class STSStaxTokenValidator
 // If the UsernameToken is to be used for key derivation, the (1.1)
 // spec says that it cannot contain a password, and it must contain
 // an Iteration element
-final byte[] salt = 
XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
WSSConstants.TAG_wsse11_Salt);
+final byte[] salt = 
XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
WSSConstants.TAG_WSSE11_SALT);
 PasswordString passwordType = 
-XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
WSSConstants.TAG_wsse_Password);
+XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
WSSConstants.TAG_WSSE_PASSWORD);
 final Long iteration = 
-XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
WSSConstants.TAG_wsse11_Iteration);
+XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
WSSConstants.TAG_WSSE11_ITERATION);
 if (salt != null && (passwordType != null || iteration == null)) {
 throw new 
WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, 
"badTokenType01");
 }
@@ -206,7 +206,7 @@ public class STSStaxTokenValidator
 
 final EncodedString encodedNonce =
 XMLSecurityUtils.getQNameType(usernameTokenType.getAny(), 
-  WSSConstants.TAG_wsse_Nonce);
+  WSSConstants.TAG_WSSE_NONCE);
 byte[] nonceVal = null;
 if (encodedNonce != null && encodedNonce.getValue() != null) {
 nonceVal = Base64.decodeBase64(encodedNonce.getValue());
@@ -214,7 +214,7 @@ public class STSStaxTokenValidator
 
 final AttributedDateTime attributedDateTimeCreated =
 XMLSecurityUtils.getQNameType(usernameTokenType.getAny(),
-  WSSConstants.TAG_wsu_Created);
+  WSSConstants.TAG_WSU_CREATED);
 
 String created = null;
 if (attributedDateTimeCreated != null) {
@@ -492,7 +492,7 @@ public class STSStaxTokenValidator
 
x509PKIPathv1SecurityToken.setElementPath(tokenContext.getElementPath());
 
x509PKIPathv1SecurityToken.setXMLSecEvent(tokenContext.getFirstXMLSecEvent());
 return x509PKIPathv1SecurityToken;
-} else if 
(WSSConstants.NS_GSS_Kerberos5_AP_REQ.equals(binarySecurityTokenType.getValueType()))
 {
+} else if 
(WSSConstants.NS_GSS_KERBEROS5_AP_REQ.equals(binarySecurityTokenType.getValueType()))
 {
 KerberosServiceSecurityTokenImpl 
kerberosServiceSecurityToken = 
 new KerberosServiceSecurityTokenImpl(
 tokenContext.getWsSecurityContext(),
@@ -540,7 +540,7 @@ public class STSStaxTokenValidator
 binarySecurity = new X509Security(doc);
 } else if 
(WSSConstants.NS_X509PKIPathv1.equals(binarySecurityTokenType.getValueType())) {
 binarySecurity = new

buildbot success in ASF Buildbot on cxf-site-production

2016-01-14 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/4758

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

cxf-fediz git commit: Minor JSP updates

2016-01-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 1813605d1 -> 6842bcfc2


Minor JSP updates


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6842bcfc
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6842bcfc
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6842bcfc

Branch: refs/heads/master
Commit: 6842bcfc2e35d1e68f088456f0e15930ba6b72f4
Parents: 1813605
Author: Sergey Beryozkin 
Authored: Thu Jan 14 14:23:05 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 14:23:05 2016 +

--
 .../src/main/webapp/WEB-INF/views/client.jsp|  7 ++--
 .../main/webapp/WEB-INF/views/clientTokens.jsp  | 37 +---
 .../webapp/WEB-INF/views/registeredClients.jsp  | 10 +++---
 3 files changed, 42 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6842bcfc/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
index fb9d4f9..95f7cb7 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
@@ -62,14 +62,15 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM  
HH:mm", Locale.US);
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
 %>
-IdentifierSecretCreation DateRedirect 
URIs 
+IDSecretCreation DateRedirect 
URI 

-   
+   
+   <%= client.getClientId() %>

<%
   if (client.getClientSecret() != null) {
%>
-  
+  <%= client.getClientSecret() %>
<%
   } else {
%>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6842bcfc/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
index 47d96f4..8a74b22 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
@@ -46,17 +46,25 @@
 
 Tokens issued to <%= client.getApplicationName() + "(" + 
client.getClientId() + ")"%>
 
-
 
 Access Tokens
 
 
-IdentifierIssue DateExpiry Date 
+
+   IDIssue DateExpiry Date
+   <%
+  if (!tokens.getRefreshTokens().isEmpty()) {
+   %>
+  Refresh Token
+   <%
+  }
+   %>
+ 
 <%
for (ServerAccessToken token : tokens.getAccessTokens()) {
 %>

-   
+   

<% 
Date issuedDate = new Date(token.getIssuedAt() * 1000);
@@ -71,6 +79,15 @@
   %>
<%=expires %>

+   <%
+ if (token.getRefreshToken() != null) {
+  %>
+
+  <%=token.getRefreshToken() %>
+  
+  <%
+ }
+  %>

" method="POST">
 
@@ -88,12 +105,12 @@
 Refresh Tokens
 
 
-IdentifierIssue DateExpiry Date 
+IDIssue DateExpiry DateAccess 
Token 
 <%
for (RefreshToken token : tokens.getRefreshTokens()) {
 %>

-   
+   

<% 
Date issuedDate = new Date(token.getIssuedAt() * 1000);
@@ -109,6 +126,16 @@
<%=expires %>


+   <%
+ for (String at : token.getAccessTokens()) {
+  %>
+  <%=at %>
+  <%
+ }
+  %>
+   
+  
+   
" method="POST">
 
   Delete

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6842bcfc/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
index ee1455c..6ddeca0 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
@@ -15,7 +15,7 @@
 %>
 http://www.w3.org/1999/xhtml;>
 
-API Client Registration Confirmation
+Registered Clients

buildbot success in ASF Buildbot on cxf-site-production

2016-01-14 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/4761

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

cxf-fediz git commit: Fixing merge

2016-01-14 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes e0d2b1c40 -> 46b05ed9a


Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/46b05ed9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/46b05ed9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/46b05ed9

Branch: refs/heads/1.2.x-fixes
Commit: 46b05ed9a478d58bfbf90cfa90cd9121e566e55d
Parents: e0d2b1c
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 17:02:16 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 17:02:16 2016 +

--
 .../java/org/apache/cxf/fediz/integrationtests/KerberosTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/46b05ed9/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
index a414bdb..3dda898 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
@@ -94,7 +94,8 @@ import org.junit.runner.RunWith;
 
 @CreateKdcServer(
 transports = {
-@CreateTransport(protocol = "KRB", address = "127.0.0.1")
+// @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
+@CreateTransport(protocol = "UDP", address = "127.0.0.1")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

cxf-fediz git commit: Removing table borders around action buttons

2016-01-14 Thread sergeyb 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master def5708ef -> b63d8dd0c


Removing table borders around action buttons


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b63d8dd0
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b63d8dd0
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b63d8dd0

Branch: refs/heads/master
Commit: b63d8dd0c2bfab1db66ca0051993917dbb8ec5fd
Parents: def5708
Author: Sergey Beryozkin 
Authored: Thu Jan 14 17:05:41 2016 +
Committer: Sergey Beryozkin 
Committed: Thu Jan 14 17:05:41 2016 +

--
 .../src/main/webapp/WEB-INF/views/client.jsp| 18 +--
 .../webapp/WEB-INF/views/clientCodeGrants.jsp   |  4 +--
 .../main/webapp/WEB-INF/views/clientTokens.jsp  | 32 ++--
 3 files changed, 39 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b63d8dd0/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
index 95f7cb7..90dd1de 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp
@@ -33,6 +33,18 @@
border-width: 1px;
padding: 3px 4px;
}
+
+
+
+.table_no_border {
+border-collapse: collapse;
+}
+.table_no_border .td_no_border {
+padding: 0;
+border-width: 0px;
+}
+
+

 .form {
max-width: 425px;
@@ -99,12 +111,12 @@
  
 
 
-
+
 
 <%
 if (client.getClientSecret() != null) {
 %>
-
+
 " 
method="POST">

Reset Secret
@@ -114,7 +126,7 @@
 <%
 }
 %>
-
+
 " 
method="POST">

Delete Client

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b63d8dd0/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
index 59a8d1d..5afb966 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp
@@ -44,7 +44,7 @@
 Code Grants issued to <%= client.getApplicationName() + "(" + 
client.getClientId() + ")"%>
 
 
-IdentifierIssue DateExpiry Date 
+IDIssue DateExpiry Date 
 <%
SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM  
HH:mm:ss", Locale.US);
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
@@ -52,7 +52,7 @@
for (ServerAuthorizationCodeGrant token : tokens.getCodeGrants()) {
 %>

-   
+   <%= token.getCode() %>

<% 
Date issuedDate = new Date(token.getIssuedAt() * 1000);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b63d8dd0/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
index 8a74b22..ca58329 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp
@@ -59,12 +59,20 @@
<%
   }
%>
+   <%
+  if (!tokens.getAccessTokens().isEmpty()) {
+   %>
+  Action
+   <%
+  }
+   %>   
+  
  
 <%
for (ServerAccessToken token : tokens.getAccessTokens()) {
 %>

-   
+   <%= token.getTokenKey() %>

<% 
Date issuedDate = new Date(token.getIssuedAt() * 1000);
@@ -84,15 +92,13 @@
   %>
 
   <%=token.getRefreshToken() %>
-  
+  
   <%
  }
   %>

" method="POST">
-
-  Delete
-
+



@@ -105,12 +111,20 @@
 Refresh Tokens
 
 
-IDIssue DateExpiry DateAccess 
Token 
+IDIssue DateExpiry DateAccess 
Token 
+   <%
+  if (!tokens.getRefreshTokens().isEmpty()) {
+   %>
+  Action
+   <%
+  }
+   %>
+   
 <%
for (RefreshToken token : tokens.getRefreshTokens()) {
 %>

cxf git commit: [CXF-6748]the qop, nc, algorithm parameter in http auth header must not be enclosed between doble quotation

2016-01-14 Thread ffang 
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes dac3e9e25 -> b0035ade0


[CXF-6748]the qop,nc,algorithm parameter in http auth header must not be 
enclosed between doble quotation

(cherry picked from commit bf4f4c89b61640faa41dbac68cf591cb923eb144)


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b0035ade
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b0035ade
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b0035ade

Branch: refs/heads/3.1.x-fixes
Commit: b0035ade0042160b77b4848939f58efe9a77d6c7
Parents: dac3e9e
Author: Freeman Fang 
Authored: Thu Jan 14 17:23:43 2016 +0800
Committer: Freeman Fang 
Committed: Fri Jan 15 10:26:21 2016 +0800

--
 .../cxf/transport/http/auth/HttpAuthHeader.java | 26 +---
 1 file changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b0035ade/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index f9e96d9..0b331ed 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -84,7 +84,13 @@ public final class HttpAuthHeader {
 if (!first) {
 builder.append(", ");
 }
-builder.append(entry.getKey() + "=\"" + param + "\"");
+if (entry.getKey().equals("nc") 
+|| entry.getKey().equals("qop")
+|| entry.getKey().equals("algorithm")) {
+builder.append(entry.getKey() + "=" + param + "");
+} else {
+builder.append(entry.getKey() + "=\"" + param + "\"");
+}
 first = false;
 }
 }
@@ -99,14 +105,28 @@ public final class HttpAuthHeader {
 tok.quoteChar('\'');
 tok.whitespaceChars('=', '=');
 tok.whitespaceChars(',', ',');
-
+
 while (tok.nextToken() != StreamTokenizer.TT_EOF) {
 String key = tok.sval;
 if (tok.nextToken() == StreamTokenizer.TT_EOF) {
 map.put(key, null);
 return map;
 }
-String value = tok.sval;
+String value = null;
+if ("nc".equals(key)) {
+//nc is a 8 length HEX number so need get it as number
+value = String.valueOf(tok.nval);
+if (value.indexOf(".") > 0) {
+value = value.substring(0, value.indexOf("."));
+}
+String pad = "";
+for (int i = 0; i < 8 - value.length(); i++) {
+pad = pad + "0";
+}
+value = pad + value;
+} else {
+value = tok.sval;
+}
 map.put(key, value);
 }
 } catch (IOException ex) {

cxf git commit: [CXF-6748]the qop, nc, algorithm parameter in http auth header must not be enclosed between doble quotation

2016-01-14 Thread ffang 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 0e140596b -> cb0d7506c


[CXF-6748]the qop,nc,algorithm parameter in http auth header must not be 
enclosed between doble quotation

(cherry picked from commit bf4f4c89b61640faa41dbac68cf591cb923eb144)
(cherry picked from commit b0035ade0042160b77b4848939f58efe9a77d6c7)

Conflicts:

rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cb0d7506
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cb0d7506
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cb0d7506

Branch: refs/heads/3.0.x-fixes
Commit: cb0d7506c1fe3a59fa513ffb02f9551a0e6aa69e
Parents: 0e14059
Author: Freeman Fang 
Authored: Thu Jan 14 17:23:43 2016 +0800
Committer: Freeman Fang 
Committed: Fri Jan 15 11:35:22 2016 +0800

--
 .../cxf/transport/http/auth/HttpAuthHeader.java | 26 +---
 1 file changed, 23 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cb0d7506/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index 5b32dbf..eee12dc 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -84,7 +84,13 @@ public final class HttpAuthHeader {
 if (!first) {
 builder.append(", ");
 }
-builder.append(key + "=\"" + param + "\"");
+if ("nc".equals(key) 
+|| "qop".equals(key)
+|| "algorithm".equals(key)) {
+builder.append(key + "=" + param + "");
+} else {
+builder.append(key + "=\"" + param + "\"");
+}
 first = false;
 }
 }
@@ -99,14 +105,28 @@ public final class HttpAuthHeader {
 tok.quoteChar('\'');
 tok.whitespaceChars('=', '=');
 tok.whitespaceChars(',', ',');
-
+
 while (tok.nextToken() != StreamTokenizer.TT_EOF) {
 String key = tok.sval;
 if (tok.nextToken() == StreamTokenizer.TT_EOF) {
 map.put(key, null);
 return map;
 }
-String value = tok.sval;
+String value = null;
+if ("nc".equals(key)) {
+//nc is a 8 length HEX number so need get it as number
+value = String.valueOf(tok.nval);
+if (value.indexOf(".") > 0) {
+value = value.substring(0, value.indexOf("."));
+}
+String pad = "";
+for (int i = 0; i < 8 - value.length(); i++) {
+pad = pad + "0";
+}
+value = pad + value;
+} else {
+value = tok.sval;
+}
 map.put(key, value);
 }
 } catch (IOException ex) {

buildbot success in ASF Buildbot on cxf-site-production

2016-01-14 Thread buildbot 
The Buildbot has detected a restored build on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/4765

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on cxf-site-production

2016-01-14 Thread buildbot 
The Buildbot has detected a new failure on builder cxf-site-production while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/cxf-site-production/builds/4760

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this 
build
Build Source Stamp: [branch cxf/web] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

cxf-fediz git commit: Checkstyle fix

2016-01-14 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master a4a00 -> 61be9e5f7


Checkstyle fix


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/61be9e5f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/61be9e5f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/61be9e5f

Branch: refs/heads/master
Commit: 61be9e5f76a8bd11470329b66689e1ea78832c98
Parents: a4a
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 16:26:12 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 16:26:12 2016 +

--
 .../test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java| 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/61be9e5f/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
--
diff --git 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index 2401a03..d8f20af 100644
--- 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -22,7 +22,6 @@ package org.apache.cxf.fediz.systests.oidc;
 
 import java.io.File;
 import java.io.IOException;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -38,8 +37,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTable;
-import com.gargoylesoftware.htmlunit.html.HtmlTableCell;
-import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
 import com.gargoylesoftware.htmlunit.util.WebConnectionWrapper;

cxf-fediz git commit: Updating Kerberos systests

2016-01-14 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/1.2.x-fixes 5d18973a1 -> e0d2b1c40


Updating Kerberos systests


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/e0d2b1c4
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/e0d2b1c4
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/e0d2b1c4

Branch: refs/heads/1.2.x-fixes
Commit: e0d2b1c40756b00bc09a4f294b4dc8c45fb56212
Parents: 5d18973
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:41:47 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 16:43:23 2016 +

--
 .../apache/cxf/fediz/integrationtests/KerberosTest.java   | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/e0d2b1c4/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
index 8379b3e..a414bdb 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
@@ -41,7 +41,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.cxf.fediz.core.ClaimTypes;
 import org.apache.cxf.fediz.tomcat.FederationAuthenticator;
 import org.apache.directory.server.annotations.CreateKdcServer;
-import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.annotations.CreateDS;
@@ -93,16 +92,9 @@ import org.junit.runner.RunWith;
 }
 )
 
-@CreateLdapServer(
-transports = {
-@CreateTransport(protocol = "LDAP")
-}
-)
-
 @CreateKdcServer(
 transports = {
-// @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
-@CreateTransport(protocol = "UDP", address = "127.0.0.1")
+@CreateTransport(protocol = "KRB", address = "127.0.0.1")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

[2/3] cxf-fediz git commit: Updating Kerberos systests

2016-01-14 Thread coheigea 
Updating Kerberos systests


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/6608107a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/6608107a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/6608107a

Branch: refs/heads/master
Commit: 6608107a3544332313da3ecfcd138f2f47f796b8
Parents: 5f5dfbf
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:41:47 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:41:47 2016 +

--
 .../apache/cxf/fediz/integrationtests/KerberosTest.java   | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/6608107a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
--
diff --git 
a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
 
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
index 57c9876..564731a 100644
--- 
a/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
+++ 
b/systests/kerberos/src/test/java/org/apache/cxf/fediz/integrationtests/KerberosTest.java
@@ -41,7 +41,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.cxf.fediz.core.ClaimTypes;
 import org.apache.cxf.fediz.tomcat7.FederationAuthenticator;
 import org.apache.directory.server.annotations.CreateKdcServer;
-import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.annotations.CreateDS;
@@ -93,16 +92,9 @@ import org.junit.runner.RunWith;
 }
 )
 
-@CreateLdapServer(
-transports = {
-@CreateTransport(protocol = "LDAP")
-}
-)
-
 @CreateKdcServer(
 transports = {
-// @CreateTransport(protocol = "TCP", address = "127.0.0.1", port=1024)
-@CreateTransport(protocol = "UDP", address = "127.0.0.1")
+@CreateTransport(protocol = "KRB", address = "127.0.0.1")
 },
 primaryRealm = "service.ws.apache.org",
 kdcPrincipal = "krbtgt/service.ws.apache@service.ws.apache.org"

[1/3] cxf-fediz git commit: More OIDC tests

2016-01-14 Thread coheigea 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 6842bcfc2 -> a4a00


More OIDC 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/5f5dfbf9
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5f5dfbf9
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5f5dfbf9

Branch: refs/heads/master
Commit: 5f5dfbf9ae7a6193c911a7b194e64ff3e91c1a44
Parents: 6842bcf
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:34:29 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:34:29 2016 +

--
 .../webapp/WEB-INF/views/registeredClients.jsp  |  2 +-
 systests/oidc/pom.xml   |  1 +
 .../cxf/fediz/systests/oidc/OIDCTest.java   | 74 
 3 files changed, 63 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5f5dfbf9/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
--
diff --git a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp 
b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
index 6ddeca0..afd91ae 100644
--- a/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
+++ b/services/oidc/src/main/webapp/WEB-INF/views/registeredClients.jsp
@@ -40,7 +40,7 @@
 
 Registered Clients
 
-
+
 NameIDCreation DateRedirect 
URI 
 <%
SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM ", 
Locale.US);

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5f5dfbf9/systests/oidc/pom.xml
--
diff --git a/systests/oidc/pom.xml b/systests/oidc/pom.xml
index b96f16d..42bf107 100644
--- a/systests/oidc/pom.xml
+++ b/systests/oidc/pom.xml
@@ -234,6 +234,7 @@
 true
 
${idp.https.port}
 ${rp.https.port}
+
${basedir}/target
 
 
 **/systests/**

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/5f5dfbf9/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
--
diff --git 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
index 41918df..2401a03 100644
--- 
a/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
+++ 
b/systests/oidc/src/test/java/org/apache/cxf/fediz/systests/oidc/OIDCTest.java
@@ -22,6 +22,11 @@ package org.apache.cxf.fediz.systests.oidc;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.WebRequest;
@@ -32,6 +37,9 @@ import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import com.gargoylesoftware.htmlunit.html.HtmlTable;
+import com.gargoylesoftware.htmlunit.html.HtmlTableCell;
+import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
 import com.gargoylesoftware.htmlunit.util.WebConnectionWrapper;
 
@@ -58,7 +66,7 @@ public class OIDCTest {
 private static Tomcat rpServer;
 
 @BeforeClass
-public static void init() {
+public static void init() throws Exception {
 System.setProperty("org.apache.commons.logging.Log", 
"org.apache.commons.logging.impl.SimpleLog");
 
System.setProperty("org.apache.commons.logging.simplelog.showdatetime", "true");
 
System.setProperty("org.apache.commons.logging.simplelog.log.httpclient.wire", 
"info");
@@ -75,6 +83,8 @@ public class OIDCTest {
 
 initIdp();
 initOidc();
+
+loginToClientsPage(rpHttpsPort, idpHttpsPort);
 }
 
 private static void initIdp() {
@@ -193,16 +203,16 @@ public class OIDCTest {
 }
 
 // Login to the OIDC Clients page + create a new client
-@org.junit.Test
-public void testLoginToClientsPage() throws Exception {
-String url = "https://localhost:; + getRpHttpsPort() + 
"/fediz-oidc/clients";
+private static void loginToClientsPage(String rpPort, String idpPort) 
throws Exception {
+String url = "https://localhost:; + rpPort + "/fediz-oidc/clients";

[3/3] cxf-fediz git commit: Updating Apache DS

2016-01-14 Thread coheigea 
Updating Apache DS


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/a4a0
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/a4a0
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/a4a0

Branch: refs/heads/master
Commit: a4a00eb5f241986a827c1fb9eaf64adc85b9
Parents: 6608107
Author: Colm O hEigeartaigh 
Authored: Thu Jan 14 15:41:55 2016 +
Committer: Colm O hEigeartaigh 
Committed: Thu Jan 14 15:41:55 2016 +

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/a4a0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5c45967..bbba1aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
 
 
 
-2.0.0-M20
+2.0.0-M21
 3.4
 1.2
 3.1.5-SNAPSHOT

cxf-fediz git commit: Fediz IDP Spring config cleanup

2016-01-14 Thread jbernhardt 
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 61be9e5f7 -> def5708ef


Fediz IDP Spring config cleanup


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/def5708e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/def5708e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/def5708e

Branch: refs/heads/master
Commit: def5708efda3b5fef007bf09c4d2f3c8532aea47
Parents: 61be9e5
Author: Jan Bernhardt 
Authored: Thu Jan 7 17:03:13 2016 +0100
Committer: Jan Bernhardt 
Committed: Thu Jan 14 17:47:25 2016 +0100

--
 .../idp/beans/CacheTokenForWauthAction.java |   3 +-
 .../service/idp/beans/HomeRealmReminder.java|   4 +-
 .../fediz/service/idp/beans/LogoutAction.java   |   3 +-
 .../idp/beans/ProcessHRDSExpressionAction.java  |   6 +-
 .../idp/beans/SigninParametersCacheAction.java  |   2 +
 .../idp/beans/TrustedIdpProtocolAction.java |   6 +-
 .../fediz/service/idp/beans/WfreshParser.java   |   3 +-
 .../WEB-INF/flows/federation-signin-request.xml |   2 +-
 .../flows/federation-signin-response.xml|   2 +-
 .../flows/federation-validate-request.xml   |   2 +-
 .../idp/src/main/webapp/WEB-INF/idp-servlet.xml | 129 +++
 .../src/test/resources/realmb/idp-servlet.xml   |  19 ---
 12 files changed, 63 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/def5708e/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/CacheTokenForWauthAction.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/CacheTokenForWauthAction.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/CacheTokenForWauthAction.java
index 852a338..15e0589 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/CacheTokenForWauthAction.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/CacheTokenForWauthAction.java
@@ -26,13 +26,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 import org.springframework.webflow.execution.RequestContext;
 
 /**
  * This class is responsible to cache IDP token.
  */
-
+@Component
 public class CacheTokenForWauthAction {
 
 private static final String IDP_CONFIG = "idpConfig";

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/def5708e/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/HomeRealmReminder.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/HomeRealmReminder.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/HomeRealmReminder.java
index 51522ca..c755ebf 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/HomeRealmReminder.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/HomeRealmReminder.java
@@ -21,10 +21,10 @@ package org.apache.cxf.fediz.service.idp.beans;
 import javax.servlet.http.Cookie;
 
 import org.apache.cxf.fediz.service.idp.util.WebUtils;
+import org.springframework.stereotype.Component;
 import org.springframework.webflow.execution.RequestContext;
 
-/**
- */
+@Component
 public class HomeRealmReminder {
 
 public static final String FEDIZ_HOME_REALM = "FEDIZ_HOME_REALM";

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/def5708e/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/LogoutAction.java
--
diff --git 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/LogoutAction.java
 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/LogoutAction.java
index 8cc3ecf..b17de18 100644
--- 
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/LogoutAction.java
+++ 
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/LogoutAction.java
@@ -24,12 +24,13 @@ import org.apache.cxf.fediz.service.idp.util.WebUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
 import org.springframework.webflow.execution.RequestContext;
 
 /**
  * This class is responsible to clear security context and invalidate IDP 
session.
  */
-
+@Component
 public class LogoutAction {
 
 private static final Logger LOG =