Author: azeez Date: Mon Jan 19 07:13:48 2009 New Revision: 28963 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=28963
Log: Fixing up the Data services sample Modified: trunk/wsas/java/modules/distribution/bin.xml trunk/wsas/java/modules/distribution/pom.xml trunk/wsas/java/modules/samples/DataService/README trunk/wsas/java/modules/samples/DataService/build.xml trunk/wsas/java/modules/samples/DataService/dbs/DataServiceSample2.dbs trunk/wsas/java/modules/samples/DataService/dbs/DeptUpdateService.dbs trunk/wsas/java/modules/samples/DataService/dbs/NestedQuerySample.dbs trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/CSVDataServiceClient.java trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient1.java trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient2.java trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/ExcelDataServiceClient.java trunk/wsas/java/modules/samples/EJBService/src/org/wso2/wsas/sample/ejbservice/EJBServiceClient.java trunk/wsas/java/modules/samples/Jibx/wsdl/jibx_wsdl.wsdl trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/HelloWorldService2.wsdl trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/ServiceData.xml trunk/wsas/java/modules/samples/MTOM/wsdl/MTOMSample.wsdl Modified: trunk/wsas/java/modules/distribution/bin.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/distribution/bin.xml?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/distribution/bin.xml (original) +++ trunk/wsas/java/modules/distribution/bin.xml Mon Jan 19 07:13:48 2009 @@ -55,21 +55,6 @@ </includes> </fileSet> - <!-- copying data service samples into repository--> - <fileSet> - <directory>../samples/DataService/dbs</directory> - <outputDirectory>wso2wsas-${pom.version}/repository/dataservices</outputDirectory> - <includes> - <include>**/DataServiceSample1.dbs</include> - </includes> - </fileSet> - <!-- Copy sample database into samples --> - <fileSet> - <directory>target/samples/DataService/database</directory> - <outputDirectory>wso2wsas-${pom.version}/samples/DataService/database</outputDirectory> - </fileSet> - - <!-- copy executables in samples with execute permissions --> <fileSet> <directory>../samples</directory> Modified: trunk/wsas/java/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/distribution/pom.xml?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/distribution/pom.xml (original) +++ trunk/wsas/java/modules/distribution/pom.xml Mon Jan 19 07:13:48 2009 @@ -688,8 +688,7 @@ <artifactId>maven-antrun-plugin</artifactId> <version>1.1</version> <executions> - <execution> - <!-- Creating sample database for data services--> + <!--<execution> <id>create-sample-database</id> <phase>package</phase> <goals> @@ -715,19 +714,19 @@ <fileset file="${basedir}/../samples/DataService/sql/CreateTables.sql"/> <fileset file="${basedir}/../samples/DataService/sql/Customers.sql"/> <fileset file="${basedir}/../samples/DataService/sql/Employees.sql"/> - <!-- + --><!-- <fileset file="${basedir}/../samples/DataService/sql/Offices.sql"/> <fileset file="${basedir}/../samples/DataService/sql/OrderDetails.sql"/> <fileset file="${basedir}/../samples/DataService/sql/Orders.sql"/> <fileset file="${basedir}/../samples/DataService/sql/Payments.sql"/> <fileset file="${basedir}/../samples/DataService/sql/ProductLines.sql"/> <fileset file="${basedir}/../samples/DataService/sql/Products.sql"/> - --> + --><!-- </sql> </tasks> </configuration> - </execution> + </execution>--> <execution> <id>clean_target</id> <phase>install</phase> Modified: trunk/wsas/java/modules/samples/DataService/README URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/README?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/README (original) +++ trunk/wsas/java/modules/samples/DataService/README Mon Jan 19 07:13:48 2009 @@ -2,7 +2,7 @@ ===================================================================== Please refer sample-guide.html for detailed instructions for WSAS Documentation on Data Services. WSAS should be running when running the sample clients -Target endpoint reference is set to localhost:9762 as default in client source +Target endpoint reference is set to localhost:9763 as default in client source files. Change if required. Modified: trunk/wsas/java/modules/samples/DataService/build.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/build.xml?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/build.xml (original) +++ trunk/wsas/java/modules/samples/DataService/build.xml Mon Jan 19 07:13:48 2009 @@ -89,23 +89,15 @@ </copy> <copy file="./dbs/NestedQuerySample.dbs" toDir="${wsashome}/repository/dataservices"> - </copy> - </target> - - <target name="deploy-csv-service" description="deploy CSV data service sample"> - <mkdir dir="${wsashome}/repository/dataservices" /> - <copy file="./dbs/CSVSampleService.dbs" - toDir="${wsashome}/repository/dataservices"> </copy> - </target> - - <target name="deploy-excel-service" description="deploy Excel data service sample"> - <mkdir dir="${wsashome}/repository/dataservices" /> + <mkdir dir="${wsashome}/repository/dataservices" /> <copy file="./dbs/ExcelSampleService.dbs" toDir="${wsashome}/repository/dataservices"> </copy> + <copy file="./dbs/CSVSampleService.dbs" + toDir="${wsashome}/repository/dataservices"> + </copy> </target> - <target name="compile-all" depends="init"> <javac debug="on" destdir="${classes}"> @@ -114,8 +106,6 @@ </javac> </target> - - <target name="run-client-1" depends="compile-all" description="run data service client 1"> <java classname="org.wso2.wsas.sample.dataservice.DataServiceClient1"> <classpath refid="client.class.path" /> Modified: trunk/wsas/java/modules/samples/DataService/dbs/DataServiceSample2.dbs URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/dbs/DataServiceSample2.dbs?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/dbs/DataServiceSample2.dbs (original) +++ trunk/wsas/java/modules/samples/DataService/dbs/DataServiceSample2.dbs Mon Jan 19 07:13:48 2009 @@ -1,7 +1,7 @@ <data name="DataServiceSample2"> <config> <property name="org.wso2.ws.dataservice.driver">org.apache.derby.jdbc.EmbeddedDriver</property> - <property name="org.wso2.ws.dataservice.protocol">jdbc:derby:../samples/DataService/database/DATA_SERV_SAMP</property> + <property name="org.wso2.ws.dataservice.protocol">jdbc:derby:./samples/DataService/database/DATA_SERV_SAMP</property> <property name="org.wso2.ws.dataservice.user">wso2wsas</property> <property name="org.wso2.ws.dataservice.password">wso2wsas</property> </config> Modified: trunk/wsas/java/modules/samples/DataService/dbs/DeptUpdateService.dbs URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/dbs/DeptUpdateService.dbs?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/dbs/DeptUpdateService.dbs (original) +++ trunk/wsas/java/modules/samples/DataService/dbs/DeptUpdateService.dbs Mon Jan 19 07:13:48 2009 @@ -1,7 +1,7 @@ <data name="DeptUpdateService"> <config> <property name="org.wso2.ws.dataservice.driver">org.apache.derby.jdbc.EmbeddedDriver</property> - <property name="org.wso2.ws.dataservice.protocol">jdbc:derby:../samples/DataService/database/DATA_SERV_SAMP</property> + <property name="org.wso2.ws.dataservice.protocol">jdbc:derby:./samples/DataService/database/DATA_SERV_SAMP</property> <property name="org.wso2.ws.dataservice.user">wsas</property> <property name="org.wso2.ws.dataservice.password">wsas</property> </config> Modified: trunk/wsas/java/modules/samples/DataService/dbs/NestedQuerySample.dbs URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/dbs/NestedQuerySample.dbs?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/dbs/NestedQuerySample.dbs (original) +++ trunk/wsas/java/modules/samples/DataService/dbs/NestedQuerySample.dbs Mon Jan 19 07:13:48 2009 @@ -1,7 +1,7 @@ <data name="NextedQuerySample"> <config> <property name="org.wso2.ws.dataservice.driver">org.apache.derby.jdbc.EmbeddedDriver</property> - <property name="org.wso2.ws.dataservice.protocol">jdbc:derby:../samples/DataService/database/DATA_SERV_SAMP</property> + <property name="org.wso2.ws.dataservice.protocol">jdbc:derby:./samples/DataService/database/DATA_SERV_SAMP</property> <property name="org.wso2.ws.dataservice.user">wso2wsas</property> <property name="org.wso2.ws.dataservice.password">wso2wsas</property> </config> Modified: trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/CSVDataServiceClient.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/CSVDataServiceClient.java?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/CSVDataServiceClient.java (original) +++ trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/CSVDataServiceClient.java Mon Jan 19 07:13:48 2009 @@ -27,7 +27,7 @@ public class CSVDataServiceClient{ private static EndpointReference targetEPR = new EndpointReference( - "http://localhost:9762/services/CSVSampleService";); + "http://localhost:9763/services/CSVSampleService";); public static void main(String args[]) { try { Modified: trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient1.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient1.java?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient1.java (original) +++ trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient1.java Mon Jan 19 07:13:48 2009 @@ -27,7 +27,7 @@ public class DataServiceClient1 { private static EndpointReference targetEPR = new EndpointReference( - "http://localhost:9762/services/DataServiceSample1";); + "http://localhost:9763/services/DataServiceSample1";); public static void main(String args[]) { try { Modified: trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient2.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient2.java?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient2.java (original) +++ trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/DataServiceClient2.java Mon Jan 19 07:13:48 2009 @@ -27,7 +27,7 @@ public class DataServiceClient2 { private static EndpointReference targetEPR = new EndpointReference( - "http://localhost:9762/services/DataServiceSample2";); + "http://localhost:9763/services/DataServiceSample2";); public static void main(String args[]) { try { Modified: trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/ExcelDataServiceClient.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/ExcelDataServiceClient.java?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/ExcelDataServiceClient.java (original) +++ trunk/wsas/java/modules/samples/DataService/src/org/wso2/wsas/sample/dataservice/ExcelDataServiceClient.java Mon Jan 19 07:13:48 2009 @@ -27,7 +27,7 @@ public class ExcelDataServiceClient{ private static EndpointReference targetEPR = new EndpointReference( - "http://localhost:9762/services/ExcelSampleService";); + "http://localhost:9763/services/ExcelSampleService";); public static void main(String args[]) { try { Modified: trunk/wsas/java/modules/samples/EJBService/src/org/wso2/wsas/sample/ejbservice/EJBServiceClient.java URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/EJBService/src/org/wso2/wsas/sample/ejbservice/EJBServiceClient.java?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/EJBService/src/org/wso2/wsas/sample/ejbservice/EJBServiceClient.java (original) +++ trunk/wsas/java/modules/samples/EJBService/src/org/wso2/wsas/sample/ejbservice/EJBServiceClient.java Mon Jan 19 07:13:48 2009 @@ -27,7 +27,7 @@ public class EJBServiceClient{ private static EndpointReference targetEPR = new EndpointReference( - "http://localhost:9762/services/TimeServiceRemote";); + "http://localhost:9763/services/TimeServiceRemote";); public static void main(String args[]) { try { Modified: trunk/wsas/java/modules/samples/Jibx/wsdl/jibx_wsdl.wsdl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/Jibx/wsdl/jibx_wsdl.wsdl?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/Jibx/wsdl/jibx_wsdl.wsdl (original) +++ trunk/wsas/java/modules/samples/Jibx/wsdl/jibx_wsdl.wsdl Mon Jan 19 07:13:48 2009 @@ -118,7 +118,7 @@ <wsdl:service name="LibraryService"> <wsdl:port name="LibraryPort" binding="wns:LibraryBinding"> - <soap:address location="http://127.0.0.1:9762/services/LibraryService"/> + <soap:address location="http://127.0.0.1:9763/services/LibraryService"/> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/HelloWorldService2.wsdl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/HelloWorldService2.wsdl?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/HelloWorldService2.wsdl (original) +++ trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/HelloWorldService2.wsdl Mon Jan 19 07:13:48 2009 @@ -68,13 +68,13 @@ </wsp:ExactlyOne> </wsp:Policy> <wsdl:port name="HelloWorldService2SOAP11port_http" binding="ns0:HelloWorldService2SOAP11Binding"> - <soap:address location="http://127.0.0.1:9762/axis2/services/HelloWorldService2"/> + <soap:address location="http://127.0.0.1:9763/axis2/services/HelloWorldService2"/> </wsdl:port> <wsdl:port name="HelloWorldService2SOAP12port_http" binding="ns0:HelloWorldService2SOAP12Binding"> - <soap12:address location="http://127.0.0.1:9762/axis2/services/HelloWorldService2"/> + <soap12:address location="http://127.0.0.1:9763/axis2/services/HelloWorldService2"/> </wsdl:port> <wsdl:port name="HelloWorldService2Httpport" binding="ns0:HelloWorldService2HttpBinding"> - <http:address location="http://127.0.0.1:9762/axis2/services/HelloWorldService2"/> + <http:address location="http://127.0.0.1:9763/axis2/services/HelloWorldService2"/> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file Modified: trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/ServiceData.xml URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/ServiceData.xml?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/ServiceData.xml (original) +++ trunk/wsas/java/modules/samples/MEX/src/org/wso2/wsas/sample/mex/service/example2/META-INF/ServiceData.xml Mon Jan 19 07:13:48 2009 @@ -2,13 +2,13 @@ <Data dialect="http://schemas.xmlsoap.org/wsdl/"; file="META-INF/HelloWorldService2.wsdl"> <URL> - http://10.100.1.204:9762/services/HelloWorldService2?wsdl + http://10.100.1.204:9763/services/HelloWorldService2?wsdl </URL> </Data> <Data dialect="http://schemas.xmlsoap.org/ws/2004/09/policy"; file="META-INF/HelloWorldService2_Policy.xml"> <URL> - http://10.100.1.204:9762/services/HelloWorldService2?policy + http://10.100.1.204:9763/services/HelloWorldService2?policy </URL> </Data> </ServiceData> \ No newline at end of file Modified: trunk/wsas/java/modules/samples/MTOM/wsdl/MTOMSample.wsdl URL: http://wso2.org/svn/browse/wso2/trunk/wsas/java/modules/samples/MTOM/wsdl/MTOMSample.wsdl?rev=28963&r1=28962&r2=28963&view=diff ============================================================================== --- trunk/wsas/java/modules/samples/MTOM/wsdl/MTOMSample.wsdl (original) +++ trunk/wsas/java/modules/samples/MTOM/wsdl/MTOMSample.wsdl Mon Jan 19 07:13:48 2009 @@ -92,12 +92,12 @@ <wsdl:port name="MTOMSampleSOAP11Port" binding="tns:MTOMServiceSOAP11Binding"> <soap:address - location="http://127.0.0.1:9762/services/MTOMSample"; /> + location="http://127.0.0.1:9763/services/MTOMSample"; /> </wsdl:port> <wsdl:port name="MTOMSampleSOAP12Port" binding="tns:MTOMServiceSOAP12Binding"> <soap12:address - location="http://127.0.0.1:9762/services/MTOMSample"; /> + location="http://127.0.0.1:9763/services/MTOMSample"; /> </wsdl:port> </wsdl:service> </wsdl:definitions> \ No newline at end of file _______________________________________________ Wsas-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
