Author: lresende
Date: Thu Aug 30 10:00:22 2007
New Revision: 571243
URL: http://svn.apache.org/viewvc?rev=571243&view=rev
Log:
TUSCANY-961 - Applying Amita's patch
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.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/CompanyTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
Thu Aug 30 10:00:22 2007
@@ -86,7 +86,7 @@
appendFieldSet(statement, idx > 1, c.getColumnName());
String propertyName = c.getPropertyName() == null ?
c.getColumnName() : c.getPropertyName();
parameters.add(createManagedParameter(tableWrapper,
- changedObject.getProperty(propertyName), idx++));
+ changedObject.getInstanceProperty(propertyName), idx++));
}
statement.append(" where ");
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
Thu Aug 30 10:00:22 2007
@@ -27,21 +27,24 @@
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.Config;
import org.apache.tuscany.das.rdb.config.Relationship;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.impl.ResultSetShape;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.Property;
import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
/**
*/
public class GraphBuilderMetadata {
+ private final Logger logger =
Logger.getLogger(GraphBuilderMetadata.class);
+
private MappingWrapper configWrapper;
private final Collection resultSets = new ArrayList();
@@ -50,7 +53,7 @@
private Type rootType;
- private TypeHelper typeHelper = SDOUtil.createTypeHelper();
+ private HelperContext defaultHelperContext =
HelperProvider.getDefaultContext();
public GraphBuilderMetadata(Collection results, Config model,
ResultSetShape shape) throws SQLException {
this.configWrapper = new MappingWrapper(model);
@@ -107,11 +110,12 @@
private void createDynamicTypes() {
- DataObjectUtil.initRuntime();
+ Type root = SDOUtil.createType(defaultHelperContext, getDefaultURI(),
"DataGraphRoot", false);
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("GBMD.createDynamicTypes():created
Type for "+getDefaultURI());
+ }
- Type root = SDOUtil.createType(typeHelper, getDefaultURI(),
"DataGraphRoot", false);
-
- Iterator iter = getResultMetadata().iterator();
+ Iterator iter = getResultMetadata().iterator();
while (iter.hasNext()) {
ResultMetadata resultMetadata = (ResultMetadata) iter.next();
@@ -120,12 +124,14 @@
Iterator names =
resultMetadata.getAllTablePropertyNames().iterator();
while (names.hasNext()) {
String tableName = (String) names.next();
-
if (root.getProperty(tableName) == null) {
- Type tableType = SDOUtil.createType(typeHelper,
getDefaultURI(), tableName, false);
+ Type tableType = SDOUtil.createType(defaultHelperContext,
getDefaultURI(), tableName, false);
Property property = SDOUtil.createProperty(root,
tableName, tableType);
SDOUtil.setMany(property, true);
SDOUtil.setContainment(property, true);
+ if (this.logger.isDebugEnabled()) {
+
this.logger.debug("GBMD.createDynamicTypes():CREATING NEW TABLE TYPE & PROPERTY
:"+tableName);
+ }
}
}
@@ -216,9 +222,10 @@
*
*/
private void createDynamicRoot() {
- Type root = SDOUtil.createType(typeHelper, getDefaultURI() +
"/DataGraphRoot", "DataGraphRoot", false);
+ Type root = SDOUtil.createType(defaultHelperContext, getDefaultURI() +
"/DataGraphRoot", "DataGraphRoot", false);
- List types = SDOUtil.getTypes(typeHelper, typeURI);
+ List types = getDefinedTypes();
+
if (types == null) {
throw new RuntimeException("SDO Types have not been registered for
URI " + typeURI);
}
@@ -234,12 +241,35 @@
}
public List getDefinedTypes() {
+ List types = null;
+ List defaultTypes = null;
if (this.typeURI == null) {
- return SDOUtil.getTypes(typeHelper, getDefaultURI());
+ types = SDOUtil.getTypes(defaultHelperContext, getDefaultURI());
+ defaultTypes = SDOUtil.getTypes(defaultHelperContext,
getDefaultURI());
+ if(defaultTypes != null){
+ if(types == null) {
+ types = defaultTypes;
+ }
+ else {
+ types.addAll(defaultTypes);
+ }
+ }
+ return types;
}
- List types = SDOUtil.getTypes(typeHelper, typeURI);
- types.add(rootType);
+ types = SDOUtil.getTypes(defaultHelperContext, typeURI);
+ defaultTypes = SDOUtil.getTypes(defaultHelperContext, typeURI);
+ if(defaultTypes != null){
+ if(types == null) {
+ types = defaultTypes;
+ }
+ else {
+ types.addAll(defaultTypes);
+ }
+ }
+
+ if(rootType != null)
+ types.add(rootType);
return types;
}
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java?rev=571243&r1=571242&r2=571243&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
Thu Aug 30 10:00:22 2007
@@ -30,7 +30,7 @@
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;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataGraph;
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java?rev=571243&r1=571242&r2=571243&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
Thu Aug 30 10:00:22 2007
@@ -23,14 +23,14 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import org.apache.tuscany.das.rdb.config.Config;
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.ChangeSummaryImpl;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataGraph;
@@ -38,6 +38,7 @@
import commonj.sdo.Property;
import commonj.sdo.Type;
import commonj.sdo.helper.TypeHelper;
+import commonj.sdo.impl.HelperProvider;
public class GraphMerger {
@@ -68,10 +69,17 @@
}
String uri = "http:///org.apache.tuscany.das.rdb/das";;
- TypeHelper typeHelper = SDOUtil.createTypeHelper();
- Type rootType = SDOUtil.createType(typeHelper, uri + "/DataGraphRoot",
"DataGraphRoot", false);
-
- List types = SDOUtil.getTypes(typeHelper, config.getDataObjectModel());
+ TypeHelper typeHelper =
HelperProvider.getDefaultContext().getTypeHelper();
+ Type rootType = null;
+ rootType = typeHelper.getType(uri + "/DataGraphRoot", "DataGraphRoot");
+ if(rootType == null){
+ rootType =
SDOUtil.createType(HelperProvider.getDefaultContext(), uri + "/DataGraphRoot",
"DataGraphRoot", false);
+ if (logger.isDebugEnabled()) {
+ logger.debug("GraphMerger.emptyGraph():creating type
for "+uri);
+ }
+ }
+
+ List types = SDOUtil.getTypes(HelperProvider.getDefaultContext(),
config.getDataObjectModel());
if (types == null) {
throw new RuntimeException("SDO Types have not been registered for
URI " + config.getDataObjectModel());
}
@@ -79,9 +87,15 @@
Iterator i = types.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);
+ Property property = rootType.getProperty(type.getName());
+ if( !(property != null &&
+ (property.getType().isDataType()== type.isDataType()) &&
+ (property.isContainment() == true) &&
+ (property.isMany() == true)) ){
+ property = SDOUtil.createProperty(rootType, type.getName(),
type);
+ SDOUtil.setContainment(property, true);
+ SDOUtil.setMany(property, true);
+ }
}
// Create the DataGraph
@@ -179,7 +193,9 @@
while (objects.hasNext()) {
DataObject object = (DataObject) objects.next();
Object pk = object.get(getPrimaryKeyName(object));
- logger.finest("Adding object with pk " + pk + " to registry");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Adding object with pk " + pk + " to
registry");
+ }
registry.put(object.getType().getName(),
Collections.singletonList(pk), object);
}
}
@@ -204,7 +220,9 @@
column = new QualifiedColumn(key);
}
- logger.finest("Adding " + column.getTableName() + " " +
column.getColumnName() + " to keys");
+ if (logger.isDebugEnabled()) {
+ logger.debug("Adding " + column.getTableName() + " " +
column.getColumnName() + " to keys");
+ }
keys.put(column.getTableName(), column.getColumnName());
}
}
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
Thu Aug 30 10:00:22 2007
@@ -30,9 +30,10 @@
import org.apache.tuscany.das.rdb.test.data.DepartmentData;
import org.apache.tuscany.das.rdb.test.data.EmployeeData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
-import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
public class CompanyTests extends DasTest {
@@ -75,7 +76,8 @@
public void testSimpleStatic() throws Exception {
DAS das =
DAS.FACTORY.createDAS(getConfig("companyMappingWithConverters.xml"),
getConnection());
- SDOUtil.registerStaticTypes(CompanyFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CompanyFactory.INSTANCE.register(context);
// Build the select command
Command selectCommand = das.createCommand("select COMPANY.ID,
COMPANY.NAME, "
+ "EMPLOYEE.ID, EMPLOYEE.NAME, EMPLOYEE.SN, EMPLOYEE.MANAGER, "
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
Thu Aug 30 10:00:22 2007
@@ -30,10 +30,10 @@
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;
-import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
-
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
/**
* Tests the Converter framwork
*/
@@ -124,7 +124,8 @@
public void testInvalidConverter2() throws Exception {
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
DAS das = DAS.FACTORY.createDAS(getConfig("InvalidConverter.xml"),
getConnection());
// Build the select command to read a specific customer and related
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DynamicResultDescriptorTests.java
Thu Aug 30 10:00:22 2007
@@ -143,7 +143,6 @@
select.setResultDescriptors(resultDescriptorList);
try{
root = select.executeQuery();
-
System.out.println(((DataObject)root.getList("CUSTOMER").get(0)).getString("LASTNAME"));
fail("Expected exception");
}catch(Exception e){
assertTrue(e instanceof ClassCastException);
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
Thu Aug 30 10:00:22 2007
@@ -31,7 +31,9 @@
import org.apache.tuscany.das.rdb.test.data.OrderData;
import org.apache.tuscany.das.rdb.test.data.OrderDetailsData;
import org.apache.tuscany.das.rdb.test.framework.DasTest;
-import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
public class ExceptionTests extends DasTest {
@@ -81,7 +83,8 @@
}
public void testMissingMapping() throws Exception {
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
DAS das = DAS.FACTORY.createDAS(getConfig("staticCustomer.xml"),
getConnection());
Command readCustomers = das.createCommand("select * from CUSTOMER
where ID = 1");
@@ -136,7 +139,8 @@
}
public void testMismatchedDataObjectModel() throws SQLException {
- SDOUtil.registerStaticTypes(CompanynoidFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CompanynoidFactory.INSTANCE.register(context);
DAS das =
DAS.FACTORY.createDAS(getConfig("companynoidMappingWithConverters.xml"),
getConnection());
Command read = das.createCommand("select * from company");
try {
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
Thu Aug 30 10:00:22 2007
@@ -30,9 +30,10 @@
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;
-import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
public class GraphMergeTests extends DasTest {
@@ -46,7 +47,8 @@
public void testCreateEmptyGraph() throws Exception {
String typeUri =
"http:///org.apache.tuscany.das.rdb.test/customer.xsd";;
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
ConfigHelper helper = new ConfigHelper();
helper.setDataObjectModel(typeUri);
DataObject graph = new GraphMerger().emptyGraph(helper.getConfig());
@@ -57,7 +59,8 @@
public void testCreateEmptyGraphAndAddCustomer() throws Exception {
String typeUri =
"http:///org.apache.tuscany.das.rdb.test/customer.xsd";;
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
ConfigHelper helper = new ConfigHelper();
helper.setDataObjectModel(typeUri);
helper.addTable("CUSTOMER", "Customer");
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
Thu Aug 30 10:00:22 2007
@@ -28,9 +28,10 @@
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;
-import org.apache.tuscany.sdo.util.SDOUtil;
import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
public class TopDown extends DasTest {
@@ -49,7 +50,8 @@
Command select = das.getCommand("Customer and Orders");
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
// Parameterize the command
select.setParameter(1, new Integer(1));
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
Thu Aug 30 10:00:22 2007
@@ -25,7 +25,9 @@
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.impl.ReadCommandImpl;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
-import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
public class ReadCustomersStaticTypesCommand extends ReadCommandImpl {
@@ -53,7 +55,8 @@
CONFIG.getTable().add(t);
CONFIG.setDataObjectModel("http:///org.apache.tuscany.das.rdb.test/customer.xsd";);
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
}
public ReadCustomersStaticTypesCommand() {
Modified:
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java?rev=571243&r1=571242&r2=571243&view=diff
==============================================================================
---
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
(original)
+++
incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
Thu Aug 30 10:00:22 2007
@@ -22,13 +22,16 @@
import java.util.Collection;
import org.apache.tuscany.das.rdb.Command;
+import org.apache.tuscany.das.rdb.ConfigHelper;
import org.apache.tuscany.das.rdb.DAS;
+import org.apache.tuscany.das.rdb.merge.impl.GraphMerger;
import org.apache.tuscany.das.rdb.test.customer.CustomerFactory;
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;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
/**
*/
@@ -42,7 +45,8 @@
public void testRead() throws Exception {
InputStream mapping =
getClass().getClassLoader().getResourceAsStream("basicStaticCustomer.xml");
DAS das = DAS.FACTORY.createDAS(mapping, getConnection());
- SDOUtil.registerStaticTypes(CustomerFactory.class);
+ HelperContext context = HelperProvider.getDefaultContext();
+ CustomerFactory.INSTANCE.register(context);
Command select = das.createCommand("Select ID, LASTNAME, ADDRESS from
CUSTOMER where LASTNAME = ?");
select.setParameter(1, "Williams");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
