cxf git commit: [CXF-6155] Reacting to ParamConverter IllegalArgumentException

2014-12-15 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master e47e39411 - 51c5ff8ad


[CXF-6155] Reacting to ParamConverter IllegalArgumentException


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

Branch: refs/heads/master
Commit: 51c5ff8ad31404ee566bf2c3f68897290a086405
Parents: e47e394
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Dec 15 12:33:53 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Dec 15 12:33:53 2014 +

--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  | 29 
 1 file changed, 18 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/51c5ff8a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index cab2f3b..631d2e4 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -354,11 +354,15 @@ public final class InjectionUtils {
 
 value = decodeValue(value, decoded, pType);
 
-Object result = createFromParameterHandler(value, pClass, genericType, 
paramAnns, message);
+Object result = null;
+try {
+result = createFromParameterHandler(value, pClass, genericType, 
paramAnns, message);
+} catch (IllegalArgumentException nfe) {
+throw createParamConversionException(pType, nfe);
+}
 if (result != null) {
 return pClass.cast(result);
 }
-
 if (pClass.isPrimitive()) {
 try {
 @SuppressWarnings(unchecked)
@@ -368,15 +372,7 @@ public final class InjectionUtils {
 // the object is a Boolean object
 return ret;
 } catch (NumberFormatException nfe) {
-//
-//  For path, query  matrix parameters this is 404,
-//  for others 400...
-//
-if (pType == ParameterType.PATH || pType == ParameterType.QUERY
-|| pType == ParameterType.MATRIX) {
-throw ExceptionUtils.toNotFoundException(nfe, null);
-}
-throw ExceptionUtils.toBadRequestException(nfe, null);
+throw createParamConversionException(pType, nfe);
 }
 }
 
@@ -431,6 +427,17 @@ public final class InjectionUtils {
 return pClass.cast(result);
 }
 
+private static RuntimeException 
createParamConversionException(ParameterType pType, Exception ex) {
+//
+//  For path, query  matrix parameters this is 404,
+//  for others 400...
+//
+if (pType == ParameterType.PATH || pType == ParameterType.QUERY
+|| pType == ParameterType.MATRIX) {
+return ExceptionUtils.toNotFoundException(ex, null);
+}
+return ExceptionUtils.toBadRequestException(ex, null);
+}
 public static T T createFromParameterHandler(String value, 
 ClassT pClass,
 Type genericType,

cxf git commit: [CXF-6155] Reacting to ParamConverter IllegalArgumentException

2014-12-15 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes d1ada3d16 - 6ada6c2df


[CXF-6155] Reacting to ParamConverter IllegalArgumentException


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

Branch: refs/heads/3.0.x-fixes
Commit: 6ada6c2df830b7bf54d8b94a203180086169b8f2
Parents: d1ada3d
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Dec 15 12:33:53 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Dec 15 12:35:10 2014 +

--
 .../apache/cxf/jaxrs/utils/InjectionUtils.java  | 29 
 1 file changed, 18 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6ada6c2d/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
--
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index cab2f3b..631d2e4 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -354,11 +354,15 @@ public final class InjectionUtils {
 
 value = decodeValue(value, decoded, pType);
 
-Object result = createFromParameterHandler(value, pClass, genericType, 
paramAnns, message);
+Object result = null;
+try {
+result = createFromParameterHandler(value, pClass, genericType, 
paramAnns, message);
+} catch (IllegalArgumentException nfe) {
+throw createParamConversionException(pType, nfe);
+}
 if (result != null) {
 return pClass.cast(result);
 }
-
 if (pClass.isPrimitive()) {
 try {
 @SuppressWarnings(unchecked)
@@ -368,15 +372,7 @@ public final class InjectionUtils {
 // the object is a Boolean object
 return ret;
 } catch (NumberFormatException nfe) {
-//
-//  For path, query  matrix parameters this is 404,
-//  for others 400...
-//
-if (pType == ParameterType.PATH || pType == ParameterType.QUERY
-|| pType == ParameterType.MATRIX) {
-throw ExceptionUtils.toNotFoundException(nfe, null);
-}
-throw ExceptionUtils.toBadRequestException(nfe, null);
+throw createParamConversionException(pType, nfe);
 }
 }
 
@@ -431,6 +427,17 @@ public final class InjectionUtils {
 return pClass.cast(result);
 }
 
+private static RuntimeException 
createParamConversionException(ParameterType pType, Exception ex) {
+//
+//  For path, query  matrix parameters this is 404,
+//  for others 400...
+//
+if (pType == ParameterType.PATH || pType == ParameterType.QUERY
+|| pType == ParameterType.MATRIX) {
+return ExceptionUtils.toNotFoundException(ex, null);
+}
+return ExceptionUtils.toBadRequestException(ex, null);
+}
 public static T T createFromParameterHandler(String value, 
 ClassT pClass,
 Type genericType,

cxf git commit: Reuse the principal from UT valdation if possible

2014-12-15 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 6ada6c2df - 5452608c3


Reuse the principal from UT valdation if possible


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

Branch: refs/heads/3.0.x-fixes
Commit: 5452608c33ade4ea4e4760d119af1497ab0a336e
Parents: 6ada6c2
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Dec 15 12:08:02 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Dec 15 12:38:45 2014 +

--
 .../apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5452608c/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index 4325ad9..11128f5 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -96,7 +96,7 @@ public class UsernameTokenInterceptor extends 
AbstractTokenInterceptor {
  WSConstants.WSSE_NS.equals(child.getNamespaceURI())) {
 try {
 boolean bspCompliant = isWsiBSPCompliant(message);
-Principal principal = parseTokenAndCreatePrincipal(child, 
bspCompliant);
+Principal principal = null;
 Subject subject = null;
 Object transformedToken = null;
 
@@ -104,6 +104,10 @@ public class UsernameTokenInterceptor extends 
AbstractTokenInterceptor {
 final WSSecurityEngineResult result = 
validateToken(child, message);
 subject = 
(Subject)result.get(WSSecurityEngineResult.TAG_SUBJECT);
 transformedToken = 
result.get(WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN);
+principal = 
(Principal)result.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+if (principal == null) {
+principal = parseTokenAndCreatePrincipal(child, 
bspCompliant);
+}
 } else {
 principal = parseTokenAndCreatePrincipal(child, 
bspCompliant);
 WSS4JTokenConverter.convertToken(message, principal);

cxf git commit: Recording .gitmergeinfo Changes

2014-12-15 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 7832dc32d - 956501357


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

Branch: refs/heads/2.7.x-fixes
Commit: 95650135737c87970e607e5f23de780b3f741691
Parents: 7832dc3
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Dec 15 13:27:54 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Dec 15 13:27:54 2014 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/95650135/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0b4a1a9..3a9403b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -579,6 +579,7 @@ B 53d80e130b5a74530605418f109a679c5f3950aa
 B 53f1131e6ef056c0ca06e73041e68eafcfe8a737
 B 542e4160f6d7bc220160fd672accd963da1303e3
 B 5448c31c043b1b2e18918616749fbd9f033923b4
+B 5452608c33ade4ea4e4760d119af1497ab0a336e
 B 5484ef481f6ab34c8e6a1bfc9f79d1c3f7789717
 B 556c23841a6d49d7c8f5b103a7abc336f944e717
 B 557bcd4ea79ba9a01a62765e63e97663b73363aa

cxf git commit: making it simpler to use refresh tokens as oAuth2 client ids and avoiding using UUID to generate tokens

2014-12-15 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 6b1b576d6 - fb6867e0f


making it simpler to use refresh tokens as oAuth2 client ids and avoiding using 
UUID to generate tokens


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

Branch: refs/heads/master
Commit: fb6867e0f5affd2f386e787e722c17fd086d3600
Parents: 6b1b576
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Dec 15 15:02:15 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Dec 15 15:02:15 2014 +

--
 .../org/apache/cxf/common/util/StringUtils.java |  8 +++
 .../common/util/crypto/MessageDigestUtils.java  | 11 -
 .../oauth2/services/AbstractTokenService.java   | 17 +++--
 .../services/RedirectionBasedGrantService.java  |  3 +--
 .../rs/security/oauth2/utils/OAuthUtils.java| 25 +++-
 5 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fb6867e0/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 40e45a5..7df3d52 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -216,4 +216,12 @@ public final class StringUtils {
 public static byte[] toBytes(String str, String enc) throws 
UnsupportedEncodingException {
 return str.getBytes(enc);
 }
+
+public static String toHexString(byte[] bytes) {
+StringBuilder hexString = new StringBuilder();
+for (int i = 0; i  bytes.length; i++) {
+hexString.append(Integer.toHexString(0xFF  bytes[i]));
+}
+return hexString.toString();
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb6867e0/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
index 24b096b..b8e84e2 100644
--- 
a/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
@@ -22,6 +22,8 @@ import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import org.apache.cxf.common.util.StringUtils;
+
 /**
  * The utility Message Digest generator which can be used for generating
  * random values
@@ -37,18 +39,13 @@ public final class MessageDigestUtils {
 }
 
 public static String generate(byte[] input) {
-return generate(input, ALGO_MD5);
+return generate(input, ALGO_SHA_256);
 }   
 
 public static String generate(byte[] input, String algo) {
 try {
 byte[] messageDigest = createDigest(input, algo);
-StringBuilder hexString = new StringBuilder();
-for (int i = 0; i  messageDigest.length; i++) {
-hexString.append(Integer.toHexString(0xFF  messageDigest[i]));
-}
-
-return hexString.toString();
+return StringUtils.toHexString(messageDigest);
 } catch (NoSuchAlgorithmException e) {
 throw new SecurityException(e);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/fb6867e0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
index f7feec8..23d8053 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
@@ -107,24 +107,27 @@ public class AbstractTokenService extends 
AbstractOAuthService {
 }
 
 // Get the Client and check the id and secret
-protected Client getAndValidateClientFromIdAndSecret(String clientId, 
String clientSecret) {
+protected Client getAndValidateClientFromIdAndSecret(String clientId,

cxf git commit: making it simpler to use refresh tokens as oAuth2 client ids and avoiding using UUID to generate tokens

2014-12-15 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 5452608c3 - 7cc912790


making it simpler to use refresh tokens as oAuth2 client ids and avoiding using 
UUID to generate tokens


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

Branch: refs/heads/3.0.x-fixes
Commit: 7cc912790b4e871012efc2539b6e80cb7289194d
Parents: 5452608
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Dec 15 15:02:15 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Dec 15 15:03:37 2014 +

--
 .../org/apache/cxf/common/util/StringUtils.java |  8 +++
 .../common/util/crypto/MessageDigestUtils.java  | 11 -
 .../oauth2/services/AbstractTokenService.java   | 17 +++--
 .../services/RedirectionBasedGrantService.java  |  3 +--
 .../rs/security/oauth2/utils/OAuthUtils.java| 25 +++-
 5 files changed, 32 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7cc91279/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 40e45a5..7df3d52 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -216,4 +216,12 @@ public final class StringUtils {
 public static byte[] toBytes(String str, String enc) throws 
UnsupportedEncodingException {
 return str.getBytes(enc);
 }
+
+public static String toHexString(byte[] bytes) {
+StringBuilder hexString = new StringBuilder();
+for (int i = 0; i  bytes.length; i++) {
+hexString.append(Integer.toHexString(0xFF  bytes[i]));
+}
+return hexString.toString();
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7cc91279/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java 
b/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
index 24b096b..b8e84e2 100644
--- 
a/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/common/util/crypto/MessageDigestUtils.java
@@ -22,6 +22,8 @@ import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import org.apache.cxf.common.util.StringUtils;
+
 /**
  * The utility Message Digest generator which can be used for generating
  * random values
@@ -37,18 +39,13 @@ public final class MessageDigestUtils {
 }
 
 public static String generate(byte[] input) {
-return generate(input, ALGO_MD5);
+return generate(input, ALGO_SHA_256);
 }   
 
 public static String generate(byte[] input, String algo) {
 try {
 byte[] messageDigest = createDigest(input, algo);
-StringBuilder hexString = new StringBuilder();
-for (int i = 0; i  messageDigest.length; i++) {
-hexString.append(Integer.toHexString(0xFF  messageDigest[i]));
-}
-
-return hexString.toString();
+return StringUtils.toHexString(messageDigest);
 } catch (NoSuchAlgorithmException e) {
 throw new SecurityException(e);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/7cc91279/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
index f7feec8..23d8053 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
@@ -107,24 +107,27 @@ public class AbstractTokenService extends 
AbstractOAuthService {
 }
 
 // Get the Client and check the id and secret
-protected Client getAndValidateClientFromIdAndSecret(String clientId, 
String clientSecret) {
+protected Client getAndValidateClientFromIdAndSecret(String

cxf git commit: Adding more comprehensive IssuedToken policy systests

2014-12-15 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/master fb6867e0f - 27ae3418d


Adding more comprehensive IssuedToken policy systests


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

Branch: refs/heads/master
Commit: 27ae3418d46d25593bb5b8759a830e256bbbf0a4
Parents: fb6867e
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Dec 15 15:20:05 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Dec 15 15:20:30 2014 +

--
 .../apache/cxf/systest/sts/template/Server.java |  46 +++
 .../cxf/systest/sts/template/StaxServer.java|  46 +++
 .../cxf/systest/sts/template/TemplateTest.java  | 371 +++
 .../cxf/systest/sts/template/DoubleIt.wsdl  | 222 +++
 .../sts/template/DoubleItNoTemplate.wsdl| 218 +++
 .../sts/template/DoubleItNoTemplate2.wsdl   | 218 +++
 .../cxf/systest/sts/template/cxf-client.xml |  50 +++
 .../cxf/systest/sts/template/cxf-service.xml|  49 +++
 .../systest/sts/template/cxf-stax-service.xml   |  51 +++
 9 files changed, 1271 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/27ae3418/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
new file mode 100644
index 000..bc39447
--- /dev/null
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.template;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server extends AbstractBusTestServerBase {
+
+public Server() {
+
+}
+
+protected void run()  {
+URL busFile = Server.class.getResource(cxf-service.xml);
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/27ae3418/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
new file mode 100644
index 000..18818af
--- /dev/null
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.template;

cxf git commit: Adding more comprehensive IssuedToken policy systests

2014-12-15 Thread coheigea 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 7cc912790 - 6057b95ed


Adding more comprehensive IssuedToken policy systests


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

Branch: refs/heads/3.0.x-fixes
Commit: 6057b95ed42f39b30d273c6b0611b535b2047dce
Parents: 7cc9127
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Dec 15 15:20:05 2014 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Dec 15 15:22:13 2014 +

--
 .../apache/cxf/systest/sts/template/Server.java |  46 +++
 .../cxf/systest/sts/template/StaxServer.java|  46 +++
 .../cxf/systest/sts/template/TemplateTest.java  | 371 +++
 .../cxf/systest/sts/template/DoubleIt.wsdl  | 222 +++
 .../sts/template/DoubleItNoTemplate.wsdl| 218 +++
 .../sts/template/DoubleItNoTemplate2.wsdl   | 218 +++
 .../cxf/systest/sts/template/cxf-client.xml |  50 +++
 .../cxf/systest/sts/template/cxf-service.xml|  49 +++
 .../systest/sts/template/cxf-stax-service.xml   |  51 +++
 9 files changed, 1271 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6057b95e/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
new file mode 100644
index 000..bc39447
--- /dev/null
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/Server.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.sts.template;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
+public class Server extends AbstractBusTestServerBase {
+
+public Server() {
+
+}
+
+protected void run()  {
+URL busFile = Server.class.getResource(cxf-service.xml);
+Bus busLocal = new SpringBusFactory().createBus(busFile);
+BusFactory.setDefaultBus(busLocal);
+setBus(busLocal);
+
+try {
+new Server();
+} catch (Exception e) {
+e.printStackTrace();
+}
+}
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/6057b95e/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
new file mode 100644
index 000..18818af
--- /dev/null
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/StaxServer.java
@@ -0,0 +1,46 @@
+/**
+ * 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

svn commit: r932874 - in /websites/production/cxf/content: cache/main.pageCache cxf-2714-release-notes.html cxf-303-release-notes.html download.html index.html

2014-12-15 Thread buildbot 
Author: buildbot
Date: Mon Dec 15 20:47:35 2014
New Revision: 932874

Log:
Production update by buildbot for cxf

Added:
websites/production/cxf/content/cxf-2714-release-notes.html
websites/production/cxf/content/cxf-303-release-notes.html
Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/download.html
websites/production/cxf/content/index.html

Modified: websites/production/cxf/content/cache/main.pageCache
==
Binary files - no diff available.

Added: websites/production/cxf/content/cxf-2714-release-notes.html
==
--- websites/production/cxf/content/cxf-2714-release-notes.html (added)
+++ websites/production/cxf/content/cxf-2714-release-notes.html Mon Dec 15 
20:47:35 2014
@@ -0,0 +1,155 @@
+
+!DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN 
http://www.w3.org/TR/html4/loose.dtd;
+!--
+
+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.
+--
+html
+  head
+
+link type=text/css rel=stylesheet href=/resources/site.css
+script src='/resources/space.js'/script
+
+meta http-equiv=Content-type content=text/html;charset=UTF-8
+meta name=keywords content=business integration, EAI, SOA, Service 
Oriented Architecture, web services, SOAP, JBI, JMS, WSDL, XML, EDI, Electronic 
Data Interchange, standards support, integration standards, application 
integration, middleware, software, solutions, services, CXF, open source
+meta name=description content=Apache CXF, Services Framework - CXF 2.7.14 
Release Notes
+
+
+
+
+title
+Apache CXF -- CXF 2.7.14 Release Notes
+/title
+  /head
+body onload=init()
+
+
+table width=100% cellpadding=0 cellspacing=0
+  tr
+td id=cell-0-0 colspan=2nbsp;/td
+td id=cell-0-1nbsp;/td
+td id=cell-0-2 colspan=2nbsp;/td
+  /tr
+  tr
+td id=cell-1-0nbsp;/td
+td id=cell-1-1nbsp;/td
+td id=cell-1-2
+  !-- Banner --
+div class=banner id=bannerdivtable border=0 cellpadding=0 
cellspacing=0 width=100%trtd align=left colspan=1 nowrap
+a shape=rect href=http://cxf.apache.org/; title=Apache CXFspan 
style=font-weight: bold; font-size: 170%; color: whiteApache CXF/span/a
+/tdtd align=right colspan=1 nowrap
+a shape=rect href=http://www.apache.org/; title=The Apache Software 
Foundationimg border=0 alt=ASF Logo 
src=http://cxf.apache.org/images/asf-logo.png;/a
+/td/tr/table/div/div
+  !-- Banner --
+  div id=top-menu
+table border=0 cellpadding=1 cellspacing=0 width=100%
+  tr
+td
+  div align=left
+!-- Breadcrumbs --
+a href=index.htmlIndex/anbsp;gt;nbsp;a 
href=download.htmlDownload/anbsp;gt;nbsp;a 
href=cxf-2714-release-notes.htmlCXF 2.7.14 Release Notes/a
+!-- Breadcrumbs --
+  /div
+/td
+td
+  div align=right
+!-- Quicklinks --
+div id=quicklinkspa shape=rect href=download.htmlDownload/a | a 
shape=rect 
href=http://cxf.apache.org/docs/index.html;Documentation/a/p/div
+!-- Quicklinks --
+  /div
+/td
+  /tr
+/table
+  /div
+/td
+td id=cell-1-3nbsp;/td
+td id=cell-1-4nbsp;/td
+  /tr
+  tr
+td id=cell-2-0 colspan=2nbsp;/td
+td id=cell-2-1
+  table
+tr valign=top
+  td height=100%
+div id=wrapper-menu-page-right
+  div id=wrapper-menu-page-top
+div id=wrapper-menu-page-bottom
+  div id=menu-page
+!-- NavigationBar --
+div id=navigationh3 id=Navigation-ApacheCXFa shape=rect 
href=index.htmlApache CXF/a/h3ul class=alternatelia shape=rect 
href=index.htmlHome/a/lilia shape=rect 
href=download.htmlDownload/a/lilia shape=rect 
href=people.htmlPeople/a/lilia shape=rect 
href=project-status.htmlProject Status/a/lilia shape=rect 
href=roadmap.htmlRoadmap/a/lilia shape=rect 
href=mailing-lists.htmlMailing Lists/a/lilia shape=rect 
class=external-link href=http://issues.apache.org/jira/browse/CXF;Issue 
Reporting/a/lilia shape=rect href=special-thanks.htmlSpecial 
Thanks/a/lilia shape=rect