You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2012/05/09 07:23:22 UTC

svn commit: r1335924 - in /servicemix/smx4/features/trunk/examples/cxf: cxf-ws-security-blueprint/ cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ cxf-ws-security-osgi/ cxf-ws-security-osgi/src/main/java/org/apache/servicemi...

Author: ffang
Date: Wed May  9 05:23:21 2012
New Revision: 1335924

URL: http://svn.apache.org/viewvc?rev=1335924&view=rev
Log:
[SMX4-1132]cxf-ws-security-osgi/blueprint example should use smx/smx by default

Modified:
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/README.txt
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/client.html
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/README.txt
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/client.html
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
    servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/README.txt?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/README.txt (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/README.txt Wed May  9 05:23:21 2012
@@ -60,7 +60,7 @@ directory:
        <property name="contextName" value="karaf"/>
     </bean>
 
-This will leverage cxf JAASLoginInterceptor to authenticate against karaf default jaas configuration through property contextName, which store username/password/role in SMX_HOME/etc/users.properties, to run this example, need add joe=password in etc/users.properties. Users can easily change to use other jaas context(JDBC,LDAP etc) as described from http://karaf.apache.org/manual/2.2.4/developers-guide/security-framework.html.
+This will leverage cxf JAASLoginInterceptor to authenticate against karaf default jaas configuration through property contextName, which store username/password/role in SMX_HOME/etc/users.properties. Users can easily change to use other jaas context(JDBC,LDAP etc) as described from http://karaf.apache.org/manual/2.2.4/developers-guide/security-framework.html.
 
 
 Prerequisites for Running the Example

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/client.html
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/client.html?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/client.html (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/client.html Wed May  9 05:23:21 2012
@@ -115,8 +115,8 @@ function send() {
     <soap:Header>
         <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
             <wsse:UsernameToken >
-                <wsse:Username>joe</wsse:Username>
-                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">password</wsse:Password>
+                <wsse:Username>smx</wsse:Username>
+                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">smx</wsse:Password>
             </wsse:UsernameToken>
         </wsse:Security>
     </soap:Header>

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java Wed May  9 05:23:21 2012
@@ -31,8 +31,8 @@ public class ClientPasswordCallback impl
 
         WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
 
-        if (pc.getIdentifier().equals("joe")) {
-            pc.setPassword("password");
+        if (pc.getIdentifier().equals("smx")) {
+            pc.setPassword("smx");
         }
     }
 

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-blueprint/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java Wed May  9 05:23:21 2012
@@ -40,7 +40,7 @@ public class CustomerSecurityInterceptor
         outProps.put("action", "UsernameToken");
 
         outProps.put("passwordType", "PasswordText");
-        outProps.put("user", "joe");
+        outProps.put("user", "smx");
         outProps.put("passwordCallbackClass", "org.apache.servicemix.examples.cxf.ClientPasswordCallback");
         for (Interceptor inteceptor : message.getInterceptorChain()) {
             //set properties for WSS4JOutInterceptor

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/README.txt?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/README.txt (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/README.txt Wed May  9 05:23:21 2012
@@ -59,7 +59,7 @@ directory:
        <property name="contextName" value="karaf"/>
     </bean>
 
-This will leverage cxf JAASLoginInterceptor to authenticate against karaf default jaas configuration through property contextName, which store username/password/role in SMX_HOME/etc/users.properties, to run this example, need add joe=password in etc/users.properties. Users can easily change to use other jaas context(JDBC,LDAP etc) as described from http://karaf.apache.org/manual/2.2.4/developers-guide/security-framework.html.
+This will leverage cxf JAASLoginInterceptor to authenticate against karaf default jaas configuration through property contextName, which store username/password/role in SMX_HOME/etc/users.properties. Users can easily change to use other jaas context(JDBC,LDAP etc) as described from http://karaf.apache.org/manual/2.2.4/developers-guide/security-framework.html.
 
 
 Prerequisites for Running the Example

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/client.html
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/client.html?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/client.html (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/client.html Wed May  9 05:23:21 2012
@@ -115,8 +115,8 @@ function send() {
     <soap:Header>
         <wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
             <wsse:UsernameToken >
-                <wsse:Username>joe</wsse:Username>
-                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">password</wsse:Password>
+                <wsse:Username>smx</wsse:Username>
+                <wsse:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText">smx</wsse:Password>
             </wsse:UsernameToken>
         </wsse:Security>
     </soap:Header>

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/ClientPasswordCallback.java Wed May  9 05:23:21 2012
@@ -31,8 +31,8 @@ public class ClientPasswordCallback impl
 
         WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
 
-        if (pc.getIdentifier().equals("joe")) {
-            pc.setPassword("password");
+        if (pc.getIdentifier().equals("smx")) {
+            pc.setPassword("smx");
         }
     }
 

Modified: servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java?rev=1335924&r1=1335923&r2=1335924&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java (original)
+++ servicemix/smx4/features/trunk/examples/cxf/cxf-ws-security-osgi/src/main/java/org/apache/servicemix/examples/cxf/CustomerSecurityInterceptor.java Wed May  9 05:23:21 2012
@@ -40,7 +40,7 @@ public class CustomerSecurityInterceptor
         outProps.put("action", "UsernameToken");
 
         outProps.put("passwordType", "PasswordText");
-        outProps.put("user", "joe");
+        outProps.put("user", "smx");
         outProps.put("passwordCallbackClass", "org.apache.servicemix.examples.cxf.ClientPasswordCallback");
         for (Interceptor inteceptor : message.getInterceptorChain()) {
             //set properties for WSS4JOutInterceptor