Author: jsdelfino
Date: Tue Feb 28 23:51:22 2006
New Revision: 381940
URL: http://svn.apache.org/viewcvs?rev=381940&view=rev
Log:
show usage of WSDL2Java in the bigbank sample, the AccountService interfaces
are now generated by WSDL2Java as part of the Maven build
Removed:
incubator/tuscany/java/samples/bigbank/account/src/main/java/org/apache/tuscany/samples/bigbank/account/services/account/AccountService.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/services/account/AccountService.java
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/AccountServiceImpl.java
incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
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/AccountServiceComponentImpl.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/tags/account/AccountStatusTag.java
incubator/tuscany/java/samples/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
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=381940&r1=381939&r2=381940&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/account/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/account/pom.xml Tue Feb 28 23:51:22
2006
@@ -45,11 +45,24 @@
<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>
+ <plugin>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-sca-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+
<wsdlFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</wsdlFile>
</configuration>
<goals>
<goal>generate</goal>
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=381940&r1=381939&r2=381940&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
Tue Feb 28 23:51:22 2006
@@ -29,6 +29,8 @@
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
+import com.bigbank.account.service.AccountService;
+
public class AccountServiceImpl implements AccountService {
private final static AccountFactory accountFactory=new AccountFactory();
Modified:
incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/AccountService.wsdl?rev=381940&r1=381939&r2=381940&view=diff
==============================================================================
---
incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
(original)
+++
incubator/tuscany/java/samples/bigbank/account/src/main/resources/wsdl/AccountService.wsdl
Tue Feb 28 23:51:22 2006
@@ -19,12 +19,13 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/Account/";
- targetNamespace="http://www.bigbank.com/AccountService/";
-
+ targetNamespace="http://www.bigbank.com/AccountService/";
name="AccountService">
<wsdl:types>
- <xsd:schema targetNamespace="http://www.bigbank.com/Account/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/Account/";>
+ <xsd:schema targetNamespace="http://www.bigbank.com/Account/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/Account/";
+ xmlns:sdojava="commonj.sdo/java"
+ sdojava:package="org.apache.tuscany.samples.bigbank.account">
<xsd:element name="customerID" type="xsd:string"/>
<xsd:element name="getAccountReportResponse"
type="account:AccountReport"/>
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=381940&r1=381939&r2=381940&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
Tue Feb 28 23:51:22 2006
@@ -21,10 +21,11 @@
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 com.bigbank.account.service.AccountService;
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=381940&r1=381939&r2=381940&view=diff
==============================================================================
--- incubator/tuscany/java/samples/bigbank/webclient/pom.xml (original)
+++ incubator/tuscany/java/samples/bigbank/webclient/pom.xml Tue Feb 28
23:51:22 2006
@@ -58,11 +58,24 @@
<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>
+ <plugin>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>tuscany-sca-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+
<wsdlFile>${basedir}/src/main/resources/wsdl/AccountService.wsdl</wsdlFile>
</configuration>
<goals>
<goal>generate</goal>
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=381940&r1=381939&r2=381940&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
Tue Feb 28 23:51:22 2006
@@ -18,9 +18,12 @@
import org.apache.tuscany.samples.bigbank.account.AccountFactory;
import org.apache.tuscany.samples.bigbank.account.AccountReport;
+import org.osoa.sca.ServiceUnavailableException;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
+import com.bigbank.account.service.AccountService;
+
/**
*/
@Service(AccountService.class)
@@ -42,7 +45,11 @@
* @see
org.apache.tuscany.samples.bigbank.webclient.services.account.AccountService#getAccountReport(java.lang.String)
*/
public AccountReport getAccountReport(String customerID) {
- return accountService.getAccountReport(customerID);
+ try {
+ return accountService.getAccountReport(customerID);
+ } catch (Exception e) {
+ throw new ServiceUnavailableException(e);
+ }
}
}
Modified:
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/tags/account/AccountStatusTag.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/tags/account/AccountStatusTag.java?rev=381940&r1=381939&r2=381940&view=diff
==============================================================================
---
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/tags/account/AccountStatusTag.java
(original)
+++
incubator/tuscany/java/samples/bigbank/webclient/src/main/java/org/apache/tuscany/samples/bigbank/webclient/tags/account/AccountStatusTag.java
Tue Feb 28 23:51:22 2006
@@ -16,16 +16,18 @@
*/
package org.apache.tuscany.samples.bigbank.webclient.tags.account;
+import java.rmi.RemoteException;
import java.util.Iterator;
import java.util.List;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.TagSupport;
+import
org.apache.tuscany.samples.bigbank.webclient.services.profile.ProfileService;
import org.osoa.sca.CurrentModuleContext;
import org.osoa.sca.ModuleContext;
-import
org.apache.tuscany.samples.bigbank.webclient.services.account.AccountService;
-import
org.apache.tuscany.samples.bigbank.webclient.services.profile.ProfileService;
+import com.bigbank.account.service.AccountService;
/**
* Retrieves and iterates over account summary information for the current
@@ -93,8 +95,12 @@
throw new JspException("Service [" + mAccountService
+ "] not found in current module context");
}
- List summaries = service.getAccountReport(profile.getId())
- .getAccountSummaries();
+ List summaries;
+ try {
+ summaries =
service.getAccountReport(profile.getId()).getAccountSummaries();
+ } catch (Exception e) {
+ throw new JspException(e);
+ }
mIterator = summaries.iterator();
if (mIterator.hasNext()) {
pageContext.setAttribute(mId, mIterator.next());
Modified:
incubator/tuscany/java/samples/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/samples/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl?rev=381940&r1=381939&r2=381940&view=diff
==============================================================================
---
incubator/tuscany/java/samples/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
(original)
+++
incubator/tuscany/java/samples/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
Tue Feb 28 23:51:22 2006
@@ -19,12 +19,13 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/Account/";
- targetNamespace="http://www.bigbank.com/AccountService/";
-
+ targetNamespace="http://www.bigbank.com/AccountService/";
name="AccountService">
<wsdl:types>
- <xsd:schema targetNamespace="http://www.bigbank.com/Account/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/Account/";>
+ <xsd:schema targetNamespace="http://www.bigbank.com/Account/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:account="http://www.bigbank.com/Account/";
+ xmlns:sdojava="commonj.sdo/java"
+ sdojava:package="org.apache.tuscany.samples.bigbank.account">
<xsd:element name="customerID" type="xsd:string"/>
<xsd:element name="getAccountReportResponse"
type="account:AccountReport"/>
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=381940&r1=381939&r2=381940&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
Tue Feb 28 23:51:22 2006
@@ -20,10 +20,11 @@
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 com.bigbank.account.service.AccountService;
public class TestAccountService extends SCA {
