Splitting into three seperate patch files to help out with eclipse
project patcher weirdness. The content is the same.
On 7/7/06, Brent Daniel <[EMAIL PROTECTED]> wrote:
The attached patch contains the runtime changes as well as changes to
BigBank to remove a workaround for this issue.
Index: src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
===================================================================
--- src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
(revision 419503)
+++ src/main/java/bigbank/account/services/accountdb/AccountDBInit.java
(working copy)
@@ -48,7 +48,6 @@
import com.bigbank.account.AccountFactory;
import com.bigbank.account.AccountSummary;
import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.DataGraphRoot;
import com.bigbank.account.StockSummary;
import com.bigbank.account.purchaseStock;
import com.bigbank.account.withdraw;
@@ -316,10 +315,10 @@
select.setParameterValue("loginID", logonID);
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
+ DataObject root = select.executeQuery();
conn.close();
- Collection customers = root.getCustomerProfileData();
+ Collection customers = root.getList("CustomerProfileData");
CustomerProfileData customerProfileData = (CustomerProfileData)
customers.iterator().next();
System.out.println(customerProfileData);
System.out.flush();
@@ -395,9 +394,9 @@
select.setParameterValue("accountNumber", wd.getAccountNumber());
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
+ DataObject root = select.executeQuery();
- Collection accounts = root.getAccountSummaries();
+ Collection accounts = root.getList("AccountSummary");
AccountSummary account = (AccountSummary) accounts.iterator().next();
float newbalance = account.getBalance() - wd.getAmount();
account.setBalance(newbalance);
Index:
src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
===================================================================
---
src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
(revision 419503)
+++
src/main/java/bigbank/account/services/accountdata/AccountDataServiceDASImpl.java
(working copy)
@@ -42,7 +42,6 @@
import com.bigbank.account.AccountReport;
import com.bigbank.account.AccountSummary;
import com.bigbank.account.CustomerProfileData;
-import com.bigbank.account.DataGraphRoot;
import com.bigbank.account.StockSummary;
import commonj.sdo.DataObject;
@@ -72,10 +71,10 @@
select.setParameterValue("loginID", logonID);
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
+ DataObject root = select.executeQuery();
conn.close();
- Collection customers = root.getCustomerProfileData();
+ Collection customers = root.getList("CustomerProfileData");
CustomerProfileData customerProfileData = (CustomerProfileData)
customers.iterator().next();
@@ -103,10 +102,10 @@
select.setParameterValue("loginID", logonID);
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
+ DataObject root = select.executeQuery();
conn.close();
- Collection customers = root.getCustomerProfileData();
+ Collection customers = root.getList("CustomerProfileData");
CustomerProfileData customerProfileData = (CustomerProfileData)
customers.iterator().next();
return customerProfileData;
@@ -188,8 +187,8 @@
Command select = das.createCommand("SELECT accountNumber,
accountType, balance FROM accounts where id = :id");
select.setParameterValue("id", customerID);
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
-
accountReport.getAccountSummaries().addAll(root.getAccountSummaries());
+ DataObject root = select.executeQuery();
+
accountReport.getAccountSummaries().addAll(root.getList("AccountSummary"));
// Get Stocks
@@ -199,8 +198,8 @@
// select.addConverter("STOCKS.PURCHASEDATE",
DateConverter.class.getName());
- root = (DataGraphRoot) select.executeQuery();
- accountReport.getStockSummaries().addAll(root.getStockSummaries());
+ root = (DataObject) select.executeQuery();
+
accountReport.getStockSummaries().addAll(root.getList("StockSummary"));
conn.close();
@@ -227,8 +226,8 @@
Command select = das.createCommand("SELECT accountNumber, balance
FROM accounts where accountNumber = :accountNumber");
select.setParameterValue("accountNumber", account);
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
- Collection accounts = root.getAccountSummaries();
+ DataObject root = select.executeQuery();
+ Collection accounts = root.getList("AccountSummary");
AccountSummary accountData = (AccountSummary)
accounts.iterator().next();
float newbalance = accountData.getBalance() + ammount;
accountData.setBalance(newbalance);
@@ -252,8 +251,8 @@
Command read = das.getCommand("stockbylotSelect");
read.setParameterValue("PURCHASELOTNUMBER", purchaseLotNumber);//
autoboxing :-)
- DataGraphRoot root = (DataGraphRoot) read.executeQuery();
- List stocks = root.getStockSummaries();
+ DataObject root = read.executeQuery();
+ List stocks = root.getList("StockSummary");
if (null != stocks && !stocks.isEmpty()) {
StockSummary stock = (StockSummary) stocks.get(0);
int newQuatity = Math.max(stock.getQuantity() - quantity, 0);
Index:
src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
===================================================================
---
src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
(revision 419503)
+++
src/main/java/bigbank/account/services/accountlogger/AccountLoggerServiceImpl.java
(working copy)
@@ -30,8 +30,8 @@
import com.bigbank.account.AccountFactory;
import com.bigbank.account.AccountLog;
-import com.bigbank.account.DataGraphRoot;
import com.bigbank.account.StockSummary;
+import commonj.sdo.DataObject;
/**
* This class implements the Account Logger service component.
@@ -182,14 +182,14 @@
select.setParameterValue("id", customerID);
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
-
accountLog.getAccountLogEntries().addAll(root.getAccountLogEntries());
+ DataObject root = select.executeQuery();
+
accountLog.getAccountLogEntries().addAll(root.getList("AccountLogEntry"));
select = das.createCommand(
"SELECT logSeqNo, Symbol, quantity, actionType,
purchaseLotNumber FROM stockLog where id = :id");
select.setParameterValue("id", customerID);
- root = (DataGraphRoot) select.executeQuery();
- accountLog.getStockLogEntries().addAll(root.getStockLogEntries());
+ root = select.executeQuery();
+
accountLog.getStockLogEntries().addAll(root.getList("StockLogEntry"));
conn.close();
Index: src/main/resources/wsdl/AccountService.wsdl
===================================================================
--- src/main/resources/wsdl/AccountService.wsdl (revision 419503)
+++ src/main/resources/wsdl/AccountService.wsdl (working copy)
@@ -29,8 +29,7 @@
> <!-- xmlns:sdojava="commonj.sdo/java"
sdojava:package="org.apache.tuscany.samples.bigbank.account" -->
- <xsd:complexType name="DataGraphRoot"> <!-- This was added
temporarily for DAS
- changes are on the way
to lift this requirement -->
+<!-- <xsd:complexType name="DataGraphRoot">
<xsd:sequence>
<xsd:element name="customerProfileData"
type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" />
<xsd:element name="StockSummaries" type="account:StockSummary"
maxOccurs="unbounded" minOccurs="0" />
@@ -38,7 +37,7 @@
<xsd:element name="StockLogEntries" type="account:StockLogEntry"
maxOccurs="unbounded" minOccurs="0" />
<xsd:element name="AccountLogEntries"
type="account:AccountLogEntry" maxOccurs="unbounded" minOccurs="0" />
</xsd:sequence>
- </xsd:complexType>
+ </xsd:complexType>-->
<xsd:element name="getAccountReport">
Index: src/main/resources/DasAccountConfiguration.xml
===================================================================
--- src/main/resources/DasAccountConfiguration.xml (revision 419503)
+++ src/main/resources/DasAccountConfiguration.xml (working copy)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- dataObjectModel="com.bigbank.account.DataGraphRoot">
+ dataObjectModel="com.bigbank.account.CustomerProfileData">
<Table tableName="CUSTOMERS" typeName="CustomerProfileData">
<!-- Column name="firstName" primaryKey="true"/ -->
Index: src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
===================================================================
--- src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
(revision 419503)
+++ src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
(working copy)
@@ -24,7 +24,6 @@
import org.apache.tuscany.das.rdb.test.commands.ReadCustomersWithShapeCommand;
import
org.apache.tuscany.das.rdb.test.commands.SimpleReadCustomersWithShapeCommand;
import org.apache.tuscany.das.rdb.test.customer.Customer;
-import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -65,9 +64,9 @@
cmd.setConnection(getConnection());
cmd.setParameterValue("LASTNAME", "Williams");
- DataGraphRoot root = (DataGraphRoot) cmd.executeQuery();
+ DataObject root = cmd.executeQuery();
- List customers = root.getCustomers();
+ List customers = root.getList("Customer");
assertEquals(4, customers.size());
Customer cust1 = (Customer) customers.get(0);
Index: src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
===================================================================
--- src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
(revision 419503)
+++ src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
(working copy)
@@ -20,7 +20,6 @@
import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.company.CompanyFactory;
import org.apache.tuscany.das.rdb.test.company.CompanyType;
-import org.apache.tuscany.das.rdb.test.company.DatagraphRoot;
import org.apache.tuscany.das.rdb.test.company.DepartmentType;
import org.apache.tuscany.das.rdb.test.company.EmployeeType;
import org.apache.tuscany.das.rdb.test.data.CompanyData;
@@ -83,10 +82,10 @@
// Get the graph
- DatagraphRoot root = (DatagraphRoot) selectCommand.executeQuery();
+ DataObject root = selectCommand.executeQuery();
- CompanyType company = (CompanyType) root.getCompanies().get(0);
+ CompanyType company = (CompanyType) root.getList("CompanyType").get(0);
assertEquals("MegaCorp", company.getName());
Index:
src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
===================================================================
--- src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
(revision 419503)
+++ src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
(working copy)
@@ -22,12 +22,13 @@
import org.apache.tuscany.das.rdb.Command;
import org.apache.tuscany.das.rdb.DAS;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
-import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
import org.apache.tuscany.sdo.util.SDOUtil;
+import commonj.sdo.DataObject;
+
/**
*/
public class SimplestStaticCrud extends DasTest {
@@ -45,9 +46,9 @@
Command select = das.createCommand("Select ID, LASTNAME,
ADDRESS from CUSTOMER where LASTNAME = :LASTNAME");
select.setParameterValue("LASTNAME", "Williams");
- DataGraphRoot root = (DataGraphRoot) select.executeQuery();
+ DataObject root = select.executeQuery();
- Collection customers = root.getCustomers();
+ Collection customers = root.getList("Customer");
assertEquals(4, customers.size());
}
Index:
src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
===================================================================
---
src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
(revision 419503)
+++
src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
(working copy)
@@ -22,11 +22,8 @@
import org.apache.tuscany.das.rdb.config.Table;
import org.apache.tuscany.das.rdb.config.impl.ConfigFactoryImpl;
import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
-import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
-import commonj.sdo.helper.TypeHelper;
-
public class ReadCustomersStaticTypesCommand extends ReadCommandImpl {
private static final String sqlString = "Select ID, LASTNAME, ADDRESS
from CUSTOMER where LASTNAME = :LASTNAME";
@@ -51,7 +48,7 @@
t.setTypeName("Customer");
mapping.getTable().add(t);
-
mapping.setDataObjectModel("org.apache.tuscany.das.rdb.test.customer.DataGraphRoot");
+
mapping.setDataObjectModel("org.apache.tuscany.das.rdb.test.customer.Customer");
}
public ReadCustomersStaticTypesCommand() {
Index: src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
===================================================================
--- src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java (revision
419503)
+++ src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java (working copy)
@@ -24,7 +24,6 @@
import org.apache.tuscany.das.rdb.test.customer.AnOrder;
import org.apache.tuscany.das.rdb.test.customer.Customer;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
-import org.apache.tuscany.das.rdb.test.customer.DataGraphRoot;
import org.apache.tuscany.das.rdb.test.data.CustomerData;
import org.apache.tuscany.das.rdb.test.data.OrderData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
@@ -58,7 +57,7 @@
DataObject root = select.executeQuery();
// Modify a customer
- Customer customer = (Customer)root.getDataObject("customers[1]");
+ Customer customer = (Customer)root.getDataObject("Customer[1]");
customer.setLastName("Pavick");
// Modify an order
Index: src/test/resources/customer.xsd
===================================================================
--- src/test/resources/customer.xsd (revision 419503)
+++ src/test/resources/customer.xsd (working copy)
@@ -15,13 +15,6 @@
limitations under the License.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:this="http:///org.apache.tuscany.das.rdb.test/customer.xsd";
targetNamespace="http:///org.apache.tuscany.das.rdb.test/customer.xsd";>
- <xsd:complexType name="DataGraphRoot">
- <xsd:sequence>
-
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="customers"
type="this:Customer"/>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="orders"
type="this:AnOrder"/>
- </xsd:sequence>
- </xsd:complexType>
<xsd:complexType name="Customer">
<xsd:sequence>
Index: src/test/resources/staticCustomer.xml
===================================================================
--- src/test/resources/staticCustomer.xml (revision 419503)
+++ src/test/resources/staticCustomer.xml (working copy)
@@ -16,7 +16,7 @@
-->
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="org.apache.tuscany.das.rdb.test.customer.DataGraphRoot">
+dataObjectModel="org.apache.tuscany.das.rdb.test.customer.Customer">
</Config>
Index: src/test/resources/companyMappingWithConverters.xml
===================================================================
--- src/test/resources/companyMappingWithConverters.xml (revision 419503)
+++ src/test/resources/companyMappingWithConverters.xml (working copy)
@@ -15,7 +15,7 @@
limitations under the License.
-->
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
dataObjectModel="org.apache.tuscany.das.rdb.test.company.DatagraphRoot">
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
dataObjectModel="org.apache.tuscany.das.rdb.test.company.CompanyType">
<Table tableName="COMPANY" typeName="CompanyType">
<Column columnName="ID" primaryKey="true"/>
Index: src/test/resources/company.xsd
===================================================================
--- src/test/resources/company.xsd (revision 419503)
+++ src/test/resources/company.xsd (working copy)
@@ -17,15 +17,7 @@
<xsd:schema targetNamespace="org.apache.tuscany.das.rdb.test/company.xsd"
xmlns:company="org.apache.tuscany.das.rdb.test/company.xsd"
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore";>
-
- <xsd:complexType name="DatagraphRoot">
- <xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="companies"
type="company:CompanyType"/>
- <xsd:element maxOccurs="unbounded" minOccurs="0"
name="departments" type="company:DepartmentType"/>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="employees"
type="company:EmployeeType"/>
- </xsd:sequence>
- </xsd:complexType>
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore";>
<xsd:element name="company" type="company:CompanyType"/>
Index: src/test/resources/staticCustomerOrder.xml
===================================================================
--- src/test/resources/staticCustomerOrder.xml (revision 419503)
+++ src/test/resources/staticCustomerOrder.xml (working copy)
@@ -16,7 +16,7 @@
-->
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="org.apache.tuscany.das.rdb.test.customer.DataGraphRoot">
+dataObjectModel="org.apache.tuscany.das.rdb.test.customer.Customer">
<Command name="Customer and Orders" SQL="SELECT * FROM CUSTOMER LEFT JOIN
ANORDER ON CUSTOMER.ID = ANORDER.CUSTOMER_ID where CUSTOMER.ID = ?"
kind="Select"/>
Index: src/test/resources/basicStaticCustomer.xml
===================================================================
--- src/test/resources/basicStaticCustomer.xml (revision 419503)
+++ src/test/resources/basicStaticCustomer.xml (working copy)
@@ -16,7 +16,7 @@
-->
<Config
xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-dataObjectModel="org.apache.tuscany.das.rdb.test.customer.DataGraphRoot">
+dataObjectModel="org.apache.tuscany.das.rdb.test.customer.Customer">
<Table tableName="CUSTOMER" typeName="Customer">
<Column columnName="ID" primaryKey="true"/>
Index:
src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
===================================================================
---
src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
(revision 419660)
+++
src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
(working copy)
@@ -25,8 +25,10 @@
import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultMetadata;
import org.apache.tuscany.das.rdb.util.DebugUtil;
+import org.apache.tuscany.sdo.helper.TypeHelperImpl;
import org.apache.tuscany.sdo.util.DataObjectUtil;
import org.apache.tuscany.sdo.util.SDOUtil;
+import org.eclipse.emf.ecore.EPackage;
import commonj.sdo.Property;
import commonj.sdo.Type;
@@ -44,6 +46,8 @@
private boolean debug = false;
+ private TypeHelper typeHelper = SDOUtil.createTypeHelper();
+
/**
* Constructor for ESchemaMaker. Creates an SDO model based on the
metadata
* passed in.
@@ -63,13 +67,12 @@
*/
public Type createTypes() {
- TypeHelper types = SDOUtil.createTypeHelper();
DataObjectUtil.initRuntime();
SDOUtil.createDataGraph();
- Type rootType = SDOUtil.createType(types, getURI(),
"DataGraphRoot", false);
+ Type rootType = SDOUtil.createType(typeHelper, getURI(),
"DataGraphRoot", false);
Iterator iter = metadata.getResultMetadata().iterator();
while (iter.hasNext()) {
@@ -82,7 +85,7 @@
while (names.hasNext()) {
String tableName = (String) names.next();
- Type tableType = SDOUtil.createType(types,
getURI(), tableName, false);
+ Type tableType = SDOUtil.createType(typeHelper,
getURI(), tableName, false);
Property property =
SDOUtil.createProperty(rootType, tableName, tableType);
SDOUtil.setMany(property,true);
SDOUtil.setContainment(property, true);
@@ -178,6 +181,20 @@
private String getURI() {
return "http:///org.apache.tuscany.das.rdb/das";;
+ }
+
+ public Type createTypes(Type aType) {
+ Type rootType = SDOUtil.createType(typeHelper, getURI() +
"/DataGraphRoot", "DataGraphRoot", false);
+
+ EPackage pkg =
((TypeHelperImpl)typeHelper).getExtendedMetaData().getPackage(aType.getURI());
+ Iterator i = pkg.getEClassifiers().iterator();
+ while ( i.hasNext() ) {
+ Type type = (Type) i.next();
+ Property property = SDOUtil.createProperty(rootType,
type.getName(), type);
+ SDOUtil.setContainment(property, true);
+ SDOUtil.setMany(property, true);
+ }
+ return rootType;
}
Index:
src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
===================================================================
---
src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
(revision 419503)
+++
src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
(working copy)
@@ -95,11 +95,11 @@
* @return
*/
public Type getSchema() {
- if ( this.schema == null ) {
- ESchemaMaker schemaMaker = new ESchemaMaker(this);
+ ESchemaMaker schemaMaker = new ESchemaMaker(this);
+ if ( this.schema == null ) {
return schemaMaker.createTypes();
} else {
- return this.schema;
+ return schemaMaker.createTypes(this.schema);
}
}
Index: pom.xml
===================================================================
--- pom.xml (revision 419503)
+++ pom.xml (working copy)
@@ -79,21 +79,19 @@
<configuration>
<schemaFile>${basedir}/src/test/resources/company.xsd</schemaFile>
<generateLoader>true</generateLoader>
- <generateSwitch>true</generateSwitch>
- <noNotification>true</noNotification>
+ <generateSwitch>true</generateSwitch>
<noUnsettable>true</noUnsettable>
</configuration>
<goals>
<goal>generate</goal>
</goals>
- </execution>
+ </execution>
<execution>
<id>customer</id>
<configuration>
<schemaFile>${basedir}/src/test/resources/customer.xsd</schemaFile>
<generateLoader>true</generateLoader>
- <generateSwitch>true</generateSwitch>
- <noNotification>true</noNotification>
+ <generateSwitch>true</generateSwitch>
<noUnsettable>true</noUnsettable>
</configuration>
<goals>
Index: src/main/resources/wsdl/AccountService.wsdl
===================================================================
--- src/main/resources/wsdl/AccountService.wsdl (revision 419503)
+++ src/main/resources/wsdl/AccountService.wsdl (working copy)
@@ -29,8 +29,7 @@
> <!-- xmlns:sdojava="commonj.sdo/java"
sdojava:package="org.apache.tuscany.samples.bigbank.account" -->
- <xsd:complexType name="DataGraphRoot"> <!-- This was added
temporarily for DAS
- changes are on the way
to lift this requirement -->
+<!-- <xsd:complexType name="DataGraphRoot">
<xsd:sequence>
<xsd:element name="customerProfileData"
type="account:CustomerProfileData" maxOccurs="unbounded" minOccurs="0" />
<xsd:element name="StockSummaries" type="account:StockSummary"
maxOccurs="unbounded" minOccurs="0" />
@@ -38,7 +37,7 @@
<xsd:element name="StockLogEntries" type="account:StockLogEntry"
maxOccurs="unbounded" minOccurs="0" />
<xsd:element name="AccountLogEntries"
type="account:AccountLogEntry" maxOccurs="unbounded" minOccurs="0" />
</xsd:sequence>
- </xsd:complexType>
+ </xsd:complexType>-->
<xsd:element name="getAccountReport">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
