Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2012-08-23 09:16:19 +0000
committerMartin Taal2012-08-23 09:16:19 +0000
commit58e8a504aad68d6ff5b33b29bba2422d28ecdbaa (patch)
tree0ae8b994e4a7951dc6da61cc60a9ca832bf15d41
parentdfb7c88e1e8a7c72b7b7306b5d34328db4a71178 (diff)
downloadorg.eclipse.emf.texo-58e8a504aad68d6ff5b33b29bba2422d28ecdbaa.tar.gz
org.eclipse.emf.texo-58e8a504aad68d6ff5b33b29bba2422d28ecdbaa.tar.xz
org.eclipse.emf.texo-58e8a504aad68d6ff5b33b29bba2422d28ecdbaa.zip
Make Texo tests run with juno and latest hsqldb and eclipselink
-rwxr-xr-xcore/org.eclipse.emf.texo.datagenerator/src/org/eclipse/emf/texo/datagenerator/attributegenerators/BigDecimalDataGenerator.java4
-rwxr-xr-xgenerator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java36
-rwxr-xr-xgenerator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java7
-rwxr-xr-xgenerator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EReferenceORMAnnotator.java2
-rw-r--r--generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EStructuralFeatureORMAnnotator.java6
-rwxr-xr-xgenerator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/ORMNamingStrategy.java6
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch2
-rwxr-xr-xtests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF6
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch4
-rwxr-xr-xtests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/DataGenCompareModelJPATest.java15
-rwxr-xr-xtests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/ORMGeneratorTest.java1
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/samples/SingleDataGenCompareModelJPATest.java36
-rw-r--r--tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF14
-rw-r--r--tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/NotRequiredSerialization-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz306546-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz325427-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz352285-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369476-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369931-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369962-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz371509-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz378087-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz379815-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz380279-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/main-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/model-orm.xml37
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz378642-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz379796-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/test-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/accounting-orm.xml8
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/emapsample-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/epo2-orm.xml6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/extlibrary-orm.xml5
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/interfaces-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/inv-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/kdm-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/mm-orm.xml13
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/music-orm.xml5
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.capa-orm.xml7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.catalog-orm.xml5
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.claim-orm.xml6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.employee-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.featuremaptest-orm.xml4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.forum-orm.xml4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.jpamixed-orm.xml6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.play-orm.xml13
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.rental-orm.xml5
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.schemaprimerpo-orm.xml7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.sunBooks-orm.xml5
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/types-orm.xml6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/workflow-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/duration-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.anytype-orm.xml8
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.attributes-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.datetime-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.documentroot-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs-orm.xml10
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.emap-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.groupall-orm.xml11
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.include-orm.xml2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.list-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.listunion-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.mixed-orm.xml6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup-orm.xml7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.qname-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.restriction-orm.xml1
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap-orm.xml4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes-orm.xml5
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitution-orm.xml9
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon-orm.xml6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.request-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.response-orm.xml3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/ActionType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/Parameter.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/QueryType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/request.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ErrorType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResponseType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResultType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/response.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/base/identifiable/identifiable.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassA.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassB.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/bz325427.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Address.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Contact.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Person.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/test.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Address.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Car.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarModel.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarPassport.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarProducer.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarRegInfo.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Contract.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/ContractPackage.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Coordinates.java6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Document.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/DrivingLicense.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Event.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Message.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Passport.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentInfo.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentItem.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Person.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Phone.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Price.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SecretQuestion.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Service.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCard.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCardXSimContract.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimContract.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Tariff.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Units.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/User.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/UserGroup.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/VolumePayment.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/model.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/Abstract.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/bz352285.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/Test.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/bz369476.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/Formula.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/bz369931.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369962/Mother.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass0.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass1.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/bz371509.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/Test.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/bz378087.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/PriceType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/bz378642.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/PriceType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/bz379796.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarConditionType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarInputType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarPolicyTypeType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/bz379815.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/BZ380279.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/bz380279.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/MySerializableClass.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/bz306546.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/NotRequiredSerialization.ecore6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/SerializationTest.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/MainType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/main.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub1/Sub1Type.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub2/Sub2Type.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Account.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountGroup.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountingClass.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalGroup.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalStatement.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Report.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/ReportGroup.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Vat.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/accounting.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/CapacityEntry.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Machine.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/MachineList.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Production.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Task.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkDay.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkWeek.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/capa.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/CatalogType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/PriceType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/ProductType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/StringType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/SupplierType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/catalog.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/Claim.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimCompositeKey.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLine.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLineCompositeKey.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/claim.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Book.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/BookStore.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Writer.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/emapsample.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Department.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Employee.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/employee.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Address.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Customer.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/GlobalLocation.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Item.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/PurchaseOrder.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Supplier.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/epo2.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Addressable.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Item.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Lendable.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Library.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Person.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/extlibrary.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/PurchaseOrder.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/Supplier.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/featuremaptest.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Forum.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Member.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Post.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Topic.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/forum.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/Describable.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableConcrete.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableIdentifiableConcrete.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiableConcrete.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiedType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/interfaces.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PDeclaration.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/inv.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/LetterBodyType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/SalutationType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/jpamixed.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Album.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Artist.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Country.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Genre.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Song.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/music.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/ActType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/FmType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaGroupType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaeType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PlayType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SceneType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SpeechType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/play.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalBusiness.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalCarDriver.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContract.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContractLine.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalUnit.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/rental.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/Item.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/PurchaseOrder.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/USAddress.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/schemaprimerpo.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/Asset.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/schoollibrary.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/AuthorsType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BookType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BooksType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/CollectionType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/PromotionType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/sunBooks.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/ManyTypes.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/SingleTypes.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/types.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/WorkflowElement.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/workflow.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/A.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/B.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/C.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/TestAny.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/anytype.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/AType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/RType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/attributes.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/TestDate.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/datetime.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/ComplexType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/documentroot.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/DurationTest.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/duration.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Element.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Feature.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Mixed.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/NameList.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/ecoreattrs.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Book.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/BookStore.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Writer.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/emap.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressGroupType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressList.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllMapType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/groupall.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include1.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include2.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/include.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/StatesByCountry.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/list.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/StatesByCountry.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/listunion.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/LetterBodyType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/SalutationType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/mixed.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/A.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/CType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/Element.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/nestedgroup.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/Mytest.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/qname.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/XMLDeviant.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/restriction.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/Person.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/simplechoice.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/PurchaseOrder.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/Supplier.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/simplefeaturemap.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleList.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleType.java4
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleTypeObject.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/simpletypes.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/ComplexNumber.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/MultiNumberType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/NumberType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/substitution.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/ComplexAAA.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/RootType.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/substitutionzvon.ecore3
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/xml/model/texoextensions/texoExtensions.ecore7
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/Property.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/PropertyContainer.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/StyleContainer.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AbstractStyle.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AdaptedGradientColoredAreas.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Color.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Font.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredArea.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredAreas.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredLocation.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Point.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/PrecisionPoint.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/RenderingStyle.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore6
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/core/Element.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/kdm.ecore6
-rw-r--r--tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF1
337 files changed, 927 insertions, 300 deletions
diff --git a/core/org.eclipse.emf.texo.datagenerator/src/org/eclipse/emf/texo/datagenerator/attributegenerators/BigDecimalDataGenerator.java b/core/org.eclipse.emf.texo.datagenerator/src/org/eclipse/emf/texo/datagenerator/attributegenerators/BigDecimalDataGenerator.java
index cfb5ac84..abbd0fa6 100755
--- a/core/org.eclipse.emf.texo.datagenerator/src/org/eclipse/emf/texo/datagenerator/attributegenerators/BigDecimalDataGenerator.java
+++ b/core/org.eclipse.emf.texo.datagenerator/src/org/eclipse/emf/texo/datagenerator/attributegenerators/BigDecimalDataGenerator.java
@@ -18,6 +18,7 @@
package org.eclipse.emf.texo.datagenerator.attributegenerators;
import java.math.BigDecimal;
+import java.math.MathContext;
import org.eclipse.emf.texo.datagenerator.EDataTypeDataGenerator;
@@ -35,6 +36,7 @@ public class BigDecimalDataGenerator extends EDataTypeDataGenerator {
@Override
protected Object getNextValue() {
index += 0.1;
- return new BigDecimal(index);
+ final BigDecimal bd = new BigDecimal(index, MathContext.DECIMAL32);
+ return bd;
}
} \ No newline at end of file
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java
index fb71c07b..d746f3d4 100755
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EAttributeORMAnnotator.java
@@ -17,6 +17,7 @@
package org.eclipse.emf.texo.orm.annotator;
+import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Date;
@@ -157,7 +158,7 @@ public class EAttributeORMAnnotator extends EStructuralFeatureORMAnnotator imple
featureMapEntity.setName(namingStrategy.getFeatureMapEntityName(eAttribute));
}
- if (isPartOfFeatureMap && FeatureMapUtil.isFeatureMap(eAttribute)) {
+ if (isPartOfFeatureMap) {
if (annotation.getManyToOne() == null) {
annotation.setManyToOne(OrmFactory.eINSTANCE.createManyToOne());
}
@@ -170,13 +171,18 @@ public class EAttributeORMAnnotator extends EStructuralFeatureORMAnnotator imple
if (annotation.getOneToMany() == null) {
annotation.setOneToMany(OrmFactory.eINSTANCE.createOneToMany());
}
- final OneToMany OneToMany = annotation.getOneToMany();
- OneToMany.setTargetEntity(eAttributeModelGen.getFeatureMapQualifiedClassName());
- OneToMany.setCascade(OrmFactory.eINSTANCE.createCascadeType());
- OneToMany.setOrphanRemoval(true);
- OneToMany.getCascade().setCascadeAll(OrmFactory.eINSTANCE.createEmptyType());
- OneToMany.setJoinTable(OrmFactory.eINSTANCE.createJoinTable());
- OneToMany.setName(getName(eAttribute));
+ final OneToMany oneToMany = annotation.getOneToMany();
+ oneToMany.setTargetEntity(eAttributeModelGen.getFeatureMapQualifiedClassName());
+ oneToMany.setCascade(OrmFactory.eINSTANCE.createCascadeType());
+ oneToMany.setOrphanRemoval(true);
+ oneToMany.getCascade().setCascadeAll(OrmFactory.eINSTANCE.createEmptyType());
+ if (oneToMany.getJoinTable() == null) {
+ oneToMany.setJoinTable(OrmFactory.eINSTANCE.createJoinTable());
+ }
+ if (oneToMany.getJoinTable().getName() == null && namingStrategy.isGenerateAllDBSchemaNames()) {
+ oneToMany.getJoinTable().setName(namingStrategy.getJoinTableName(eAttribute));
+ }
+ oneToMany.setName(getName(eAttribute));
}
return;
@@ -186,11 +192,14 @@ public class EAttributeORMAnnotator extends EStructuralFeatureORMAnnotator imple
boolean isLob = false;
boolean isTime = false;
boolean isDate = false;
+ boolean isBigDecimal = false;
if (eDataType.getInstanceClass() != null) {
isLob = eDataType.getInstanceClass().isArray() && eDataType.getInstanceClass().getComponentType() == byte.class;
isTime = Timestamp.class == eDataType.getInstanceClass() || eDataType == XMLTypePackage.eINSTANCE.getDateTime();
isDate = eDataType == XMLTypePackage.eINSTANCE.getDate() || eDataType.getInstanceClass() != null
&& Date.class.isAssignableFrom(eDataType.getInstanceClass());
+ isBigDecimal = BigDecimal.class == eDataType.getInstanceClass()
+ || eDataType == XMLTypePackage.eINSTANCE.getDecimal();
}
final boolean isEnum = eDataType instanceof EEnum;
@@ -210,6 +219,12 @@ public class EAttributeORMAnnotator extends EStructuralFeatureORMAnnotator imple
elementCollection.setTemporal(TemporalType.TIMESTAMP);
} else if (isDate) {
elementCollection.setTemporal(TemporalType.DATE);
+ } else if (isBigDecimal && elementCollection.getColumn() == null
+ && ORMMappingOptions.getDefaultOptions().isTestRun()) {
+ final Column column = OrmFactory.eINSTANCE.createColumn();
+ column.setScale(7);
+ column.setPrecision(15);
+ elementCollection.setColumn(column);
} else if (doAddConverter(eAttributeModelGen)) {
elementCollection.setConvert(ORMUtils.OBJECT_CONVERTER_NAME);
}
@@ -297,6 +312,11 @@ public class EAttributeORMAnnotator extends EStructuralFeatureORMAnnotator imple
basic.setTemporal(TemporalType.TIMESTAMP);
} else if (!basicSet && isDate) {
basic.setTemporal(TemporalType.DATE);
+ } else if (isBigDecimal && basic.getColumn() == null && ORMMappingOptions.getDefaultOptions().isTestRun()) {
+ final Column column = OrmFactory.eINSTANCE.createColumn();
+ column.setScale(7);
+ column.setPrecision(15);
+ basic.setColumn(column);
} else if (doAddConverter(eAttributeModelGen)) {
basic.setConvert(ORMUtils.OBJECT_CONVERTER_NAME);
}
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java
index 5179854b..410b93a2 100755
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EClassORMAnnotator.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.texo.modelgenerator.annotator.GenUtils;
import org.eclipse.emf.texo.modelgenerator.modelannotations.EClassModelGenAnnotation;
import org.eclipse.emf.texo.modelgenerator.modelannotations.ModelcodegeneratorPackage;
import org.eclipse.emf.texo.orm.annotations.model.orm.AccessType;
+import org.eclipse.emf.texo.orm.annotations.model.orm.DiscriminatorColumn;
import org.eclipse.emf.texo.orm.annotations.model.orm.Entity;
import org.eclipse.emf.texo.orm.annotations.model.orm.MappedSuperclass;
import org.eclipse.emf.texo.orm.annotations.model.orm.OrmFactory;
@@ -118,6 +119,12 @@ public class EClassORMAnnotator extends ETypeElementORMAnnotator implements Anno
}
}
+ if (isRoot(annotation) && ORMMappingOptions.getDefaultOptions().isTestRun()) {
+ final DiscriminatorColumn dc = OrmFactory.eINSTANCE.createDiscriminatorColumn();
+ dc.setLength(255);
+ entity.setDiscriminatorColumn(dc);
+ }
+
// with interfaces always access through the property
if (eClass.isInterface()) {
entity.setAccess(AccessType.PROPERTY);
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EReferenceORMAnnotator.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EReferenceORMAnnotator.java
index a3ca563e..5f30bc41 100755
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EReferenceORMAnnotator.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EReferenceORMAnnotator.java
@@ -284,7 +284,7 @@ public class EReferenceORMAnnotator extends EStructuralFeatureORMAnnotator imple
if (namingStrategy.isGenerateAllDBSchemaNames()) {
if (oneToMany.getJoinTable() != null) {
// set a unique name
- if (oneToMany.getJoinTable() != null && GeneratorUtils.isEmptyOrNull(oneToMany.getJoinTable().getName())) {
+ if (GeneratorUtils.isEmptyOrNull(oneToMany.getJoinTable().getName())) {
oneToMany.getJoinTable().setName(namingStrategy.getJoinTableName(eReference));
}
addColumnsToJoinTable(namingStrategy, oneToMany.getJoinTable(), annotation);
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EStructuralFeatureORMAnnotator.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EStructuralFeatureORMAnnotator.java
index 7f6f19ea..f9d78288 100644
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EStructuralFeatureORMAnnotator.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/EStructuralFeatureORMAnnotator.java
@@ -19,6 +19,7 @@ package org.eclipse.emf.texo.orm.annotator;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.emf.texo.modelgenerator.modelannotations.EStructuralFeatureModelGenAnnotation;
import org.eclipse.emf.texo.utils.ModelUtils;
@@ -32,7 +33,8 @@ import org.eclipse.emf.texo.utils.ModelUtils;
public class EStructuralFeatureORMAnnotator extends ETypeElementORMAnnotator {
protected boolean doAddConverter(EStructuralFeatureModelGenAnnotation annotation) {
- if (FeatureMapUtil.isFeatureMap(annotation.getEStructuralFeature())) {
+ final EStructuralFeature eFeature = annotation.getEStructuralFeature();
+ if (FeatureMapUtil.isFeatureMap(eFeature)) {
return false;
}
if (!ORMMappingOptions.getDefaultOptions().isTestRun()) {
@@ -41,7 +43,7 @@ public class EStructuralFeatureORMAnnotator extends ETypeElementORMAnnotator {
if (annotation.getEStructuralFeature().getEType() instanceof EEnum) {
return false;
}
- if (ModelUtils.isAnyType(annotation.getEStructuralFeature())) {
+ if (ModelUtils.isAnyType(eFeature)) {
return true;
}
if (annotation.getObjectType() != null
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/ORMNamingStrategy.java b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/ORMNamingStrategy.java
index 65bfb220..b54168f6 100755
--- a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/ORMNamingStrategy.java
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/ORMNamingStrategy.java
@@ -31,6 +31,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.emf.texo.generator.GeneratorUtils;
import org.eclipse.emf.texo.orm.ormannotations.EPackageORMAnnotation;
@@ -171,6 +172,11 @@ public class ORMNamingStrategy {
if (localName == null) {
localName = getEntityName(eFeature.getEContainingClass()) + "_" + eFeature.getName(); //$NON-NLS-1$
}
+ // add a postfix to make it unique, as often a nameclash occurs with the
+ // featuremap entry table
+ if (FeatureMapUtil.isFeatureMap(eFeature)) {
+ localName += "_FM";
+ }
return processName(localName, ePackageORMAnnotation.getTableNamePrefix());
}
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch
index 1f65cebc..4877c4d4 100644
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch
@@ -32,7 +32,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.inject@default:default,com.ibm.icu@default:default,javax.servlet@default:default,javax.transaction@default:false,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang*2.4.0.v201005080502@default:default,org.apache.commons.logging*1.1.1@default:default,org.apache.log4j*1.2.16@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.hamcrest.core@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.inject@default:default,com.ibm.icu@default:default,javax.annotation*1.1.0.v201108011116@default:default,javax.inject@default:default,javax.servlet*2.4.0.v200806031604@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.transaction@default:false,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang*2.6.0.v201205030909@default:default,org.apache.commons.logging*1.1.1.201205201951@default:default,org.apache.log4j*1.2.16.201205201951@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.hamcrest.core@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
index 5d462875..25c6b784 100755
--- a/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.0.1)",
javax.persistence;bundle-version="[1.0.0.0,3.0.0)",
org.eclipse.persistence.jpa;bundle-version="[2.0.0,3.0.0)",
- org.hsqldb;bundle-version="[1.8.0,2.0.0)",
+ org.hsqldb;bundle-version="[1.8.0,3.0.0)",
org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",
@@ -29,6 +29,8 @@ Require-Bundle: org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.0.1)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.test;bundle-version="[0.1.0,1.0.0)",
org.eclipse.emf.texo.modelgenerator;bundle-version="[0.1.0,1.0.0)",
- org.eclipse.emf.texo.annotations.model;bundle-version="[0.1.0,1.0.0)"
+ org.eclipse.emf.texo.annotations.model;bundle-version="[0.1.0,1.0.0)",
+ com.mysql.jdbc;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.persistence.jpa.jpql;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.texo.orm.test;version="0.1.0",
org.eclipse.emf.texo.orm.test.samples;version="0.1.0"
diff --git a/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch b/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch
index 2c8e8ed8..111f81d2 100644
--- a/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch
+++ b/tests/org.eclipse.emf.texo.orm.test/ORMGeneratorTest.launch
@@ -33,8 +33,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.inject@default:default,com.ibm.icu@default:default,javax.activation*1.1.0.v201105071233@default:default,javax.mail@default:default,javax.persistence*2.0.3.v201010191057@default:default,javax.servlet@default:default,javax.transaction@default:false,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang*2.4.0.v201005080502@default:default,org.apache.commons.logging*1.1.1@default:default,org.apache.log4j*1.2.16@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.net4j.jms.api@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.persistence.jpa.equinox@default:false,org.eclipse.persistence.jpa.osgi@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.oracle@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.hamcrest.core@default:default,org.hsqldb@default:default,org.json@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="asdasdsad@default:default,org.eclipse.emf.examples.databinding.project.core.model@default:default,org.eclipse.emf.examples.databinding.project.core@default:default,org.eclipse.emf.examples.databinding.project.ui.rcp@default:default,org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.datagenerator@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.json@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm.test@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo.server@default:default,org.eclipse.emf.texo.test.emfmodel@default:default,org.eclipse.emf.texo.test.model@default:default,org.eclipse.emf.texo.test@default:default,org.eclipse.emf.texo.xml@default:default,org.eclipse.emf.texo@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.mysql.jdbc*5.1.11.201205201951@default:default,javax.activation@default:default,javax.annotation*1.1.0.v201108011116@default:default,javax.inject@default:default,javax.mail@default:default,javax.persistence*2.0.4.v201112161009@default:default,javax.servlet*2.4.0.v200806031604@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.transaction@default:false,javax.xml.stream@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang*2.6.0.v201205030909@default:default,org.apache.commons.logging*1.1.1.201205201951@default:default,org.apache.log4j*1.2.16.201205201951@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.antlr@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.persistence.jpa.equinox@default:false,org.eclipse.persistence.jpa.jpql@default:default,org.eclipse.persistence.jpa.osgi@default:default,org.eclipse.persistence.jpa@default:default,org.eclipse.persistence.nosql@default:false,org.eclipse.persistence.oracle@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.hamcrest.core@default:default,org.hsqldb@default:default,org.json@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.examples.databinding.project.core.model@default:default,org.eclipse.emf.examples.databinding.project.core@default:default,org.eclipse.emf.examples.databinding.project.ui.rcp@default:default,org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.datagenerator@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.json@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm.test@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo.server@default:default,org.eclipse.emf.texo.test.emfmodel@default:default,org.eclipse.emf.texo.test.model@default:default,org.eclipse.emf.texo.test@default:default,org.eclipse.emf.texo.xml@default:default,org.eclipse.emf.texo@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/DataGenCompareModelJPATest.java b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/DataGenCompareModelJPATest.java
index 75248ac9..13f23084 100755
--- a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/DataGenCompareModelJPATest.java
+++ b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/DataGenCompareModelJPATest.java
@@ -338,12 +338,25 @@ public class DataGenCompareModelJPATest extends JPATest {
assertTrue(found);
} else if (value1 instanceof Date) {
findData(c2, (Date) value1);
+ } else if (value1 instanceof Number) {
+ findNumber(c2, (Number) value1);
} else {
assertTrue(c2.contains(value1));
}
}
}
+ private void findNumber(Collection<?> c, Number number) {
+ for (Object o : c) {
+ final Number n = (Number) o;
+ final double diff = n.doubleValue() - number.doubleValue();
+ if (diff < 0.1 && diff > -0.1) {
+ return;
+ }
+ }
+ fail("Value " + number + " not present in collection " + c); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
private void findData(Collection<?> c, Date date) {
final Calendar cal1 = Calendar.getInstance();
cal1.setTime(date);
@@ -444,7 +457,7 @@ public class DataGenCompareModelJPATest extends JPATest {
if (v1 instanceof Number && v2 instanceof Number) {
if (((Number) v1).intValue() != ((Number) v2).intValue()) {
- fail("Different values " + v1 + " " + v2); //$NON-NLS-1$ //$NON-NLS-2$
+ fail("Different values " + v1 + "/" + ((Number) v1).intValue() + " " + v2 + "/" + ((Number) v2).intValue()); //$NON-NLS-1$ //$NON-NLS-2$
}
return;
}
diff --git a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/ORMGeneratorTest.java b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/ORMGeneratorTest.java
index 41fdc4c5..d52cc4bf 100755
--- a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/ORMGeneratorTest.java
+++ b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/ORMGeneratorTest.java
@@ -81,6 +81,7 @@ public class ORMGeneratorTest extends TestCase {
testORMOptions.setRenameSQLReservedNames(true);
testORMOptions.setEnforceUniqueNames(true);
testORMOptions.setGenerateFullDbSchemaNames(true);
+ testORMOptions.setMaximumSqlNameLength(64);
testORMOptions.setTestRun(true);
ORMMappingOptions.setDefaultOptions(testORMOptions);
diff --git a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/samples/SingleDataGenCompareModelJPATest.java b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/samples/SingleDataGenCompareModelJPATest.java
new file mode 100644
index 00000000..7cee1f72
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/samples/SingleDataGenCompareModelJPATest.java
@@ -0,0 +1,36 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2012 Springsite BV (The Netherlands) and others
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Martin Taal - Initial API and implementation
+ *
+ * </copyright>
+ *
+ * $Id: SimpleLibraryTest.java,v 1.5 2011/09/02 07:12:37 mtaal Exp $
+ */
+package org.eclipse.emf.texo.orm.test.samples;
+
+import org.eclipse.emf.texo.orm.test.DataGenCompareModelJPATest;
+import org.eclipse.emf.texo.test.model.schemaconstructs.substitution.SubstitutionModelPackage;
+
+/**
+ * Full persistence test for a single model
+ *
+ * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
+ * @version $Revision: 1.5 $
+ */
+public class SingleDataGenCompareModelJPATest extends DataGenCompareModelJPATest {
+ public SingleDataGenCompareModelJPATest() {
+ super(SubstitutionModelPackage.INSTANCE, "-mysql");
+ }
+
+ public void test() {
+ super.runTest();
+ }
+}
diff --git a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
index 948c6f86..c832df5c 100644
--- a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
@@ -16,9 +16,9 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.texo.datagenerator;bundle-version="[0.1.0,1.1.0)",
org.eclipse.persistence.jpa;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.persistence.asm;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.persistence.antlr;bundle-version="[2.0.0,3.0.0)",
- org.hsqldb;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.persistence.asm;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.persistence.antlr;bundle-version="[3.0.0,4.0.0)",
+ org.hsqldb;bundle-version="[2.0.0,3.0.0)",
javax.persistence;bundle-version="[2.0.0,3.0.0)",
org.eclipse.persistence.jpa.osgi;bundle-version="[2.1.0,3.0.0)",
org.eclipse.jetty.server;bundle-version="[7.0.0,9.0.0)",
@@ -30,9 +30,11 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.jetty.security;bundle-version="[7.0.0,9.0.0)",
org.eclipse.jetty.continuation;bundle-version="[7.0.0,9.0.0)",
org.eclipse.jetty.client;bundle-version="[7.0.0,9.0.0)",
- org.json;bundle-version="[1.0.0, 2.1.0)",
+ org.json;bundle-version="[1.0.0,2.1.0)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0,1.1.0)",
- org.eclipse.emf.texo.test.emfmodel;bundle-version="[0.1.0, 1.1.0)"
+ org.eclipse.emf.texo.test.emfmodel;bundle-version="[0.1.0,1.1.0)",
+ org.eclipse.persistence.jpa.jpql;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.texo.server.test
Bundle-Activator: org.eclipse.emf.texo.server.test.ServerTestPluginActivator
-Import-Package: org.osgi.framework;version="[1.0.0,3.0.0)"
+Import-Package: javax.servlet;version="[2.0.0,3.0.0)",
+ org.osgi.framework;version="[1.0.0,3.0.0)"
diff --git a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java
index 77b8c54f..61976996 100644
--- a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java
+++ b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
+import javax.servlet.DispatcherType;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.emf.texo.model.ModelObject;
@@ -43,7 +44,6 @@ import org.eclipse.jetty.client.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.http.HttpMethods;
import org.eclipse.jetty.io.ByteArrayBuffer;
-import org.eclipse.jetty.server.DispatcherType;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/NotRequiredSerialization-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/NotRequiredSerialization-orm.xml
index 0c3df969..b37979f6 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/NotRequiredSerialization-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/NotRequiredSerialization-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.notrequiredserialization.SerializationTest" name="NotRequiredSerialization_SerializationTest">
<orm:table name="NotRequiredSerialization_SerializationTest"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz306546-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz306546-orm.xml
index f5e072fb..eaee870a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz306546-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz306546-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.instanceclassset.MySerializableClass" name="bz306546_MySerializableClass">
<orm:table name="bz306546_MySerializableClass"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="somethingInteresting">
@@ -37,6 +38,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.instanceclassset.NonEMF" name="bz306546_NonEMF">
<orm:table name="bz306546_NonEMF"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes/>
</orm:entity>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz325427-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz325427-orm.xml
index 4dcc1600..0ed714fd 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz325427-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz325427-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz325427.EClassB" name="bz325427_EClassB">
<orm:table name="bz325427_EClassB"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -17,6 +18,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz325427.EClassA" name="bz325427_EClassA">
<orm:table name="bz325427_EClassA"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz352285-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz352285-orm.xml
index d8c5dacf..85241497 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz352285-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz352285-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz352285.Abstract" name="bz352285_Abstract">
<orm:table name="bz352285_Abstract"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369476-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369476-orm.xml
index d00c6920..f23a0403 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369476-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369476-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz369476.Test" name="bz369476_Test">
<orm:table name="bz369476_Test"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes/>
</orm:entity>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369931-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369931-orm.xml
index d976cdc3..e291c3f4 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369931-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369931-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz369931.Formula" name="bz369931_Formula">
<orm:table name="bz369931_Formula"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="formulaType">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369962-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369962-orm.xml
index 3424ebb4..6edc4953 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369962-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz369962-orm.xml
@@ -9,6 +9,7 @@
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz369962.Mother" name="bz369962_Mother">
<orm:table name="bz369962_Mother"/>
<orm:inheritance strategy="SINGLE_TABLE"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes/>
</orm:entity>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz371509-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz371509-orm.xml
index 89830b4b..7264316b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz371509-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz371509-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz371509.EClass0" name="test_EClass0">
<orm:table name="test_EClass0"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="toClass1">
@@ -34,6 +35,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz371509.EClass1" name="test_EClass1">
<orm:table name="test_EClass1"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many mapped-by="toClass1" name="toClass0">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz378087-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz378087-orm.xml
index f7bfa29b..b86b9ed2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz378087-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz378087-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz378087.Test" name="test_Test">
<orm:table name="test_Test"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="class_">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz379815-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz379815-orm.xml
index 86c20da5..5c244b78 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz379815-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz379815-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz379815.VarInputType" name="bz379815_VarInputType">
<orm:table name="DPL_bz379815_VarInputType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="measure" optional="false">
@@ -23,6 +24,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz379815.VarConditionType" name="bz379815_VarConditionType">
<orm:table name="DPL_bz379815_VarConditionType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="policyType">
@@ -35,6 +37,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz379815.VarPolicyTypeType" name="bz379815_VarPolicyTypeType">
<orm:table name="DPL_bz379815_VarPolicyTypeType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="type" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz380279-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz380279-orm.xml
index e8e47610..cd45359c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz380279-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/bz380279-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz380279.BZ380279" name="bz380279_BZ380279">
<orm:table name="bz380279_BZ380279"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="firstName">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/main-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/main-orm.xml
index 1565030e..804efe35 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/main-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/main-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.subpackage.MainType" name="main_MainType">
<orm:table name="main_MainType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -17,6 +18,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.subpackage.sub1.Sub1Type" name="sub1_Sub1Type">
<orm:table name="sub1_Sub1Type"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -26,6 +28,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.subpackage.sub2.Sub2Type" name="sub2_Sub2Type">
<orm:table name="sub2_Sub2Type"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/model-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/model-orm.xml
index 9416806f..933e307d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/model-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/model-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.SimCard" name="m_SimCard">
<orm:table name="m_SimCard"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="phoneNumber">
@@ -20,6 +21,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.SimContract" name="m_SimContract">
<orm:table name="m_SimContract"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="contractNumber">
@@ -43,6 +45,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.PaymentInfo" name="m_PaymentInfo">
<orm:table name="m_PaymentInfo"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="tariff">
@@ -69,6 +72,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.SimCardXSimContract" name="m_SimCardXSimContract">
<orm:table name="m_SimCardXSimContract"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="simCard">
@@ -95,6 +99,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Tariff" name="m_Tariff">
<orm:table name="m_Tariff"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -155,10 +160,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.PaymentItem" name="m_PaymentItem">
<orm:table name="m_PaymentItem"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="sum">
- <orm:column name="T_sum"/>
+ <orm:column name="T_sum" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="currency">
<orm:column name="currency"/>
@@ -181,10 +187,10 @@
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="volume">
- <orm:column name="volume" nullable="true"/>
+ <orm:column name="volume" nullable="true" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="price">
- <orm:column name="price" nullable="true"/>
+ <orm:column name="price" nullable="true" precision="15" scale="7"/>
</orm:basic>
<orm:many-to-one name="unit">
<orm:join-column name="m_VolumePayment_unit" nullable="true"/>
@@ -211,6 +217,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Service" name="m_Service">
<orm:table name="m_Service"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -247,6 +254,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Units" name="m_Units">
<orm:table name="m_Units"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -256,11 +264,13 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Price" name="m_Price">
<orm:table name="m_Price"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes/>
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.CarProducer" name="m_CarProducer">
<orm:table name="m_CarProducer"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -270,6 +280,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.CarModel" name="m_CarModel">
<orm:table name="m_CarModel"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -287,6 +298,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.CarRegInfo" name="m_CarRegInfo">
<orm:table name="m_CarRegInfo"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="series">
@@ -335,6 +347,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Person" name="m_Person">
<orm:table name="m_Person"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="surname">
@@ -398,6 +411,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Car" name="m_Car">
<orm:table name="m_Car"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="model">
@@ -428,6 +442,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.CarPassport" name="m_CarPassport">
<orm:table name="m_CarPassport"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="series">
@@ -446,6 +461,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Phone" name="m_Phone">
<orm:table name="m_Phone"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="number">
@@ -458,6 +474,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Address" name="m_Address">
<orm:table name="m_Address"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="zipCode">
@@ -485,6 +502,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Passport" name="m_Passport">
<orm:table name="m_Passport"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="series">
@@ -503,6 +521,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.DrivingLicense" name="m_DrivingLicense">
<orm:table name="m_DrivingLicense"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="series">
@@ -521,6 +540,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Contract" name="m_Contract">
<orm:table name="m_Contract"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="signDate">
@@ -570,6 +590,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.SecretQuestion" name="m_SecretQuestion">
<orm:table name="m_SecretQuestion"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="question">
@@ -596,6 +617,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.ContractPackage" name="m_ContractPackage">
<orm:table name="m_ContractPackage"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="client">
@@ -630,6 +652,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.User" name="m_User">
<orm:table name="m_User"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="login">
@@ -650,11 +673,13 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.UserGroup" name="m_UserGroup">
<orm:table name="m_UserGroup"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes/>
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Message" name="m_Message">
<orm:table name="m_Message"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="text">
@@ -688,6 +713,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Event" name="m_Event">
<orm:table name="m_Event"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="eventType">
@@ -714,13 +740,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz331009.Coordinates" name="m_Coordinates">
<orm:table name="m_Coordinates"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="x">
- <orm:column name="x"/>
+ <orm:column name="x" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="y">
- <orm:column name="y"/>
+ <orm:column name="y" precision="15" scale="7"/>
</orm:basic>
</orm:attributes>
</orm:entity>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz378642-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz378642-orm.xml
index 3f3b85b0..d5ea61e3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz378642-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz378642-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz378642.PriceType" name="bz378642_PriceType">
<orm:table name="bz378642_PriceType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="value">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz379796-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz379796-orm.xml
index e702e871..72719d55 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz379796-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/org.eclipse.emf.texo.test.model.issues.bz379796-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz379796.PriceType" name="bz379796_PriceType">
<orm:table name="bz379796_PriceType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="valueElement">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/test-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/test-orm.xml
index 307037df..4a133e25 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/test-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/issues/test-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz325429_test.Person" name="test_Person">
<orm:table name="test_Person"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="firstname">
@@ -40,6 +41,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz325429_test.Address" name="test_Address">
<orm:table name="test_Address"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="street">
@@ -52,6 +54,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.issues.bz325429_test.Contact" name="test_Contact">
<orm:table name="test_Contact"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="value">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/accounting-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/accounting-orm.xml
index 0fc2a8a6..a3a200ea 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/accounting-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/accounting-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.AccountingClass" name="accounting_Accounting">
<orm:table name="accounting_Accounting"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -52,6 +53,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.Account" name="accounting_Account">
<orm:table name="accounting_Account"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -61,6 +63,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.AccountGroup" name="accounting_AccountGroup">
<orm:table name="accounting_AccountGroup"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -77,6 +80,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.Vat" name="accounting_Vat">
<orm:table name="accounting_Vat"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -106,6 +110,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.Report" name="accounting_Report">
<orm:table name="accounting_Report"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -127,6 +132,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.JournalGroup" name="accounting_JournalGroup">
<orm:table name="accounting_JournalGroup"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -150,6 +156,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.ReportGroup" name="accounting_ReportGroup">
<orm:table name="accounting_ReportGroup"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -178,6 +185,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.accounting.JournalStatement" name="accounting_JournalStatement">
<orm:table name="accounting_JournalStatement"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="description" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/emapsample-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/emapsample-orm.xml
index 9c20127d..5ea1de4b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/emapsample-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/emapsample-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.emap.Book" name="emapsample_Book">
<orm:table name="EMAP_BOOK"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="title" optional="false">
@@ -27,6 +28,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.emap.BookStore" name="emapsample_BookStore">
<orm:table name="EMAP_BOOKSTORE"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -52,6 +54,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.emap.Writer" name="emapsample_Writer">
<orm:table name="EMAP_WRITER"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/epo2-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/epo2-orm.xml
index 312ec169..f60139bc 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/epo2-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/epo2-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extendedpo2.Item" name="com_example_epo2_Item">
<orm:table name="com_example_epo2_Item"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="productName">
@@ -41,6 +42,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extendedpo2.PurchaseOrder" name="com_example_epo2_PurchaseOrder">
<orm:table name="com_example_epo2_PurchaseOrder"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="comment">
@@ -110,6 +112,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extendedpo2.Address" name="com_example_epo2_Address">
<orm:table name="com_example_epo2_Address"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -122,6 +125,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extendedpo2.Customer" name="com_example_epo2_Customer">
<orm:table name="com_example_epo2_Customer"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="customerID">
@@ -143,6 +147,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extendedpo2.Supplier" name="com_example_epo2_Supplier">
<orm:table name="com_example_epo2_Supplier"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -178,6 +183,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extendedpo2.GlobalLocation" name="com_example_epo2_GlobalLocation">
<orm:table name="com_example_epo2_GlobalLocation"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="countryCode">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/extlibrary-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/extlibrary-orm.xml
index 97bf112c..e7bb8ce8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/extlibrary-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/extlibrary-orm.xml
@@ -31,6 +31,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extlibrary.Item" name="extlib_Item">
<orm:table name="extlib_Item"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="publicationDate">
@@ -73,6 +74,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extlibrary.Person" name="extlib_Person">
<orm:table name="extlib_Person"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="address">
@@ -113,6 +115,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.extlibrary.Library" name="extlib_Library">
<orm:table name="extlib_Library"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="address">
@@ -130,7 +133,7 @@
</orm:cascade>
</orm:many-to-one>
<orm:one-to-many name="people" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.extlibrary.LibraryPeopleFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="extlib_Library_people_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/interfaces-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/interfaces-orm.xml
index 25583851..9119443a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/interfaces-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/interfaces-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.interfaces.DescribableIdentifiableConcrete" name="interfaces_DescribableIdentifiableConcrete">
<orm:table name="interfaces_DescribableIdentifiableConcrete"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="description">
@@ -23,6 +24,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.interfaces.DescribableConcrete" name="interfaces_DescribableConcrete">
<orm:table name="interfaces_DescribableConcrete"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="description">
@@ -35,6 +37,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.interfaces.IdentifiableConcrete" name="interfaces_IdentifiableConcrete">
<orm:table name="interfaces_IdentifiableConcrete"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="identifier">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/inv-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/inv-orm.xml
index dcb8f7bc..9156bf08 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/inv-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/inv-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.inventory.PType" name="inv_PType">
<orm:table name="inv_PType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="id">
@@ -61,6 +62,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.inventory.PDeclaration" name="inv_PDeclaration">
<orm:table name="inv_PDeclaration"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="id">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/kdm-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/kdm-orm.xml
index a329db02..b21da93b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/kdm-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/kdm-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.modisco.kdm.core.Element" name="core_Element">
<orm:table name="core_Element"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="attribute">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/mm-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/mm-orm.xml
index 40d7d835..04bb2edf 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/mm-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/mm-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.graphiti.mm.Property" name="mm_Property">
<orm:table name="mm_Property"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="key" optional="false">
@@ -20,6 +21,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.PropertyContainer" name="mm_PropertyContainer">
<orm:table name="mm_PropertyContainer"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="properties">
@@ -36,6 +38,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.StyleContainer" name="mm_StyleContainer">
<orm:table name="mm_StyleContainer"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many mapped-by="styleContainer" name="styles">
@@ -541,6 +544,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.AbstractStyle" name="st_AbstractStyle">
<orm:table name="st_AbstractStyle"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="lineWidth">
@@ -585,6 +589,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.Color" name="st_Color">
<orm:table name="st_Color"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="red" optional="false">
@@ -600,6 +605,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.Font" name="st_Font">
<orm:table name="st_Font"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -618,6 +624,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.Point" name="st_Point">
<orm:table name="st_Point"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="x" optional="false">
@@ -636,6 +643,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.PrecisionPoint" name="st_PrecisionPoint">
<orm:table name="st_PrecisionPoint"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="x" optional="false">
@@ -648,6 +656,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.RenderingStyle" name="st_RenderingStyle">
<orm:table name="st_RenderingStyle"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="adaptedGradientColoredAreas">
@@ -660,6 +669,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.AdaptedGradientColoredAreas" name="st_AdaptedGradientColoredAreas">
<orm:table name="st_AdaptedGradientColoredAreas"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="definedStyleId">
@@ -679,6 +689,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.GradientColoredLocation" name="st_GradientColoredLocation">
<orm:table name="st_GradientColoredLocation"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="locationType" optional="false">
@@ -698,6 +709,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.GradientColoredArea" name="st_GradientColoredArea">
<orm:table name="st_GradientColoredArea"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="start">
@@ -716,6 +728,7 @@
</orm:entity>
<orm:entity class="org.eclipse.graphiti.mm.algorithms.styles.GradientColoredAreas" name="st_GradientColoredAreas">
<orm:table name="st_GradientColoredAreas"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="styleAdaption">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/music-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/music-orm.xml
index 638479db..23c4444e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/music-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/music-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.music.Artist" name="org_elver_music_Artist">
<orm:table name="org_elver_music_Artist"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="id">
@@ -46,6 +47,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.music.Country" name="org_elver_music_Country">
<orm:table name="org_elver_music_Country"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
@@ -61,6 +63,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.music.Genre" name="org_elver_music_Genre">
<orm:table name="org_elver_music_Genre"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="id">
@@ -76,6 +79,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.music.Album" name="org_elver_music_Album">
<orm:table name="org_elver_music_Album"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="id">
@@ -130,6 +134,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.music.Song" name="org_elver_music_Song">
<orm:table name="org_elver_music_Song"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="id">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.capa-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.capa-orm.xml
index 7b295ada..977168bf 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.capa-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.capa-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.CapacityEntry" name="capa_CapacityEntry">
<orm:table name="capa_CapacityEntry"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="capacityEntryId">
@@ -20,6 +21,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.Machine" name="capa_Machine">
<orm:table name="capa_Machine"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="machineId">
@@ -51,6 +53,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.WorkWeek" name="capa_WorkWeek">
<orm:table name="capa_WorkWeek"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="workWeekId">
@@ -67,6 +70,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.Task" name="capa_Task">
<orm:table name="capa_Task"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
@@ -97,6 +101,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.MachineList" name="capa_MachineList">
<orm:table name="capa_MachineList"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="machines">
@@ -110,6 +115,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.Production" name="capa_Production">
<orm:table name="capa_Production"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="article">
@@ -136,6 +142,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.capa.WorkDay" name="capa_WorkDay">
<orm:table name="capa_WorkDay"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="dayOfWeek">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.catalog-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.catalog-orm.xml
index a2776451..41d77f67 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.catalog-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.catalog-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.catalog.CatalogType" name="catalog_CatalogType">
<orm:table name="catalog_CatalogType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -44,6 +45,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.catalog.ProductType" name="catalog_ProductType">
<orm:table name="catalog_ProductType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
@@ -69,6 +71,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.catalog.PriceType" name="catalog_PriceType">
<orm:table name="catalog_PriceType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="price" optional="false">
@@ -89,6 +92,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.catalog.SupplierType" name="catalog_SupplierType">
<orm:table name="catalog_SupplierType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -101,6 +105,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.catalog.StringType" name="catalog_StringType">
<orm:table name="catalog_StringType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="value" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.claim-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.claim-orm.xml
index 6ee57a97..fd55ab38 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.claim-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.claim-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.claim.Claim" name="claim_Claim">
<orm:table name="claim_Claim"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="billingName" optional="false">
@@ -36,6 +37,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.claim.ClaimCompositeKey" name="claim_ClaimCompositeKey">
<orm:table name="claim_ClaimCompositeKey"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="claimNumber" optional="false">
@@ -48,10 +50,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.claim.ClaimLine" name="claim_ClaimLine">
<orm:table name="claim_ClaimLine"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="claimLineBilledAmount" optional="false">
- <orm:column name="claimLineBilledAmount"/>
+ <orm:column name="claimLineBilledAmount" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="serviceCode" optional="false">
<orm:column name="serviceCode"/>
@@ -77,6 +80,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.claim.ClaimLineCompositeKey" name="claim_ClaimLineCompositeKey">
<orm:table name="claim_ClaimLineCompositeKey"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="claimLineNumber" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.employee-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.employee-orm.xml
index 3f71b184..d27c3918 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.employee-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.employee-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.employee.Department" name="employee_Department">
<orm:table name="employee_Department"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -24,6 +25,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.employee.Employee" name="employee_Employee">
<orm:table name="employee_Employee"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.featuremaptest-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.featuremaptest-orm.xml
index badc6154..7d985d6b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.featuremaptest-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.featuremaptest-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.featuremaptest.PurchaseOrder" name="featuremaptest_PurchaseOrder">
<orm:table name="PUR_ORDER"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -46,13 +47,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.featuremaptest.Supplier" name="featuremaptest_Supplier">
<orm:table name="SUP_TABLE"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
<orm:column name="name"/>
</orm:basic>
<orm:one-to-many name="orders" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.featuremaptest.SupplierOrdersFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="featuremaptest_Supplier_orders_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.forum-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.forum-orm.xml
index 39cce954..30b4fdd9 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.forum-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.forum-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.forum.Forum" name="forum_Forum">
<orm:table name="forum_Forum"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="title" optional="false">
@@ -31,6 +32,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.forum.Member" name="forum_Member">
<orm:table name="forum_Member"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="nickname" optional="false">
@@ -64,6 +66,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.forum.Topic" name="forum_Topic">
<orm:table name="forum_Topic"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="title" optional="false">
@@ -97,6 +100,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.forum.Post" name="forum_Post">
<orm:table name="forum_Post"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="comment" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.jpamixed-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.jpamixed-orm.xml
index f90b60df..d87578d0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.jpamixed-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.jpamixed-orm.xml
@@ -40,10 +40,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.jpamixed.LetterBodyType" name="jpamixed_LetterBodyType">
<orm:table name="jpamixed_LetterBodyType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="mixed" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.jpamixed.LetterBodyTypeMixedFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="jpamixed_LetterBodyType_mixed_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -71,10 +72,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.jpamixed.SalutationType" name="jpamixed_SalutationType">
<orm:table name="jpamixed_SalutationType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="mixed" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.jpamixed.SalutationTypeMixedFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="jpamixed_SalutationType_mixed_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.play-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.play-orm.xml
index ce76c5c5..e6c49122 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.play-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.play-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.ActType" name="play_ActType">
<orm:table name="play_ActType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="pindex" optional="false">
@@ -43,6 +44,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.SceneType" name="play_SceneType">
<orm:table name="play_SceneType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="pindex" optional="false">
@@ -53,7 +55,7 @@
<orm:column name="title"/>
</orm:basic>
<orm:one-to-many name="group" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.play.SceneTypeGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="play_SceneType_group_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -62,6 +64,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.FmType" name="play_FmType">
<orm:table name="play_FmType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:element-collection name="p">
@@ -94,10 +97,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.PersonaeType" name="play_PersonaeType">
<orm:table name="play_PersonaeType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="group" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.play.PersonaeTypeGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="play_PersonaeType_group_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -106,6 +110,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.PersonaGroupType" name="play_PersonaGroupType">
<orm:table name="play_PersonaGroupType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="groupDescription" optional="false">
@@ -122,6 +127,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.PlayType" name="play_PlayType">
<orm:table name="play_PlayType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="title" optional="false">
@@ -172,10 +178,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.play.SpeechType" name="play_SpeechType">
<orm:table name="play_SpeechType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="group" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.samples.play.SpeechTypeGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="play_SpeechType_group_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.rental-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.rental-orm.xml
index 8cb7825b..9180ae95 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.rental-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.rental-orm.xml
@@ -25,6 +25,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.rental.RentalUnit" name="rental_RentalUnit">
<orm:table name="rental_RentalUnit"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="description" optional="false">
@@ -51,6 +52,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.rental.RentalBusiness" name="rental_RentalBusiness">
<orm:table name="rental_RentalBusiness"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -60,6 +62,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.rental.RentalCarDriver" name="rental_RentalCarDriver">
<orm:table name="rental_RentalCarDriver"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -77,6 +80,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.rental.RentalContract" name="rental_RentalContract">
<orm:table name="rental_RentalContract"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="rentToBusinessPartner" optional="false">
@@ -104,6 +108,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.rental.RentalContractLine" name="rental_RentalContractLine">
<orm:table name="rental_RentalContractLine"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="number">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.schemaprimerpo-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.schemaprimerpo-orm.xml
index 151fa188..b4b3f874 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.schemaprimerpo-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.schemaprimerpo-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.schemaprimerpo.PurchaseOrder" name="schemaprimerpo_PurchaseOrder">
<orm:table name="schemaprimerpo_PurchaseOrder"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="comment">
@@ -40,6 +41,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.schemaprimerpo.Item" name="schemaprimerpo_Item">
<orm:table name="schemaprimerpo_Item"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="productName" optional="false">
@@ -49,7 +51,7 @@
<orm:column name="quantity"/>
</orm:basic>
<orm:basic name="uSPrice" optional="false">
- <orm:column name="uSPrice"/>
+ <orm:column name="uSPrice" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="comment">
<orm:column name="T_comment"/>
@@ -65,6 +67,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.schemaprimerpo.USAddress" name="schemaprimerpo_USAddress">
<orm:table name="schemaprimerpo_USAddress"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -80,7 +83,7 @@
<orm:column name="T_state"/>
</orm:basic>
<orm:basic name="zip" optional="false">
- <orm:column name="zip"/>
+ <orm:column name="zip" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="country">
<orm:column name="country"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.sunBooks-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.sunBooks-orm.xml
index 81517130..f6b5e175 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.sunBooks-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/org.eclipse.emf.texo.test.model.samples.sunBooks-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.sunbooks.AuthorsType" name="sunBooks_AuthorsType">
<orm:table name="sunBooks_AuthorsType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:element-collection name="authorName">
@@ -21,6 +22,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.sunbooks.BooksType" name="sunBooks_BooksType">
<orm:table name="sunBooks_BooksType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="book">
@@ -34,6 +36,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.sunbooks.BookType" name="sunBooks_BookType">
<orm:table name="sunBooks_BookType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -75,6 +78,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.sunbooks.PromotionType" name="sunBooks_PromotionType">
<orm:table name="sunBooks_PromotionType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="discount">
@@ -87,6 +91,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.sunbooks.CollectionType" name="sunBooks_CollectionType">
<orm:table name="sunBooks_CollectionType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:many-to-one name="books" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/types-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/types-orm.xml
index 690d9f93..a3809502 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/types-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/types-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.types.ManyTypes" name="types_ManyTypes">
<orm:table name="types_ManyTypes"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:element-collection name="string">
@@ -67,7 +68,7 @@
</orm:element-collection>
<orm:element-collection name="bigDecimal">
<orm:order-column name="types_ManyTypes_bigDecimal_ind"/>
- <orm:column name="T_element"/>
+ <orm:column name="T_element" precision="15" scale="7"/>
<orm:collection-table name="types_ManyTypes_bigDecimal">
<orm:join-column name="types_ManyTypes_bigDecimal"/>
</orm:collection-table>
@@ -112,6 +113,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.types.SingleTypes" name="types_SingleTypes">
<orm:table name="types_SingleTypes"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="string">
@@ -158,7 +160,7 @@
<orm:lob/>
</orm:basic>
<orm:basic name="bigDecimal">
- <orm:column name="bigDecimal"/>
+ <orm:column name="bigDecimal" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="bigInteger">
<orm:column name="bigInteger"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/workflow-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/workflow-orm.xml
index f146989a..095dd80e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/workflow-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/samples/workflow-orm.xml
@@ -42,6 +42,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.samples.workflow.WorkflowElement" name="workflow_WorkflowElement">
<orm:table name="workflow_WorkflowElement"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/duration-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/duration-orm.xml
index e05602ce..af8def40 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/duration-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/duration-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.duration.DurationTest" name="duration_DurationTest">
<orm:table name="duration_DurationTest"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.anytype-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.anytype-orm.xml
index 370c4995..850ba743 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.anytype-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.anytype-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.anytype.A" name="anytype_A">
<orm:table name="anytype_A"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -31,6 +32,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.anytype.B" name="anytype_B">
<orm:table name="anytype_B"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -40,6 +42,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.anytype.C" name="anytype_C">
<orm:table name="anytype_C"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes/>
</orm:entity>
@@ -59,6 +62,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.anytype.TestAny" name="anytype_TestAny">
<orm:table name="anytype_TestAny"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -71,13 +75,13 @@
<orm:convert>TexoTestObjectConverter</orm:convert>
</orm:basic>
<orm:one-to-many name="myAny" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.anytype.TestAnyMyAnyFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="anytype_TestAny_myAny_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
</orm:one-to-many>
<orm:one-to-many name="any" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.anytype.TestAnyAnyFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="anytype_TestAny_any_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.attributes-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.attributes-orm.xml
index 8e5480f6..44de3d63 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.attributes-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.attributes-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.attributes.AType" name="attributes_AType">
<orm:table name="attributes_AType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -32,6 +33,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.attributes.RType" name="attributes_RType">
<orm:table name="attributes_RType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.datetime-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.datetime-orm.xml
index ed222dff..7defeb02 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.datetime-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.datetime-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.datetime.TestDate" name="datetime_TestDate">
<orm:table name="datetime_TestDate"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="date" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.documentroot-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.documentroot-orm.xml
index df7cc362..86dea6cd 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.documentroot-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.documentroot-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.documentroot.ComplexType" name="documentroot_ComplexType">
<orm:table name="documentroot_ComplexType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="test" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs-orm.xml
index e6579d2a..98d3df74 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs-orm.xml
@@ -21,10 +21,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.Element" name="ecoreattrs_Element">
<orm:table name="ecoreattrs_Element"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="nameMap" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.ElementNameMapFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="ecoreattrs_Element_nameMap_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -33,6 +34,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.NameList" name="ecoreattrs_NameList">
<orm:table name="ecoreattrs_NameList"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="firstName" optional="false">
@@ -61,10 +63,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.Feature" name="ecoreattrs_Feature">
<orm:table name="ecoreattrs_Feature"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="aMap" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.FeatureAMapFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="ecoreattrs_Feature_aMap_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -95,10 +98,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.Mixed" name="ecoreattrs_Mixed">
<orm:table name="ecoreattrs_Mixed"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="mixed" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs.MixedMixedFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="ecoreattrs_Mixed_mixed_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.emap-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.emap-orm.xml
index f80d0ae2..849c477c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.emap-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.emap-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.emap.Book" name="emap_Book">
<orm:table name="emap_Book"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="title" optional="false">
@@ -27,6 +28,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.emap.Writer" name="emap_Writer">
<orm:table name="emap_Writer"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -36,6 +38,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.emap.BookStore" name="emap_BookStore">
<orm:table name="emap_BookStore"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.groupall-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.groupall-orm.xml
index 381ea997..522f31fd 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.groupall-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.groupall-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.AddressGroupType" name="groupall_AddressGroupType">
<orm:table name="groupall_AddressGroupType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="groupName" optional="false">
@@ -45,10 +46,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.AddressType" name="groupall_AddressType">
<orm:table name="groupall_AddressType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="group" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.AddressTypeGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="groupall_AddressType_group_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -76,13 +78,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.AddressList" name="groupall_AddressList">
<orm:table name="groupall_AddressList"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="groupName" optional="false">
<orm:column name="groupName"/>
</orm:basic>
<orm:one-to-many name="addrs" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.AddressListAddrsFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="groupall_AddressList_addrs_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -91,6 +94,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.SimpleAllType" name="groupall_SimpleAllType">
<orm:table name="groupall_SimpleAllType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="aaa" optional="false">
@@ -122,10 +126,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.SimpleAllMapType" name="groupall_SimpleAllMapType">
<orm:table name="groupall_SimpleAllMapType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="allMap" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.groupall.SimpleAllMapTypeAllMapFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="groupall_SimpleAllMapType_allMap_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.include-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.include-orm.xml
index e17b9509..9fcb5970 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.include-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.include-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.include.Include1" name="include_Include1">
<orm:table name="include_Include1"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
@@ -23,6 +24,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.include.Include2" name="include_Include2">
<orm:table name="include_Include2"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.list-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.list-orm.xml
index b8ac1539..1c6a2e3f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.list-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.list-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.list.StatesByCountry" name="list_statesByCountry">
<orm:table name="list_statesByCountry"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="country" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.listunion-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.listunion-orm.xml
index c0761d35..f6963c2f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.listunion-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.listunion-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.listunion.StatesByCountry" name="listunion_statesByCountry">
<orm:table name="listunion_statesByCountry"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="country" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.mixed-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.mixed-orm.xml
index bd53a636..92f0daca 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.mixed-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.mixed-orm.xml
@@ -40,10 +40,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.mixed.LetterBodyType" name="mixed_LetterBodyType">
<orm:table name="mixed_LetterBodyType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="mixed" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.mixed.LetterBodyTypeMixedFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="mixed_LetterBodyType_mixed_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -71,10 +72,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.mixed.SalutationType" name="mixed_SalutationType">
<orm:table name="mixed_SalutationType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="mixed" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.mixed.SalutationTypeMixedFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="mixed_SalutationType_mixed_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup-orm.xml
index 28942b14..13bde859 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup-orm.xml
@@ -24,13 +24,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup.A" name="nestedgroup_A">
<orm:table name="nestedgroup_A"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
<orm:column name="name"/>
</orm:basic>
<orm:one-to-many name="group" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup.AGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="nestedgroup_A_group_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -39,6 +40,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup.CType" name="nestedgroup_CType">
<orm:table name="nestedgroup_CType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="cname" optional="false">
@@ -94,10 +96,11 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup.Element" name="nestedgroup_Element">
<orm:table name="nestedgroup_Element"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="mixed" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup.ElementMixedFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="nestedgroup_Element_mixed_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.qname-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.qname-orm.xml
index e1527ba3..88cd809f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.qname-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.qname-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.qname.Mytest" name="qname_Mytest">
<orm:table name="qname_Mytest"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="description" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.restriction-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.restriction-orm.xml
index f89da929..a36a5708 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.restriction-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.restriction-orm.xml
@@ -12,6 +12,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.restriction.XMLDeviant" name="restriction_XMLDeviant">
<orm:table name="restriction_XMLDeviant"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="numPosts">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice-orm.xml
index f142e36b..df20f4d0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice-orm.xml
@@ -21,13 +21,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice.Person" name="simplechoice_Person">
<orm:table name="simplechoice_Person"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
<orm:column name="name"/>
</orm:basic>
<orm:one-to-many name="group" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice.PersonGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="simplechoice_Person_group_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap-orm.xml
index cd2cd7bd..03503532 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap.PurchaseOrder" name="simplefeaturemap_PurchaseOrder">
<orm:table name="simplefeaturemap_PurchaseOrder"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
@@ -42,13 +43,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap.Supplier" name="simplefeaturemap_Supplier">
<orm:table name="simplefeaturemap_Supplier"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
<orm:column name="name"/>
</orm:basic>
<orm:one-to-many name="orders" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap.SupplierOrdersFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="simplefeaturemap_Supplier_orders_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes-orm.xml
index c5e6986d..0c3490e5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes.SimpleList" name="simpletypes_SimpleList">
<orm:table name="simpletypes_SimpleList"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
@@ -109,6 +110,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes.SimpleType" name="simpletypes_SimpleType">
<orm:table name="simpletypes_SimpleType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
@@ -147,7 +149,7 @@
<orm:column name="limitedstring"/>
</orm:basic>
<orm:basic name="limitedDecimal" optional="false">
- <orm:column name="limitedDecimal"/>
+ <orm:column name="limitedDecimal" precision="15" scale="7"/>
</orm:basic>
<orm:basic name="extraLimitedString" optional="false">
<orm:column name="extraLimitedString"/>
@@ -156,6 +158,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes.SimpleTypeObject" name="simpletypes_SimpleTypeObject">
<orm:table name="simpletypes_SimpleTypeObject"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="code" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitution-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitution-orm.xml
index a344964c..cdcb16b7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitution-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitution-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.substitution.ComplexNumber" name="substitution_ComplexNumber">
<orm:table name="substitution_ComplexNumber"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="value" optional="false">
@@ -37,13 +38,14 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.substitution.MultiNumberType" name="substitution_MultiNumberType">
<orm:table name="substitution_MultiNumberType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
<orm:column name="name"/>
</orm:basic>
<orm:one-to-many name="myComplexAbstractGroup" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.substitution.MultiNumberTypeMyComplexAbstractGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="substitution_MultiNumberType_myComplexAbstractGroup_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
@@ -75,19 +77,20 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.substitution.NumberType" name="substitution_NumberType">
<orm:table name="substitution_NumberType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
<orm:column name="name"/>
</orm:basic>
<orm:one-to-many name="mySimpleAbstractGroup" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.substitution.NumberTypeMySimpleAbstractGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="substitution_NumberType_mySimpleAbstractGroup_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
</orm:one-to-many>
<orm:one-to-many name="myComplexAbstractGroup" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.substitution.NumberTypeMyComplexAbstractGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="substitution_NumberType_myComplexAbstractGroup_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon-orm.xml
index 60dc94a5..8e7d5db7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/schemaconstructs/org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon.ComplexAAA" name="substitutionzvon_ComplexAAA">
<orm:table name="substitutionzvon_ComplexAAA"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="value" optional="false">
@@ -48,16 +49,17 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon.RootType" name="substitutionzvon_RootType">
<orm:table name="substitutionzvon_RootType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:one-to-many name="myAbstractGroup" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon.RootTypeMyAbstractGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="substitutionzvon_RootType_myAbstractGroup_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
</orm:one-to-many>
<orm:one-to-many name="myComplexAbstractGroup" orphan-removal="true" target-entity="org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon.RootTypeMyComplexAbstractGroupFeatureGroup">
- <orm:join-table/>
+ <orm:join-table name="substitutionzvon_RootType_myComplexAbstractGroup_FM"/>
<orm:cascade>
<orm:cascade-all/>
</orm:cascade>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.request-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.request-orm.xml
index 7cf3898e..15a884c4 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.request-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.request-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.server.model.request.ActionType" name="request_ActionType">
<orm:table name="request_ActionType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:element-collection name="update">
@@ -26,6 +27,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.server.model.request.QueryType" name="request_QueryType">
<orm:table name="request_QueryType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="namedQuery">
@@ -45,6 +47,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.server.model.request.Parameter" name="request_Parameter">
<orm:table name="request_Parameter"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="name" optional="false">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.response-orm.xml b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.response-orm.xml
index 6cd65b81..281a9d7b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.response-orm.xml
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/META-INF/mapping-files/texo/org.eclipse.emf.texo.server.model.response-orm.xml
@@ -8,6 +8,7 @@
<orm:access>FIELD</orm:access>
<orm:entity class="org.eclipse.emf.texo.server.model.response.ErrorType" name="response_ErrorType">
<orm:table name="response_ErrorType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="errorClass" optional="false">
@@ -29,6 +30,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.server.model.response.ResponseType" name="response_ResponseType">
<orm:table name="response_ResponseType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:basic name="status" optional="false">
@@ -51,6 +53,7 @@
</orm:entity>
<orm:entity class="org.eclipse.emf.texo.server.model.response.ResultType" name="response_ResultType">
<orm:table name="response_ResultType"/>
+ <orm:discriminator-column length="255"/>
<orm:converter class="org.eclipse.emf.texo.test.TexoTestObjectConverter" name="TexoTestObjectConverter"/>
<orm:attributes>
<orm:element-collection name="updated">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/ActionType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/ActionType.java
index 488939ab..01b9a711 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/ActionType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/ActionType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.server.model.request;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "request_ActionType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ActionType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/Parameter.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/Parameter.java
index fa167e4f..faf477a7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/Parameter.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/Parameter.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.server.model.request;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "request_Parameter")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Parameter extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/QueryType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/QueryType.java
index 971a9834..96aa4afe 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/QueryType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/QueryType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "request_QueryType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class QueryType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/request.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/request.ecore
index 5672747e..66621805 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/request.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/request/request.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.server.model.request"
- nsURI="http://www.eclipse.org/emf/texo/server/model/request" nsPrefix="request">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.server.model.request" nsURI="http://www.eclipse.org/emf/texo/server/model/request"
+ nsPrefix="request">
<eClassifiers xsi:type="ecore:EClass" name="ActionType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="ActionType"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ErrorType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ErrorType.java
index 6a3e25f2..984775f0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ErrorType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ErrorType.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.server.model.response;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "response_ErrorType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ErrorType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResponseType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResponseType.java
index b76d0051..02612122 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResponseType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResponseType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "response_ResponseType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ResponseType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResultType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResultType.java
index 2e31662a..93c3ec5d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResultType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/ResultType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.server.model.response;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "response_ResultType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ResultType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/response.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/response.ecore
index 1e88c45f..2714d936 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/response.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/server/model/response/response.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.server.model.response"
- nsURI="http://www.eclipse.org/emf/texo/server/model/response" nsPrefix="response">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.server.model.response" nsURI="http://www.eclipse.org/emf/texo/server/model/response"
+ nsPrefix="response">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/base/identifiable/identifiable.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/base/identifiable/identifiable.ecore
index e9004c32..3a8cad68 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/base/identifiable/identifiable.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/base/identifiable/identifiable.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="identifiable"
- nsURI="http://www.eclipse.org/emf/texo/test/model/base/identifiable" nsPrefix="identifiable">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="identifiable" nsURI="http://www.eclipse.org/emf/texo/test/model/base/identifiable"
+ nsPrefix="identifiable">
<eClassifiers xsi:type="ecore:EClass" name="Identifiable" abstract="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="db_Id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELongObject">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassA.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassA.java
index b14b0068..596f153b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassA.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassA.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz325427;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz325427_EClassA")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class EClassA extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassB.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassB.java
index 9a9730fe..b390b21d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassB.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/EClassB.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz325427;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz325427_EClassB")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class EClassB extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/bz325427.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/bz325427.ecore
index ab31c94a..e1c6051f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/bz325427.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325427/bz325427.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz325427"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz325427" nsPrefix="bz325427">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz325427" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz325427"
+ nsPrefix="bz325427">
<eClassifiers xsi:type="ecore:EClass" name="EClassB" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Address.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Address.java
index e0966c9d..f5d02ec4 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Address.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Address.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz325429_test;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "test_Address")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Address extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Contact.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Contact.java
index 0e12ee8b..8ec1de95 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Contact.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Contact.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz325429_test;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "test_Contact")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Contact extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Person.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Person.java
index 268403ce..dfcca432 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Person.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/Person.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "test_Person")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Person extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/test.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/test.ecore
index 5d87df4a..15bd41ad 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/test.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz325429_test/test.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="test"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz325429" nsPrefix="test">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="test" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz325429"
+ nsPrefix="test">
<eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="firstname" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Address.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Address.java
index ffbfe724..503ba93b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Address.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Address.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Address")
@Table(name = "m_Address")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Address extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Car.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Car.java
index 1f21ad8e..cc4a0909 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Car.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Car.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Car")
@Table(name = "m_Car")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Car extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarModel.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarModel.java
index 91747a56..5407c061 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarModel.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarModel.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_CarModel")
@Table(name = "m_CarModel")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CarModel extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarPassport.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarPassport.java
index 099d59d6..f2c893f9 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarPassport.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarPassport.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_CarPassport")
@Table(name = "m_CarPassport")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CarPassport extends Identifiable implements Document {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarProducer.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarProducer.java
index f6b4e098..abf427fc 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarProducer.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarProducer.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_CarProducer")
@Table(name = "m_CarProducer")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CarProducer extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarRegInfo.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarRegInfo.java
index c5a994c7..3575d987 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarRegInfo.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/CarRegInfo.java
@@ -4,6 +4,7 @@ import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -24,6 +25,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_CarRegInfo")
@Table(name = "m_CarRegInfo")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CarRegInfo extends Identifiable implements Document {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Contract.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Contract.java
index c7769a4d..89e2a295 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Contract.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Contract.java
@@ -8,6 +8,7 @@ import javax.persistence.AccessType;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -31,6 +32,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Contract")
@Table(name = "m_Contract")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Contract extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/ContractPackage.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/ContractPackage.java
index 790aa2b6..4dc6ef46 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/ContractPackage.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/ContractPackage.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -26,6 +27,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_ContractPackage")
@Table(name = "m_ContractPackage")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ContractPackage extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Coordinates.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Coordinates.java
index 18335c0b..4e134506 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Coordinates.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Coordinates.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import java.math.BigDecimal;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Coordinates")
@Table(name = "m_Coordinates")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Coordinates extends Identifiable {
@@ -27,7 +29,7 @@ public class Coordinates extends Identifiable {
* @generated
*/
@Basic()
- @Column(name = "x")
+ @Column(name = "x", precision = 15, scale = 7)
private BigDecimal x = null;
/**
@@ -36,7 +38,7 @@ public class Coordinates extends Identifiable {
* @generated
*/
@Basic()
- @Column(name = "y")
+ @Column(name = "y", precision = 15, scale = 7)
private BigDecimal y = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Document.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Document.java
index 9ed92c43..1c0e773a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Document.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Document.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Access;
import javax.persistence.AccessType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Document")
@Table(name = "m_Document")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
@Access(AccessType.PROPERTY)
public interface Document {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/DrivingLicense.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/DrivingLicense.java
index 1cff57c7..5ab50af2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/DrivingLicense.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/DrivingLicense.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_DrivingLicense")
@Table(name = "m_DrivingLicense")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class DrivingLicense extends Identifiable implements Document {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Event.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Event.java
index 23f13a42..7322bfd2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Event.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Event.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -23,6 +24,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Event")
@Table(name = "m_Event")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Event extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Message.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Message.java
index 5e0790de..f91ca70b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Message.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Message.java
@@ -4,6 +4,7 @@ import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -26,6 +27,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Message")
@Table(name = "m_Message")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Message extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Passport.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Passport.java
index e29623e1..46352efe 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Passport.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Passport.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Passport")
@Table(name = "m_Passport")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Passport extends Identifiable implements Document {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentInfo.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentInfo.java
index aced3b47..bf3a0887 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentInfo.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentInfo.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -26,6 +27,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_PaymentInfo")
@Table(name = "m_PaymentInfo")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PaymentInfo extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentItem.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentItem.java
index 574c4add..c9cfdf67 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentItem.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/PaymentItem.java
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -23,6 +24,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_PaymentItem")
@Table(name = "m_PaymentItem")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class PaymentItem extends Identifiable {
@@ -32,7 +34,7 @@ public abstract class PaymentItem extends Identifiable {
* @generated
*/
@Basic()
- @Column(name = "T_sum")
+ @Column(name = "T_sum", precision = 15, scale = 7)
private BigDecimal sum = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Person.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Person.java
index 75e943d1..a58ef95c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Person.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Person.java
@@ -8,6 +8,7 @@ import javax.persistence.AccessType;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -30,6 +31,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Person")
@Table(name = "m_Person")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Person extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Phone.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Phone.java
index 7910bd56..0c838f3d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Phone.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Phone.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Phone")
@Table(name = "m_Phone")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Phone extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Price.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Price.java
index 062a37b6..2657dce5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Price.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Price.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.texo.test.model.issues.bz331009;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Price")
@Table(name = "m_Price")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Price extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SecretQuestion.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SecretQuestion.java
index 64f69e53..ccb1b2be 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SecretQuestion.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SecretQuestion.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_SecretQuestion")
@Table(name = "m_SecretQuestion")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SecretQuestion extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Service.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Service.java
index b9d08528..2d8c0c3f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Service.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Service.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Service")
@Table(name = "m_Service")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Service extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCard.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCard.java
index 021c901d..2b332d12 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCard.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCard.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_SimCard")
@Table(name = "m_SimCard")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimCard extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCardXSimContract.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCardXSimContract.java
index 095ba98e..8dd91c40 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCardXSimContract.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimCardXSimContract.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_SimCardXSimContract")
@Table(name = "m_SimCardXSimContract")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimCardXSimContract extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimContract.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimContract.java
index c1fde835..ff1fce2f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimContract.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/SimContract.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_SimContract")
@Table(name = "m_SimContract")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimContract extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Tariff.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Tariff.java
index a5da5a54..835201f7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Tariff.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Tariff.java
@@ -7,6 +7,7 @@ import javax.persistence.AccessType;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -26,6 +27,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Tariff")
@Table(name = "m_Tariff")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class Tariff extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Units.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Units.java
index b290b0f2..25cace80 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Units.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/Units.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_Units")
@Table(name = "m_Units")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Units extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/User.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/User.java
index c6adea7a..ba6f01fe 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/User.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/User.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz331009;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_User")
@Table(name = "m_User")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class User extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/UserGroup.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/UserGroup.java
index 4ba23b61..5aa04bf1 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/UserGroup.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/UserGroup.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.texo.test.model.issues.bz331009;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "m_UserGroup")
@Table(name = "m_UserGroup")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class UserGroup extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/VolumePayment.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/VolumePayment.java
index 1ae5398b..198b5577 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/VolumePayment.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/VolumePayment.java
@@ -28,7 +28,7 @@ public class VolumePayment extends PaymentItem {
* @generated
*/
@Basic()
- @Column(name = "volume", nullable = true)
+ @Column(name = "volume", nullable = true, precision = 15, scale = 7)
private BigDecimal volume = null;
/**
@@ -46,7 +46,7 @@ public class VolumePayment extends PaymentItem {
* @generated
*/
@Basic()
- @Column(name = "price", nullable = true)
+ @Column(name = "price", nullable = true, precision = 15, scale = 7)
private BigDecimal price = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/model.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/model.ecore
index 7e424aab..5ece28a8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/model.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz331009/model.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz331009" nsPrefix="m">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz331009"
+ nsPrefix="m">
<eClassifiers xsi:type="ecore:EClass" name="SimCard" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Информация о сим-карте"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/Abstract.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/Abstract.java
index 97387930..81fc23dc 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/Abstract.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/Abstract.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz352285;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz352285_Abstract")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Abstract extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/bz352285.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/bz352285.ecore
index 8c6feb47..373c5adf 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/bz352285.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz352285/bz352285.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz352285"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz352285" nsPrefix="bz352285">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz352285" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz352285"
+ nsPrefix="bz352285">
<eClassifiers xsi:type="ecore:EClass" name="Abstract" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/Test.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/Test.java
index 0fc031b2..a3a1f446 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/Test.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/Test.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.texo.test.model.issues.bz369476;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz369476_Test")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Test extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/bz369476.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/bz369476.ecore
index 7196c33a..8a8d0d61 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/bz369476.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369476/bz369476.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz369476"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz369476" nsPrefix="bz369476">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz369476" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz369476"
+ nsPrefix="bz369476">
<eClassifiers xsi:type="ecore:EClass" name="Test" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="äöü&#xA;äöü&#xA;äöü&#xA;äöü"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/Formula.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/Formula.java
index 6ef673a6..8d9b1e52 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/Formula.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/Formula.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz369931;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz369931_Formula")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Formula extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/bz369931.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/bz369931.ecore
index d296e8a3..3698928b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/bz369931.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369931/bz369931.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz369931"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz369931" nsPrefix="bz369931">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz369931" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz369931"
+ nsPrefix="bz369931">
<eClassifiers xsi:type="ecore:EClass" name="Formula" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="formulaType" eType="#//FormulaType">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369962/Mother.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369962/Mother.java
index b2bad391..b3403df1 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369962/Mother.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz369962/Mother.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.texo.test.model.issues.bz369962;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "bz369962_Mother")
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Mother extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass0.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass0.java
index b0d53786..a47cfad2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass0.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass0.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "test_EClass0")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class EClass0 extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass1.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass1.java
index 6fc71c6b..35fa2a7d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass1.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/EClass1.java
@@ -6,6 +6,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
@@ -22,6 +23,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "test_EClass1")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class EClass1 extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/bz371509.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/bz371509.ecore
index 0a13c4a1..ecad5fef 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/bz371509.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz371509/bz371509.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz371509"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz371509" nsPrefix="test">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz371509" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz371509"
+ nsPrefix="test">
<eClassifiers xsi:type="ecore:EClass" name="EClass0" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EReference" name="toClass1" ordered="false"
eType="#//EClass1" eOpposite="#//EClass1/toClass0">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/Test.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/Test.java
index 343542bb..bc440e9a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/Test.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/Test.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz378087;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "test_Test")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Test extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/bz378087.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/bz378087.ecore
index af08dfed..244b9a96 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/bz378087.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378087/bz378087.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz378087"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz378087" nsPrefix="test">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz378087" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz378087"
+ nsPrefix="test">
<eClassifiers xsi:type="ecore:EClass" name="Test" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="class" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/PriceType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/PriceType.java
index 09c496c1..73a696ff 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/PriceType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/PriceType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz378642;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz378642_PriceType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PriceType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/bz378642.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/bz378642.ecore
index 7f39be08..d6214517 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/bz378642.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz378642/bz378642.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.issues.bz378642"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz378642" nsPrefix="bz378642">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.issues.bz378642" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz378642"
+ nsPrefix="bz378642">
<eClassifiers xsi:type="ecore:EClass" name="PriceType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="priceType"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/PriceType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/PriceType.java
index 61cb0f7e..f8f03c7b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/PriceType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/PriceType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz379796;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz379796_PriceType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PriceType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/bz379796.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/bz379796.ecore
index 05e6abe0..4bb2050b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/bz379796.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379796/bz379796.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.issues.bz379796"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz379796" nsPrefix="bz379796">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.issues.bz379796" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz379796"
+ nsPrefix="bz379796">
<eClassifiers xsi:type="ecore:EClass" name="PriceType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="priceType"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarConditionType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarConditionType.java
index 5695591a..7f0b600a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarConditionType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarConditionType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz379815;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "bz379815_VarConditionType")
@Table(name = "DPL_bz379815_VarConditionType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class VarConditionType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarInputType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarInputType.java
index 1d247f93..02fe5a88 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarInputType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarInputType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.issues.bz379815;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "bz379815_VarInputType")
@Table(name = "DPL_bz379815_VarInputType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class VarInputType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarPolicyTypeType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarPolicyTypeType.java
index 405155eb..ecddef6e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarPolicyTypeType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/VarPolicyTypeType.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.issues.bz379815;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "bz379815_VarPolicyTypeType")
@Table(name = "DPL_bz379815_VarPolicyTypeType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class VarPolicyTypeType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/bz379815.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/bz379815.ecore
index 6cc7eff8..39fb5858 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/bz379815.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz379815/bz379815.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz379815"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz379815" nsPrefix="bz379815">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz379815" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz379815"
+ nsPrefix="bz379815">
<eClassifiers xsi:type="ecore:EClass" name="VarConditionType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="var_conditionType"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/BZ380279.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/BZ380279.java
index 1e1ed288..d89335b3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/BZ380279.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/BZ380279.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.bz380279;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz380279_BZ380279")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class BZ380279 extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/bz380279.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/bz380279.ecore
index 199129eb..61fb8b3b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/bz380279.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/bz380279/bz380279.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz380279"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz380279" nsPrefix="bz380279">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz380279" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/bz380279"
+ nsPrefix="bz380279">
<eClassifiers xsi:type="ecore:EClass" name="BZ380279" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/MySerializableClass.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/MySerializableClass.java
index ba6b5472..af837573 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/MySerializableClass.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/MySerializableClass.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
@@ -22,6 +23,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "bz306546_MySerializableClass")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class MySerializableClass extends Identifiable implements Serializable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/bz306546.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/bz306546.ecore
index efb48824..c192bf62 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/bz306546.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/instanceclassset/bz306546.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz306546"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/instanceclassset" nsPrefix="bz306546">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bz306546" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/instanceclassset"
+ nsPrefix="bz306546">
<eClassifiers xsi:type="ecore:EClass" name="Serializable" instanceClassName="java.io.Serializable"
abstract="true" interface="true"/>
<eClassifiers xsi:type="ecore:EClass" name="MySerializableClass" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable #//Serializable">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/NotRequiredSerialization.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/NotRequiredSerialization.ecore
index eeb84cad..473a91d3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/NotRequiredSerialization.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/NotRequiredSerialization.ecore
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="NotRequiredSerialization"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/NotRequiredSerialization"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="NotRequiredSerialization" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/NotRequiredSerialization"
nsPrefix="NotRequiredSerialization">
<eClassifiers xsi:type="ecore:EClass" name="SerializationTest" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/SerializationTest.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/SerializationTest.java
index 78b11138..185214a7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/SerializationTest.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/notrequiredserialization/SerializationTest.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.notrequiredserialization;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "NotRequiredSerialization_SerializationTest")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SerializationTest extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/MainType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/MainType.java
index e16b6a7a..3936347e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/MainType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/MainType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.subpackage;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "main_MainType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class MainType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/main.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/main.ecore
index 9a8c2a6e..327ec452 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/main.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/main.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="main"
- nsURI="http://www.eclipse.org/emf/texo/test/model/issues/subpackage" nsPrefix="main">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="main" nsURI="http://www.eclipse.org/emf/texo/test/model/issues/subpackage"
+ nsPrefix="main">
<eClassifiers xsi:type="ecore:EClass" name="MainType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub1/Sub1Type.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub1/Sub1Type.java
index a807fce0..98b934c7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub1/Sub1Type.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub1/Sub1Type.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.subpackage.sub1;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sub1_Sub1Type")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Sub1Type extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub2/Sub2Type.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub2/Sub2Type.java
index d3560cf6..4d2272eb 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub2/Sub2Type.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/issues/subpackage/sub2/Sub2Type.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.issues.subpackage.sub2;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sub2_Sub2Type")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Sub2Type extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Account.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Account.java
index 366ef902..5035ef01 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Account.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Account.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.accounting;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_Account")
@Table(name = "accounting_Account")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class Account extends Identifiable implements Serializable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountGroup.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountGroup.java
index f37fcb12..9bb053c8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountGroup.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountGroup.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -23,6 +24,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_AccountGroup")
@Table(name = "accounting_AccountGroup")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AccountGroup extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountingClass.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountingClass.java
index 84ef780a..be38c7c3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountingClass.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/AccountingClass.java
@@ -6,6 +6,7 @@ import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -25,6 +26,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_Accounting")
@Table(name = "accounting_Accounting")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AccountingClass extends Identifiable implements Serializable {
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalGroup.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalGroup.java
index 5f959729..79a8fc16 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalGroup.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalGroup.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -23,6 +24,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_JournalGroup")
@Table(name = "accounting_JournalGroup")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class JournalGroup extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalStatement.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalStatement.java
index a5563b4b..f0a397b1 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalStatement.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/JournalStatement.java
@@ -4,6 +4,7 @@ import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -24,6 +25,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_JournalStatement")
@Table(name = "accounting_JournalStatement")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class JournalStatement extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Report.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Report.java
index d871484e..5de4cd5c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Report.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Report.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.accounting;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_Report")
@Table(name = "accounting_Report")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Report extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/ReportGroup.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/ReportGroup.java
index 877b756c..60b1e2ef 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/ReportGroup.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/ReportGroup.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -25,6 +26,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_ReportGroup")
@Table(name = "accounting_ReportGroup")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ReportGroup extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Vat.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Vat.java
index 904f180e..17ba7c26 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Vat.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/Vat.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.accounting;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "accounting_Vat")
@Table(name = "accounting_Vat")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Vat extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/accounting.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/accounting.ecore
index df6bba11..16013e6b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/accounting.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/accounting/accounting.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="accounting"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/accounting" nsPrefix="accounting">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="accounting" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/accounting"
+ nsPrefix="accounting">
<eClassifiers xsi:type="ecore:EClass" name="Account" abstract="true" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="Account"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/CapacityEntry.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/CapacityEntry.java
index 26235c1e..0833fec1 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/CapacityEntry.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/CapacityEntry.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.capa;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_CapacityEntry")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CapacityEntry extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Machine.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Machine.java
index 33942063..13bc7a71 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Machine.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Machine.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_Machine")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Machine extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/MachineList.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/MachineList.java
index 5c1ad455..cc1c0201 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/MachineList.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/MachineList.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.capa;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_MachineList")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class MachineList extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Production.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Production.java
index 2c5962c9..76f2a367 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Production.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Production.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.capa;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_Production")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Production extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Task.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Task.java
index 6d57caf3..02793bb8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Task.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/Task.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.capa;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_Task")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Task extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkDay.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkDay.java
index 03a1ea6f..064c8ff7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkDay.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkDay.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.capa;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_WorkDay")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class WorkDay extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkWeek.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkWeek.java
index c79936e2..09dd483e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkWeek.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/WorkWeek.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "capa_WorkWeek")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class WorkWeek extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/capa.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/capa.ecore
index 0d651296..49453fc9 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/capa.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/capa/capa.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.capa"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/capa" nsPrefix="capa">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.capa" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/capa"
+ nsPrefix="capa">
<eClassifiers xsi:type="ecore:EClass" name="CapacityEntry" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="CapacityEntry"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/CatalogType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/CatalogType.java
index 6bb1a301..aee6f3ff 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/CatalogType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/CatalogType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "catalog_CatalogType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CatalogType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/PriceType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/PriceType.java
index a2d95ba5..5cbffc54 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/PriceType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/PriceType.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.catalog;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "catalog_PriceType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PriceType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/ProductType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/ProductType.java
index 90120125..870f2c14 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/ProductType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/ProductType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "catalog_ProductType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ProductType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/StringType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/StringType.java
index 4e521203..05fbbdad 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/StringType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/StringType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.catalog;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "catalog_StringType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class StringType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/SupplierType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/SupplierType.java
index 1991da59..dd2a6ef9 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/SupplierType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/SupplierType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.catalog;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "catalog_SupplierType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SupplierType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/catalog.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/catalog.ecore
index 461cef29..b91de9f9 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/catalog.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/catalog/catalog.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.catalog"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/catalog" nsPrefix="catalog">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.catalog" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/catalog"
+ nsPrefix="catalog">
<eClassifiers xsi:type="ecore:EClass" name="CatalogType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="CatalogType"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/Claim.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/Claim.java
index 81215768..405048e5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/Claim.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/Claim.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "claim_Claim")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Claim extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimCompositeKey.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimCompositeKey.java
index 659b9283..69f83c0a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimCompositeKey.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimCompositeKey.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.claim;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "claim_ClaimCompositeKey")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ClaimCompositeKey extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLine.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLine.java
index 9430d2db..943babb4 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLine.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLine.java
@@ -3,6 +3,8 @@ package org.eclipse.emf.texo.test.model.samples.claim;
import java.math.BigDecimal;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -19,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "claim_ClaimLine")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ClaimLine extends Identifiable {
@@ -50,6 +53,7 @@ public class ClaimLine extends Identifiable {
* @generated
*/
@Basic(optional = false)
+ @Column(precision = 15, scale = 7)
private BigDecimal claimLineBilledAmount = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLineCompositeKey.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLineCompositeKey.java
index 07f2f1df..f654aa52 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLineCompositeKey.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/ClaimLineCompositeKey.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.claim;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "claim_ClaimLineCompositeKey")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ClaimLineCompositeKey extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/claim.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/claim.ecore
index 899710c8..ec3a4046 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/claim.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/claim/claim.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.claim"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/claim" nsPrefix="claim">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.claim" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/claim"
+ nsPrefix="claim">
<eClassifiers xsi:type="ecore:EClass" name="Claim" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Claim Information"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Book.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Book.java
index fc2db591..73d0fd22 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Book.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Book.java
@@ -4,6 +4,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.MapKeyColumn;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "emapsample_Book")
@Table(name = "EMAP_BOOK")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Book extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/BookStore.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/BookStore.java
index 0bf3452d..41a037ea 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/BookStore.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/BookStore.java
@@ -5,6 +5,7 @@ import java.util.Map;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
@@ -23,6 +24,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "emapsample_BookStore")
@Table(name = "EMAP_BOOKSTORE")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class BookStore extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Writer.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Writer.java
index b8e139a8..b7e30d6b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Writer.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/Writer.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.emap;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "emapsample_Writer")
@Table(name = "EMAP_WRITER")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Writer extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/emapsample.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/emapsample.ecore
index b86e63fc..794494ab 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/emapsample.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/emap/emapsample.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="emapsample"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/emap" nsPrefix="emapsample">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="emapsample" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/emap"
+ nsPrefix="emapsample">
<eClassifiers xsi:type="ecore:EClass" name="Book" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="Book"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Department.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Department.java
index c4bd0cb5..79b84fdf 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Department.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Department.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "employee_Department")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Department extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Employee.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Employee.java
index 3f2f001e..aea9723d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Employee.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/Employee.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.employee;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "employee_Employee")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Employee extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/employee.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/employee.ecore
index 904d8b79..722206da 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/employee.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/employee/employee.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.employee"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/Employee" nsPrefix="employee">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.employee" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/Employee"
+ nsPrefix="employee">
<eClassifiers xsi:type="ecore:EClass" name="Department" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="Department"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Address.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Address.java
index 242df603..c1a357ed 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Address.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Address.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.extendedpo2;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "com_example_epo2_Address")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class Address extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Customer.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Customer.java
index 72af2dd9..bb1a857e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Customer.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Customer.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "com_example_epo2_Customer")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Customer extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/GlobalLocation.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/GlobalLocation.java
index ca762b5b..5729e228 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/GlobalLocation.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/GlobalLocation.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.extendedpo2;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "com_example_epo2_GlobalLocation")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class GlobalLocation extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Item.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Item.java
index 09853d78..74fab365 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Item.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Item.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.extendedpo2;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "com_example_epo2_Item")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Item extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/PurchaseOrder.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/PurchaseOrder.java
index 32dfa870..6182358b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/PurchaseOrder.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/PurchaseOrder.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -26,6 +27,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "com_example_epo2_PurchaseOrder")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PurchaseOrder extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Supplier.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Supplier.java
index cfcf2174..4f79aa3e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Supplier.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/Supplier.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "com_example_epo2_Supplier")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Supplier extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/epo2.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/epo2.ecore
index da33fe67..a7b2b2a0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/epo2.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extendedpo2/epo2.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="epo2"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/extendedpo2" nsPrefix="com.example.epo2">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="epo2" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/extendedpo2"
+ nsPrefix="com.example.epo2">
<eClassifiers xsi:type="ecore:EClass" name="Item" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EReference" name="order" lowerBound="1" eType="#//PurchaseOrder"
transient="true" eOpposite="#//PurchaseOrder/items">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Addressable.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Addressable.java
index 8405d524..6a455d0e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Addressable.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Addressable.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.extlibrary;
import javax.persistence.Access;
import javax.persistence.AccessType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableInterface;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "extlib_Addressable")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
@Access(AccessType.PROPERTY)
public interface Addressable extends IdentifiableInterface {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Item.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Item.java
index b1f07df1..08981a33 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Item.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Item.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.extlibrary;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "extlib_Item")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class Item extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Lendable.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Lendable.java
index 017a27b5..7dbf48e3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Lendable.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Lendable.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.extlibrary;
import java.util.Set;
import javax.persistence.Access;
import javax.persistence.AccessType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableInterface;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "extlib_Lendable")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
@Access(AccessType.PROPERTY)
public interface Lendable extends IdentifiableInterface {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Library.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Library.java
index cddd1ae3..913ce99d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Library.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Library.java
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Set;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -25,6 +26,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "extlib_Library")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Library extends Identifiable implements Addressable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Person.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Person.java
index 7fd6a909..b0f7e925 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Person.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/Person.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.extlibrary;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "extlib_Person")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Person extends Identifiable implements Addressable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/extlibrary.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/extlibrary.ecore
index 1160af7b..ba752f13 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/extlibrary.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/extlibrary/extlibrary.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="extlibrary"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/extlibrary" nsPrefix="extlib">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="extlibrary" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/extlibrary"
+ nsPrefix="extlib">
<eAnnotations source="texo.test">
<details key="value" value="@NoXMLCompare"/>
</eAnnotations>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/PurchaseOrder.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/PurchaseOrder.java
index 9b133973..02a773c2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/PurchaseOrder.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/PurchaseOrder.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.featuremaptest;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "featuremaptest_PurchaseOrder")
@Table(name = "PUR_ORDER")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PurchaseOrder extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/Supplier.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/Supplier.java
index e9e9c083..bed0949b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/Supplier.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/Supplier.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "featuremaptest_Supplier")
@Table(name = "SUP_TABLE")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Supplier extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/featuremaptest.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/featuremaptest.ecore
index d1bcd661..4b0d1265 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/featuremaptest.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/featuremaptest/featuremaptest.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.featuremaptest"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/featuremaptest" nsPrefix="featuremaptest">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.featuremaptest" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/featuremaptest"
+ nsPrefix="featuremaptest">
<eClassifiers xsi:type="ecore:EClass" name="PurchaseOrder" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="PurchaseOrder"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Forum.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Forum.java
index 0430eabd..75b80a40 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Forum.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Forum.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "forum_Forum")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Forum extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Member.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Member.java
index a8008570..4e28993f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Member.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Member.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "forum_Member")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Member extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Post.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Post.java
index 1cb9a129..a406c4f4 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Post.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Post.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.forum;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "forum_Post")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Post extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Topic.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Topic.java
index d223316a..46ec1157 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Topic.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/Topic.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -24,6 +25,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "forum_Topic")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Topic extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/forum.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/forum.ecore
index d64b9f92..5fbb8f42 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/forum.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/forum/forum.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.forum"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/forum" nsPrefix="forum">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.forum" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/forum"
+ nsPrefix="forum">
<eClassifiers xsi:type="ecore:EClass" name="Forum" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="Forum"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/Describable.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/Describable.java
index 1f65b1b2..61c7e89f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/Describable.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/Describable.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.interfaces;
import javax.persistence.Access;
import javax.persistence.AccessType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableInterface;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "interfaces_Describable")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
@Access(AccessType.PROPERTY)
public interface Describable extends IdentifiableInterface {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableConcrete.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableConcrete.java
index 288dabb6..d6764037 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableConcrete.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableConcrete.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.interfaces;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "interfaces_DescribableConcrete")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class DescribableConcrete extends Identifiable implements Describable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableIdentifiableConcrete.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableIdentifiableConcrete.java
index b047f4d1..c47b158d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableIdentifiableConcrete.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/DescribableIdentifiableConcrete.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.interfaces;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "interfaces_DescribableIdentifiableConcrete")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class DescribableIdentifiableConcrete extends Identifiable implements Describable, IdentifiedType {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiableConcrete.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiableConcrete.java
index df398c38..a6d17f5f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiableConcrete.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiableConcrete.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.interfaces;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "interfaces_IdentifiableConcrete")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class IdentifiableConcrete extends Identifiable implements IdentifiedType {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiedType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiedType.java
index f4cafebf..788ae842 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiedType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/IdentifiedType.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.interfaces;
import javax.persistence.Access;
import javax.persistence.AccessType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableInterface;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "interfaces_IdentifiedType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
@Access(AccessType.PROPERTY)
public interface IdentifiedType extends IdentifiableInterface {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/interfaces.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/interfaces.ecore
index b14ca096..ced38593 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/interfaces.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/interfaces/interfaces.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="interfaces"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/interfaces" nsPrefix="interfaces">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="interfaces" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/interfaces"
+ nsPrefix="interfaces">
<eClassifiers xsi:type="ecore:EClass" name="DescribableIdentifiableConcrete" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable #//Describable #//IdentifiedType">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PDeclaration.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PDeclaration.java
index d94579d9..a9b19265 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PDeclaration.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PDeclaration.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.inventory;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "inv_PDeclaration")
@Table(name = "inv_PDeclaration")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PDeclaration extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PType.java
index 13897c8e..8e55c7ff 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/PType.java
@@ -7,6 +7,7 @@ import java.util.Set;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -27,6 +28,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "inv_PType")
@Table(name = "inv_PType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/inv.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/inv.ecore
index 5096ca11..e67b9a53 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/inv.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/inventory/inv.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="inv"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/inventory" nsPrefix="inv">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="inv" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/inventory"
+ nsPrefix="inv">
<eAnnotations source="teneo.jpa">
<details key="appinfo" value="@SequenceGenerator(name=&quot;GENERATOR&quot;, sequenceName=&quot;IDSEQUENCE&quot;)"/>
</eAnnotations>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/LetterBodyType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/LetterBodyType.java
index 8773e620..e6d270ca 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/LetterBodyType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/LetterBodyType.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "jpamixed_LetterBodyType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class LetterBodyType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/SalutationType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/SalutationType.java
index bc7c48df..da70ec5d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/SalutationType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/SalutationType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.jpamixed;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "jpamixed_SalutationType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SalutationType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/jpamixed.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/jpamixed.ecore
index b4bce0c1..5079a59b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/jpamixed.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/jpamixed/jpamixed.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.jpamixed"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/jpamixed" nsPrefix="jpamixed">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.jpamixed" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/jpamixed"
+ nsPrefix="jpamixed">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore
index ed10d491..d4084c1c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/librarymodelclasses/model/library.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="library"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/library" nsPrefix="library">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="library" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/library"
+ nsPrefix="library">
<eAnnotations source="texo.java.annotation">
<details key="type" value="@org.eclipse.emf.texo.test.models.annotations.TestAnnotationOne(&quot;type&quot;)"/>
</eAnnotations>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Album.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Album.java
index 4d7fc957..189a3622 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Album.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Album.java
@@ -6,6 +6,7 @@ import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -27,6 +28,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "org_elver_music_Album")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Album extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Artist.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Artist.java
index d8019a8c..d285508f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Artist.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Artist.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.music;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.Temporal;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "org_elver_music_Artist")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Artist extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Country.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Country.java
index e4051f21..6402e9de 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Country.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Country.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.music;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "org_elver_music_Country")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Country extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Genre.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Genre.java
index 8c9b86de..d7d96193 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Genre.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Genre.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.music;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "org_elver_music_Genre")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Genre extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Song.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Song.java
index db8e59d8..feba8924 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Song.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/Song.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.music;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "org_elver_music_Song")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Song extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/music.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/music.ecore
index 7710a1af..907dfd09 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/music.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/music/music.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="music"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/music" nsPrefix="org.elver.music">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="music" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/music"
+ nsPrefix="org.elver.music">
<eClassifiers xsi:type="ecore:EClass" name="Artist" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="elver.org/displayLabel">
<details key="value" value="${firstName} ${lastName}"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/ActType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/ActType.java
index 20126219..5084071a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/ActType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/ActType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_ActType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ActType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/FmType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/FmType.java
index 4f222846..74e5d6a2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/FmType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/FmType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.play;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.OrderColumn;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_FmType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class FmType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaGroupType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaGroupType.java
index 09852f50..f5890c52 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaGroupType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaGroupType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.OrderColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_PersonaGroupType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PersonaGroupType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaeType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaeType.java
index 1895c475..b26ef047 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaeType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PersonaeType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.play;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_PersonaeType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PersonaeType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PlayType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PlayType.java
index b71914e9..19ee195d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PlayType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/PlayType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_PlayType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PlayType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SceneType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SceneType.java
index 7d9a9839..1a6278df 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SceneType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SceneType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_SceneType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SceneType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SpeechType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SpeechType.java
index d7fae9f8..eff450b0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SpeechType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/SpeechType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.play;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "play_SpeechType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SpeechType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/play.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/play.ecore
index d2cb6727..a907ccef 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/play.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/play/play.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.play"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/play" nsPrefix="play">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.play" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/play"
+ nsPrefix="play">
<eAnnotations>
<details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&lt;jxb:globalBindings collectionType=&quot;java.util.Vector&quot; xmlns:jxb=&quot;http://java.sun.com/xml/ns/jaxb&quot;/>&#xA;&#x9;&#x9;"/>
</eAnnotations>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalBusiness.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalBusiness.java
index 80c208ce..dbbf4c2e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalBusiness.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalBusiness.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.rental;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "rental_RentalBusiness")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RentalBusiness extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalCarDriver.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalCarDriver.java
index c33c191d..de64251a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalCarDriver.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalCarDriver.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.rental;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "rental_RentalCarDriver")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RentalCarDriver extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContract.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContract.java
index 7f21bcb6..d102aa8f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContract.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContract.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "rental_RentalContract")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RentalContract extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContractLine.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContractLine.java
index 5f8453c8..1be709de 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContractLine.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalContractLine.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.rental;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinColumns;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "rental_RentalContractLine")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RentalContractLine extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalUnit.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalUnit.java
index de024777..6341c5b0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalUnit.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/RentalUnit.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.rental;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "rental_RentalUnit")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class RentalUnit extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/rental.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/rental.ecore
index 6b55d22f..372209b7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/rental.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/rental/rental.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.rental"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/rental" nsPrefix="rental">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.rental" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/rental"
+ nsPrefix="rental">
<eClassifiers xsi:type="ecore:EClass" name="RentalBicycle" eSuperTypes="#//RentalUnit">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="RentalBicycle"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/Item.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/Item.java
index 8ac75bef..f6d0bdae 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/Item.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/Item.java
@@ -4,6 +4,8 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -18,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "schemaprimerpo_Item")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Item extends Identifiable {
@@ -43,6 +46,7 @@ public class Item extends Identifiable {
* @generated
*/
@Basic(optional = false)
+ @Column(precision = 15, scale = 7)
private BigDecimal uSPrice = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/PurchaseOrder.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/PurchaseOrder.java
index 12187929..910d1541 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/PurchaseOrder.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/PurchaseOrder.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
@@ -22,6 +23,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "schemaprimerpo_PurchaseOrder")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PurchaseOrder extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/USAddress.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/USAddress.java
index 41cf7126..2e212ed8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/USAddress.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/USAddress.java
@@ -2,6 +2,8 @@ package org.eclipse.emf.texo.test.model.samples.schemaprimerpo;
import java.math.BigDecimal;
import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "schemaprimerpo_USAddress")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class USAddress extends Identifiable {
@@ -55,6 +58,7 @@ public class USAddress extends Identifiable {
* @generated
*/
@Basic(optional = false)
+ @Column(precision = 15, scale = 7)
private BigDecimal zip = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/schemaprimerpo.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/schemaprimerpo.ecore
index 1c4c85d9..08396ad2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/schemaprimerpo.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schemaprimerpo/schemaprimerpo.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.schemaprimerpo"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/schemaprimerpo" nsPrefix="schemaprimerpo">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.schemaprimerpo" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/schemaprimerpo"
+ nsPrefix="schemaprimerpo">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/Asset.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/Asset.java
index 7f529f61..de887532 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/Asset.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/Asset.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.schoollibrary;
import javax.persistence.Access;
import javax.persistence.AccessType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.persistence.annotations.Converter;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "schoollibrary_Asset")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
@Access(AccessType.PROPERTY)
public interface Asset {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/schoollibrary.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/schoollibrary.ecore
index 2bb7ba33..d06d7ad6 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/schoollibrary.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/schoollibrary/schoollibrary.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="schoollibrary"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/schoollibrary" nsPrefix="schoollibrary">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="schoollibrary" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/schoollibrary"
+ nsPrefix="schoollibrary">
<eClassifiers xsi:type="ecore:EClass" name="Asset" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/AuthorsType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/AuthorsType.java
index 90fc4f0a..88d384ed 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/AuthorsType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/AuthorsType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.sunbooks;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.OrderColumn;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sunBooks_AuthorsType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AuthorsType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BookType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BookType.java
index 208f1875..ac1a46a0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BookType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BookType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.sunbooks;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sunBooks_BookType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class BookType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BooksType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BooksType.java
index bf481332..ee3e235e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BooksType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/BooksType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.samples.sunbooks;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sunBooks_BooksType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class BooksType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/CollectionType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/CollectionType.java
index f44dbe18..4e5a30bf 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/CollectionType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/CollectionType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.sunbooks;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sunBooks_CollectionType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CollectionType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/PromotionType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/PromotionType.java
index eece075d..06657f3c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/PromotionType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/PromotionType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.samples.sunbooks;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "sunBooks_PromotionType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PromotionType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/sunBooks.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/sunBooks.ecore
index 473e4ec0..704cd147 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/sunBooks.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/sunbooks/sunBooks.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.sunBooks"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/sun_books" nsPrefix="sunBooks">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.samples.sunBooks" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/sun_books"
+ nsPrefix="sunBooks">
<eClassifiers xsi:type="ecore:EClass" name="AuthorsType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="authors_._type"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/ManyTypes.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/ManyTypes.java
index 936ee108..f2c66f28 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/ManyTypes.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/ManyTypes.java
@@ -8,6 +8,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.CollectionTable;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -28,6 +30,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "types_ManyTypes")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ManyTypes extends Identifiable {
@@ -125,6 +128,7 @@ public class ManyTypes extends Identifiable {
*/
@ElementCollection()
@OrderColumn()
+ @Column(precision = 15, scale = 7)
@CollectionTable(name = "types_ManyTypes_bigDecimal")
private List<BigDecimal> bigDecimal = new ArrayList<BigDecimal>();
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/SingleTypes.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/SingleTypes.java
index 0a31b086..402983f3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/SingleTypes.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/SingleTypes.java
@@ -4,6 +4,8 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -24,6 +26,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "types_SingleTypes")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SingleTypes extends Identifiable {
@@ -154,6 +157,7 @@ public class SingleTypes extends Identifiable {
* @generated
*/
@Basic()
+ @Column(precision = 15, scale = 7)
private BigDecimal bigDecimal = new BigDecimal("5");
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/types.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/types.ecore
index d2e9f084..cfc10ef2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/types.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/types/types.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="types"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/types" nsPrefix="types">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="types" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/types"
+ nsPrefix="types">
<eClassifiers xsi:type="ecore:EClass" name="SingleTypes" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="string" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="test&quot;test">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/WorkflowElement.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/WorkflowElement.java
index 5b66b518..23cdd44e 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/WorkflowElement.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/WorkflowElement.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.samples.workflow;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "workflow_WorkflowElement")
@Table(name = "workflow_WorkflowElement")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class WorkflowElement extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/workflow.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/workflow.ecore
index 692697e9..edaf03a0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/workflow.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/samples/workflow/workflow.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="workflow"
- nsURI="http://www.eclipse.org/emf/texo/test/model/samples/workflow" nsPrefix="workflow">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="workflow" nsURI="http://www.eclipse.org/emf/texo/test/model/samples/workflow"
+ nsPrefix="workflow">
<eClassifiers xsi:type="ecore:EClass" name="Workflow" eSuperTypes="#//WorkflowElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
eType="#//WorkflowNode" containment="true" eOpposite="#//WorkflowNode/workflow">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/A.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/A.java
index 7d5f89a1..904266b9 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/A.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/A.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.anytype;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "anytype_A")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class A extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/B.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/B.java
index 2aa08b60..10044fad 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/B.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/B.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.anytype;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "anytype_B")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class B extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/C.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/C.java
index d136f244..f8a54010 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/C.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/C.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.anytype;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -12,6 +13,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "anytype_C")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class C extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/TestAny.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/TestAny.java
index f270442d..88decebd 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/TestAny.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/TestAny.java
@@ -5,6 +5,7 @@ import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
@@ -21,6 +22,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "anytype_TestAny")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class TestAny extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/anytype.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/anytype.ecore
index f6f5e109..497a139b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/anytype.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/anytype/anytype.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.anytype"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/anytype" nsPrefix="anytype">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.anytype" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/anytype"
+ nsPrefix="anytype">
<eClassifiers xsi:type="ecore:EClass" name="A" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="myA"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/AType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/AType.java
index e1238aa4..a62a739d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/AType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/AType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.attributes;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "attributes_AType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/RType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/RType.java
index 9b8e2894..eb324f18 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/RType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/RType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.attributes;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "attributes_RType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/attributes.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/attributes.ecore
index cc0628b1..a6d480f3 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/attributes.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/attributes/attributes.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.attributes"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/attributes"
nsPrefix="attributes">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/TestDate.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/TestDate.java
index dc1c31da..b2880bec 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/TestDate.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/TestDate.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.datetime;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "datetime_TestDate")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class TestDate extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/datetime.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/datetime.ecore
index 860102b0..453e690c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/datetime.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/datetime/datetime.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.datetime"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/datetime" nsPrefix="datetime">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.datetime" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/datetime"
+ nsPrefix="datetime">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/ComplexType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/ComplexType.java
index f8d4b78a..f0d7054a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/ComplexType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/ComplexType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.documentroot;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "documentroot_ComplexType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ComplexType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/documentroot.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/documentroot.ecore
index a8654077..f6ddfbfa 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/documentroot.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/documentroot/documentroot.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.documentroot"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/documentroot"
nsPrefix="documentroot">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/DurationTest.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/DurationTest.java
index 58650bd9..303e05de 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/DurationTest.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/DurationTest.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.OrderColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "duration_DurationTest")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class DurationTest extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/duration.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/duration.ecore
index 2f38a665..870ad056 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/duration.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/duration/duration.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="duration"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/duration" nsPrefix="duration">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="duration" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/duration"
+ nsPrefix="duration">
<eClassifiers xsi:type="ecore:EClass" name="DurationTest" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" unique="false" lowerBound="1"
eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Element.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Element.java
index 6628ab09..f21dde36 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Element.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Element.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "ecoreattrs_Element")
@Table(name = "ecoreattrs_Element")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Element extends Identifiable {
@@ -28,7 +30,7 @@ public class Element extends Identifiable {
* @generated
*/
@OneToMany(cascade = { CascadeType.ALL }, orphanRemoval = true, targetEntity = ElementNameMapFeatureGroup.class)
- @JoinTable()
+ @JoinTable(name = "ecoreattrs_Element_nameMap_FM")
private List<ElementNameMapFeatureGroup> nameMap = new ArrayList<ElementNameMapFeatureGroup>();
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Feature.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Feature.java
index 5910521b..231325c5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Feature.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Feature.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "ecoreattrs_Feature")
@Table(name = "ecoreattrs_Feature")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Feature extends Identifiable {
@@ -28,7 +30,7 @@ public class Feature extends Identifiable {
* @generated
*/
@OneToMany(cascade = { CascadeType.ALL }, orphanRemoval = true, targetEntity = FeatureAMapFeatureGroup.class)
- @JoinTable()
+ @JoinTable(name = "ecoreattrs_Feature_aMap_FM")
private List<FeatureAMapFeatureGroup> aMap = new ArrayList<FeatureAMapFeatureGroup>();
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Mixed.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Mixed.java
index de34f358..92eceef0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Mixed.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/Mixed.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "ecoreattrs_Mixed")
@Table(name = "ecoreattrs_Mixed")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Mixed extends Identifiable {
@@ -28,7 +30,7 @@ public class Mixed extends Identifiable {
* @generated
*/
@OneToMany(cascade = { CascadeType.ALL }, orphanRemoval = true, targetEntity = MixedMixedFeatureGroup.class)
- @JoinTable()
+ @JoinTable(name = "ecoreattrs_Mixed_mixed_FM")
private List<MixedMixedFeatureGroup> mixed = new ArrayList<MixedMixedFeatureGroup>();
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/NameList.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/NameList.java
index 884b1013..a0ee57ba 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/NameList.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/NameList.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs;
import javax.persistence.Basic;
import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Table;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
*/
@Entity(name = "ecoreattrs_NameList")
@Table(name = "ecoreattrs_NameList")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class NameList extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/ecoreattrs.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/ecoreattrs.ecore
index eb723b97..02094f70 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/ecoreattrs.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/ecoreattrs/ecoreattrs.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.ecoreattrs"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/ecoreattrs"
nsPrefix="ecoreattrs">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Book.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Book.java
index 6c8e0472..c149e5b5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Book.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Book.java
@@ -4,6 +4,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.MapKeyColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "emap_Book")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Book extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/BookStore.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/BookStore.java
index adb1eecf..94f78c4c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/BookStore.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/BookStore.java
@@ -4,6 +4,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.MapKeyColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "emap_BookStore")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class BookStore extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Writer.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Writer.java
index c3ba76b1..88054b43 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Writer.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/Writer.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.emap;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "emap_Writer")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Writer extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/emap.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/emap.ecore
index edb06029..162d8022 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/emap.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/emap/emap.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.emap"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/emap" nsPrefix="emap">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.emap" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/emap"
+ nsPrefix="emap">
<eClassifiers xsi:type="ecore:EClass" name="Book" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="Book"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressGroupType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressGroupType.java
index a61b2f7b..97a2a1a8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressGroupType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressGroupType.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.groupall;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -16,6 +17,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "groupall_AddressGroupType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AddressGroupType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressList.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressList.java
index 9e5cb9cd..d18c781b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressList.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressList.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "groupall_AddressList")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AddressList extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressType.java
index b5929f29..589b2314 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/AddressType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.groupall;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "groupall_AddressType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AddressType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllMapType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllMapType.java
index a5fbd2df..d026a606 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllMapType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllMapType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.groupall;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "groupall_SimpleAllMapType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimpleAllMapType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllType.java
index eaf5d6d3..6f41117a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/SimpleAllType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.groupall;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "groupall_SimpleAllType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimpleAllType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/groupall.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/groupall.ecore
index 62b6134d..7374ab02 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/groupall.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/groupall/groupall.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.groupall"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/groupall" nsPrefix="groupall">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.groupall" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/groupall"
+ nsPrefix="groupall">
<eClassifiers xsi:type="ecore:EClass" name="AddressGroupType" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="AddressGroup_._type"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include1.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include1.java
index 1e5ff7a6..fbe42873 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include1.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include1.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.include;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "include_Include1")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Include1 extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include2.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include2.java
index 78ff6432..500bd92f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include2.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/Include2.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.include;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "include_Include2")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Include2 extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/include.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/include.ecore
index 6a487b28..fcec14f7 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/include.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/include/include.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.include"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/include" nsPrefix="include">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.include" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/include"
+ nsPrefix="include">
<eClassifiers xsi:type="ecore:EClass" name="Include1" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="Include1"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/StatesByCountry.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/StatesByCountry.java
index c983e271..d262e3bf 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/StatesByCountry.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/StatesByCountry.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.list;
import java.util.List;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "list_statesByCountry")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class StatesByCountry extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/list.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/list.ecore
index fb6cc83a..541a3b55 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/list.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/list/list.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.list"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/list" nsPrefix="list">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.list" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/list"
+ nsPrefix="list">
<eClassifiers xsi:type="ecore:EClass" name="statesByCountry" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value="CountryStates"/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/StatesByCountry.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/StatesByCountry.java
index d5289a71..2e482e3c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/StatesByCountry.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/StatesByCountry.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.OrderColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "listunion_statesByCountry")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class StatesByCountry extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/listunion.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/listunion.ecore
index d7f07d9b..40f3b355 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/listunion.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/listunion/listunion.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.listunion"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/listunion"
nsPrefix="listunion">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/LetterBodyType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/LetterBodyType.java
index 1d224d40..a0bc9901 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/LetterBodyType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/LetterBodyType.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "mixed_LetterBodyType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class LetterBodyType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/SalutationType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/SalutationType.java
index be6ad07d..80ad48d4 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/SalutationType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/SalutationType.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.mixed;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "mixed_SalutationType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SalutationType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/mixed.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/mixed.ecore
index 0bd973cf..c848e6c0 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/mixed.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/mixed/mixed.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.mixed"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/mixed" nsPrefix="mixed">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.mixed" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/mixed"
+ nsPrefix="mixed">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/A.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/A.java
index 2f37d2f7..21cdf051 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/A.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/A.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "nestedgroup_A")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class A extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/CType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/CType.java
index 29d948d8..20b62b89 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/CType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/CType.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "nestedgroup_CType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class CType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/Element.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/Element.java
index daa6fc46..5d21826c 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/Element.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/Element.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "nestedgroup_Element")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Element extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/nestedgroup.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/nestedgroup.ecore
index e44c30dc..e3481fd6 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/nestedgroup.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/nestedgroup/nestedgroup.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.nestedgroup"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/nestedgroup"
nsPrefix="nestedgroup">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/Mytest.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/Mytest.java
index eea439fb..a2096483 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/Mytest.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/Mytest.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.OrderColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "qname_Mytest")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Mytest extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/qname.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/qname.ecore
index 4ade6cfc..84218018 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/qname.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/qname/qname.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.qname"
- nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/qname" nsPrefix="qname">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.qname" nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/qname"
+ nsPrefix="qname">
<eAnnotations source="http://www.w3.org/XML/1998/namespace">
<details key="lang" value="en"/>
</eAnnotations>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/XMLDeviant.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/XMLDeviant.java
index ada38abf..5c2e8277 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/XMLDeviant.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/XMLDeviant.java
@@ -3,6 +3,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.restriction;
import java.math.BigInteger;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "restriction_XMLDeviant")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class XMLDeviant extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/restriction.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/restriction.ecore
index 9904514a..ef83e631 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/restriction.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/restriction/restriction.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.restriction"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/restriction"
nsPrefix="restriction">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/Person.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/Person.java
index c5758608..1a355c03 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/Person.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/Person.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "simplechoice_Person")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Person extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/simplechoice.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/simplechoice.ecore
index f91864d1..0ce04ebc 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/simplechoice.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplechoice/simplechoice.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.simplechoice"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/simplechoice"
nsPrefix="simplechoice">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/PurchaseOrder.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/PurchaseOrder.java
index 7b55b715..2afcc536 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/PurchaseOrder.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/PurchaseOrder.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "simplefeaturemap_PurchaseOrder")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PurchaseOrder extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/Supplier.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/Supplier.java
index 8f317154..a5f563ad 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/Supplier.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/Supplier.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "simplefeaturemap_Supplier")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Supplier extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/simplefeaturemap.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/simplefeaturemap.ecore
index d0588a82..af0442aa 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/simplefeaturemap.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simplefeaturemap/simplefeaturemap.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.simplefeaturemap"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/simplefeaturemap"
nsPrefix="simplefeaturemap">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleList.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleList.java
index 43c3fbd0..903ee216 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleList.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleList.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CollectionTable;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -24,6 +25,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "simpletypes_SimpleList")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimpleList extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleType.java
index a4e3b1d6..cdf15b0a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleType.java
@@ -3,6 +3,8 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -19,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "simpletypes_SimpleType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimpleType extends Identifiable {
@@ -118,6 +121,7 @@ public class SimpleType extends Identifiable {
* @generated
*/
@Basic(optional = false)
+ @Column(precision = 15, scale = 7)
private BigDecimal limitedDecimal = null;
/**
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleTypeObject.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleTypeObject.java
index 6476201a..a8ce2f72 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleTypeObject.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/SimpleTypeObject.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes;
import java.util.Date;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "simpletypes_SimpleTypeObject")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class SimpleTypeObject extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/simpletypes.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/simpletypes.ecore
index 90b96948..11b3a37b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/simpletypes.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/simpletypes/simpletypes.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.simpletypes"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/simpletypes"
nsPrefix="simpletypes">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/ComplexNumber.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/ComplexNumber.java
index a4c14a26..a9ab7ca5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/ComplexNumber.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/ComplexNumber.java
@@ -2,6 +2,7 @@ package org.eclipse.emf.texo.test.model.schemaconstructs.substitution;
import java.math.BigInteger;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "substitution_ComplexNumber")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ComplexNumber extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/MultiNumberType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/MultiNumberType.java
index 1ccb05b6..fd2f1f66 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/MultiNumberType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/MultiNumberType.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "substitution_MultiNumberType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class MultiNumberType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/NumberType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/NumberType.java
index 27aaa7e5..3361f969 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/NumberType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/NumberType.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "substitution_NumberType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class NumberType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/substitution.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/substitution.ecore
index 6f2d48b4..cfaff5a6 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/substitution.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitution/substitution.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.substitution"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/substitution"
nsPrefix="substitution">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/ComplexAAA.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/ComplexAAA.java
index d7b3b63e..9087a39f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/ComplexAAA.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/ComplexAAA.java
@@ -1,6 +1,7 @@
package org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "substitutionzvon_ComplexAAA")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class ComplexAAA extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/RootType.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/RootType.java
index 860743bb..8bf0b8fe 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/RootType.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/RootType.java
@@ -4,6 +4,7 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.JoinTable;
import javax.persistence.OneToMany;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "substitutionzvon_RootType")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RootType extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/substitutionzvon.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/substitutionzvon.ecore
index f787e521..a547bf17 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/substitutionzvon.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/test/model/schemaconstructs/substitutionzvon/substitutionzvon.ecore
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.test.model.schemaconstructs.substitutionzvon"
nsURI="http://www.eclipse.org/emf/texo/test/model/schemaconstructs/substitutionzvon"
nsPrefix="substitutionzvon">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/xml/model/texoextensions/texoExtensions.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/xml/model/texoextensions/texoExtensions.ecore
index 82f56c86..e92ae07f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/xml/model/texoextensions/texoExtensions.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/emf/texo/xml/model/texoextensions/texoExtensions.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.xml.model.texoExtensions"
- nsURI="http://www.eclipse.org/emf/texo/xml/model/texo_extensions" nsPrefix="texoExtensions">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="org.eclipse.emf.texo.xml.model.texoExtensions" nsURI="http://www.eclipse.org/emf/texo/xml/model/texo_extensions"
+ nsPrefix="texoExtensions">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/Property.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/Property.java
index 0ae72d97..b03865e2 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/Property.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/Property.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "mm_Property")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Property extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/PropertyContainer.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/PropertyContainer.java
index b55e3ff8..d2c35a76 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/PropertyContainer.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/PropertyContainer.java
@@ -3,6 +3,7 @@ package org.eclipse.graphiti.mm;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "mm_PropertyContainer")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class PropertyContainer extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/StyleContainer.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/StyleContainer.java
index 6edc5f94..2e35f1c5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/StyleContainer.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/StyleContainer.java
@@ -3,6 +3,7 @@ package org.eclipse.graphiti.mm;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "mm_StyleContainer")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class StyleContainer extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AbstractStyle.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AbstractStyle.java
index 7f78fc51..77795599 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AbstractStyle.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AbstractStyle.java
@@ -2,6 +2,7 @@ package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -17,6 +18,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_AbstractStyle")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class AbstractStyle extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AdaptedGradientColoredAreas.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AdaptedGradientColoredAreas.java
index 4aedc052..31b3a1f8 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AdaptedGradientColoredAreas.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/AdaptedGradientColoredAreas.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_AdaptedGradientColoredAreas")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class AdaptedGradientColoredAreas extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Color.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Color.java
index 6f2f882c..917e54b5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Color.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Color.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_Color")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Color extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Font.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Font.java
index a6f8c70f..1fca9115 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Font.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Font.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_Font")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Font extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredArea.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredArea.java
index a9bb891b..866603dc 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredArea.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredArea.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -15,6 +16,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_GradientColoredArea")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class GradientColoredArea extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredAreas.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredAreas.java
index 87e3ecd8..d0048f98 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredAreas.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredAreas.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.persistence.OrderColumn;
@@ -19,6 +20,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_GradientColoredAreas")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class GradientColoredAreas extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredLocation.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredLocation.java
index 066a57b0..409fa141 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredLocation.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/GradientColoredLocation.java
@@ -2,6 +2,7 @@ package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -18,6 +19,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_GradientColoredLocation")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class GradientColoredLocation extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Point.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Point.java
index a180b2e1..5c908dcb 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Point.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/Point.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_Point")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class Point extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/PrecisionPoint.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/PrecisionPoint.java
index 92ea7106..7924969b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/PrecisionPoint.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/PrecisionPoint.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.Basic;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
@@ -13,6 +14,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_PrecisionPoint")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class PrecisionPoint extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/RenderingStyle.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/RenderingStyle.java
index 3fecc839..93728c7a 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/RenderingStyle.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/RenderingStyle.java
@@ -1,6 +1,7 @@
package org.eclipse.graphiti.mm.algorithms.styles;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -14,6 +15,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "st_RenderingStyle")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public class RenderingStyle extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore
index 1430f07f..2967c6ef 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mm"
- nsURI="http://eclipse.org/graphiti/mm" nsPrefix="mm">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mm" nsURI="http://eclipse.org/graphiti/mm" nsPrefix="mm">
<eClassifiers xsi:type="ecore:EClass" name="Property" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/core/Element.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/core/Element.java
index d3fd1ab5..360baa98 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/core/Element.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/core/Element.java
@@ -3,6 +3,7 @@ package org.eclipse.modisco.kdm.core;
import java.util.HashSet;
import java.util.Set;
import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
@@ -20,6 +21,7 @@ import org.eclipse.persistence.annotations.Converters;
* @generated
*/
@Entity(name = "core_Element")
+@DiscriminatorColumn(length = 255)
@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter") })
public abstract class Element extends Identifiable {
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/kdm.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/kdm.ecore
index 076b44e1..7372fb5b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/kdm.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/modisco/kdm/kdm.ecore
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="kdm"
- nsURI="http://www.eclipse.org/MoDisco/kdm" nsPrefix="kdm">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="kdm" nsURI="http://www.eclipse.org/MoDisco/kdm" nsPrefix="kdm">
<eSubpackages name="core" nsURI="http://www.eclipse.org/MoDisco/kdm/core" nsPrefix="core">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="The Core package provides basic constructs for creating and describing meta-model classes in all specific KDM packages.&#xD;&#xA;Classes of the Core package determine the structure of KDM models, define fundamental modeling constraints, and&#xD;&#xA;determine the reflective API to KDM instances."/>
diff --git a/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
index 17325acb..604721f9 100644
--- a/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.compare;bundle-version="[1.0.1,2.0.0)",
org.junit;bundle-version="[4.0.0,5.1.0)"
Export-Package: org.eclipse.emf.texo.xml.test;version="0.1.0"
+Import-Package: com.google.common.collect;version="[10.0.0,11.0.0)"

Back to the top