[Modeling-cvs] ProjectModeling/Modeling/tests/xmlmodels model_StoreEmployees2.xml,NONE,1.1 model_StoreEmployees3.xml,NONE,1.1 model_StoreEmployees.xml2,1.2,NONE model_StoreEmployees.xml3,1.2,NONE

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels
In directory sc8-pr-cvs1:/tmp/cvs-serv3358/xmlmodels

Added Files:
	model_StoreEmployees2.xml model_StoreEmployees3.xml 
Removed Files:
	model_StoreEmployees.xml2 model_StoreEmployees.xml3 
Log Message:
Renamed model.xml2/3 to model2/3.xml

--- NEW FILE: model_StoreEmployees2.xml ---
<?xml version='1.0' encoding='iso-8859-1'?>
<model name='StoreEmployees' packageName='StoreEmployees' adaptorName='' connectionDictionary="{'database': 'STORE_EMPLOYEES', 'user': '', 'password': '', 'host': ''}">
  <entity isReadOnly='0' isAbstract='0' name='Store' parentEntity='' moduleName='Store' className='Store' typeName='' externalName='STORE'>
    <primaryKey attributeName='id'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='30' columnName='CORPORATE_NAME' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' name='corporateName' scale='0' type='string' displayLabel=''/>
    <relation deleteRule='1' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Employee' name='employees' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkStoreId'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Employee' parentEntity='' moduleName='Employee' className='Employee' typeName='' externalName='EMPLOYEE'>
    <primaryKey attributeName='id'/>
    <attributesUsedForLocking attributeName='lastName'/>
    <attributesUsedForLocking attributeName='firstName'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='50' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_STORE_ID' isRequired='0' precision='0' defaultValue='None' externalType='integer' name='fkStoreId' scale='0' type='int' displayLabel=''/>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Address' name='toAddresses' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
    </relation>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Store' name='toStore' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkStoreId' destinationAttribute='id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Address' parentEntity='' moduleName='Address' className='Address' typeName='' externalName='ADDRESS'>
    <primaryKey attributeName='id'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='80' columnName='STREET' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='street' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='10' columnName='ZIP_CODE' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='zipCode' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='30' columnName='TOWN' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='town' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_EMPLOYEE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='fkEmployeeId' scale='0' type='int' displayLabel=''/>
    <relation deleteRule='1' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Employee' name='toEmployee' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkEmployeeId' destinationAttribute='id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='SalesClerk' parentEntity='Employee' moduleName='Employees' className='SalesClerk' typeName='' externalName='SALES_CLERK'>
    <primaryKey attributeName='id'/>
    <attributesUsedForLocking attributeName='lastName'/>
    <attributesUsedForLocking attributeName='firstName'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='50' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_STORE_ID' isRequired='0' precision='0' defaultValue='' externalType='integer' name='fkStoreId' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='STORE_AREA' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='storeArea' scale='0' type='string' displayLabel=''/>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Address' name='toAddresses' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
    </relation>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Store' name='toStore' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkStoreId' destinationAttribute='id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Executive' parentEntity='Employee' moduleName='Employees' className='Executive' typeName='' externalName='EXECUTIVE'>
    <primaryKey attributeName='id'/>
    <attributesUsedForLocking attributeName='lastName'/>
    <attributesUsedForLocking attributeName='firstName'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='50' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_STORE_ID' isRequired='0' precision='0' defaultValue='' externalType='integer' name='fkStoreId' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='5' columnName='OFFICE_LOCATION' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='officeLocation' scale='0' type='string' displayLabel=''/>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Address' name='toAddresses' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
    </relation>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Store' name='toStore' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkStoreId' destinationAttribute='id'/>
    </relation>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Mark' name='marks' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='FK_Executive_id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Mark' parentEntity='' moduleName='Mark' className='Mark' typeName='' externalName='MARK'>
    <primaryKey attributeName='id'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='0' columnName='MONTH' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='month' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='0' columnName='MARK' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='mark' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_EXECUTIVE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='FK_Executive_id' scale='0' type='int' displayLabel=''/>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Executive' name='executive' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='FK_Executive_id' destinationAttribute='id'/>
    </relation>
  </entity>
