Author: isuru Date: Mon Nov 17 10:58:46 2008 New Revision: 24089 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24089
Log: Fixing CommodityQuote sample issues Added: trunk/wsas/java/carbon/samples/CommodityQuote/keys/ trunk/wsas/java/carbon/samples/CommodityQuote/keys/client.jks (contents, props changed) trunk/wsas/java/carbon/samples/CommodityQuote/keys/service.jks (contents, props changed) Modified: trunk/wsas/java/carbon/samples/CommodityQuote/build.xml trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr.properties trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr_web.properties trunk/wsas/java/carbon/samples/CommodityQuote/pom.xml trunk/wsas/java/carbon/samples/CommodityQuote/run-client.bat trunk/wsas/java/carbon/samples/CommodityQuote/run-client.sh trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java Modified: trunk/wsas/java/carbon/samples/CommodityQuote/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/build.xml?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/build.xml (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/build.xml Mon Nov 17 10:58:46 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/CommodityQuote/conf/default_epr.properties URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr.properties?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr.properties (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr.properties Mon Nov 17 10:58:46 2008 @@ -14,5 +14,5 @@ # limitations under the License. # -http.epr=http://@hostname@:9762/services/CommodityQuote +http.epr=http://@hostname@:9763/services/CommodityQuote https.epr=https://@hostname@:9443/services/CommodityQuote \ No newline at end of file Modified: trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr_web.properties URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr_web.properties?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr_web.properties (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/conf/default_epr_web.properties Mon Nov 17 10:58:46 2008 @@ -14,5 +14,5 @@ # limitations under the License. # -http.epr=http://@hostname@:9762/wso2wsas/services/CommodityQuote +http.epr=http://@hostname@:9763/wso2wsas/services/CommodityQuote https.epr=https://@hostname@:9443/wso2wsas/services/CommodityQuote \ No newline at end of file Added: trunk/wsas/java/carbon/samples/CommodityQuote/keys/client.jks URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/keys/client.jks?pathrev=24089 ============================================================================== Binary file. No diff available. Added: trunk/wsas/java/carbon/samples/CommodityQuote/keys/service.jks URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/keys/service.jks?pathrev=24089 ============================================================================== Binary file. No diff available. Modified: trunk/wsas/java/carbon/samples/CommodityQuote/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/pom.xml?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/pom.xml (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/pom.xml Mon Nov 17 10:58:46 2008 @@ -55,7 +55,7 @@ <tasks> <property name="keys.dir" value="${basedir}/target/keys"/> <delete dir="${keys.dir}"/> - <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/CommodityQuote/run-client.bat URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/run-client.bat?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/run-client.bat (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/run-client.bat Mon Nov 17 10:58:46 2008 @@ -68,7 +68,7 @@ rem loop through the libs and add them to the class path cd %WSO2WSAS_HOME%\samples\CommodityQuote set CLIENT_CLASSPATH=.\conf;.\temp\classes -FOR %%C in (..\..\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\lib\%%~nC%%~xC +FOR %%C in (..\..\repository\lib\*.jar) DO set CLIENT_CLASSPATH=!CLIENT_CLASSPATH!;..\..\repository\lib\%%~nC%%~xC rem ----- Execute The Requested Command --------------------------------------- echo Using WSO2WSAS_HOME: %WSO2WSAS_HOME% Modified: trunk/wsas/java/carbon/samples/CommodityQuote/run-client.sh URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/run-client.sh?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/run-client.sh (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/run-client.sh Mon Nov 17 10:58:46 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/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/client/Client.java Mon Nov 17 10:58:46 2008 @@ -37,8 +37,8 @@ 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.wsas.security.WSS4JUtil; +import org.wso2.carbon.utils.NetworkUtils; +import org.wso2.carbon.security.util.WSS4JUtil; import org.wso2.www.types.client.*; import javax.xml.namespace.QName; @@ -365,7 +365,7 @@ stub._getServiceClient() .engageModule(new QName(org.apache.axis2.Constants.MODULE_ADDRESSING)); String clientSSLStore = wso2wsasHome + File.separator + "conf" + File.separator + - "client-truststore.jks"; + "wso2carbon.jks"; System.getProperties().remove("javax.net.ssl.trustStore"); System.getProperties().remove("javax.net.ssl.trustStoreType"); @@ -568,7 +568,7 @@ private static Policy loadPolicy(int scenario) throws FileNotFoundException, XMLStreamException { StAXOMBuilder builder = - new StAXOMBuilder(wso2wsasHome + File.separator + "conf" + File.separator + + new StAXOMBuilder(wso2wsasHome + File.separator + "samples" + File.separator + "conf" + File.separator + "rampart" + File.separator + "scenario" + scenario + "-policy.xml"); return PolicyEngine.getPolicy(builder.getDocumentElement()); Modified: trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java?rev=24089&r1=24088&r2=24089&view=diff ============================================================================== --- trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java (original) +++ trunk/wsas/java/carbon/samples/CommodityQuote/src/org/wso2/wsas/sample/commodityquote/services/CommodityQuoteUtil.java Mon Nov 17 10:58:46 2008 @@ -16,7 +16,6 @@ package org.wso2.wsas.sample.commodityquote.services; -import org.wso2.wsas.ServerConstants; import org.wso2.wsas.sample.commodityquote.services.util.SymbolTable; import org.wso2.wsas.sample.commodityquote.services.util.Utils; import org.wso2.www.types.services.StockQuote; @@ -28,10 +27,13 @@ public class CommodityQuoteUtil { public final static String EXCHANGE_SERVICE_ENDPORT_ADDRESS = "exchangeEndpointAddress"; private static CommodityQuoteUtil ourInstance = new CommodityQuoteUtil(); - private String myEPR = "http://127.0.0.1:9762/"; + ServerConstants.SERVICE_PATH + "/Trader"; + private String myEPR; private Map stockMarket; private CommodityQuoteUtil() { + String httpPort = System.getProperty("carbon.http.port"); + httpPort = (httpPort == null) ? "9763" : httpPort; + myEPR = "http://127.0.0.1:"; + httpPort + "/services/Trader"; stockMarket = Utils.getPrePopulatedStockMarket(); } _______________________________________________ Wsas-java-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
