Index: testdata/testMark.vdb
===================================================================
RCS file: /cvs/dev/test.metamatrix.metamodels.builder/testdata/Attic/testMark.vdb,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 testMark.vdb
Binary files /tmp/cvsR3444H and testMark.vdb differ
Index: testdata/admin/config/testMark.vdb
===================================================================
RCS file: /cvs/dev/test.metamatrix.metamodels.builder/testdata/admin/config/Attic/testMark.vdb,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 testMark.vdb
Binary files /tmp/cvsJwKTvm and testMark.vdb differ
Index: testsrc/com/metamatrix/metamodels/builder/translator/TestRecordGenerator.java
===================================================================
RCS file: /cvs/dev/test.metamatrix.metamodels.builder/testsrc/com/metamatrix/metamodels/builder/translator/Attic/TestRecordGenerator.java,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 TestRecordGenerator.java
--- testsrc/com/metamatrix/metamodels/builder/translator/TestRecordGenerator.java	10 Jul 2006 18:56:49 -0000	1.1.6.1
+++ testsrc/com/metamatrix/metamodels/builder/translator/TestRecordGenerator.java	9 Apr 2007 20:42:19 -0000
@@ -324,9 +324,12 @@
     			fail("ModelRecords created: "+recordList.size()+";  Expected: 1");
     		}
     		ModelRecord record1 = (ModelRecord)recordList.get(0);
-    		if(!record1.getModelName().equals("MyGeneratedModel")) {
-    			fail("Record 1 didnt match the expected modelName");
-    		}
+            if(!record1.getModelName().equals("MyGeneratedModel")) {
+                fail("Record 1 didnt match the expected modelName");
+            }
+            if(!record1.getModelNameInSource().equals("TestNIS")) {
+                fail("Record 1 didnt match the expected model NameInSource");
+            }
             cleanupVDB(admin, VDB_NAME, "1");
         } catch (Exception x) {
             fail("Failed with exception " + getStackTraceAsString(x)); //$NON-NLS-1$
Index: testsrc/com/metamatrix/metamodels/internal/builder/TestModelBuilderImpl.java
===================================================================
RCS file: /cvs/dev/test.metamatrix.metamodels.builder/testsrc/com/metamatrix/metamodels/internal/builder/Attic/TestModelBuilderImpl.java,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 TestModelBuilderImpl.java
--- testsrc/com/metamatrix/metamodels/internal/builder/TestModelBuilderImpl.java	10 Jul 2006 18:56:49 -0000	1.1.6.1
+++ testsrc/com/metamatrix/metamodels/internal/builder/TestModelBuilderImpl.java	9 Apr 2007 20:42:19 -0000
@@ -207,6 +207,7 @@
     	ModelRecord record = new ModelRecord();
         record.setLocationPath(TEST_MODEL_LOCATION);
         record.setModelName("TestRelationalPhysicalModel");
+        record.setModelNameInSource("TestNIS");
         record.setModelType("Relational");
         record.setModelSubType("Physical");
         record.setModelDescription("Here is the relational physical description");
@@ -228,6 +229,7 @@
         ModelRecord record = new ModelRecord();
         record.setLocationPath(TEST_MODEL_LOCATION);
         record.setModelName("TestRelationalPhysicalModel");
+        record.setModelNameInSource("TestNIS");
         record.setModelType("Relational");
         record.setModelSubType("Physical");
         record.setModelDescription("Here is the relational physical description");