tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwilli...@apache.org
Subject svn commit: r412513 [1/2] - in /incubator/tuscany/java: das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/ das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/ das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl...
Date Wed, 07 Jun 2006 20:00:49 GMT
Author: kwilliams
Date: Wed Jun  7 13:00:47 2006
New Revision: 412513

URL: http://svn.apache.org/viewvc?rev=412513&view=rev
Log:
Applying Brent's patch for T-422

Modified:
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
    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/ResultMetadata.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
    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/ChangeFactory.java
    incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.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/resources/config.xsd
    incubator/tuscany/java/das/rdb/src/main/resources/dasmodel4.mdl
    incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
    incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
    incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.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/OneToOneRelationshipTests.java
    incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
    incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
    incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.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/commands/SimpleReadCustomersWithShapeCommand.java
    incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
    incubator/tuscany/java/das/rdb/src/test/resources/BooksConfig.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CompanyConfig.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
    incubator/tuscany/java/das/rdb/src/test/resources/CustomersOrdersConfig.xml
    incubator/tuscany/java/das/rdb/src/test/resources/InvalidConfig1.xml
    incubator/tuscany/java/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
    incubator/tuscany/java/das/rdb/src/test/resources/PartsConfig.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/basicCustomerMappingWithCUD2.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/companyMappingWithConverters.xml
    incubator/tuscany/java/das/rdb/src/test/resources/customerMapping.xml
    incubator/tuscany/java/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/DasAccountConfiguration.xml
    incubator/tuscany/java/samples/das/companyweb/src/main/resources/CompanyConfig.xml

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java Wed Jun  7 13:00:47 2006
@@ -54,29 +54,29 @@
         return this.config;
     }
 
-    public Table getTable(String name) {
+    public Table getTable(String tableName) {
         if (config == null)
             return null;
-        DebugUtil.debugln(getClass(), debug, "Looking for table " + name);
+        DebugUtil.debugln(getClass(), debug, "Looking for table " + tableName);
         Iterator i = config.getTable().iterator();
         while (i.hasNext()) {
             Table t = (Table) i.next();
-            if (name.equals(t.getName()))
+            if (tableName.equals(t.getTableName()))
                 return t;
         }
 
         return null;
     }
 
-    public Table getTableByPropertyName(String name) {
+    public Table getTableByTypeName(String typeName) {
         if (config == null)
             return null;
-        DebugUtil.debugln(getClass(), debug, "Looking for table by property: " + name);
+        DebugUtil.debugln(getClass(), debug, "Looking for table by property: " + typeName);
         Iterator i = config.getTable().iterator();
         while (i.hasNext()) {
             Table t = (Table) i.next();
             TableWrapper wrapper = new TableWrapper(t);
-            if (name.equals(wrapper.getPropertyName()))
+            if (typeName.equals(wrapper.getTypeName()))
                 return t;
         }
         return null;
@@ -174,11 +174,11 @@
         }
     }
 
-    public String getTablePropertyName(String tableName) {
+    public String getTableTypeName(String tableName) {
         Table t = getTable(tableName);
         if (t == null)
             return tableName;
-        String propertyName = t.getPropertyName();
+        String propertyName = t.getTypeName();
 
         if (propertyName == null)
             return tableName;
@@ -186,18 +186,18 @@
         return propertyName;
     }
 
-    public Column getColumn(Table t, String name) {
+    public Column getColumn(Table t, String columnName) {
         if (t == null)
             return null;
         Iterator i = t.getColumn().iterator();
         while (i.hasNext()) {
             Column c = (Column) i.next();
-            if (c.getName().equals(name)) {
+            if (c.getColumnName().equals(columnName)) {
                 return c;
             }
         }
         DebugUtil
-                .debugln(getClass(), debug, "WARNING: Could not find column " + name + " in table " + t.getName());
+                .debugln(getClass(), debug, "WARNING: Could not find column " + columnName + " in table " + t.getTableName());
         return null;
     }
 
@@ -207,13 +207,13 @@
         Iterator i = t.getColumn().iterator();
         while (i.hasNext()) {
             Column c = (Column) i.next();
-            if (c.getName().equals(propertyName))
+            if (c.getColumnName().equals(propertyName))
                 return c;
             if (c.getPropertyName() != null && c.getPropertyName().equals(propertyName))
                 return c;
         }
         DebugUtil.debugln(getClass(), debug, "WARNING: Could not find column " + propertyName + " in table "
-                + t.getName());
+                + t.getTableName());
         return null;
     }
 
@@ -225,7 +225,7 @@
 
         String propertyName = c.getPropertyName();
         if (propertyName == null)
-            return c.getName();
+            return c.getColumnName();
 
         return propertyName;
     }
@@ -243,14 +243,14 @@
         config.getTable().add(t);
     }
 
-    public void addTable(String tableName, String propertyName) {
+    public void addTable(String tableName, String typeName) {
         Table table = getTable(tableName);
         if (table != null)
             throw new RuntimeException("Table " + tableName + "already exists");
 
         table = ConfigFactoryImpl.eINSTANCE.createTable();
-        table.setName(tableName);
-        table.setPropertyName(propertyName);
+        table.setTableName(tableName);
+        table.setTypeName(typeName);
         config.getTable().add(table);
 
     }
@@ -259,7 +259,7 @@
         Table table = getTable(tableName);
         if (table == null) {
             table = ConfigFactoryImpl.eINSTANCE.createTable();
-            table.setName(tableName);
+            table.setTableName(tableName);
             config.getTable().add(table);
         }
         return table;
@@ -270,12 +270,12 @@
         Iterator i = t.getColumn().iterator();
         while (i.hasNext()) {
             Column c = (Column) i.next();
-            if (name.equals(c.getName()))
+            if (name.equals(c.getColumnName()))
                 return c;
         }
 
         Column c = ConfigFactoryImpl.eINSTANCE.createColumn();
-        c.setName(name);
+        c.setColumnName(name);
         t.getColumn().add(c);
         return c;
     }
@@ -381,7 +381,7 @@
             if (c.getConverterClassName() != null) {
                 String property = c.getPropertyName();
                 if (property == null)
-                    property = c.getName();
+                    property = c.getColumnName();
                 converters.put(property, c.getConverterClassName());
             }
         }

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java Wed Jun  7 13:00:47 2006
@@ -31,9 +31,9 @@
 		this.table = table;
 	}
 
-	public String getPropertyName() {
-		return table.getPropertyName() == null ? table.getName() : table
-				.getPropertyName();
+	public String getTypeName() {
+		return table.getTypeName() == null ? table.getTableName() : table
+				.getTypeName();
 	}
 
 	public Collection getPrimaryKeyNames() {
@@ -42,7 +42,7 @@
 		while (i.hasNext()) {
 			Column c = (Column) i.next();
 			if (c.isPrimaryKey())
-				pkNames.add(c.getName());
+				pkNames.add(c.getColumnName());
 		}
 		return pkNames;
 	}
@@ -65,7 +65,7 @@
 		if (c.getPropertyName() != null)
 			return c.getPropertyName();
 		else
-			return c.getName();
+			return c.getColumnName();
 	}
 
 	public boolean isGeneratedColumnProperty(String name) {
@@ -94,7 +94,7 @@
 			Column c = (Column) columns.next();
 			String property = c.getPropertyName();
 			if (property == null)
-				property = c.getName();
+				property = c.getColumnName();
 			if (propertyName.equals(property))
 				return c;
 		}
@@ -119,6 +119,6 @@
 		if ( c.getPropertyName() != null ) 
 			return c.getPropertyName();
 		else
-			return c.getName();
+			return c.getColumnName();
 	}
 }

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java Wed Jun  7 13:00:47 2006
@@ -43,7 +43,7 @@
 
 		StringBuffer statement = new StringBuffer();
 		statement.append("delete from ");
-		statement.append(t.getName());
+		statement.append(t.getTableName());
 		statement.append(" where ");
 
 		Iterator names = table.getPrimaryKeyNames().iterator();

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java Wed Jun  7 13:00:47 2006
@@ -51,7 +51,7 @@
 		ArrayList parameters = new ArrayList();
 		TableWrapper table = new TableWrapper(t);
 		StringBuffer statement = new StringBuffer("insert into ");
-		statement.append(t.getName());
+		statement.append(t.getTableName());
 
 		Iterator i = getAttributeProperties(changedObject, config).iterator();
 
