cxf git commit: Updating JOSE password handling

2015-02-20 Thread sergeyb
Repository: cxf
Updated Branches:
  refs/heads/master 6e3224606 - 6641d5892


Updating JOSE password handling


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

Branch: refs/heads/master
Commit: 6641d5892b25949723fd7a5f1b59a2f457f9ecc6
Parents: 6e32246
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Feb 20 22:24:16 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Feb 20 22:24:16 2015 +

--
 .../PbesHmacAesWrapKeyDecryptionAlgorithm.java  | 18 +-
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  | 36 +++-
 .../rs/security/jose/jwk/JsonWebKeyTest.java| 10 +++---
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 13 +--
 .../jwt/PrivateKeyPasswordProviderImpl.java |  9 -
 .../cxf/systest/jaxrs/security/jwt/server.xml   |  5 ++-
 .../security/certs/encryptedJwkPrivateSet.txt   |  2 +-
 .../secret.aescbchmac.inlinejwk.properties  |  5 +--
 .../secret.aescbchmac.inlineset.properties  | 15 +---
 9 files changed, 67 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6641d589/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
index 3fd9992..3ab9623 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
@@ -25,22 +25,22 @@ public class PbesHmacAesWrapKeyDecryptionAlgorithm 
implements KeyDecryptionAlgor
 private byte[] password;
 private String algo;
 public PbesHmacAesWrapKeyDecryptionAlgorithm(String password) {
-this(password, Algorithm.PBES2_HS256_A128KW.getJwtName());
+this(password, Algorithm.PBES2_HS256_A128KW.getJwtName(), false);
 }
-public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, String algo) 
{
-this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password), 
algo);
+public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, String algo, 
boolean hashLargePasswords) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password), 
algo, hashLargePasswords);
 }
 public PbesHmacAesWrapKeyDecryptionAlgorithm(char[] password) {
-this(password, Algorithm.PBES2_HS256_A128KW.getJwtName());
+this(password, Algorithm.PBES2_HS256_A128KW.getJwtName(), false);
 }
-public PbesHmacAesWrapKeyDecryptionAlgorithm(char[] password, String algo) 
{
-this(PbesHmacAesWrapKeyEncryptionAlgorithm.charsToBytes(password), 
algo);
+public PbesHmacAesWrapKeyDecryptionAlgorithm(char[] password, String algo, 
boolean hashLargePasswords) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.charsToBytes(password), 
algo, hashLargePasswords);
 }
 public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password) {
-this(password, Algorithm.PBES2_HS256_A128KW.getJwtName());
+this(password, Algorithm.PBES2_HS256_A128KW.getJwtName(), false);
 }
-public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, String algo) 
{
-this.password = password;
+public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, String algo, 
boolean hashLargePasswords) {
+this.password = 
PbesHmacAesWrapKeyEncryptionAlgorithm.validatePassword(password, algo, 
hashLargePasswords);
 this.algo = algo;
 }
 @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/6641d589/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
index 2089859..ecb9aa0 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import 

cxf git commit: Updating JOSE password handling

2015-02-20 Thread sergeyb
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 99f64eb11 - 1efedabb4


Updating JOSE password handling


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

Branch: refs/heads/3.0.x-fixes
Commit: 1efedabb4ab91b317fa6f222f55c2c45f22ed2bf
Parents: 99f64eb
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Feb 20 22:24:16 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Feb 20 22:25:25 2015 +

--
 .../PbesHmacAesWrapKeyDecryptionAlgorithm.java  | 18 +-
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  | 36 +++-
 .../rs/security/jose/jwk/JsonWebKeyTest.java| 10 +++---
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 13 +--
 .../jwt/PrivateKeyPasswordProviderImpl.java |  9 -
 .../cxf/systest/jaxrs/security/jwt/server.xml   |  5 ++-
 .../security/certs/encryptedJwkPrivateSet.txt   |  2 +-
 .../secret.aescbchmac.inlinejwk.properties  |  5 +--
 .../secret.aescbchmac.inlineset.properties  | 15 +---
 9 files changed, 67 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1efedabb/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
