You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/02/23 00:00:18 UTC
svn commit: r379959 - in /incubator/tuscany/java/das/rdb/src:
main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/
main/java/org/apache/tuscany/das/rdb/impl/
main/java/org/apache/tuscany/das/rdb/merge/impl/
test/java/org/apache/tuscany/das/rdb/tes...
Author: kwilliams
Date: Wed Feb 22 14:59:59 2006
New Revision: 379959
URL: http://svn.apache.org/viewcvs?rev=379959&view=rev
Log:
Application of Brent's patch replace more EMF API's with SDO2 equivalents...
"The DAS is currently using XMLResource from EMF to load config documents.
This patch converts over to SDO's XMLHelper and fixes up the schema URL in
the test config files."
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java Wed Feb 22 14:59:59 2006
@@ -125,7 +125,7 @@
while (names.hasNext()) {
String tableName = (String) names.next();
if (rootClass.getEStructuralFeature(tableName) == null) {
- Type clazz = createEClass(tableName);
+ Type clazz = createType(tableName);
getEPackage().getEClassifiers().add(clazz);
ReferenceImpl ref = refMaker.createOneToManyReference(
tableName, clazz, true);
@@ -208,7 +208,7 @@
* @param name
* @return EClass
*/
- protected Type createEClass(String name) {
+ protected Type createType(String name) {
ClassImpl ecl = (ClassImpl) SDOFactory.eINSTANCE.createClass();
ecl.setName(name);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java Wed Feb 22 14:59:59 2006
@@ -20,7 +20,6 @@
import java.io.InputStream;
import java.sql.Connection;
import java.sql.DriverManager;
-import java.util.HashMap;
import org.apache.tuscany.das.rdb.ApplyChangesCommand;
import org.apache.tuscany.das.rdb.Command;
@@ -29,8 +28,6 @@
import org.apache.tuscany.das.rdb.config.ConnectionProperties;
import org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl;
import org.apache.tuscany.das.rdb.util.DebugUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
@@ -113,12 +110,11 @@
public void execute(DataObject root) {
DebugUtil.debugln(getClass(), debug, "Executing ApplyChangesCmd");
- //Assertions
if (dasConnection == null)
- throw new Error("A connection must be provided");
+ throw new RuntimeException("A connection must be provided");
if (!root.equals(root.getDataGraph().getRootObject()))
- throw new Error("'root' argument must be the root of the datagraph");
+ throw new RuntimeException("'root' argument must be the root of the datagraph");
Changes changes = summarizer.loadChanges(root);
@@ -136,15 +132,9 @@
public void setMapping(InputStream stream) throws IOException {
XMLHelper helper = XMLHelper.INSTANCE;
-
- HashMap map = new HashMap();
- ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
- metadata.putPackage(null, ConfigPackageImpl.eINSTANCE);
-
- map.put(XMLResource.NO_NAMESPACE_SCHEMA_LOCATION, ConfigPackageImpl.eNS_URI);
- map.put(XMLResource.OPTION_EXTENDED_META_DATA, metadata);
-
- XMLDocument doc = helper.load(stream, ConfigPackageImpl.eNS_URI, map);
+
+ ConfigPackageImpl impl = ConfigPackageImpl.eINSTANCE;
+ XMLDocument doc = helper.load(stream);
Config mapping = (Config) doc.getRootObject();
summarizer.setMapping(mapping);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java Wed Feb 22 14:59:59 2006
@@ -35,8 +35,6 @@
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.ConnectionProperties;
import org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
import commonj.sdo.helper.XMLHelper;
@@ -115,15 +113,11 @@
private void setConfig(InputStream stream) {
XMLHelper helper = XMLHelper.INSTANCE;
- HashMap map = new HashMap();
- ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
- metadata.putPackage(null, ConfigPackageImpl.eINSTANCE);
-
- map.put(XMLResource.NO_NAMESPACE_SCHEMA_LOCATION, ConfigPackageImpl.eNS_URI);
- map.put(XMLResource.OPTION_EXTENDED_META_DATA, metadata);
+
+ ConfigPackageImpl impl = ConfigPackageImpl.eINSTANCE;
try {
- config = (Config) helper.load(stream, ConfigPackageImpl.eNS_URI, map).getRootObject();
+ config = (Config) helper.load(stream).getRootObject();
} catch (IOException e) {
throw new RuntimeException(e);
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java Wed Feb 22 14:59:59 2006
@@ -25,11 +25,9 @@
import org.apache.tuscany.das.rdb.config.Relationship;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.util.DebugUtil;
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.eclipse.emf.ecore.EObject;
import commonj.sdo.DataObject;
+import commonj.sdo.Property;
/**
* DatabaseObject wraps DataObject. If a field is an FK field, it will return
@@ -43,7 +41,7 @@
private final DataObject dataObject;
- private ReferenceImpl parentReference;
+ private Property parentReference;
private static final boolean debug = false;
@@ -81,8 +79,8 @@
if (r == null)
return dataObject.get(parameter);
- ReferenceImpl parentRef = getParentReference(r.getPrimaryKeyTable());
- DataObject parent = (DataObject) ((EObject) dataObject).eGet(parentRef);
+ Property parentRef = getParentReference(r.getPrimaryKeyTable());
+ DataObject parent = dataObject.getDataObject(parentRef);
String parentKey = getParentKey(r, parameter);
return parent.get(parentKey);
@@ -99,15 +97,14 @@
return null;
}
- public ReferenceImpl getParentReference(String parentName) {
+ public Property getParentReference(String parentName) {
if (this.parentReference == null) {
- List references = ((ClassImpl) dataObject.getType())
- .getEAllReferences();
- Iterator i = references.iterator();
+ Iterator i = dataObject.getType().getProperties().iterator();
while (i.hasNext()) {
- ReferenceImpl ref = (ReferenceImpl) i.next();
- if (ref.getEReferenceType().getName().equals(parentName)) {
+ Property ref = (Property) i.next();
+ if ((!ref.getType().isDataType()) &&
+ (ref.getType().getName().equals(parentName))) {
this.parentReference = ref;
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java Wed Feb 22 14:59:59 2006
@@ -23,12 +23,10 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.ConnectionProperties;
-import org.apache.tuscany.das.rdb.config.impl.ConfigPackageImpl;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultSetProcessor;
@@ -37,9 +35,6 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataGraph;
@@ -163,27 +158,21 @@
}
public void setMappingModel(InputStream stream) {
+
+ XMLHelper helper = XMLHelper.INSTANCE;
+
+// ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
+// metadata.putPackage(null, ConfigPackageImpl.eINSTANCE);
+
+ try {
+ Config config = (Config) helper.load(stream).getRootObject();
+ mappingModel = new MappingWrapper(config);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
- XMLResource resource = new XMLResourceImpl();
-
- HashMap map = new HashMap();
- ExtendedMetaData metadata = ExtendedMetaData.INSTANCE;
- metadata.putPackage(null, ConfigPackageImpl.eINSTANCE);
-
- map.put(XMLResource.NO_NAMESPACE_SCHEMA_LOCATION,
- ConfigPackageImpl.eNS_URI);
- map.put(XMLResource.OPTION_EXTENDED_META_DATA, metadata);
-
- try {
- Config config = (Config) XMLHelper.INSTANCE.load(stream, ConfigPackageImpl.eNS_URI,map).getRootObject();
- mappingModel = new MappingWrapper(config);
- // resource.load(stream, map);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-// mappingModel = new MappingWrapper((Config) resource.getContents().get(
-// 0));
- if (mappingModel.getConfig().getConnectionProperties() != null)
+
+ if (mappingModel.getConfig().getConnectionProperties() != null)
setConnection(mappingModel.getConfig().getConnectionProperties());
}
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java Wed Feb 22 14:59:59 2006
@@ -25,10 +25,7 @@
import org.apache.tuscany.das.rdb.config.wrapper.QualifiedColumn;
import org.apache.tuscany.das.rdb.graphbuilder.impl.MultiTableRegistry;
import org.apache.tuscany.das.rdb.graphbuilder.impl.TableRegistry;
-import org.apache.tuscany.sdo.impl.AttributeImpl;
import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.eclipse.emf.ecore.EObject;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataObject;
@@ -90,43 +87,44 @@
// logger.info("creating " + object.getType().getName() + " with pk " + pk);
DataObject newObject = root.createDataObject(p.getName());
- EObject eObjectToCopy = (EObject) object;
+
- Iterator attrs = eObjectToCopy.eClass().getEAllAttributes()
- .iterator();
+ Iterator attrs = object.getType().getProperties().iterator();
while (attrs.hasNext()) {
- AttributeImpl attr = (AttributeImpl) attrs.next();
- newObject.set(attr.getName(), eObjectToCopy.eGet(attr));
+ Property attr = (Property) attrs.next();
+ if ( attr.getType().isDataType()) {
+ newObject.set(attr.getName(), object.get(attr));
+ }
}
registry.put(object.getType().getName(), Collections
.singletonList(pk), newObject);
- Iterator refs = eObjectToCopy.eClass().getEAllReferences()
- .iterator();
+ Iterator refs = object.getType().getProperties().iterator();
while (refs.hasNext()) {
- ReferenceImpl ref = (ReferenceImpl) refs.next();
- List refObjects;
- if (!ref.isMany()) {
- refObjects = Collections.singletonList(eObjectToCopy
- .eGet(ref));
- } else {
- refObjects = (List) eObjectToCopy.eGet(ref);
- }
-
- Iterator iter = refObjects.iterator();
- while (iter.hasNext()) {
- DataObject refObject = (DataObject) iter.next();
- createObjectWithSubtree(root, refObject
+ Property ref = (Property) refs.next();
+ if ( !ref.getType().isDataType()) {
+ List refObjects;
+ if (!ref.isMany()) {
+ refObjects = Collections.singletonList(object.get(ref));
+ } else {
+ refObjects = (List) object.get(ref);
+ }
+
+ Iterator iter = refObjects.iterator();
+ while (iter.hasNext()) {
+ DataObject refObject = (DataObject) iter.next();
+ createObjectWithSubtree(root, refObject
.getContainmentProperty(), refObject);
- refObject = (DataObject) registry.get(refObject.getType().getName(), Collections.singletonList(getPrimaryKey(refObject)));
- if (ref.isMany()) {
- newObject.getList(
+ refObject = (DataObject) registry.get(refObject.getType().getName(), Collections.singletonList(getPrimaryKey(refObject)));
+ if (ref.isMany()) {
+ newObject.getList(
newObject.getType().getProperty(ref.getName()))
.add(refObject);
- } else
- newObject.set(newObject.getType().getProperty(
- ref.getName()), refObject);
+ } else
+ newObject.set(newObject.getType().getProperty(
+ ref.getName()), refObject);
+ }
}
}
Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java Wed Feb 22 14:59:59 2006
@@ -90,7 +90,7 @@
int custID = cust.getInt("ID");
int custOrderCount = cust.getList("ANORDER").size();
int rootCount = root.getList("ANORDER").size();
-
+
// Create a new Order and add to customer1
DataObject order = root.createDataObject("ANORDER");
@@ -153,8 +153,7 @@
public void testWASDefect330118() throws Exception {
// Create the group and set common connection
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CustomersOrdersConfig.xml"));
+ CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CustomersOrdersConfig.xml"));
commandGroup.setConnection(getConnection());
// Read all customers and add one
@@ -229,15 +228,17 @@
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
}
+
+
+
/**
- * Should be able to explicitly set a parameter to null. But, should require
+ * Should be able to explicitly set a parameter to null. But, should require
* that the parameter type is set.
*/
public void testDiltonsNullParameterBug1() throws Exception {
-
- Command insert = Command.FACTORY
- .createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
+
+ Command insert = Command.FACTORY.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setConnection(getConnection());
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", null);
@@ -245,84 +246,55 @@
insert.setParameterValue("ADDRESS", "5528 Wells Fargo Dr");
insert.execute();
- // Verify
+ //Verify
Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 10");
select.setConnection(getConnection());
- DataObject root = select.executeQuery();
+ DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
}
+
/**
* Error by not setting a parameter
- */
+ */
public void testDiltonsNullParameterBug2() throws Exception {
-
- Command insert = Command.FACTORY
- .createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
+
+ Command insert = Command.FACTORY.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setConnection(getConnection());
insert.setParameterValue("ID", new Integer(10));
- // insert.setParameterValue("LASTNAME", null);
+// insert.setParameterValue("LASTNAME", null);
insert.setParameterValue("ADDRESS", "5528 Wells Fargo Dr");
-
+
try {
insert.execute();
fail();
- } catch (RuntimeException e) {
- // Expected since "LASTNAME" parameter not set
}
- }
-
+ catch (RuntimeException e) {
+ //Expected since "LASTNAME" parameter not set
+ }
+ }
+
/**
* Set parameter to empty string
- */
+ */
public void testDiltonsNullParameterBug3() throws Exception {
-
- Command insert = Command.FACTORY
- .createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
+
+ Command insert = Command.FACTORY.createCommand("insert into CUSTOMER values (:ID, :LASTNAME, :ADDRESS)");
insert.setConnection(getConnection());
insert.setParameterValue("ID", new Integer(10));
insert.setParameterValue("LASTNAME", "");
insert.setParameterValue("ADDRESS", "5528 Wells Fargo Dr");
insert.execute();
- // Verify
+ //Verify
Command select = Command.FACTORY.createCommand("Select * from CUSTOMER where ID = 10");
select.setConnection(getConnection());
- DataObject root = select.executeQuery();
+ DataObject root = select.executeQuery();
assertEquals(1, root.getList("CUSTOMER").size());
assertEquals("5528 Wells Fargo Dr", root.get("CUSTOMER[1]/ADDRESS"));
}
-
- /**
- * Test bug reported by Philip K Warren Silent fail if a non-datagraph root
- * is passed to ApplyChangesCommand
- *
- * 2-21-06 Modified to verify exception thrown if datagrpah root is not passed
- * to applychanges command
- */
- public void testTuscany35() throws Exception {
-
- CommandGroup commandGroup = CommandGroup.FACTORY
- .createCommandGroup(getConfig("CustOrdersConnectionProps.xml"));
-
- Command read = commandGroup.getCommand("all customers");
- DataObject root = read.executeQuery();
-
- // Update first customer
- DataObject cust1 = root.getDataObject("CUSTOMER[1]");
- cust1.setString("LASTNAME", "Pavick");
-
- ApplyChangesCommand update = commandGroup.getApplyChangesCommand();
- try {
- // pass cust1 instead of root
- update.execute(cust1);
- fail();
- } catch (Error e) {
- // Expected
- }
-
- }
+
}
Modified: incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER" propertyName="Customer">
<Column name="ID" propertyName="iD" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Command name="all companies" SQL="select * from COMPANY" kind="Select"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Command name="all customers" SQL="select * from CUSTOMER" kind="Select"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Command name="all customers" SQL="select * from CUSTOMER" kind="Select"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="COMPANY">
<Column name="ID" primaryKey="true" generated="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCompanyMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="COMPANY">
<Column name="ID" primaryKey="true" generated="true"/>
<Column name="NAME"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER">
<Column name="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml Wed Feb 22 14:59:59 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
<Table name="CUSTOMER"
create="insert into customer values (:ID, :LASTNAME, :ADDRESS)"
update="update customer set lastname = :LASTNAME, address = :ADDRESS where ID = :ID"
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER"
create="insert into customer blah values (:ID, :LASTNAME, :ADDRESS)"
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicCustomerOrderMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER">
<Column name="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/basicStaticCustomer.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER" propertyName="Customer">
<Column name="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/cityStates.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="STATES">
<Column name="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/companyMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="COMPANY" propertyName="CompanyType">
<Column name="ID" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER" propertyName="Customer">
<Column name="ID" propertyName="id" primaryKey="true"/>
Modified: incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml?rev=379959&r1=379958&r2=379959&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml (original)
+++ incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml Wed Feb 22 14:59:59 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<Config xsi:noNamespaceSchemaLocation="../../main/resources/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Config xsi:noNamespaceSchemaLocation="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Table name="CUSTOMER">
<Column name="ID" primaryKey="true"/>