@@ -165,10 +165,10 @@
 	private boolean hasState(MappingWrapper config, Relationship rel, DataObject changedObject) {							
 			
 			if ( !rel.isMany()) {
-				Table t = config.getTableByPropertyName(changedObject.getType().getName());
+				Table t = config.getTableByTypeName(changedObject.getType().getName());
 				TableWrapper tw = new TableWrapper(t);
 				RelationshipWrapper rw = new RelationshipWrapper(rel);
-				if (( rel.getForeignKeyTable().equals(t.getName())) &&
+				if (( rel.getForeignKeyTable().equals(t.getTableName())) &&
 						( Collections.disjoint(tw.getPrimaryKeyProperties(),rw.getForeignKeys()) ))
 					return true;			
 			}

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=412513&r1=412512&r2=412513&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 Wed Jun  7 13:00:47 2006
@@ -53,7 +53,7 @@
 		Type type = changedObject.getType();
 		TableWrapper t = new TableWrapper(table);
 		StringBuffer statement = new StringBuffer("update ");
-		statement.append(table.getName());
+		statement.append(table.getTableName());
 		statement.append(" set ");
 
 		
@@ -71,7 +71,7 @@
 				}
 			} else {
 				parameters.add(attr);
-				statement.append(c == null ? attr.getName() : c.getName());
+				statement.append(c == null ? attr.getName() : c.getColumnName());
 				statement.append(" = ?");
 				if (i.hasNext())
 					statement.append(", ");
@@ -94,7 +94,7 @@
 
 		if (t.getCollisionColumn() != null) {
 			statement.append(" and ");
-			statement.append(t.getCollisionColumn().getName());
+			statement.append(t.getCollisionColumn().getColumnName());
 			statement.append(" = ?");
 			parameters.add(type.getProperty(t.getCollisionColumnPropertyName()));
 		}

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java Wed Jun  7 13:00:47 2006
@@ -70,7 +70,7 @@
             String tableName = resultSetShape.getTableName(i);
 
             String tableProperty = mappingWrapper
-                    .getTablePropertyName(tableName);
+                    .getTableTypeName(tableName);
             String columnProperty = mappingWrapper.getColumnPropertyName(
                     tableName, resultSetShape.getColumnName(i));
             String converter = mappingWrapper.getConverter(tableName,
@@ -124,8 +124,8 @@
             while (tablesFromModel.hasNext()) {
                 TableWrapper t = new TableWrapper((Table) tablesFromModel
                         .next());
-                if (tableToColumnMap.get(t.getPropertyName()) == null)
-                    tableToColumnMap.put(t.getPropertyName(),
+                if (tableToColumnMap.get(t.getTypeName()) == null)
+                    tableToColumnMap.put(t.getTypeName(),
                             Collections.EMPTY_LIST);
             }
         }

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java Wed Jun  7 13:00:47 2006
@@ -70,9 +70,9 @@
 
 			
             DataObject parentTable = get(wrapper
-					.getTablePropertyName(r.getPrimaryKeyTable()));
+					.getTableTypeName(r.getPrimaryKeyTable()));
 			DataObject childTable = get(wrapper
-					.getTablePropertyName(r.getForeignKeyTable()));
+					.getTableTypeName(r.getForeignKeyTable()));
 
 			DebugUtil.debugln(getClass(), debug, "Parent table: " + parentTable);
 			DebugUtil.debugln(getClass(), debug, "Child table: " + childTable);

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java?rev=412513&r1=412512&r2=412513&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 Jun  7 13:00:47 2006
@@ -130,8 +130,8 @@
 			while (i.hasNext()) {
 				Relationship r = (Relationship) i.next();
 
-				String parentName = wrapper.getTablePropertyName(r.getPrimaryKeyTable());
-				String childName = wrapper.getTablePropertyName(r.getForeignKeyTable());
+				String parentName = wrapper.getTableTypeName(r.getPrimaryKeyTable());
+				String childName = wrapper.getTableTypeName(r.getForeignKeyTable());
 				
 				if (parentName == null) {
 					throw new RuntimeException("The parent table ("

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java?rev=412513&r1=412512&r2=412513&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 Jun  7 13:00:47 2006
@@ -17,12 +17,10 @@
 package org.apache.tuscany.das.rdb.impl;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 
 import org.apache.tuscany.das.rdb.ApplyChangesCommand;
 import org.apache.tuscany.das.rdb.Command;
 import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
 import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
 import org.apache.tuscany.das.rdb.util.DebugUtil;
 
@@ -42,9 +40,7 @@
     }
 
     public ApplyChangesCommandImpl(Config config){
-    	this.configWrapper = new MappingWrapper(config); 
-        if (config.getConnectionProperties() != null)
-            setConnection(config.getConnectionProperties());
+    	this.configWrapper = new MappingWrapper(config);       
     }
     
     public ApplyChangesCommandImpl(Config config, Connection connection){
@@ -55,21 +51,6 @@
 	public void setConnection(ConnectionImpl connection) {
 		summarizer.setConnection(connection);
 	}
-
-    public void setConnection(ConnectionProperties c) {
-        try {
-            Connection connection = null;
-            Class.forName(c.getDriverClassName());
-            if (c.getDriverUserName() == null)
-                connection = DriverManager.getConnection(c.getDriverURL());
-            else
-                connection = DriverManager.getConnection(c.getDriverURL(), c.getDriverUserName(), c.getDriverPassword());
-            connection.setAutoCommit(false);
-            setConnection(connection);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
 
     public void addCreateCommand(Type type, Command cmd) {
         summarizer.addCreateCommand(type, cmd);        

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java Wed Jun  7 13:00:47 2006
@@ -99,12 +99,12 @@
 	private InsertCommandImpl getCreateCommand(DataObject changedObject) {
 		
 		if ( createCommand == null ) {
-			Table table = mapping.getTableByPropertyName(changedObject.getType().getName());
+			Table table = mapping.getTableByTypeName(changedObject.getType().getName());
 			if (table == null ) {
 				if (changedObject.getType().getProperty("ID") != null ) {
 					// If the table is not defined in the config, assume it has a primary key of "ID"
 					mapping.addPrimaryKey(changedObject.getType().getName() + ".ID");
-					table = mapping.getTableByPropertyName(changedObject.getType().getName());
+					table = mapping.getTableByTypeName(changedObject.getType().getName());
 				} else {
 					throw new RuntimeException("Table " + changedObject.getType().getName() + " was changed in the DataGraph but is not present in the Config");
 				}
@@ -131,12 +131,12 @@
 	private DeleteCommandImpl getDeleteCommand(DataObject changedObject) {
 		
 		if ( deleteCommand == null ) {
-			Table table = mapping.getTableByPropertyName(changedObject.getType().getName());
+			Table table = mapping.getTableByTypeName(changedObject.getType().getName());
 			if (table == null )  {
 				if (changedObject.getType().getProperty("ID") != null ) {
 					// If the table is not defined in the config, assume it has a primary key of "ID"
 					mapping.addPrimaryKey(changedObject.getType().getName() + ".ID");
-					table = mapping.getTableByPropertyName(changedObject.getType().getName());
+					table = mapping.getTableByTypeName(changedObject.getType().getName());
 				} else {
 					throw new RuntimeException("Table " + changedObject.getType().getName() + " was changed in the DataGraph but is not present in the Config");
 				}
@@ -160,12 +160,12 @@
 	private UpdateCommandImpl getUpdateCommand(DataObject changedObject) {
 	
 		if ( updateCommand == null ) {
-			Table table = mapping.getTableByPropertyName(changedObject.getType().getName());
+			Table table = mapping.getTableByTypeName(changedObject.getType().getName());
 			if (table == null ) {
 				if (changedObject.getType().getProperty("ID") != null ) {
 					// If the table is not defined in the config, assume it has a primary key of "ID"
 					mapping.addPrimaryKey(changedObject.getType().getName() + ".ID");
-					table = mapping.getTableByPropertyName(changedObject.getType().getName());
+					table = mapping.getTableByTypeName(changedObject.getType().getName());
 				} else {
 					throw new RuntimeException("Table " + changedObject.getType().getName() + " was changed in the DataGraph but is not present in the Config");
 				}

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java Wed Jun  7 13:00:47 2006
@@ -156,10 +156,10 @@
 			
 			if ( !rel.isMany()) {
 				// This is a one-one relationship
-				Table t = mapping.getTableByPropertyName(changedObject.getType().getName());
+				Table t = mapping.getTableByTypeName(changedObject.getType().getName());
 				TableWrapper tw = new TableWrapper(t);
 				RelationshipWrapper rw = new RelationshipWrapper(rel);
-				if (( rel.getForeignKeyTable().equals(t.getName())) &&
+				if (( rel.getForeignKeyTable().equals(t.getTableName())) &&
 						( Collections.disjoint(tw.getPrimaryKeyProperties(),rw.getForeignKeys()) ))
 					return true;
 				
@@ -223,9 +223,9 @@
 				Column c = (Column) columns.next();
 				if ( c.isPrimaryKey() && c.isGenerated()) {
 					DebugUtil.debugln(getClass(), debug, "adding generated key "
-							+ t.getName() + "."
-							+ c.getName());
-					generatedKeys.put(t.getName(), c.getName());
+							+ t.getTableName() + "."
+							+ c.getColumnName());
+					generatedKeys.put(t.getTableName(), c.getColumnName());
 				}
 			}
 		}

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandGroupImpl.java?rev=412513&r1=412512&r2=412513&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 Jun  7 13:00:47 2006
@@ -32,7 +32,6 @@
 import org.apache.tuscany.das.rdb.Command;
 import org.apache.tuscany.das.rdb.CommandGroup;
 import org.apache.tuscany.das.rdb.config.Config;
-import org.apache.tuscany.das.rdb.config.ConnectionProperties;
 import org.apache.tuscany.das.rdb.util.ConfigUtil;
 
 /**
@@ -62,12 +61,8 @@
             org.apache.tuscany.das.rdb.config.Command commandConfig = (org.apache.tuscany.das.rdb.config.Command) i
                     .next();
             String kind = commandConfig.getKind();
-            if (kind.equalsIgnoreCase("select"))
-                //TODO - Need to refactor Command heirarchy based on Datasource
-                if (config.getConnectionProperties() != null)
-                    commands.put(commandConfig.getName(), new ReadCommandImpl(commandConfig.getSQL(), config, getConnection()));
-                else
-                    commands.put(commandConfig.getName(), new ReadCommandImpl(commandConfig.getSQL(), config));
+            if (kind.equalsIgnoreCase("select"))                             
+                commands.put(commandConfig.getName(), new ReadCommandImpl(commandConfig.getSQL(), config));
             else if (kind.equalsIgnoreCase("update"))
                 commands.put(commandConfig.getName(), new UpdateCommandImpl(commandConfig.getSQL()));
             else if (kind.equalsIgnoreCase("insert"))
@@ -117,39 +112,10 @@
 
     private void initializeConnection() {
 
-        ConnectionProperties cp = config.getConnectionProperties();
-        if (cp == null)
+        String dataSource = config.getDataSource();
+        if (dataSource == null)
             throw new RuntimeException(
-                    "No connection properties have been configured and no connection has been provided");
-
-        if (cp.getDataSource() != null)
-            initViaDataSource(cp);
-        else
-            initViaDriverManager(cp);
-
-    }
-
-    private void initViaDriverManager(ConnectionProperties cp) {
-        Connection connection = null;
-
-        try {
-            Class.forName(cp.getDriverClassName());
-            if (cp.getDriverUserName() == null)
-                connection = DriverManager.getConnection(cp.getDriverURL());
-            else
-                connection = DriverManager.getConnection(cp.getDriverURL(), cp.getDriverUserName(), cp
-                        .getDriverPassword());
-            connection.setAutoCommit(false);
-            setConnection(connection);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-
-    }
-
-    // TODO - Refactor to eliminate common initialization code after connection
-    // is got
-    private void initViaDataSource(ConnectionProperties cp) {
+                    "No connection has been provided and no data source has been specified");
 
         Connection connection = null;
 
@@ -161,7 +127,7 @@
         }
         try {
             // TODO - I think we should rename this getDataSourceURL?
-            DataSource ds = (DataSource) ctx.lookup(cp.getDataSource());
+            DataSource ds = (DataSource) ctx.lookup(dataSource);
             try {
                 connection = ds.getConnection();
                 connection.setAutoCommit(false);
@@ -192,12 +158,12 @@
     }
 
     /**
-     * If the config has connection properties then we are "manageing" the
-     * connection via DriverManager or DataSource
+     * If the config has connection properties then we are "managing" the
+     * connection via DataSource
      */
     private boolean managingConnections() {
 
-        if (config.getConnectionProperties() == null)
+        if (config.getDataSource() == null)
             return false;
         else
             return true;

Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java?rev=412513&r1=412512&r2=412513&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 Jun  7 13:00:47 2006
@@ -120,7 +120,7 @@
 
     public String getTableName() {
         if (mappingWrapper.getConfig() != null)
-            return mappingWrapper.getTableByPropertyName(getTypeName()).getName();
+            return mappingWrapper.getTableByTypeName(getTypeName()).getTableName();
         else
             return null;
     }

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=412513&r1=412512&r2=412513&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 Jun  7 13:00:47 2006
@@ -17,14 +17,12 @@
 package org.apache.tuscany.das.rdb.impl;
 
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 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.wrapper.MappingWrapper;
 import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
 import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultSetProcessor;
@@ -134,28 +132,8 @@
     }
 
     private void setMappingModel(Config config) {
-        configWrapper = new MappingWrapper(config);
-        //TODO - need to refactor and take into regression that lost ability to use Datasource
-        if (getConnection() == null)
-            if (config.getConnectionProperties() != null)
-                setConnection(config.getConnectionProperties());
-    }
-
-    public void setConnection(ConnectionProperties c) {
-        try {
-            Connection connection = null;
-            Class.forName(c.getDriverClassName());
-            if (c.getDriverUserName() == null)
-                connection = DriverManager.getConnection(c.getDriverURL());
-            else
-                connection = DriverManager.getConnection(c.getDriverURL(), c.getDriverUserName(), c
-                        .getDriverPassword());
-            connection.setAutoCommit(false);
-            setConnection(connection);
-        } catch (Exception ex) {
-            throw new RuntimeException(ex);
-        }
-    }
+        configWrapper = new MappingWrapper(config);    
+    }   
 
     public void setDataObjectModel(Type schema) {
         this.schema = schema;

Modified: incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/resources/config.xsd?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/resources/config.xsd (original)
+++ incubator/tuscany/java/das/rdb/src/main/resources/config.xsd Wed Jun  7 13:00:47 2006
@@ -14,90 +14,67 @@
   See the License for the specific language governing permissions and
   limitations under the License.
  -->
-<xsd:schema xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.apache.tuscany.das.rdb.config="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ecore:nsPrefix="org.apache.tuscany.das.rdb.config" ecore:package="org.apache.tuscany.das.rdb.config" targetNamespace="http:///org.apache.tuscany.das.rdb/config.xsd">
-   <xsd:import namespace="http://www.eclipse.org/emf/2002/Ecore" schemaLocation="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.xsd"/>
-   <xsd:element ecore:ignore="true" name="Config" type="org.apache.tuscany.das.rdb.config:Config"/>
-   <xsd:element ecore:ignore="true" name="Command" type="org.apache.tuscany.das.rdb.config:Command"/>
-   <xsd:element ecore:ignore="true" name="ConnectionProperties" type="org.apache.tuscany.das.rdb.config:ConnectionProperties"/>
-   <xsd:element ecore:ignore="true" name="Parameter" type="org.apache.tuscany.das.rdb.config:Parameter"/>
-   <xsd:element ecore:ignore="true" name="Relationship" type="org.apache.tuscany.das.rdb.config:Relationship"/>
-   <xsd:element ecore:ignore="true" name="Table" type="org.apache.tuscany.das.rdb.config:Table"/>
-   <xsd:element ecore:ignore="true" name="KeyPair" type="org.apache.tuscany.das.rdb.config:KeyPair"/>
-   <xsd:element ecore:ignore="true" name="Column" type="org.apache.tuscany.das.rdb.config:Column"/>
-   <xsd:element ecore:ignore="true" name="ResultDescriptor" type="org.apache.tuscany.das.rdb.config:ResultDescriptor"/>
+<xsd:schema  xmlns:org.apache.tuscany.das.rdb.config="http:///org.apache.tuscany.das.rdb/config.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema"  targetNamespace="http:///org.apache.tuscany.das.rdb/config.xsd">
    <xsd:complexType name="Config">
       <xsd:sequence>
-         <xsd:element ecore:opposite="Config" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="Command" type="org.apache.tuscany.das.rdb.config:Command"/>
-         <xsd:element ecore:opposite="Config" ecore:resolveProxies="true" minOccurs="0" name="ConnectionProperties" type="org.apache.tuscany.das.rdb.config:ConnectionProperties"/>
-         <xsd:element ecore:opposite="Config" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="Table" type="org.apache.tuscany.das.rdb.config:Table"/>
-         <xsd:element ecore:opposite="Config" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="Relationship" type="org.apache.tuscany.das.rdb.config:Relationship"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Command" type="org.apache.tuscany.das.rdb.config:Command"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Table" type="org.apache.tuscany.das.rdb.config:Table"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Relationship" type="org.apache.tuscany.das.rdb.config:Relationship"/>      
       </xsd:sequence>
+      <xsd:attribute name="dataSource" type="xsd:string"/>
       <xsd:attribute name="uri" type="xsd:string"/>
    </xsd:complexType>
    <xsd:complexType name="Command">
       <xsd:sequence>
-         <xsd:element ecore:opposite="Command" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="Parameter" type="org.apache.tuscany.das.rdb.config:Parameter"/>
-         <xsd:element ecore:opposite="Command" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="ResultDescriptor" type="org.apache.tuscany.das.rdb.config:ResultDescriptor"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Parameter" type="org.apache.tuscany.das.rdb.config:Parameter"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="ResultDescriptor" type="org.apache.tuscany.das.rdb.config:ResultDescriptor"/>
       </xsd:sequence>
       <xsd:attribute name="name" type="xsd:string"/>
       <xsd:attribute name="SQL" type="xsd:string"/>
       <xsd:attribute name="kind" type="xsd:string"/>
-      <xsd:attribute ecore:opposite="Command" ecore:reference="org.apache.tuscany.das.rdb.config:Config" ecore:transient="true" name="Config" type="xsd:anyURI"/>
-   </xsd:complexType>
-   <xsd:complexType name="ConnectionProperties">
-      <xsd:attribute name="dataSource" type="xsd:string"/>
-      <xsd:attribute name="driverClassName" type="xsd:string"/>
-      <xsd:attribute name="driverURL" type="xsd:string"/>
-      <xsd:attribute name="driverPassword" type="xsd:string"/>
-      <xsd:attribute name="driverUserName" type="xsd:string"/>
-      <xsd:attribute ecore:opposite="ConnectionProperties" ecore:reference="org.apache.tuscany.das.rdb.config:Config" ecore:transient="true" name="Config" type="xsd:anyURI"/>
-   </xsd:complexType>
+   </xsd:complexType>     
    <xsd:complexType name="Parameter">
       <xsd:attribute name="name" type="xsd:string"/>
       <xsd:attribute name="columnType" type="xsd:string"/>
-      <xsd:attribute ecore:opposite="Parameter" ecore:reference="org.apache.tuscany.das.rdb.config:Command" ecore:transient="true" name="Command" type="xsd:anyURI"/>
+      <xsd:attribute name="direction" type="xsd:string"/>     
    </xsd:complexType>
    <xsd:complexType name="Relationship">
       <xsd:sequence>
-         <xsd:element ecore:opposite="Relationship" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="KeyPair" type="org.apache.tuscany.das.rdb.config:KeyPair"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="KeyPair" type="org.apache.tuscany.das.rdb.config:KeyPair"/>
       </xsd:sequence>
       <xsd:attribute name="name" type="xsd:string"/>
       <xsd:attribute name="primaryKeyTable" type="xsd:string"/>
       <xsd:attribute name="foreignKeyTable" type="xsd:string"/>
-      <xsd:attribute name="many" type="xsd:boolean"/>
-      <xsd:attribute ecore:opposite="Relationship" ecore:reference="org.apache.tuscany.das.rdb.config:Config" ecore:transient="true" name="Config" type="xsd:anyURI"/>
+      <xsd:attribute name="many" type="xsd:boolean"/>   
    </xsd:complexType>
    <xsd:complexType name="Table">
       <xsd:sequence>
-         <xsd:element ecore:opposite="Table" ecore:resolveProxies="true" maxOccurs="unbounded" minOccurs="0" name="Column" type="org.apache.tuscany.das.rdb.config:Column"/>
+         <xsd:element  maxOccurs="unbounded" minOccurs="0" name="Column" type="org.apache.tuscany.das.rdb.config:Column"/>
       </xsd:sequence>
-      <xsd:attribute name="name" type="xsd:string"/>
-      <xsd:attribute name="propertyName" type="xsd:string"/>
+      <xsd:attribute name="tableName" type="xsd:string"/>
+      <xsd:attribute name="typeName" type="xsd:string"/>
       <xsd:attribute name="create" type="xsd:string"/>
       <xsd:attribute name="update" type="xsd:string"/>
-      <xsd:attribute name="delete" type="xsd:string"/>
-      <xsd:attribute ecore:opposite="Table" ecore:reference="org.apache.tuscany.das.rdb.config:Config" ecore:transient="true" name="Config" type="xsd:anyURI"/>
+      <xsd:attribute name="delete" type="xsd:string"/>    
    </xsd:complexType>
    <xsd:complexType name="KeyPair">
       <xsd:attribute name="primaryKeyColumn" type="xsd:string"/>
-      <xsd:attribute name="foreignKeyColumn" type="xsd:string"/>
-      <xsd:attribute ecore:opposite="KeyPair" ecore:reference="org.apache.tuscany.das.rdb.config:Relationship" ecore:transient="true" name="Relationship" type="xsd:anyURI"/>
+      <xsd:attribute name="foreignKeyColumn" type="xsd:string"/>   
    </xsd:complexType>
    <xsd:complexType name="Column">
-      <xsd:attribute name="name" type="xsd:string"/>
+      <xsd:attribute name="columnName" type="xsd:string"/>
       <xsd:attribute name="propertyName" type="xsd:string"/>
       <xsd:attribute name="converterClassName" type="xsd:string"/>
       <xsd:attribute name="columnType" type="xsd:string"/>
       <xsd:attribute name="primaryKey" type="xsd:boolean"/>
       <xsd:attribute name="generated" type="xsd:boolean"/>
-      <xsd:attribute name="collision" type="xsd:boolean"/>
-      <xsd:attribute ecore:opposite="Column" ecore:reference="org.apache.tuscany.das.rdb.config:Table" ecore:transient="true" name="Table" type="xsd:anyURI"/>
+      <xsd:attribute name="collision" type="xsd:boolean"/>    
    </xsd:complexType>
    <xsd:complexType name="ResultDescriptor">
       <xsd:attribute name="columnName" type="xsd:string"/>
       <xsd:attribute name="tableName" type="xsd:string"/>
       <xsd:attribute name="columnType" type="xsd:string"/>
-      <xsd:attribute name="converter" type="xsd:string"/>
-      <xsd:attribute ecore:opposite="ResultDescriptor" ecore:reference="org.apache.tuscany.das.rdb.config:Command" ecore:transient="true" name="Command" type="xsd:anyURI"/>
+      <xsd:attribute name="converter" type="xsd:string"/>   
    </xsd:complexType>
+   
 </xsd:schema>

Modified: incubator/tuscany/java/das/rdb/src/main/resources/dasmodel4.mdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/resources/dasmodel4.mdl?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/resources/dasmodel4.mdl (original)
+++ incubator/tuscany/java/das/rdb/src/main/resources/dasmodel4.mdl Wed Jun  7 13:00:47 2006
@@ -70,6 +70,9 @@
 			class_attributes 	(list class_attribute_list
 			    (object ClassAttribute "uri"
 				quid       	"4362A337006B"
+				type       	"String")
+			    (object ClassAttribute "dataSource"
+				quid       	"4485DF600233"
 				type       	"String")))
 		    (object Class "Command"
 			quid       	"4362A2EC01FE"
@@ -83,24 +86,6 @@
 			    (object ClassAttribute "kind"
 				quid       	"437903E60321"
 				type       	"String")))
-		    (object Class "ConnectionProperties"
-			quid       	"4362A2FD0085"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "dataSource"
-				quid       	"4362A35A035A"
-				type       	"String")
-			    (object ClassAttribute "driverClassName"
-				quid       	"4362A36D0203"
-				type       	"String")
-			    (object ClassAttribute "driverURL"
-				quid       	"4362A3740330"
-				type       	"String")
-			    (object ClassAttribute "driverPassword"
-				quid       	"4362A384022E"
-				type       	"String")
-			    (object ClassAttribute "driverUserName"
-				quid       	"4378E1B303C2"
-				type       	"String")))
 		    (object Class "Parameter"
 			quid       	"4362A3C902BA"
 			class_attributes 	(list class_attribute_list
@@ -128,10 +113,10 @@
 		    (object Class "Table"
 			quid       	"4362A43C0002"
 			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
+			    (object ClassAttribute "tableName"
 				quid       	"4362A7B2031D"
 				type       	"String")
-			    (object ClassAttribute "propertyName"
+			    (object ClassAttribute "typeName"
 				quid       	"4362A7C203A2"
 				type       	"String")
 			    (object ClassAttribute "create"
@@ -155,7 +140,7 @@
 		    (object Class "Column"
 			quid       	"4362A75C016B"
 			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "name"
+			    (object ClassAttribute "columnName"
 				quid       	"4362A8BD02E5"
 				type       	"String")
 			    (object ClassAttribute "propertyName"
@@ -209,112 +194,96 @@
 				Containment 	"By Value"
 				is_navigable 	TRUE)))
 		    (object Association "$UNNAMED$3"
-			quid       	"4362A308010D"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$4"
-				quid       	"4362A3090015"
-				supplier   	"Logical View::config::Config"
-				quidu      	"4362A2DE0045"
-				is_navigable 	TRUE
-				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$5"
-				quid       	"4362A3090016"
-				supplier   	"Logical View::config::ConnectionProperties"
-				quidu      	"4362A2FD0085"
-				client_cardinality 	(value cardinality "0..1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$6"
 			quid       	"4362A3D302FA"
 			roles      	(list role_list
-			    (object Role "$UNNAMED$7"
+			    (object Role "$UNNAMED$4"
 				quid       	"4362A3D40143"
 				supplier   	"Logical View::config::Command"
 				quidu      	"4362A2EC01FE"
 				is_navigable 	TRUE
 				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$8"
+			    (object Role "$UNNAMED$5"
 				quid       	"4362A3D40144"
 				supplier   	"Logical View::config::Parameter"
 				quidu      	"4362A3C902BA"
 				client_cardinality 	(value cardinality "0..n")
 				Containment 	"By Value"
 				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$9"
+		    (object Association "$UNNAMED$6"
 			quid       	"4362A448026C"
 			roles      	(list role_list
-			    (object Role "$UNNAMED$10"
+			    (object Role "$UNNAMED$7"
 				quid       	"4362A4490105"
 				supplier   	"Logical View::config::Config"
 				quidu      	"4362A2DE0045"
 				is_navigable 	TRUE
 				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$11"
+			    (object Role "$UNNAMED$8"
 				quid       	"4362A4490106"
 				supplier   	"Logical View::config::Table"
 				quidu      	"4362A43C0002"
 				client_cardinality 	(value cardinality "0..n")
 				Containment 	"By Value"
 				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$12"
+		    (object Association "$UNNAMED$9"
 			quid       	"4362A44B0298"
 			roles      	(list role_list
-			    (object Role "$UNNAMED$13"
+			    (object Role "$UNNAMED$10"
 				quid       	"4362A44C01AA"
 				supplier   	"Logical View::config::Config"
 				quidu      	"4362A2DE0045"
 				is_navigable 	TRUE
 				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$14"
+			    (object Role "$UNNAMED$11"
 				quid       	"4362A44C01AB"
 				supplier   	"Logical View::config::Relationship"
 				quidu      	"4362A42E03A5"
 				client_cardinality 	(value cardinality "0..n")
 				Containment 	"By Value"
 				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$15"
+		    (object Association "$UNNAMED$12"
 			quid       	"4362A76302A1"
 			roles      	(list role_list
-			    (object Role "$UNNAMED$16"
+			    (object Role "$UNNAMED$13"
 				quid       	"4362A7640090"
 				supplier   	"Logical View::config::Table"
 				quidu      	"4362A43C0002"
 				is_navigable 	TRUE
 				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$17"
+			    (object Role "$UNNAMED$14"
 				quid       	"4362A7640091"
 				supplier   	"Logical View::config::Column"
 				quidu      	"4362A75C016B"
 				client_cardinality 	(value cardinality "0..n")
 				Containment 	"By Value"
 				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$18"
+		    (object Association "$UNNAMED$15"
 			quid       	"4362A771032E"
 			roles      	(list role_list
-			    (object Role "$UNNAMED$19"
+			    (object Role "$UNNAMED$16"
 				quid       	"4362A7720108"
 				supplier   	"Logical View::config::Relationship"
 				quidu      	"4362A42E03A5"
 				is_navigable 	TRUE
 				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$20"
+			    (object Role "$UNNAMED$17"
 				quid       	"4362A7720109"
 				supplier   	"Logical View::config::KeyPair"
 				quidu      	"4362A72E0010"
 				client_cardinality 	(value cardinality "0..n")
 				Containment 	"By Value"
 				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$21"
+		    (object Association "$UNNAMED$18"
 			quid       	"437B59A10066"
 			roles      	(list role_list
-			    (object Role "$UNNAMED$22"
+			    (object Role "$UNNAMED$19"
 				quid       	"437B59A30145"
 				supplier   	"Logical View::config::Command"
 				quidu      	"4362A2EC01FE"
 				Containment 	"By Value"
 				is_navigable 	TRUE
 				is_aggregate 	TRUE)
-			    (object Role "$UNNAMED$23"
+			    (object Role "$UNNAMED$20"
 				quid       	"437B59A30146"
 				supplier   	"Logical View::config::ResultDescriptor"
 				quidu      	"437B57EF0008"
@@ -348,6 +317,14 @@
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A72E0010"
+				compartment 	(object Compartment
+				    Parent_View 	@1
+				    location   	(809, 1287)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	3
+				    max_width  	496)
 				width      	508
 				height     	236
 				autoResize 	TRUE)
@@ -368,36 +345,24 @@
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A75C016B"
+				compartment 	(object Compartment
+				    Parent_View 	@2
+				    location   	(1756, 1348)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	8
+				    max_width  	515)
 				width      	536
 				height     	486
 				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::config::ConnectionProperties" @3
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2542, 248)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(2317, 67)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"ConnectionProperties")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4362A2FD0085"
-				width      	468
-				height     	386
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::config::Relationship" @4
+			    (object ClassView "Class" "Logical View::config::Relationship" @3
 				ShowCompartmentStereotypes 	TRUE
 				IncludeAttribute 	TRUE
 				IncludeOperation 	TRUE
 				location   	(1054, 744)
 				label      	(object ItemLabel
-				    Parent_View 	@4
+				    Parent_View 	@3
 				    location   	(829, 588)
 				    fill_color 	13434879
 				    nlines     	1
@@ -408,39 +373,47 @@
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A42E03A5"
+				compartment 	(object Compartment
+				    Parent_View 	@3
+				    location   	(829, 648)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	5
+				    max_width  	456)
 				width      	468
 				height     	336
 				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$18" @5
+			    (object AssociationViewNew "$UNNAMED$15" @4
 				location   	(1081, 1063)
 				stereotype 	TRUE
 				line_color 	3342489
 				quidu      	"4362A771032E"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$19" @6
-					Parent_View 	@5
+				    (object RoleView "$UNNAMED$16" @5
+					Parent_View 	@4
 					location   	(-97, -84)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A7720108"
-					client     	@5
-					supplier   	@4
+					client     	@4
+					supplier   	@3
 					line_style 	3
 					origin_attachment 	(1080, 1063)
 					terminal_attachment 	(1080, 912))
-				    (object RoleView "$UNNAMED$20" @7
-					Parent_View 	@5
+				    (object RoleView "$UNNAMED$17" @6
+					Parent_View 	@4
 					location   	(-97, -84)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A7720109"
-					client     	@5
+					client     	@4
 					supplier   	@1
 					line_style 	3
 					origin_attachment 	(1080, 1063)
 					terminal_attachment 	(1080, 1215)
-					label      	(object SegLabel @8
-					    Parent_View 	@7
+					label      	(object SegLabel @7
+					    Parent_View 	@6
 					    location   	(1135, 1112)
 					    anchor     	2
 					    anchor_loc 	1
@@ -451,57 +424,65 @@
 					    pctDist    	0.327273
 					    height     	55
 					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::config::Table" @9
+			    (object ClassView "Class" "Logical View::config::Table" @8
 				ShowCompartmentStereotypes 	TRUE
 				IncludeAttribute 	TRUE
 				IncludeOperation 	TRUE
 				location   	(1984, 837)
 				label      	(object ItemLabel
-				    Parent_View 	@9
-				    location   	(1784, 656)
+				    Parent_View 	@8
+				    location   	(1814, 656)
 				    fill_color 	13434879
 				    nlines     	1
-				    max_width  	400
+				    max_width  	340
 				    justify    	0
 				    label      	"Table")
 				icon_style 	"Icon"
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A43C0002"
-				width      	418
+				compartment 	(object Compartment
+				    Parent_View 	@8
+				    location   	(1814, 716)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	6
+				    max_width  	337)
+				width      	358
 				height     	386
 				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$15" @10
-				location   	(1778, 1153)
+			    (object AssociationViewNew "$UNNAMED$12" @9
+				location   	(1807, 1153)
 				stereotype 	TRUE
 				line_color 	3342489
 				quidu      	"4362A76302A1"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$16" @11
-					Parent_View 	@10
-					location   	(1003, 6)
+				    (object RoleView "$UNNAMED$13" @10
+					Parent_View 	@9
+					location   	(1032, 6)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A7640090"
-					client     	@10
-					supplier   	@9
+					client     	@9
+					supplier   	@8
 					line_style 	3
-					origin_attachment 	(1778, 1153)
-					terminal_attachment 	(1778, 1030))
-				    (object RoleView "$UNNAMED$17" @12
-					Parent_View 	@10
-					location   	(1003, 6)
+					origin_attachment 	(1807, 1153)
+					terminal_attachment 	(1807, 1030))
+				    (object RoleView "$UNNAMED$14" @11
+					Parent_View 	@9
+					location   	(1032, 6)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A7640091"
-					client     	@10
+					client     	@9
 					supplier   	@2
 					line_style 	3
-					origin_attachment 	(1778, 1153)
-					terminal_attachment 	(1778, 1276)
-					label      	(object SegLabel @13
-					    Parent_View 	@12
-					    location   	(1832, 1166)
+					origin_attachment 	(1807, 1153)
+					terminal_attachment 	(1807, 1276)
+					label      	(object SegLabel @12
+					    Parent_View 	@11
+					    location   	(1861, 1166)
 					    anchor     	2
 					    anchor_loc 	1
 					    nlines     	1
@@ -511,13 +492,13 @@
 					    pctDist    	0.109091
 					    height     	54
 					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::config::Parameter" @14
+			    (object ClassView "Class" "Logical View::config::Parameter" @13
 				ShowCompartmentStereotypes 	TRUE
 				IncludeAttribute 	TRUE
 				IncludeOperation 	TRUE
 				location   	(186, 806)
 				label      	(object ItemLabel
-				    Parent_View 	@14
+				    Parent_View 	@13
 				    location   	(4, 700)
 				    fill_color 	13434879
 				    nlines     	1
@@ -528,74 +509,50 @@
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A3C902BA"
+				compartment 	(object Compartment
+				    Parent_View 	@13
+				    location   	(4, 760)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	3
+				    max_width  	371)
 				width      	382
 				height     	236
 				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::config::Config" @15
+			    (object ClassView "Class" "Logical View::config::Config" @14
 				ShowCompartmentStereotypes 	TRUE
 				IncludeAttribute 	TRUE
 				IncludeOperation 	TRUE
 				location   	(1054, 155)
 				label      	(object ItemLabel
-				    Parent_View 	@15
-				    location   	(959, 74)
+				    Parent_View 	@14
+				    location   	(877, 49)
 				    fill_color 	13434879
 				    nlines     	1
-				    max_width  	190
+				    max_width  	354
 				    justify    	0
 				    label      	"Config")
 				icon_style 	"Icon"
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A2DE0045"
-				width      	208
-				height     	186
+				compartment 	(object Compartment
+				    Parent_View 	@14
+				    location   	(877, 109)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	3
+				    max_width  	350)
+				width      	372
+				height     	236
 				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$3" @16
-				location   	(1733, 184)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4362A308010D"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$4" @17
-					Parent_View 	@16
-					location   	(307, -498)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4362A3090015"
-					client     	@16
-					supplier   	@15
-					line_style 	3
-					origin_attachment 	(1733, 184)
-					terminal_attachment 	(1158, 184))
-				    (object RoleView "$UNNAMED$5" @18
-					Parent_View 	@16
-					location   	(307, -498)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4362A3090016"
-					client     	@16
-					supplier   	@3
-					line_style 	3
-					origin_attachment 	(1733, 184)
-					terminal_attachment 	(2308, 184)
-					label      	(object SegLabel @19
-					    Parent_View 	@18
-					    location   	(2194, 126)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..1"
-					    pctDist    	0.801805
-					    height     	59
-					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$12" @20
-				location   	(1054, 411)
-				label      	(object SegLabel @21
-				    Parent_View 	@20
-				    location   	(1054, 352)
+			    (object AssociationViewNew "$UNNAMED$9" @15
+				location   	(1054, 424)
+				label      	(object SegLabel @16
+				    Parent_View 	@15
+				    location   	(1054, 365)
 				    font       	(object Font
 					italics    	TRUE)
 				    hidden     	TRUE
@@ -612,12 +569,12 @@
 				line_color 	3342489
 				quidu      	"4362A44B0298"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$13" @22
-					Parent_View 	@20
-					location   	(-93, -395)
-					label      	(object SegLabel @23
-					    Parent_View 	@22
-					    location   	(1013, 281)
+				    (object RoleView "$UNNAMED$10" @17
+					Parent_View 	@15
+					location   	(-93, -382)
+					label      	(object SegLabel @18
+					    Parent_View 	@17
+					    location   	(1013, 304)
 					    hidden     	TRUE
 					    anchor     	1
 					    anchor_loc 	1
@@ -631,15 +588,15 @@
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A44C01AA"
-					client     	@20
-					supplier   	@15
+					client     	@15
+					supplier   	@14
 					line_style 	0)
-				    (object RoleView "$UNNAMED$14" @24
-					Parent_View 	@20
-					location   	(-93, -395)
-					label      	(object SegLabel @25
-					    Parent_View 	@24
-					    location   	(1013, 509)
+				    (object RoleView "$UNNAMED$11" @19
+					Parent_View 	@15
+					location   	(-93, -382)
+					label      	(object SegLabel @20
+					    Parent_View 	@19
+					    location   	(1013, 513)
 					    hidden     	TRUE
 					    anchor     	1
 					    anchor_loc 	1
@@ -653,12 +610,12 @@
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A44C01AB"
-					client     	@20
-					supplier   	@4
+					client     	@15
+					supplier   	@3
 					line_style 	0
-					label      	(object SegLabel @26
-					    Parent_View 	@24
-					    location   	(1011, 558)
+					label      	(object SegLabel @21
+					    Parent_View 	@19
+					    location   	(1011, 559)
 					    anchor     	2
 					    anchor_loc 	1
 					    nlines     	1
@@ -668,41 +625,41 @@
 					    pctDist    	0.899471
 					    height     	44
 					    orientation 	1))))
-			    (object AssociationViewNew "$UNNAMED$9" @27
-				location   	(1666, 248)
+			    (object AssociationViewNew "$UNNAMED$6" @22
+				location   	(1804, 247)
 				stereotype 	TRUE
 				line_color 	3342489
 				quidu      	"4362A448026C"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$10" @28
-					Parent_View 	@27
-					location   	(860, -558)
+				    (object RoleView "$UNNAMED$7" @23
+					Parent_View 	@22
+					location   	(998, -559)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A4490105"
-					client     	@27
-					supplier   	@15
+					client     	@22
+					supplier   	@14
 					line_style 	3
-					origin_attachment 	(1667, 247)
-					terminal_attachment 	(1158, 247))
-				    (object RoleView "$UNNAMED$11" @29
-					Parent_View 	@27
-					location   	(860, -558)
+					origin_attachment 	(1804, 247)
+					terminal_attachment 	(1240, 247))
+				    (object RoleView "$UNNAMED$8" @24
+					Parent_View 	@22
+					location   	(998, -559)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A4490106"
-					client     	@27
-					supplier   	@9
+					client     	@22
+					supplier   	@8
 					vertices   	(list Points
-					    (1667, 247)
+					    (1804, 247)
 					    (1972, 247)
 					    (1972, 644))
 					line_style 	3
-					origin_attachment 	(1667, 247)
+					origin_attachment 	(1804, 247)
 					terminal_attachment 	(1972, 644)
-					label      	(object SegLabel @30
-					    Parent_View 	@29
-					    location   	(2031, 380)
+					label      	(object SegLabel @25
+					    Parent_View 	@24
+					    location   	(2031, 431)
 					    anchor     	2
 					    anchor_loc 	1
 					    nlines     	1
@@ -712,13 +669,13 @@
 					    pctDist    	0.625538
 					    height     	59
 					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::config::Command" @31
+			    (object ClassView "Class" "Logical View::config::Command" @26
 				ShowCompartmentStereotypes 	TRUE
 				IncludeAttribute 	TRUE
 				IncludeOperation 	TRUE
 				location   	(186, 217)
 				label      	(object ItemLabel
-				    Parent_View 	@31
+				    Parent_View 	@26
 				    location   	(63, 86)
 				    fill_color 	13434879
 				    nlines     	1
@@ -729,35 +686,43 @@
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"4362A2EC01FE"
+				compartment 	(object Compartment
+				    Parent_View 	@26
+				    location   	(63, 146)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	4
+				    max_width  	253)
 				width      	264
 				height     	286
 				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$6" @32
+			    (object AssociationViewNew "$UNNAMED$3" @27
 				location   	(186, 523)
 				stereotype 	TRUE
 				line_color 	3342489
 				quidu      	"4362A3D302FA"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$7" @33
-					Parent_View 	@32
+				    (object RoleView "$UNNAMED$4" @28
+					Parent_View 	@27
 					location   	(-279, -500)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A3D40143"
-					client     	@32
-					supplier   	@31
+					client     	@27
+					supplier   	@26
 					line_style 	0)
-				    (object RoleView "$UNNAMED$8" @34
-					Parent_View 	@32
+				    (object RoleView "$UNNAMED$5" @29
+					Parent_View 	@27
 					location   	(-279, -500)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A3D40144"
-					client     	@32
-					supplier   	@14
+					client     	@27
+					supplier   	@13
 					line_style 	0
-					label      	(object SegLabel @35
-					    Parent_View 	@34
+					label      	(object SegLabel @30
+					    Parent_View 	@29
 					    location   	(241, 600)
 					    anchor     	2
 					    anchor_loc 	1
@@ -768,37 +733,37 @@
 					    pctDist    	0.473684
 					    height     	55
 					    orientation 	0))))
-			    (object AssociationViewNew "$UNNAMED$0" @36
-				location   	(634, 212)
+			    (object AssociationViewNew "$UNNAMED$0" @31
+				location   	(593, 212)
 				stereotype 	TRUE
 				line_color 	3342489
 				quidu      	"4362A3030323"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$1" @37
-					Parent_View 	@36
-					location   	(200, -470)
+				    (object RoleView "$UNNAMED$1" @32
+					Parent_View 	@31
+					location   	(159, -470)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A3040108"
-					client     	@36
-					supplier   	@15
+					client     	@31
+					supplier   	@14
 					line_style 	3
-					origin_attachment 	(634, 212)
-					terminal_attachment 	(950, 212))
-				    (object RoleView "$UNNAMED$2" @38
-					Parent_View 	@36
-					location   	(200, -470)
+					origin_attachment 	(593, 212)
+					terminal_attachment 	(868, 212))
+				    (object RoleView "$UNNAMED$2" @33
+					Parent_View 	@31
+					location   	(159, -470)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"4362A3040109"
-					client     	@36
-					supplier   	@31
+					client     	@31
+					supplier   	@26
 					line_style 	3
-					origin_attachment 	(634, 212)
+					origin_attachment 	(593, 212)
 					terminal_attachment 	(318, 212)
-					label      	(object SegLabel @39
-					    Parent_View 	@38
-					    location   	(371, 260)
+					label      	(object SegLabel @34
+					    Parent_View 	@33
+					    location   	(365, 260)
 					    anchor     	2
 					    anchor_loc 	1
 					    nlines     	1
@@ -808,13 +773,13 @@
 					    pctDist    	0.831858
 					    height     	48
 					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::config::ResultDescriptor" @40
+			    (object ClassView "Class" "Logical View::config::ResultDescriptor" @35
 				ShowCompartmentStereotypes 	TRUE
 				IncludeAttribute 	TRUE
 				IncludeOperation 	TRUE
 				location   	(465, 1240)
 				label      	(object ItemLabel
-				    Parent_View 	@40
+				    Parent_View 	@35
 				    location   	(248, 1084)
 				    fill_color 	13434879
 				    nlines     	1
@@ -825,24 +790,32 @@
 				line_color 	3342489
 				fill_color 	13434879
 				quidu      	"437B57EF0008"
+				compartment 	(object Compartment
+				    Parent_View 	@35
+				    location   	(248, 1144)
+				    icon_style 	"Icon"
+				    fill_color 	16777215
+				    anchor     	2
+				    nlines     	5
+				    max_width  	440)
 				width      	452
 				height     	336
 				annotation 	8
 				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$21" @41
+			    (object AssociationViewNew "$UNNAMED$18" @36
 				location   	(484, 626)
 				stereotype 	TRUE
 				line_color 	3342489
 				quidu      	"437B59A10066"
 				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$22" @42
-					Parent_View 	@41
+				    (object RoleView "$UNNAMED$19" @37
+					Parent_View 	@36
 					location   	(50, -614)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"437B59A30145"
-					client     	@41
-					supplier   	@31
+					client     	@36
+					supplier   	@26
 					vertices   	(list Points
 					    (484, 626)
 					    (484, 347)
@@ -850,19 +823,19 @@
 					line_style 	3
 					origin_attachment 	(484, 626)
 					terminal_attachment 	(318, 347))
-				    (object RoleView "$UNNAMED$23" @43
-					Parent_View 	@41
+				    (object RoleView "$UNNAMED$20" @38
+					Parent_View 	@36
 					location   	(50, -614)
 					stereotype 	TRUE
 					line_color 	3342489
 					quidu      	"437B59A30146"
-					client     	@41
-					supplier   	@40
+					client     	@36
+					supplier   	@35
 					line_style 	3
 					origin_attachment 	(484, 626)
 					terminal_attachment 	(484, 1072)
-					label      	(object SegLabel @44
-					    Parent_View 	@43
+					label      	(object SegLabel @39
+					    Parent_View 	@38
 					    location   	(538, 1027)
 					    anchor     	2
 					    anchor_loc 	1
@@ -883,10 +856,10 @@
 		origin_x   	0
 		origin_y   	0
 		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::config" @45
+		    (object CategoryView "Logical View::config" @40
 			location   	(682, 589)
 			label      	(object ItemLabel
-			    Parent_View 	@45
+			    Parent_View 	@40
 			    location   	(538, 505)
 			    fill_color 	13434879
 			    nlines     	2

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java Wed Jun  7 13:00:47 2006
@@ -47,6 +47,7 @@
     public void testReadCompanies() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CompanyConfig.xml"));
+        commandGroup.setConnection(getConnection());
         Command read = commandGroup.getCommand("all companies");
         DataObject root = read.executeQuery(); 
         assertEquals(3, root.getList("COMPANY").size());
@@ -57,6 +58,7 @@
     public void testReadCompaniesWithDepartments() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CompanyConfig.xml"));
+        commandGroup.setConnection(getConnection());
         Command read = commandGroup.getCommand("all companies and departments");
         DataObject root = read.executeQuery(); 
         DataObject firstCompany = root.getDataObject("COMPANY[1]");
@@ -68,6 +70,7 @@
     public void testddDepartmentToFirstCompany() throws Exception {
         
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CompanyConfig.xml"));
+        commandGroup.setConnection(getConnection());
         Command read = commandGroup.getCommand("all companies and departments");
         DataObject root = read.executeQuery();
         DataObject firstCustomer = root.getDataObject("COMPANY[1]");
@@ -92,6 +95,7 @@
     public void testFlushCreateHeirarchy() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CompanyConfig.xml"));
+        commandGroup.setConnection(getConnection());
         Command select = commandGroup.getCommand("all companies and departments");
         select.setConnection(getConnection());
         DataObject root = select.executeQuery();
@@ -136,6 +140,7 @@
     public void testGetEmptyGraph() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CompanyConfig.xml"));
+        commandGroup.setConnection(getConnection());
 
         Command select = commandGroup.getCommand("company by id with departments");
         Integer idOfNoExistingCompany = new Integer(-1);

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java Wed Jun  7 13:00:47 2006
@@ -99,7 +99,8 @@
     public void testReadWithParmmarker() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CustOrdersConnectionProps.xml"));
-
+        commandGroup.setConnection(getConnection());
+        
         Command read = commandGroup.getCommand("order by id with ?");
         read.setParameterValue(1, new Integer(1));
         DataObject root = read.executeQuery();
@@ -114,7 +115,8 @@
     public void testReadWithConnectionProperties() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CustOrdersConnectionProps.xml"));
-
+        commandGroup.setConnection(getConnection());
+        
         Command read = commandGroup.getCommand("all customers");
         DataObject root = read.executeQuery();
 
@@ -128,7 +130,8 @@
     public void testUpdate() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CustOrdersConnectionProps.xml"));
-
+        commandGroup.setConnection(getConnection());
+        
         Command read = commandGroup.getCommand("all customers");
         DataObject root = read.executeQuery();
         // Verify precondition

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java Wed Jun  7 13:00:47 2006
@@ -219,7 +219,8 @@
     public void testUpdateChildThatHasGeneratedKey() throws Exception {
 
         CommandGroup commandGroup = CommandGroup.FACTORY.createCommandGroup(getConfig("CompanyConfig.xml"));
-
+        commandGroup.setConnection(getConnection());
+        
         // Read a specific company based on the known ID
         Command readCust = commandGroup.getCommand("all companies and departments");
         DataObject root = readCust.executeQuery();

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=412513&r1=412512&r2=412513&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 Wed Jun  7 13:00:47 2006
@@ -63,6 +63,7 @@
 
     }
 
+
     public void testMissingMapping() throws Exception {
         Command readCustomers = Command.FACTORY.createCommand("select * from CUSTOMER where ID = 1");
         readCustomers.setConnection(getConnection());

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java Wed Jun  7 13:00:47 2006
@@ -46,6 +46,7 @@
 
         CommandGroup commandGroup = CommandGroup.FACTORY
                 .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+        commandGroup.setConnection(getConnection());
 
         Command read = commandGroup.getCommand("get companies with employee of the month");
         DataObject root = read.executeQuery();
@@ -62,6 +63,7 @@
 
         CommandGroup commandGroup = CommandGroup.FACTORY
                 .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+        commandGroup.setConnection(getConnection());
 
         Command read = commandGroup.getCommand("get named employee with company");
         read.setParameterValue("NAME", "Mary Smith");
@@ -79,6 +81,7 @@
 
         CommandGroup commandGroup = CommandGroup.FACTORY
                 .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+        commandGroup.setConnection(getConnection());
 
         Command read = commandGroup.getCommand("get companies with employee of the month");
         DataObject root = read.executeQuery();
@@ -102,6 +105,7 @@
 
         CommandGroup commandGroup = CommandGroup.FACTORY
                 .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+        commandGroup.setConnection(getConnection());
 
         Command read = commandGroup.getCommand("get companies with employee of the month");
         DataObject root = read.executeQuery();
@@ -126,6 +130,7 @@
 
         CommandGroup commandGroup = CommandGroup.FACTORY
                 .createCommandGroup(getConfig("CompanyEmployeeConfig.xml"));
+        commandGroup.setConnection(getConnection());
 
         Command read = commandGroup.getCommand("get companies with employee of the month");
         DataObject root = read.executeQuery();

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java Wed Jun  7 13:00:47 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.tuscany.das.rdb.test;
 
+import java.util.Iterator;
+
 import org.apache.tuscany.das.rdb.ApplyChangesCommand;
 import org.apache.tuscany.das.rdb.Command;
 import org.apache.tuscany.das.rdb.ConfigHelper;
@@ -25,6 +27,7 @@
 import org.apache.tuscany.das.rdb.test.framework.DasTest;
 
 import commonj.sdo.DataObject;
+import commonj.sdo.Property;
 
 /**
  * Tests the Converter framwork
@@ -139,7 +142,7 @@
 
         DataObject root = select.executeQuery();
         
-        DataObject newBook = root.createDataObject("Book");
+        DataObject newBook = root.createDataObject("Book");     
         newBook.setString("NAME", "Ant Colonies of the Old World");
         newBook.setInt("BOOK_ID", 1001);
         root.getList("Book").add(newBook);

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java Wed Jun  7 13:00:47 2006
@@ -34,17 +34,17 @@
 		mapping = factory.createConfig();
 		Table t = factory.createTable();
 		Column id = factory.createColumn();
-		id.setName("ID");
+		id.setColumnName("ID");
 		id.setPrimaryKey(true);
 		Column lastname = factory.createColumn();
-		lastname.setName("LASTNAME");
+		lastname.setColumnName("LASTNAME");
 		Column address = factory.createColumn();
-		address.setName("ADDRESS");
+		address.setColumnName("ADDRESS");
 		
 		t.getColumn().add(id);
 		t.getColumn().add(lastname);
 		t.getColumn().add(address);
-		t.setName("CUSTOMER");
+		t.setTableName("CUSTOMER");
 		mapping.getTable().add(t);
 	}
 	

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java Wed Jun  7 13:00:47 2006
@@ -34,17 +34,17 @@
 		mapping = factory.createConfig();
 		Table t = factory.createTable();
 		Column id = factory.createColumn();
-		id.setName("ID");
+		id.setColumnName("ID");
 		id.setPrimaryKey(true);
 		Column lastname = factory.createColumn();
-		lastname.setName("LASTNAME");
+		lastname.setColumnName("LASTNAME");
 		Column address = factory.createColumn();
-		address.setName("ADDRESS");
+		address.setColumnName("ADDRESS");
 	
 		t.getColumn().add(id);
 		t.getColumn().add(lastname);
 		t.getColumn().add(address);
-		t.setName("CUSTOMER");
+		t.setTableName("CUSTOMER");
 		mapping.getTable().add(t);
 	}
 	

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=412513&r1=412512&r2=412513&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 Wed Jun  7 13:00:47 2006
@@ -37,18 +37,18 @@
 		mapping = factory.createConfig();
 		Table t = factory.createTable();
 		Column id = factory.createColumn();
-		id.setName("ID");
+		id.setColumnName("ID");
 		id.setPrimaryKey(true);
 		Column lastname = factory.createColumn();
-		lastname.setName("LASTNAME");
+		lastname.setColumnName("LASTNAME");
 		Column address = factory.createColumn();
-		address.setName("ADDRESS");
+		address.setColumnName("ADDRESS");
 		
 		t.getColumn().add(id);
 		t.getColumn().add(lastname);
 		t.getColumn().add(address);
-		t.setName("CUSTOMER");
-		t.setPropertyName("Customer");
+		t.setTableName("CUSTOMER");
+		t.setTypeName("Customer");
 		mapping.getTable().add(t);
 	}
 	

Modified: incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java?rev=412513&r1=412512&r2=412513&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java (original)
+++ incubator/tuscany/java/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java Wed Jun  7 13:00:47 2006
@@ -43,17 +43,17 @@
 		mapping = factory.createConfig();
 		Table t = factory.createTable();
 		Column id = factory.createColumn();
-		id.setName("ID");
+		id.setColumnName("ID");
 		id.setPrimaryKey(true);
 		Column lastname = factory.createColumn();
-		lastname.setName("LASTNAME");
+		lastname.setColumnName("LASTNAME");
 		Column address = factory.createColumn();
-		address.setName("ADDRESS");
+		address.setColumnName("ADDRESS");
 	
 		t.getColumn().add(id);
 		t.getColumn().add(lastname);
 		t.getColumn().add(address);
-		t.setName("CUSTOMER");
+		t.setTableName("CUSTOMER");
 		mapping.getTable().add(t);
 	}
 

Modified: incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/test/resources/1xM_mapping_no_cud.xml?rev=412513&r1=412512&r2=412513&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 Jun  7 13:00:47 2006
@@ -16,13 +16,13 @@
  -->
 <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"/>
+  <Table tableName="CUSTOMER" typeName="Customer">
+    <Column columnName="ID" propertyName="iD" primaryKey="true"/>
   </Table>
   
-  <Table name="ANORDER" propertyName="AnOrder">
-  	<Column name="CUSTOMER_ID" propertyName="customerID"/>
-    <Column name="ID" propertyName="iD" primaryKey="true"/>
+  <Table tableName="ANORDER" typeName="AnOrder">
+  	<Column columnName="CUSTOMER_ID" propertyName="customerID"/>
+    <Column columnName="ID" propertyName="iD" primaryKey="true"/>
   </Table>
 	
   <Relationship name="orders" primaryKeyTable="CUSTOMER" foreignKeyTable="ANORDER" many="true">



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message