Author: isuru Date: Fri Nov 14 06:57:05 2008 New Revision: 23950 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=23950
Log: Fixing sample Modified: trunk/wsas/java/carbon/samples/Trader/build.xml trunk/wsas/java/carbon/samples/Trader/pom.xml trunk/wsas/java/carbon/samples/Trader/run-client.sh trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/exchange/Exchange.java trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java Modified: trunk/wsas/java/carbon/samples/Trader/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/build.xml?rev=23950&r1=23949&r2=23950&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/build.xml (original) +++ trunk/wsas/java/carbon/samples/Trader/build.xml Fri Nov 14 06:57:05 2008 @@ -17,7 +17,8 @@ <project default="build-all"> <property name="wso2wsas.home" value="../../"/> - <property name="lib" value="${wso2wsas.home}/lib"/> + <property name="carbon.home" value="${wso2wsas.home}"/> + <property name="wsas.lib" value="${wso2wsas.home}/lib"/> <property name="repo.location" value="${wso2wsas.home}/repository"/> <property name="temp.dir" value="temp"/> <property name="classes" value="${temp.dir}/classes"/> @@ -25,10 +26,12 @@ <property name="gen.src" value="target/generated/src"/> <property name="services" value="services"/> + <ant antfile="${wso2wsas.home}/bin/build.xml"/> + <path id="axis2.class.path"> <pathelement path="${java.class.path}"/> <fileset dir="${wso2wsas.home}"> - <include name="lib/*.jar"/> + <include name="repository/lib/*.jar"/> </fileset> </path> Modified: trunk/wsas/java/carbon/samples/Trader/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/pom.xml?rev=23950&r1=23949&r2=23950&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/pom.xml (original) +++ trunk/wsas/java/carbon/samples/Trader/pom.xml Fri Nov 14 06:57:05 2008 @@ -52,7 +52,7 @@ <phase>generate-sources</phase> <configuration> <tasks> - <java classname="org.wso2.utils.codegen.CodegenHelper" + <java classname="org.wso2.carbon.utils.codegen.CodegenHelper" fork="true"> <arg value="./conf/codegen.xml"/> <classpath refid="maven.dependency.classpath"/> Modified: trunk/wsas/java/carbon/samples/Trader/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/run-client.sh?rev=23950&r1=23949&r2=23950&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/Trader/run-client.sh Fri Nov 14 06:57:05 2008 @@ -65,7 +65,7 @@ # update classpath CLIENT_CLASSPATH="" -for f in "$WSO2WSAS_HOME"/lib/*.jar +for f in "$WSO2WSAS_HOME"/repository/lib/*.jar do CLIENT_CLASSPATH=$CLIENT_CLASSPATH:$f done Modified: trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/exchange/Exchange.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/exchange/Exchange.java?rev=23950&r1=23949&r2=23950&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/exchange/Exchange.java (original) +++ trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/exchange/Exchange.java Fri Nov 14 06:57:05 2008 @@ -16,7 +16,7 @@ package org.wso2.wsas.sample.exchange; -import org.wso2.wsas.ServerConstants; +//import org.wso2.wsas.ServerConstants; import org.wso2.wsas.sample.trader.ClientDetails; import org.wso2.wsas.sample.utils.Utils; import org.wso2.www.types.exchange.trader.service.ClientInfo; @@ -28,7 +28,8 @@ public class Exchange { private static Exchange ourInstance = new Exchange(); - private String myEPR = "http://127.0.0.1:3501/"; + ServerConstants.SERVICE_PATH + "/ExchangeTrader"; +// private String myEPR = "http://127.0.0.1:3501/"; + ServerConstants.SERVICE_PATH + "/ExchangeTrader"; + private String myEPR = "http://127.0.0.1:3501/services/ExchangeTrader";; private ArrayList tradersToBeNotified = new ArrayList(); private Map registeredClients; Modified: trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java?rev=23950&r1=23949&r2=23950&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java (original) +++ trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Client.java Fri Nov 14 06:57:05 2008 @@ -33,12 +33,12 @@ import org.apache.sandesha2.client.SandeshaClientConstants; import org.apache.sandesha2.client.SandeshaListener; import org.apache.sandesha2.client.SequenceReport; -import org.wso2.utils.NetworkUtils; +import org.wso2.carbon.utils.NetworkUtils; import org.wso2.wsas.sample.exchange.client.ExchangeClientCallbackHandlerExt; import org.wso2.wsas.sample.exchange.client.ExchangeClientStub; import org.wso2.wsas.sample.trader.client.TraderClientCallbackHandlerExt; import org.wso2.wsas.sample.trader.client.TraderClientStub; -import org.wso2.wsas.security.WSS4JUtil; +//import org.wso2.wsas.security.WSS4JUtil; import org.wso2.www.types.exchange.client.GetInfoRequest; import org.wso2.www.types.exchange.client.GetInfoResponse; import org.wso2.www.types.exchange.client.MarketInfo; @@ -819,7 +819,8 @@ rc.setUser(username); System.out.println("Please enter your password : "); String password = readOption(); - Parameter param = WSS4JUtil.getClientUsernameTokenHandler(password); +// Parameter param = WSS4JUtil.getClientUsernameTokenHandler(password); + Parameter param = new Parameter("foo", "bar"); traderStub._getServiceClient().getAxisService().addParameter(param); Policy policy = loadPolicy(1); Modified: trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java?rev=23950&r1=23949&r2=23950&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java (original) +++ trunk/wsas/java/carbon/samples/Trader/src/org/wso2/wsas/sample/trader/Trader.java Fri Nov 14 06:57:05 2008 @@ -18,9 +18,9 @@ import org.apache.axis2.Constants; import org.apache.sandesha2.client.SandeshaClientConstants; -import org.wso2.utils.NetworkUtils; -import org.wso2.wsas.ServerConstants; -import org.wso2.wsas.ServerManager; +import org.wso2.carbon.utils.NetworkUtils; +//import org.wso2.wsas.ServerConstants; +import org.wso2.carbon.core.ServerManager; import org.wso2.wsas.sample.exchange.trader.ExchangeTraderStub; import org.wso2.wsas.sample.utils.Utils; import org.wso2.www.types.exchange.trader.*; @@ -38,8 +38,11 @@ //TODO Neet to remove this hard coded endpoints - private String myEPR = "http://127.0.0.1:9762/"; + ServerConstants.SERVICE_PATH + "/TraderClient"; - private String exchangeEPR = "http://127.0.0.1:9762/"; + ServerConstants.SERVICE_PATH + "/ExchangeTrader"; +// private String myEPR = "http://127.0.0.1:9762/"; + ServerConstants.SERVICE_PATH + "/TraderClient"; +// private String exchangeEPR = "http://127.0.0.1:9762/"; + ServerConstants.SERVICE_PATH + "/ExchangeTrader"; + + private String myEPR = "http://127.0.0.1:9763/services/TraderClient";; + private String exchangeEPR = "http://127.0.0.1:9763/services/ExchangeTrader";; private Map stockMarket; private Map clientDetails; @@ -58,14 +61,14 @@ } public void setExchangeEPR(String serviceContextPath) throws SocketException { - exchangeEPR = "http://"; + NetworkUtils.getLocalHostname() + ":" + - ServerManager.getInstance().getHttpPort() + serviceContextPath + "/ExchangeTrader"; +// exchangeEPR = "http://"; + NetworkUtils.getLocalHostname() + ":" + +// ServerManager.getInstance().getHttpPort() + serviceContextPath + "/ExchangeTrader"; + exchangeEPR = "http://localhost:9763"; + serviceContextPath + "/ExchangeTrader"; } public void setExchangeEPR(String serviceContextPath, String serviceName) throws SocketException { - exchangeEPR = "http://"; + NetworkUtils.getLocalHostname() + ":" + - ServerManager.getInstance().getHttpPort() + serviceContextPath + "/" + serviceName; + exchangeEPR = "http://localhost:9763"; + serviceContextPath + "/" + serviceName; } public Trader createTraderWithExchangeEPR(String serviceContextPath) throws SocketException { _______________________________________________ Wsas-java-dev mailing list Wsas-java-dev@wso2.org http://mailman.wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
