[jbossws-commits] JBossWS SVN: r16468 - in stack/native/branches/jbossws-native-3.1.2: modules/core and 2 other directories.

Author: klape Date: 2012-07-13 01:12:50 -0400 (Fri, 13 Jul 2012) New Revision: 16468 Modified: stack/native/branches/jbossws-native-3.1.2/ stack/native/branches/jbossws-native-3.1.2/modules/core/ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/ Log: [JBPAPP-8118] <key-passwords> in jboss-wsse-client.xml does not work. Property changes on: stack/native/branches/jbossws-native-3.1.2 ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946 /stack/native/trunk:12502,13992,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365:14192 /stack/native/branches/jbossws-native-3.4.0.SP1:13928,13933,13936,13946 /stack/native/trunk:12502,13992,14157,14160,14181,14183,14842 Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/core ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946 /stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/core:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/core:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/core:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/core:13928,13933,13936,13946 /stack/native/trunk/modules/core:12502,13992,14011,14157,14160,14181,14183,14842 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2012-07-12 17:25:50 UTC (rev 16467) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/security/SecurityStore.java 2012-07-13 05:12:50 UTC (rev 16468) @@ -132,6 +132,8 @@ String trustStoreType = conf.getTrustStoreType(); String trustStorePassword = conf.getTrustStorePassword(); + keyPasswords = conf.getKeyPasswords(); + loadKeyStore(keyStoreURL, keyStoreType, keyStorePassword); loadTrustStore(trustStoreURL, trustStoreType, trustStorePassword); } Property changes on: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests ___________________________________________________________________ Modified: svn:mergeinfo - /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946 /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842 + /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP-8128/modules/testsuite/native-tests:15667 /stack/native/branches/jbossws-native-3.1.2.SP10_JBPAPP6864/modules/testsuite/native-tests:14776-14778,14786,14894,14905,14907-14908 /stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-6365/modules/testsuite/native-tests:14192 /stack/native/branches/jbossws-native-3.4.0.SP1/modules/testsuite/native-tests:13928,13933,13936,13946 /stack/native/trunk/modules/testsuite/native-tests:12502,13992,14013,14157,14160,14181,14183,14842