index 3fd9992..3ab9623 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java
@@ -25,22 +25,22 @@ public class PbesHmacAesWrapKeyDecryptionAlgorithm 
implements KeyDecryptionAlgor
 private byte[] password;
 private String algo;
 public PbesHmacAesWrapKeyDecryptionAlgorithm(String password) {
-this(password, Algorithm.PBES2_HS256_A128KW.getJwtName());
+this(password, Algorithm.PBES2_HS256_A128KW.getJwtName(), false);
 }
-public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, String algo) 
{
-this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password), 
algo);
+public PbesHmacAesWrapKeyDecryptionAlgorithm(String password, String algo, 
boolean hashLargePasswords) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.stringToBytes(password), 
algo, hashLargePasswords);
 }
 public PbesHmacAesWrapKeyDecryptionAlgorithm(char[] password) {
-this(password, Algorithm.PBES2_HS256_A128KW.getJwtName());
+this(password, Algorithm.PBES2_HS256_A128KW.getJwtName(), false);
 }
-public PbesHmacAesWrapKeyDecryptionAlgorithm(char[] password, String algo) 
{
-this(PbesHmacAesWrapKeyEncryptionAlgorithm.charsToBytes(password), 
algo);
+public PbesHmacAesWrapKeyDecryptionAlgorithm(char[] password, String algo, 
boolean hashLargePasswords) {
+this(PbesHmacAesWrapKeyEncryptionAlgorithm.charsToBytes(password), 
algo, hashLargePasswords);
 }
 public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password) {
-this(password, Algorithm.PBES2_HS256_A128KW.getJwtName());
+this(password, Algorithm.PBES2_HS256_A128KW.getJwtName(), false);
 }
