servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject git commit: [SM-2341]Improve WS-Security demos (cherry picked from commit b3bd4750d2bdc4b75ca079217cbdc20a781add32)
Date Tue, 08 Jul 2014 01:28:53 GMT
Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.0.x 3cd0837ad -> 388447318


[SM-2341]Improve WS-Security demos
(cherry picked from commit b3bd4750d2bdc4b75ca079217cbdc20a781add32)


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

Branch: refs/heads/servicemix-5.0.x
Commit: 3884473186d405594c0da9a28fc71b8141937326
Parents: 3cd0837
Author: Freeman Fang <freeman.fang@gmail.com>
Authored: Tue Jul 8 09:27:38 2014 +0800
Committer: Freeman Fang <freeman.fang@gmail.com>
Committed: Tue Jul 8 09:28:43 2014 +0800

----------------------------------------------------------------------
 examples/cxf/cxf-ws-security-blueprint/README.txt                  | 2 +-
 .../src/main/resources/OSGI-INF/blueprint/blueprint.xml            | 2 +-
 examples/cxf/cxf-ws-security-signature/README.txt                  | 2 +-
 .../src/main/resources/META-INF/spring/beans.xml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/38844731/examples/cxf/cxf-ws-security-blueprint/README.txt
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/README.txt b/examples/cxf/cxf-ws-security-blueprint/README.txt
index 0a9c17c..2af749f 100644
--- a/examples/cxf/cxf-ws-security-blueprint/README.txt
+++ b/examples/cxf/cxf-ws-security-blueprint/README.txt
@@ -46,7 +46,7 @@ directory:
                  <property name="properties">
                      <map>
                          <entry key="action" value="UsernameToken"/>
-                         <entry key="passwordType" value="PasswordTest"/>
+                         <entry key="passwordType" value="PasswordText"/>
                      </map>
                  </property>
              </bean>          

http://git-wip-us.apache.org/repos/asf/servicemix/blob/38844731/examples/cxf/cxf-ws-security-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
b/examples/cxf/cxf-ws-security-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 6e7a504..e2c6abd 100755
--- a/examples/cxf/cxf-ws-security-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/examples/cxf/cxf-ws-security-blueprint/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -34,7 +34,7 @@ under the License.
                  <property name="properties">
                      <map>
                          <entry key="action" value="UsernameToken"/>
-                         <entry key="passwordType" value="PasswordTest"/>
+                         <entry key="passwordType" value="PasswordText"/>
                      </map>
                  </property>
              </bean>          

http://git-wip-us.apache.org/repos/asf/servicemix/blob/38844731/examples/cxf/cxf-ws-security-signature/README.txt
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/README.txt b/examples/cxf/cxf-ws-security-signature/README.txt
index 7dd381b..7df964f 100644
--- a/examples/cxf/cxf-ws-security-signature/README.txt
+++ b/examples/cxf/cxf-ws-security-signature/README.txt
@@ -70,7 +70,7 @@ directory:
            key="org.apache.ws.security.crypto.merlin.keystore.password">storepassword</prop>
 
        <prop
-           key="org.apache.ws.security.crypto.merlin.file">server-truststore.jks</prop>
+           key="org.apache.ws.security.crypto.merlin.keystore.file">server-truststore.jks</prop>
     </util:properties>
 
 Prerequisites for Running the Example

http://git-wip-us.apache.org/repos/asf/servicemix/blob/38844731/examples/cxf/cxf-ws-security-signature/src/main/resources/META-INF/spring/beans.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/src/main/resources/META-INF/spring/beans.xml
b/examples/cxf/cxf-ws-security-signature/src/main/resources/META-INF/spring/beans.xml
index 124ad12..7f2ac9f 100755
--- a/examples/cxf/cxf-ws-security-signature/src/main/resources/META-INF/spring/beans.xml
+++ b/examples/cxf/cxf-ws-security-signature/src/main/resources/META-INF/spring/beans.xml
@@ -63,7 +63,7 @@ under the License.
            key="org.apache.ws.security.crypto.merlin.keystore.password">storepassword</prop>
 
        <prop
-           key="org.apache.ws.security.crypto.merlin.file">server-truststore.jks</prop>
+           key="org.apache.ws.security.crypto.merlin.keystore.file">server-truststore.jks</prop>
     </util:properties>
 
 


Mime
View raw message