Author: saminda Date: Sat Jun 7 04:55:38 2008 New Revision: 18118 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18118
Log: Changes from Ruchith and updates Modified: branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/PWCallback.java branches/wsas/java/2.3/wsas/pom.xml Modified: branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java?rev=18118&r1=18117&r2=18118&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java (original) +++ branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java Sat Jun 7 04:55:38 2008 @@ -39,6 +39,7 @@ import org.apache.sandesha2.client.SequenceReport; import org.wso2.utils.NetworkUtils; import org.wso2.wsas.security.WSS4JUtil; +import org.apache.ws.security.handler.WSHandlerConstants; import org.wso2.www.types.client.*; import javax.xml.namespace.QName; @@ -517,14 +518,17 @@ rc.setUser(username); System.out.println("Please enter your password :"); String password = readOption(); - Parameter param = WSS4JUtil.getClientUsernameTokenHandler(password); - stub._getServiceClient().getAxisService().addParameter(param); rc.setUserCertAlias("alice"); rc.setEncryptionUser("bob"); - rc.setPwCbClass(PWCallback.class.getName()); - CryptoConfig sigCryptoConfig = new CryptoConfig(); + Parameter param = new Parameter(); + param.setName(WSHandlerConstants.PW_CALLBACK_REF); + param.setValue(new PWCallback(password)); + + stub._getServiceClient().getAxisService().addParameter(param); + + CryptoConfig sigCryptoConfig = new CryptoConfig(); sigCryptoConfig.setProvider("org.apache.ws.security.components.crypto.Merlin"); @@ -547,7 +551,7 @@ prop2.put("org.apache.ws.security.crypto.merlin.file", keystore); - prop2.put("org.apache.ws.security.crypto.merlin.keystore.password", "testing"); + prop2.put("org.apache.ws.security.crypto.merlin.keystore.password", "password"); encrCryptoConfig.setProp(prop2); rc.setSigCryptoConfig(sigCryptoConfig); Modified: branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/PWCallback.java URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/PWCallback.java?rev=18118&r1=18117&r2=18118&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/PWCallback.java (original) +++ branches/wsas/java/2.3/wsas/modules/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/PWCallback.java Sat Jun 7 04:55:38 2008 @@ -28,6 +28,14 @@ public class PWCallback implements CallbackHandler { + private String defaultPasswd; + + + public PWCallback() {} + + public PWCallback(String defaultPassword) { + this.defaultPasswd = defaultPassword; + } /** * Field key @@ -157,7 +165,7 @@ } else { - pc.setPassword("sirhC"); + pc.setPassword(this.defaultPasswd); } @@ -173,4 +181,4 @@ } -} +} \ No newline at end of file Modified: branches/wsas/java/2.3/wsas/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/wsas/java/2.3/wsas/pom.xml?rev=18118&r1=18117&r2=18118&view=diff ============================================================================== --- branches/wsas/java/2.3/wsas/pom.xml (original) +++ branches/wsas/java/2.3/wsas/pom.xml Sat Jun 7 04:55:38 2008 @@ -2139,6 +2139,7 @@ <wso2dataservice.version>2.3</wso2dataservice.version> <a1deployer.version>2.3</a1deployer.version> <rampart.version>1.4.01</rampart.version> + <mercury.version>0.92</mercury.version> <wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs> @@ -2197,7 +2198,6 @@ <geronimo.spec.jms.version>1.1-rc4</geronimo.spec.jms.version> - <mercury.version>SNAPSHOT</mercury.version> <server.short.name>WSO2 WSAS</server.short.name> <server.name>WSO2 Web Services Application Server</server.name> _______________________________________________ Wsas-java-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
