You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/04/14 09:04:47 UTC

svn commit: r647675 - in /incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank: ./ src/main/java/bigbank/ src/main/resources/ src/main/resources/wsdl/

Author: lresende
Date: Mon Apr 14 00:04:42 2008
New Revision: 647675

URL: http://svn.apache.org/viewvc?rev=647675&view=rev
Log:
TUSCANY-2214 - Merging fixes from trunk and fixing README with new demo app output

Removed:
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/quotes.xml
Modified:
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/README
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/BigBank.composite
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/stock.xq
    incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/README?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/README (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/README Mon Apr 14 00:04:42 2008
@@ -3,46 +3,39 @@
 
 This demo showcases the integration with XML technolgies in the service assembly.
 
-Note: To build the project with maven or other IDEs, please download the WSDL from http://www.swanandmokashi.com/HomePage/WebServices/StockQuotes.asmx?WSDL and save the file as src/main/resources/wsdl/StockQuotes.wsdl.
-
 Note: The live stock quote web service is not always running. Sometimes empty response is returned and the stock value is 0.
 
-To run the demo, type "ant run" and it will produce the following output.
+To run the demo, type "ant compile run" and it will produce the following output.
 
 Buildfile: build.xml
 
-init:
-      [get] Getting: http://www.swanandmokashi.com/HomePage/WebServices/StockQuotes.asmx?WSDL
-      [get] To: C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\src\main\resources\wsdl\StockQuotes.wsdl
-      [get] local file date : Tue Nov 06 15:50:37 PST 2007
-      [get] .
-      [get] last modified = Wed Dec 31 16:00:00 PST 1969 - using current time instead
-    [mkdir] Created dir: C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\classes
+clean:
 
 compile:
-    [javac] Compiling 11 source files to C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\classes
-     [copy] Copying 6 files to C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\classes
-      [jar] Building jar: C:\Apache\tuscany-sca-1.0.1-incubating\demos\xml-bigbank\target\demo-xml-bigbank.jar
+    [mkdir] Created dir: /home/lresende/apache/tuscany/java-sca-1.2/distribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-incubating-SNAPSHOT/demos/xml-bigbank/target/classes
+    [javac] Compiling 11 source files to /home/lresende/apache/tuscany/java-sca-1.2/distribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-incubating-SNAPSHOT/demos/xml-bigbank/target/classes
+     [copy] Copying 5 files to /home/lresende/apache/tuscany/java-sca-1.2/distribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-incubating-SNAPSHOT/demos/xml-bigbank/target/classes
+      [jar] Building jar: /home/lresende/apache/tuscany/java-sca-1.2/distribution/target/apache-tuscany-sca-1.2-incubating-SNAPSHOT.dir/tuscany-sca-1.2-incubating-SNAPSHOT/demos/xml-bigbank/target/demo-xml-bigbank.jar
 
 run:
-     [java] Nov 6, 2007 3:52:28 PM org.apache.axis2.deployment.DeploymentEngine loadFromClassPath
-     [java] INFO: Module validation failed: The system is attempting to engage a module that is not available: rampart
      [java] Retrieving exchange rate...
-     [java] Nov 6, 2007 3:52:29 PM org.apache.tuscany.sca.binding.feed.provider.RSSBindingInvoker invoke
-     [java] INFO: >>> RSSBindingInvoker (rss_2.0) http://ansuz.sooke.bc.ca/rippy/exchange/?M=R&B=USD&F=CAD,CNY,EUR&T=F&S=O&I=S
-     [java] Exchange rate: USD 1.0=EUR 0.68705
+     [java] Apr 14, 2008 12:01:16 AM org.apache.tuscany.sca.binding.rss.provider.RSSBindingInvoker invoke
+     [java] INFO: >>> RSSBindingInvoker (null) http://ansuz.sooke.bc.ca/rippy/exchange/?M=R&B=USD&F=CAD,CNY,EUR&T=F&S=O&I=S
+     [java] Exchange rate: USD 1.0=EUR 0.63306
      [java] Loading account data...
      [java] Getting stock quote...
-     [java] Nov 6, 2007 3:52:30 PM org.apache.commons.httpclient.HttpMethodBase readResponse
-     [java] INFO: Discarding unexpected response: HTTP/1.1 100 Continue
+     [java] <StockQuotes><Stock><Symbol>IBM</Symbol><Last>116.00</Last><Date>4/11/2008</Date><Time>4:02pm</Time><Change>-2.78</Change><Open>117.31</Open><High>117.80</High><Low>115.51</Low><Volume>9561275</Volume><MktCap>160.6B</MktCap><PreviousClose>118.78</PreviousClose><PercentageChange>-2.34%</PercentageChange><AnnRange>93.91 - 121.46</AnnRange><Earns>7.182</Earns><P-E>16.54</P-E><Name>INTL BUSINESS MAC</Name></Stock><Stock><Symbol>GOOG</Symbol><Last>457.45</Last><Date>4/11/2008</Date><Time>4:00pm</Time><Change>-11.63</Change><Open>464.07</Open><High>467.26</High><Low>455.01</Low><Volume>4169662</Volume><MktCap>143.4B</MktCap><PreviousClose>469.08</PreviousClose><PercentageChange>-2.48%</PercentageChange><AnnRange>412.11 - 747.24</AnnRange><Earns>13.294</Earns><P-E>35.29</P-E><Name>GOOGLE</Name></Stock><Stock><Symbol>MSFT</Symbol><Last>28.28</Last><Date>4/11/2008</Date><Time>4:00pm</Time><Change>-0.83</Change><Open>28.84</Open><High>29.01</High><Low>28.21</Low><Volume>54
 373624</Volume><MktCap>263.2B</MktCap><PreviousClose>29.11</PreviousClose><PercentageChange>-2.85%</PercentageChange><AnnRange>26.87 - 37.50</AnnRange><Earns>1.758</Earns><P-E>16.56</P-E><Name>MICROSOFT CP</Name></Stock></StockQuotes>
      [java] Calculating total value...
      [java] Checking Balance: xs:double: 1000
      [java] Saving Blance: xs:double: 20000
-     [java] Stock Value: xs:integer: 0
-     [java] Total Value [1]: xs:double: 21000
-     [java] Total Value=USD 21000.0
-     [java] EUR: 14428.050000000001
+     [java] Stock Price [1]: xs:double: 116
+     [java] Quantity: xs:double: 500
+     [java] Stock Price [1]: xs:double: 28.28
+     [java] Quantity: xs:double: 200
+     [java] Stock Value: xs:double: 63656
+     [java] Total Value [1]: xs:double: 84656
+     [java] Total Value=USD 84656.0
+     [java] EUR: 53592.327359999996
 
 BUILD SUCCESSFUL
-Total time: 7 seconds
-
+Total time: 8 seconds

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/pom.xml Mon Apr 14 00:04:42 2008
@@ -48,20 +48,14 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
             <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-abdera</artifactId>
+            <artifactId>tuscany-binding-rss-rome</artifactId>
             <version>1.2-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-            <version>0.9</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/AccountServiceImpl.java Mon Apr 14 00:04:42 2008
@@ -24,6 +24,7 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.axiom.om.OMElement;
 import org.osoa.sca.ServiceRuntimeException;
 import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Reference;
@@ -35,7 +36,7 @@
 @Service(AccountService.class)
 public class AccountServiceImpl implements AccountService {
     private static final String STOCK_QUOTE_REQUEST =
-        "<q:GetQuotes xmlns:q=\"http://swanandmokashi.com\"><q:QuoteTicker>IBM,GOOG,MSFT</q:QuoteTicker></q:GetQuotes>";
+        "<q:GetQuote xmlns:q=\"http://www.webserviceX.NET/\"><q:symbol>IBM GOOG MSFT</q:symbol></q:GetQuote>";
 
     private XMLInputFactory factory = XMLInputFactory.newInstance();
 
@@ -64,10 +65,13 @@
             System.out.println("Getting stock quote...");
             XMLStreamReader request = factory.createXMLStreamReader(new StringReader(STOCK_QUOTE_REQUEST));
 
-            XMLStreamReader quotes = stockQuote.GetStockQuotes(request);
+            OMElement quotes = stockQuote.GetQuote(request);
 
+            String xml = quotes.getText();
+            System.out.println(xml);
+            XMLStreamReader qts = factory.createXMLStreamReader(new StringReader(xml));
             System.out.println("Calculating total value...");
-            double value = stockValue.calculate(quotes, accounts);
+            double value = stockValue.calculate(qts, accounts);
 
             System.out.println("Total Value=USD " + value);
 

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/BigBankClient.java Mon Apr 14 00:04:42 2008
@@ -21,7 +21,7 @@
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 /**
- * This client program to invoke the Mortgage LoanApproval service
+ * This client program to invoke the Account service
  */
 public class BigBankClient {
 

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/CurrencyExchange.java Mon Apr 14 00:04:42 2008
@@ -21,7 +21,7 @@
 
 import org.osoa.sca.annotations.Remotable;
 
-import com.sun.syndication.feed.atom.Feed;
+import com.sun.syndication.feed.synd.SyndFeed;
 
 /**
  * @version $Rev$ $Date$
@@ -32,5 +32,5 @@
      * Get the currency exchange rates as a RSS feed
      * @return
      */
-    Feed getRates();
+    SyndFeed getRates();
 }

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/ExchangeRateImpl.java Mon Apr 14 00:04:42 2008
@@ -35,8 +35,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
 
 /**
  * @version $Rev$ $Date$
@@ -65,9 +65,9 @@
     public double getExchangeRate(String currency) {
         try {
             System.out.println("Retrieving exchange rate...");
-            Feed feed = exchangeRate.getRates();
-            Entry entry = (Entry)feed.getEntries().get(0);
-            String rateTable = entry.getSummary().getValue();
+            SyndFeed feed = exchangeRate.getRates();
+            SyndEntry entry = (SyndEntry)feed.getEntries().get(0);
+            String rateTable = entry.getDescription().getValue();
 
             Document doc = builder.parse(new ByteArrayInputStream(rateTable.getBytes()));
             Node node = doc.getDocumentElement();

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/java/bigbank/StockQuote.java Mon Apr 14 00:04:42 2008
@@ -21,6 +21,7 @@
 
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.axiom.om.OMElement;
 import org.osoa.sca.annotations.Remotable;
 
 /**
@@ -33,5 +34,5 @@
      * @param input The StAX stream of the request
      * @return The StAX stream of the response
      */
-    public XMLStreamReader GetStockQuotes(XMLStreamReader input);
+    public OMElement GetQuote(XMLStreamReader input);
 }

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/BigBank.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/BigBank.composite?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/BigBank.composite (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/BigBank.composite Mon Apr 14 00:04:42 2008
@@ -45,7 +45,7 @@
     </component>
 
     <reference name="StockQuoteReference" promote="AccountService/stockQuote">
-        <binding.ws wsdlElement="http://swanandmokashi.com#wsdl.port(StockQuotes/StockQuotesSoap)" />
+        <binding.ws wsdlElement="http://www.webserviceX.NET/#wsdl.port(StockQuote/StockQuoteSoap)" />
     </reference>
 
 </composite>

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/stock.xq
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/stock.xq?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/stock.xq (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/stock.xq Mon Apr 14 00:04:42 2008
@@ -16,7 +16,7 @@
     * specific language governing permissions and limitations
     * under the License.    
 :)
-declare namespace q="http://swanandmokashi.com";
+declare namespace q="http://www.webserviceX.NET/";
 declare namespace c="http://example.com/customer";
 declare namespace stock="scaservice:java/bigbank.StockValue";
 (: declare namespace currency="scaproperty:java/java.lang.String"; :)
@@ -39,11 +39,11 @@
     let $value :=
     trace( 
     sum( 
-        for $quote in $quoteDoc/q:GetQuotesResponse/q:GetQuotesResult/q:Quote,
+        for $quote in $quoteDoc/StockQuotes/Stock,
             $account in $accountDoc/c:customer/c:accounts/c:stock
-        where string($quote/q:StockTicker) = string($account/@symbol)
+        where string($quote/Symbol) = string($account/@symbol)
         return 
-            trace(number($quote/q:StockQuote),"Stock Price") * trace(number($account/@quantity), "Quantity")
+            trace(number($quote/Last),"Stock Price") * trace(number($account/@quantity), "Quantity")
     ), "Stock Value")
     return trace($checking + $saving + $value, "Total Value")
 };

Modified: incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl?rev=647675&r1=647674&r2=647675&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl (original)
+++ incubator/tuscany/branches/sca-java-1.2/demos/xml-bigbank/src/main/resources/wsdl/StockQuotes.wsdl Mon Apr 14 00:04:42 2008
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.    
 -->
-<wsdl:definitions targetNamespace="http://swanandmokashi.com" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-    <wsdl:import namespace="http://swanandmokashi.com"
-        location="http://www.swanandmokashi.com/HomePage/WebServices/StockQuotes.asmx?WSDL" />
+<wsdl:definitions targetNamespace="http://www.webserviceX.NET/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+    <wsdl:import namespace="http://www.webserviceX.NET/"
+        location="http://www.webservicex.com/stockquote.asmx?WSDL" />
 </wsdl:definitions>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org