</model>

--- NEW FILE: model_StoreEmployees3.xml ---
<?xml version='1.0' encoding='iso-8859-1'?>
<model name='StoreEmployees' packageName='StoreEmployees' adaptorName='' connectionDictionary="{'database': 'STORE_EMPLOYEES', 'user': '', 'password': '', 'host': ''}">
  <entity isReadOnly='0' isAbstract='0' name='Store' parentEntity='' moduleName='Store' className='Store' typeName='' externalName='STORE'>
    <primaryKey attributeName='id'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='30' columnName='CORPORATE_NAME' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' name='corporateName' scale='0' type='string' displayLabel=''/>
    <relation deleteRule='1' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Employee' name='employees' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkStoreId'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Employee' parentEntity='' moduleName='Employees' className='Employee' typeName='' externalName='EMPLOYEE'>
    <primaryKey attributeName='id'/>
    <attributesUsedForLocking attributeName='lastName'/>
    <attributesUsedForLocking attributeName='firstName'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='50' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_STORE_ID' isRequired='0' precision='0' defaultValue='None' externalType='integer' name='fkStoreId' scale='0' type='int' displayLabel=''/>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Address' name='toAddresses' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
    </relation>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Store' name='toStore' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkStoreId' destinationAttribute='id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Address' parentEntity='' moduleName='Address' className='Address' typeName='' externalName='ADDRESS'>
    <primaryKey attributeName='id'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='80' columnName='STREET' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='street' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='10' columnName='ZIP_CODE' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='zipCode' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='30' columnName='TOWN' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='town' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_EMPLOYEE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='fkEmployeeId' scale='0' type='int' displayLabel=''/>
    <relation deleteRule='1' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Employee' name='toEmployee' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkEmployeeId' destinationAttribute='id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='SalesClerk' parentEntity='Employee' moduleName='Employees' className='SalesClerk' typeName='' externalName='SALES_CLERK'>
    <primaryKey attributeName='id'/>
    <attributesUsedForLocking attributeName='lastName'/>
    <attributesUsedForLocking attributeName='firstName'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='50' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_STORE_ID' isRequired='0' precision='0' defaultValue='' externalType='integer' name='fkStoreId' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='STORE_AREA' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='storeArea' scale='0' type='string' displayLabel=''/>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Address' name='toAddresses' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
    </relation>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Store' name='toStore' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkStoreId' destinationAttribute='id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Executive' parentEntity='Employee' moduleName='Employees' className='Executive' typeName='' externalName='EXECUTIVE'>
    <primaryKey attributeName='id'/>
    <attributesUsedForLocking attributeName='lastName'/>
    <attributesUsedForLocking attributeName='firstName'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='50' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='1' width='20' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_STORE_ID' isRequired='0' precision='0' defaultValue='' externalType='integer' name='fkStoreId' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='5' columnName='OFFICE_LOCATION' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='officeLocation' scale='0' type='string' displayLabel=''/>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Address' name='toAddresses' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
    </relation>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Store' name='toStore' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='fkStoreId' destinationAttribute='id'/>
    </relation>
    <relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Mark' name='marks' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='id' destinationAttribute='FK_Executive_id'/>
    </relation>
  </entity>
  <entity isReadOnly='0' isAbstract='0' name='Mark' parentEntity='' moduleName='Mark' className='Mark' typeName='' externalName='MARK'>
    <primaryKey attributeName='id'/>
    <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='0' columnName='MONTH' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='month' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='1' width='0' columnName='MARK' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='mark' scale='0' type='int' displayLabel=''/>
    <attribute isClassProperty='0' width='0' columnName='FK_EXECUTIVE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='FK_Executive_id' scale='0' type='int' displayLabel=''/>
    <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Executive' name='executive' displayLabel='' joinSemantic='0'>
      <join sourceAttribute='FK_Executive_id' destinationAttribute='id'/>
    </relation>
  </entity>
</model>

--- model_StoreEmployees.xml2 DELETED ---

--- model_StoreEmployees.xml3 DELETED ---