-public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, String algo) 
{
-this.password = password;
+public PbesHmacAesWrapKeyDecryptionAlgorithm(byte[] password, String algo, 
boolean hashLargePasswords) {
+this.password = 
PbesHmacAesWrapKeyEncryptionAlgorithm.validatePassword(password, algo, 
hashLargePasswords);
 this.algo = algo;
 }
 @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/1efedabb/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
index 2089859..ecb9aa0 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import 

cxf git commit: Moving SSL3 tests into a new module to avoid a failure with the latest JDK 7

2015-02-20 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/master cd7095c49 - 6e3224606


Moving SSL3 tests into a new module to avoid a failure with the latest JDK 7


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

Branch: refs/heads/master
Commit: 6e3224606ecf56b821dac537241f18a59b44e3e3
Parents: cd7095c
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 16:12:22 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 16:12:22 2015 +

--
 systests/pom.xml|   1 +
 systests/transports-ssl3/pom.xml| 172 +
 .../org/apache/cxf/https/ssl3/GreeterImpl.java  |  65 +
 .../org/apache/cxf/https/ssl3/SSLv3Server.java  |  49 
 .../org/apache/cxf/https/ssl3/SSLv3Test.java| 255 +++
 .../src/test/resources/keys/Bethal.cer  | Bin 0 - 548 bytes
 .../src/test/resources/keys/Bethal.jks  | Bin 0 - 1317 bytes
 .../src/test/resources/keys/Bethal.p12  | Bin 0 - 1705 bytes
 .../src/test/resources/keys/Gordy.cer   | Bin 0 - 544 bytes
 .../src/test/resources/keys/Gordy.jks   | Bin 0 - 1313 bytes
 .../src/test/resources/keys/Morpit.jks  | Bin 0 - 1337 bytes
 .../src/test/resources/keys/Morpit.p12  | Bin 0 - 1721 bytes
 .../src/test/resources/keys/Poltim.cer  | Bin 0 - 548 bytes
 .../src/test/resources/keys/Poltim.jks  | Bin 0 - 1318 bytes
 .../src/test/resources/keys/Tarpin.cer  | Bin 0 - 548 bytes
 .../src/test/resources/keys/Tarpin.jks  | Bin 0 - 1319 bytes
 .../src/test/resources/keys/Truststore.jks  | Bin 0 - 2942 bytes
 .../src/test/resources/keys/Truststore.pem  |  60 +
 .../src/test/resources/keys/alice.jks   | Bin 0 - 2428 bytes
 .../src/test/resources/keys/bob.jks | Bin 0 - 2422 bytes
 .../src/test/resources/keys/cxfca.jks   | Bin 0 - 1306 bytes
 .../src/test/resources/keys/genkeys.sh  |  53 
 .../src/test/resources/keys/subjalt.jks | Bin 0 - 8891 bytes
 .../cxf/https/ssl3/sslv3-client-allow.xml   |  34 +++
 .../org/apache/cxf/https/ssl3/sslv3-client.xml  |  33 +++
 .../org/apache/cxf/https/ssl3/sslv3-server.xml  | 100 
 .../https/clientauth/ClientAuthTest.java|   2 +-
 .../cxf/systest/https/ssl3/SSLv3Server.java |  47 
 .../cxf/systest/https/ssl3/SSLv3Test.java   | 255 ---
 .../systest/https/clientauth/client-no-auth.xml |  33 +++
 .../systest/https/ssl3/sslv3-client-allow.xml   |  34 ---
 .../cxf/systest/https/ssl3/sslv3-client.xml |  33 ---
 .../cxf/systest/https/ssl3/sslv3-server.xml | 100 
 33 files changed, 856 insertions(+), 470 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6e322460/systests/pom.xml
--
diff --git a/systests/pom.xml b/systests/pom.xml
index 09d36ae..5cdc6fa 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -34,6 +34,7 @@
 modulecontainer-integration/module
 moduleuncategorized/module
 moduletransports/module
+moduletransports-ssl3/module
 moduletransport-jms/module
 modulejaxws/module
 moduledatabinding/module

http://git-wip-us.apache.org/repos/asf/cxf/blob/6e322460/systests/transports-ssl3/pom.xml
--
diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml
new file mode 100644
index 000..64c05ab
--- /dev/null
+++ b/systests/transports-ssl3/pom.xml
@@ -0,0 +1,172 @@
+?xml version=1.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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+parent
+

cxf git commit: Some try with resources work for core

2015-02-20 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/master ccb82705c - cd7095c49


Some try with resources work for core


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

Branch: refs/heads/master
Commit: cd7095c49ab2be4a5667450bf67e5e4be8ec84c1
Parents: ccb8270
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 16:07:59 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 16:07:59 2015 +

--
 .../main/java/org/apache/cxf/BusFactory.java|  8 +
 .../cxf/attachment/AttachmentDeserializer.java  |  8 +
 .../apache/cxf/common/logging/JDKBugHacks.java  |  5 +--
 .../org/apache/cxf/common/logging/LogUtils.java |  5 +--
 .../cxf/common/util/PropertiesLoaderUtils.java  |  8 +
 .../apache/cxf/configuration/jsse/SSLUtils.java | 38 
 .../jsse/TLSParameterJaxBUtils.java | 20 +++
 .../databinding/source/XMLStreamDataReader.java |  5 +--
 .../java/org/apache/cxf/helpers/FileUtils.java  |  5 +--
 .../org/apache/cxf/io/CachedOutputStream.java   | 33 +++--
 .../java/org/apache/cxf/io/CachedWriter.java| 31 +++-
 .../org/apache/cxf/staxutils/StaxUtils.java |  5 +--
 12 files changed, 28 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cd7095c4/core/src/main/java/org/apache/cxf/BusFactory.java
--
diff --git a/core/src/main/java/org/apache/cxf/BusFactory.java 
b/core/src/main/java/org/apache/cxf/BusFactory.java
index 9588c54..1019fcf 100644
--- a/core/src/main/java/org/apache/cxf/BusFactory.java
+++ b/core/src/main/java/org/apache/cxf/BusFactory.java
@@ -378,15 +378,9 @@ public abstract class BusFactory {
 }
 
 if (is != null) {
-BufferedReader rd = null;
-try {
-rd = new BufferedReader(new InputStreamReader(is, 
UTF-8));
+try (BufferedReader rd = new BufferedReader(new 
InputStreamReader(is, UTF-8))) {
 busFactoryClass = rd.readLine();
 busFactoryCondition = rd.readLine();
-} finally {
-if (rd != null) {
-rd.close();
-}
 }
 }
 if (isValidBusFactoryClass(busFactoryClass) 

http://git-wip-us.apache.org/repos/asf/cxf/blob/cd7095c4/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java 
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 38e01ce..c4f99cf 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -208,18 +208,12 @@ public class AttachmentDeserializer {
 return;
 }
 loaded.add(input);
-CachedOutputStream out = null;
 InputStream origIn = input.getInputStream();
-try {
-out = new CachedOutputStream();
+try (CachedOutputStream out = new CachedOutputStream()) {
 AttachmentUtil.setStreamedAttachmentProperties(message, out);
 IOUtils.copy(input, out);
 input.setInputStream(out.getInputStream());
 origIn.close();
-} finally {
-if (out != null) {
-out.close();
-}
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/cd7095c4/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
--
diff --git a/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java 
b/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
index ae1d63c..1ab35c2 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
@@ -71,14 +71,11 @@ final class JDKBugHacks {
 ins = 
ClassLoader.getSystemResourceAsStream(META-INF/cxf/ + key);
 }
 if (ins != null) {
-BufferedReader din = new BufferedReader(new 
InputStreamReader(ins));
-try {
+try (BufferedReader din = new BufferedReader(new 
InputStreamReader(ins))) {
 cname = din.readLine();
 if (cname != null) {
 cname = cname.trim();
 

[2/2] cxf git commit: Moving SSL3 tests into a new module to avoid a failure with the latest JDK 7

2015-02-20 Thread coheigea
Moving SSL3 tests into a new module to avoid a failure with the latest JDK 7


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

Branch: refs/heads/3.0.x-fixes
Commit: 19d7e7275c680451273669004afa2a3f2f615ef3
Parents: c2eb440
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 16:12:22 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 16:15:30 2015 +

--
 systests/pom.xml|   1 +
 systests/transports-ssl3/pom.xml| 172 +
 .../org/apache/cxf/https/ssl3/GreeterImpl.java  |  65 +
 .../org/apache/cxf/https/ssl3/SSLv3Server.java  |  49 
 .../org/apache/cxf/https/ssl3/SSLv3Test.java| 255 +++
 .../src/test/resources/keys/Bethal.cer  | Bin 0 - 548 bytes
 .../src/test/resources/keys/Bethal.jks  | Bin 0 - 1317 bytes
 .../src/test/resources/keys/Bethal.p12  | Bin 0 - 1705 bytes
 .../src/test/resources/keys/Gordy.cer   | Bin 0 - 544 bytes
 .../src/test/resources/keys/Gordy.jks   | Bin 0 - 1313 bytes
 .../src/test/resources/keys/Morpit.jks  | Bin 0 - 1337 bytes
 .../src/test/resources/keys/Morpit.p12  | Bin 0 - 1721 bytes
 .../src/test/resources/keys/Poltim.cer  | Bin 0 - 548 bytes
 .../src/test/resources/keys/Poltim.jks  | Bin 0 - 1318 bytes
 .../src/test/resources/keys/Tarpin.cer  | Bin 0 - 548 bytes
 .../src/test/resources/keys/Tarpin.jks  | Bin 0 - 1319 bytes
 .../src/test/resources/keys/Truststore.jks  | Bin 0 - 2942 bytes
 .../src/test/resources/keys/Truststore.pem  |  60 +
 .../src/test/resources/keys/alice.jks   | Bin 0 - 2428 bytes
 .../src/test/resources/keys/bob.jks | Bin 0 - 2422 bytes
 .../src/test/resources/keys/cxfca.jks   | Bin 0 - 1306 bytes
 .../src/test/resources/keys/genkeys.sh  |  53 
 .../src/test/resources/keys/subjalt.jks | Bin 0 - 8891 bytes
 .../cxf/https/ssl3/sslv3-client-allow.xml   |  34 +++
 .../org/apache/cxf/https/ssl3/sslv3-client.xml  |  33 +++
 .../org/apache/cxf/https/ssl3/sslv3-server.xml  | 100 
 .../https/clientauth/ClientAuthTest.java|   2 +-
 .../cxf/systest/https/ssl3/SSLv3Server.java |  47 
 .../cxf/systest/https/ssl3/SSLv3Test.java   | 255 ---
 .../systest/https/clientauth/client-no-auth.xml |  33 +++
 .../systest/https/ssl3/sslv3-client-allow.xml   |  34 ---
 .../cxf/systest/https/ssl3/sslv3-client.xml |  33 ---
 .../cxf/systest/https/ssl3/sslv3-server.xml | 100 
 33 files changed, 856 insertions(+), 470 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/19d7e727/systests/pom.xml
--
diff --git a/systests/pom.xml b/systests/pom.xml
index 28b46e1..e4ea2bc 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -34,6 +34,7 @@
 modulecontainer-integration/module
 moduleuncategorized/module
 moduletransports/module
+moduletransports-ssl3/module
 moduletransport-jms/module
 modulejaxws/module
 moduledatabinding/module

http://git-wip-us.apache.org/repos/asf/cxf/blob/19d7e727/systests/transports-ssl3/pom.xml
--
diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml
new file mode 100644
index 000..64c05ab
--- /dev/null
+++ b/systests/transports-ssl3/pom.xml
@@ -0,0 +1,172 @@
+?xml version=1.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.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
+parent
+artifactIdcxf-parent/artifactId
+groupIdorg.apache.cxf/groupId
+

cxf git commit: Recording .gitmergeinfo Changes

2015-02-20 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 07f840c37 - 8532710e5


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

Branch: refs/heads/2.7.x-fixes
Commit: 8532710e58e8c73e532f126dc490baac64dce818
Parents: 07f840c
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 16:42:53 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 16:42:53 2015 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/8532710e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e138c8c..41b1a2d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -197,6 +197,7 @@ B 190f6e24de6404ae937a02a4530e17fea8434f42
 B 19a66ba7cdadc06cad4bbb4b5b2d61d8b19e279b
 B 19ba5d083a1819af6695aeccdb44503d3dcb3c96
 B 19d2c8ce5304d9aab5c4d0e71a6b1fd6f4434cd3
+B 19d7e7275c680451273669004afa2a3f2f615ef3
 B 19e7643b6c7bab7a01bfaede067aaed5e59008d5
 B 1a6a69574c777eccfceec8aad9c043e98b2f2439
 B 1aa01b2efdc6befbea4f786272215bcc28d842e0
@@ -224,6 +225,7 @@ B 1cbfd0ca62076f2231f41d986bf44f95696800be
 B 1cc014c3931d4d818dbf876bf959cd6f2c821732
 B 1cdac92540d5df49edf92876150fcb5bf873f49a
 B 1cf6098c2b063efb53d0d285ab54dd00dbfbf07c
+B 1d4a26ca255c0fb487342926166e49d646748e77
 B 1d6438784fc0fee6e00f3492b2920953ed6354fe
 B 1d72c1551a0bb5d671cde6332f5e87135326aff9
 B 1d7365b33c03b44f8fa984fc1f6350469f6bb7f3



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

2015-02-20 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes c2eb440d6 - 1d4a26ca2


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

Branch: refs/heads/3.0.x-fixes
Commit: 1d4a26ca255c0fb487342926166e49d646748e77
Parents: 19d7e72
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 16:15:30 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 16:15:30 2015 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/1d4a26ca/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6f58219..eeea2e1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -157,6 +157,7 @@ B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
 B c1c9562bb13eeacdd9dae5a46c513e9e03625698
 B c5609a479c87ea75e016b61daeafe0021f693332
 B cb19d05174a3bd078b391c4f6c151ee6e34e2956
+B cd7095c49ab2be4a5667450bf67e5e4be8ec84c1
 B cd809b8526fc5620c481d4ee5a8534ccf6babae4
 B d021b9041e00518099947274455b2027326a3c7c
 B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
@@ -227,6 +228,7 @@ M 6129ec5f6735a986660a2d05c6b3b0c9230610d9
 M 6292346fb110f0517b791f91d03fd2515d575388
 M 64368a5ddad507fa5d7016cbd07f3e9b5b5fd594
 M 67201fdde69488e511deb3d24794984afc01fe2d
+M 6e3224606ecf56b821dac537241f18a59b44e3e3
 M 717018e84f3ed41f0c9ca5ca550593c6c3352866
 M 71a1d1425c7cbfb6d410e6655f3579131d1fab3e
 M 7431af236a19b5b5f899bad317a548a4c5c9cd49



cxf git commit: Recording .gitmergeinfo Changes

2015-02-20 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 8532710e5 - e19524962


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

Branch: refs/heads/2.7.x-fixes
Commit: e19524962c243623f2557e1ceb6a979b43568d0e
Parents: 8532710
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 17:38:59 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 17:38:59 2015 +

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/e1952496/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 41b1a2d..28d4564 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1154,6 +1154,7 @@ B 99674f2f92a1fe03a7cf71d14a91b8b5ddf8f1e1
 B 99a0584b7c483844cab66e231cb8ffa559ea7cf9
 B 99c47519ffbf30335559f8c32d222314ff6ea438
 B 99ce97ea9c976d5e57cc79b4b26d9b10a3bb4eaa
+B 99f64eb11dbe0699d8174d77c4e50c9163234d88
 B 99fc7e1e5d5900a547a0c992102c100f69e918bd
 B 9a20282e40c3d60d03871440d0b14ee02d3f0a32
 B 9a258338bef4c952db0fed6dfa108279c34a4630



cxf git commit: Fixing the build

2015-02-20 Thread coheigea
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 1d4a26ca2 - 99f64eb11


Fixing the build


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

Branch: refs/heads/3.0.x-fixes
Commit: 99f64eb11dbe0699d8174d77c4e50c9163234d88
Parents: 1d4a26c
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Fri Feb 20 17:38:06 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Fri Feb 20 17:38:06 2015 +

--
 systests/transports-ssl3/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/99f64eb1/systests/transports-ssl3/pom.xml
--
diff --git a/systests/transports-ssl3/pom.xml b/systests/transports-ssl3/pom.xml
index 64c05ab..4c57cc2 100644
--- a/systests/transports-ssl3/pom.xml
+++ b/systests/transports-ssl3/pom.xml
@@ -21,7 +21,7 @@
 parent
 artifactIdcxf-parent/artifactId
 groupIdorg.apache.cxf/groupId
-version3.1.0-SNAPSHOT/version
+version3.0.5-SNAPSHOT/version
 relativePath../../parent/pom.xml/relativePath
 /parent
 modelVersion4.0.0/modelVersion



svn commit: r940871 - in /websites/production/cxf/content: cache/main.pageCache index.html

2015-02-20 Thread buildbot
Author: buildbot
Date: Fri Feb 20 18:22:36 2015
New Revision: 940871

Log:
Production update by buildbot for cxf

Modified:
websites/production/cxf/content/cache/main.pageCache
websites/production/cxf/content/index.html

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

Modified: websites/production/cxf/content/index.html
==
--- websites/production/cxf/content/index.html (original)
+++ websites/production/cxf/content/index.html Fri Feb 20 18:22:36 2015
@@ -99,7 +99,7 @@ Apache CXF -- Index
  td height=100%
!-- Content --
div class=wiki-content
-div id=ConfluenceContenth1 
id=Index-ApacheCXF:AnOpen-SourceServicesFrameworkApache CXF: An Open-Source 
Services Framework/h1h2 id=Index-OverviewOverview/h2pApache CXF is an 
open source services framework. CXF helps you build and develop services using 
frontend programming APIs, like JAX-WS and JAX-RS. These services can speak a 
variety of protocols such as SOAP, XML/HTTP, RESTful HTTP, or CORBA and work 
over a variety of transports such as HTTP, JMS or JBI./ph2 
id=Index-NewsNews/h2h3 
id=Index-February18,2015-ApacheCXF3.0.5/2.7.15released!February 18, 2015 - 
Apache CXF 3.0.5/2.7.15 released!/h3pThe Apache CXF team is proud to 
announce the availability of the latest patch releases. Over 60 JIRA issues 
were fixed for 3.0.3 which many of those fixes back ported to 
2.7.14./ppThis is mostly a patch release to fix problems and issues that 
users have encountered./ppDownloads are available#160;a shape=rect 
href=download.htmlhere/a./ph3 id
 =Index-December11,2014-ApacheCXF3.0.3/2.7.14released!December 11, 2014 - 
Apache CXF 3.0.3/2.7.14 released!/h3pThe Apache CXF team is proud to 
announce the availability of the latest patch releases. Over 50 JIRA issues 
were fixed for 3.0.3 which many of those fixes back ported to 
2.7.14./ppThis is mostly a patch release to fix problems and issues that 
users have encountered./ppDownloads are available#160;a shape=rect 
href=download.htmlhere/a./ph3 
id=Index-January21,2014-ApacheCXFDistributedOSGi(DOSGi)1.6.0released!January 
21, 2014 - Apache CXF Distributed OSGi (DOSGi) 1.6.0 released!/h3pThis 
release mainly updates to cxf 2.7.8 and removes the jdom 
dependency./ppDownloads are available at the#160;#160;a shape=rect 
href=dosgi-releases.htmlDOSGi Releases/a#160;page./ph2 
id=Index-FeaturesFeatures/h2pCXF includes a broad feature set, but it is 
primarily focused on the following areas:/pullistrongWeb Services 
Standards Supp
 ort:/strong CXF supports a variety of web service standards including SOAP, 
the WS-I Basic Profile, WSDL, WS-Addressing, WS-Policy, WS-ReliableMessaging, 
WS-Security, WS-SecurityPolicy, WS-SecureConverstation, and WS-Trust 
(partial)./lilistrongFrontends:/strong CXF supports a variety of 
frontend programming models./li/ulpCXF implements the JAX-WS APIs. CXF 
JAX-WS support includes some extensions to the standard that make it 
significantly easier to use, compared to the reference implementation: It will 
automatically generate code for request and response bean classes, and does not 
require a WSDL for simple cases./ppIt also includes a simple frontend 
which allows creation of clients and endpoints without annotations. CXF 
supports both contract first development with WSDL and code first development 
starting from Java./ppFor REST, CXF also supports a JAX-RS 
frontend./pullistrongEase of use:/strong CXF is designed to be 
intuitive and easy to use. The
 re are simple APIs to quickly build code-first services, Maven plug-ins to 
make tooling integration easy, JAX-WS API support, Spring 2.x XML support to 
make configuration a snap, and much more./lilistrongBinary and Legacy 
Protocol Support:/strong CXF has been designed to provide a pluggable 
architecture that supports not only XML but also non-XML type bindings, such as 
JSON and CORBA, in combination with any type of transport./li/ulpTo get 
started using CXF, check out the a shape=rect 
href=download.htmldownloads/a, the a shape=rect 
href=http://cxf.apache.org/docs/index.html;user's guide/a, or the a 
shape=rect href=mailing-lists.htmlmailing lists/a to get more 
information!/ph2 id=Index-GoalsGoals/h2h3 
id=Index-GeneralGeneral/h3ulliHigh 
Performance/liliExtensible/liliIntuitive amp; Easy to Use/li/ulh3 
id=Index-SupportforStandardsSupport for Standards/h3h5 
id=Index-JSRSupportJSR Support/h5ulliJAX-WS - J
 ava API for XML-Based Web Services (JAX-WS) 2.0 - a shape=rect 
class=external-link href=http://jcp.org/en/jsr/detail?id=224; 
rel=nofollowJSR-224/a/liliWeb Services Metadata for the Java Platform 
- a shape=rect class=external-link 
href=http://jcp.org/en/jsr/detail?id=181; 
rel=nofollowJSR-181/a/liliJAX-RS - The Java API for RESTful Web 
Services - a shape=rect class=external-link