You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/02/27 06:32:06 UTC
svn commit: r381266 - in /incubator/tuscany/java/samples/bigbank: account/
account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/
account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/impl/
accoun...
Author: jsdelfino
Date: Sun Feb 26 21:31:59 2006
New Revision: 381266
URL: http://svn.apache.org/viewcvs?rev=381266&view=rev
Log:
integrated SDO2 generation with the build of the bigbank samples - adjusted bigbank sample to the new SDO2 generated code
Added:
incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/StockQuoteWebService.wsdl
Removed:
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountFactory.java
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountPackage.java
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountReport.java
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountSummary.java
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/impl/
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/stockquote/StockQuoteWebService.wsdl
incubator/tuscany/java/samples/bigbank/account/src/main/resources/tuscany-model.config
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountFactory.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountPackage.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountReport.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountSummary.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/impl/
incubator/tuscany/java/samples/bigbank/webclient/src/main/resources/tuscany-model.config
Modified:
incubator/tuscany/java/samples/bigbank/account/pom.xml
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountService.java
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java
incubator/tuscany/java/samples/bigbank/account/src/main/resources/sca.module
incubator/tuscany/java/samples/bigbank/account/src/test/java/org/apache/tuscany/samples/bigbank/account/client/AccountClient.java
incubator/tuscany/java/samples/bigbank/webclient/pom.xml
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountService.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java
incubator/tuscany/java/samples/bigbank/webclient/src/test/java/org/apache/tuscany/samples/bigbank/webclient/client/TestAccountService.java
Modified: incubator/tuscany/java/samples/bigbank/account/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/pom.xml?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/account/pom.xml Sun Feb 26 21:31:59 2006
@@ -35,4 +35,29 @@
<scope>provided</scope> <!-- use provided so tuscany infrastructue is not inc. in the war-->
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
+ <javaPackage>org.apache.tuscany.samples.bigbank.account</javaPackage>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noInterfaces>true</noInterfaces>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountService.java?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountService.java (original)
+++ incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountService.java Sun Feb 26 21:31:59 2006
@@ -16,6 +16,7 @@
*/
package org.apache.tuscany.samples.bigbank.account.services.account;
+import org.apache.tuscany.samples.bigbank.account.AccountReport;
import org.osoa.sca.annotations.Remotable;
@Remotable
Modified: incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java (original)
+++ incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountServiceImpl.java Sun Feb 26 21:31:59 2006
@@ -18,16 +18,18 @@
import java.util.List;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Reference;
-
-import org.apache.tuscany.core.deprecated.sdo.util.DataFactory;
-import org.apache.tuscany.core.deprecated.sdo.util.impl.HelperProviderImpl;
+import org.apache.tuscany.samples.bigbank.account.AccountReport;
+import org.apache.tuscany.samples.bigbank.account.AccountSummary;
import org.apache.tuscany.samples.bigbank.account.services.accountdata.AccountDataService;
import org.apache.tuscany.samples.bigbank.account.services.accountdata.CheckingAccount;
import org.apache.tuscany.samples.bigbank.account.services.accountdata.SavingsAccount;
import org.apache.tuscany.samples.bigbank.account.services.accountdata.StockAccount;
import org.apache.tuscany.samples.bigbank.account.services.stockquote.StockQuoteService;
+import org.apache.tuscany.sdo.helper.HelperProviderImpl;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+
+import commonj.sdo.helper.DataFactory;
public class AccountServiceImpl implements AccountService {
Modified: incubator/tuscany/java/samples/bigbank/account/src/main/resources/sca.module
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/resources/sca.module?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/main/resources/sca.module (original)
+++ incubator/tuscany/java/samples/bigbank/account/src/main/resources/sca.module Sun Feb 26 21:31:59 2006
@@ -53,6 +53,9 @@
<import.wsdl
location="wsdl/AccountService.wsdl"
namespace="http://www.bigbank.com/AccountService/"/>
+ <import.wsdl
+ location="wsdl/StockQuoteWebService.wsdl"
+ namespace="http://webservice.stockquote"/>
</module>
Added: incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/StockQuoteWebService.wsdl
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/StockQuoteWebService.wsdl?rev=381266&view=auto
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/StockQuoteWebService.wsdl (added)
+++ incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/StockQuoteWebService.wsdl Sun Feb 26 21:31:59 2006
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<wsdl:definitions targetNamespace="http://webservice.stockquote" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://webservice.stockquote" xmlns:intf="http://webservice.stockquote" xmlns:tns1="http://stockquote" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="">
+ <!--WSDL created by Apache Axis version: 1.2.1
+Built on Jun 14, 2005 (09:15:57 EDT)-->
+ <wsdl:types>
+ <schema elementFormDefault="qualified" targetNamespace="http://stockquote" xmlns="http://www.w3.org/2001/XMLSchema">
+ <complexType name="GetQuoteRequest">
+ <sequence>
+ <element name="symbol" nillable="true" type="xsd:string"/>
+ </sequence>
+ </complexType>
+ <complexType name="GetQuoteResponse">
+ <sequence>
+ <element name="price" type="xsd:float"/>
+ </sequence>
+ </complexType>
+ </schema>
+ <schema elementFormDefault="qualified" targetNamespace="http://webservice.stockquote" xmlns="http://www.w3.org/2001/XMLSchema">
+ <import namespace="http://stockquote"/>
+ <element name="request" type="tns1:GetQuoteRequest"/>
+ <element name="getQuoteReturn" type="tns1:GetQuoteResponse"/>
+ </schema>
+ </wsdl:types>
+
+ <wsdl:message name="getQuoteResponse">
+
+ <wsdl:part element="impl:getQuoteReturn" name="getQuoteReturn"/>
+
+ </wsdl:message>
+
+ <wsdl:message name="getQuoteRequest">
+
+ <wsdl:part element="impl:request" name="request"/>
+
+ </wsdl:message>
+
+ <wsdl:portType name="StockQuoteWebService">
+
+ <wsdl:operation name="getQuote" parameterOrder="request">
+
+ <wsdl:input message="impl:getQuoteRequest" name="getQuoteRequest"/>
+
+ <wsdl:output message="impl:getQuoteResponse" name="getQuoteResponse"/>
+
+ </wsdl:operation>
+
+ </wsdl:portType>
+
+ <wsdl:binding name="StockQuoteWebServiceSoapBinding" type="impl:StockQuoteWebService">
+
+ <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="getQuote">
+
+ <wsdlsoap:operation soapAction=""/>
+
+ <wsdl:input name="getQuoteRequest">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:input>
+
+ <wsdl:output name="getQuoteResponse">
+
+ <wsdlsoap:body use="literal"/>
+
+ </wsdl:output>
+
+ </wsdl:operation>
+
+ </wsdl:binding>
+
+ <wsdl:service name="StockQuoteWebServiceService">
+
+ <wsdl:port binding="impl:StockQuoteWebServiceSoapBinding" name="StockQuoteWebService">
+
+ <wsdlsoap:address location="http://localhost:8123/StockQuoteWebService/services/StockQuoteWebService"/>
+
+ </wsdl:port>
+
+ </wsdl:service>
+
+</wsdl:definitions>
Modified: incubator/tuscany/java/samples/bigbank/account/src/test/java/org/apache/tuscany/samples/bigbank/account/client/AccountClient.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/test/java/org/apache/tuscany/samples/bigbank/account/client/AccountClient.java?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/src/test/java/org/apache/tuscany/samples/bigbank/account/client/AccountClient.java (original)
+++ incubator/tuscany/java/samples/bigbank/account/src/test/java/org/apache/tuscany/samples/bigbank/account/client/AccountClient.java Sun Feb 26 21:31:59 2006
@@ -18,14 +18,13 @@
import java.util.Iterator;
+import org.apache.tuscany.core.client.TuscanyRuntime;
+import org.apache.tuscany.samples.bigbank.account.AccountReport;
+import org.apache.tuscany.samples.bigbank.account.AccountSummary;
+import org.apache.tuscany.samples.bigbank.account.services.account.AccountService;
import org.osoa.sca.CurrentModuleContext;
import org.osoa.sca.ModuleContext;
import org.osoa.sca.SCA;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.apache.tuscany.samples.bigbank.account.services.account.AccountReport;
-import org.apache.tuscany.samples.bigbank.account.services.account.AccountService;
-import org.apache.tuscany.samples.bigbank.account.services.account.AccountSummary;
public class AccountClient extends SCA {
Modified: incubator/tuscany/java/samples/bigbank/webclient/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/pom.xml?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/pom.xml Sun Feb 26 21:31:59 2006
@@ -48,4 +48,29 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <schemaFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</schemaFile>
+ <javaPackage>org.apache.tuscany.samples.bigbank.account</javaPackage>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noInterfaces>true</noInterfaces>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountService.java?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountService.java (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountService.java Sun Feb 26 21:31:59 2006
@@ -16,6 +16,7 @@
*/
package org.apache.tuscany.samples.bigbank.webclient.services.account;
+import org.apache.tuscany.samples.bigbank.account.AccountReport;
import org.osoa.sca.annotations.Remotable;
@Remotable
Modified: incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountServiceComponentImpl.java Sun Feb 26 21:31:59 2006
@@ -16,9 +16,11 @@
*/
package org.apache.tuscany.samples.bigbank.webclient.services.account;
-import commonj.sdo.DataObject;
+import org.apache.tuscany.samples.bigbank.account.AccountReport;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
+
+import commonj.sdo.DataObject;
/**
*/
Modified: incubator/tuscany/java/samples/bigbank/webclient/src/test/java/org/apache/tuscany/samples/bigbank/webclient/client/TestAccountService.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/src/test/java/org/apache/tuscany/samples/bigbank/webclient/client/TestAccountService.java?rev=381266&r1=381265&r2=381266&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/webclient/src/test/java/org/apache/tuscany/samples/bigbank/webclient/client/TestAccountService.java (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/src/test/java/org/apache/tuscany/samples/bigbank/webclient/client/TestAccountService.java Sun Feb 26 21:31:59 2006
@@ -18,13 +18,12 @@
import java.util.List;
+import org.apache.tuscany.core.client.TuscanyRuntime;
+import org.apache.tuscany.samples.bigbank.account.AccountReport;
+import org.apache.tuscany.samples.bigbank.webclient.services.account.AccountService;
import org.osoa.sca.CurrentModuleContext;
import org.osoa.sca.ModuleContext;
import org.osoa.sca.SCA;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.apache.tuscany.samples.bigbank.webclient.services.account.AccountReport;
-import org.apache.tuscany.samples.bigbank.webclient.services.account.AccountService;
public class TestAccountService extends SCA {