From b1869a98cf8416d1684bcd159144c7892a12ef42 Mon Sep 17 00:00:00 2001 From: Gurunandan Rao Date: Tue, 12 Dec 2023 15:04:20 +0530 Subject: [PATCH] remove build.xml files. Signed-off-by: Gurunandan Rao --- glassfish-runner/jpa-tck/pom.xml | 31 +- .../main/java/com/sun/ts/tests/jpa/build.xml | 40 -- .../com/sun/ts/tests/jpa/common/build.xml | 22 - .../common/pluggability/altprovider/build.xml | 41 -- .../jpa/common/pluggability/util/build.xml | 25 -- .../ts/tests/jpa/common/schema30/Util.java | 15 +- .../jpa/common/schema30/UtilAliasData.java | 26 ++ .../common/schema30/UtilAliasOnlyData.java | 25 ++ .../schema30/UtilCustAliasProductData.java | 27 ++ .../jpa/common/schema30/UtilCustomerData.java | 25 ++ .../schema30/UtilDepartmentEmployeeData.java | 25 ++ .../jpa/common/schema30/UtilOrderData.java | 27 ++ .../jpa/common/schema30/UtilPhoneData.java | 26 ++ .../jpa/common/schema30/UtilProductData.java | 25 ++ .../tests/jpa/common/schema30/UtilSetup.java | 24 + .../jpa/common/schema30/UtilTrimData.java | 25 ++ .../ts/tests/jpa/common/schema30/build.xml | 22 - .../tests/jpa/core/EntityGraph/ClientIT.java | 8 +- .../ts/tests/jpa/core/EntityGraph/build.xml | 60 --- .../jpa/core/StoredProcedureQuery/Client.java | 10 +- .../jpa/core/StoredProcedureQuery/build.xml | 61 --- .../jpa/core/annotations/access/build.xml | 22 - .../core/annotations/access/field/build.xml | 58 --- .../annotations/access/mappedsc/ClientIT.java | 10 +- .../annotations/access/mappedsc/build.xml | 65 --- .../annotations/access/property/Client.java | 54 +++ .../access/property/Client1IT.java | 5 +- .../annotations/access/property/build.xml | 63 --- .../annotations/assocoverride/ClientIT.java | 10 +- .../core/annotations/assocoverride/build.xml | 60 --- .../jpa/core/annotations/basic/Client.java | 10 +- .../jpa/core/annotations/basic/build.xml | 54 --- .../ts/tests/jpa/core/annotations/build.xml | 22 - .../annotations/collectiontable/ClientIT.java | 10 +- .../annotations/collectiontable/build.xml | 58 --- .../core/annotations/convert/ClientIT.java | 10 +- .../jpa/core/annotations/convert/build.xml | 76 ---- .../discriminatorValue/ClientIT.java | 10 +- .../annotations/discriminatorValue/build.xml | 60 --- .../elementcollection/Client1IT.java | 10 +- .../elementcollection/Client2IT.java | 10 +- .../annotations/elementcollection/build.xml | 63 --- .../core/annotations/embeddable/ClientIT.java | 10 +- .../jpa/core/annotations/embeddable/build.xml | 60 --- .../embeddableMapValue/ClientIT.java | 10 +- .../annotations/embeddableMapValue/build.xml | 59 --- .../jpa/core/annotations/entity/ClientIT.java | 10 +- .../jpa/core/annotations/entity/build.xml | 57 --- .../jpa/core/annotations/id/ClientIT.java | 10 +- .../tests/jpa/core/annotations/id/build.xml | 67 --- .../jpa/core/annotations/lob/ClientIT.java | 10 +- .../tests/jpa/core/annotations/lob/build.xml | 60 --- .../jpa/core/annotations/mapkey/Client.java | 10 +- .../jpa/core/annotations/mapkey/build.xml | 61 --- .../annotations/mapkeyclass/ClientIT.java | 10 +- .../core/annotations/mapkeyclass/build.xml | 51 --- .../annotations/mapkeycolumn/ClientIT.java | 10 +- .../core/annotations/mapkeycolumn/build.xml | 57 --- .../mapkeyenumerated/ClientIT.java | 10 +- .../annotations/mapkeyenumerated/build.xml | 66 --- .../mapkeyjoincolumn/ClientIT.java | 10 +- .../annotations/mapkeyjoincolumn/build.xml | 51 --- .../annotations/mapkeytemporal/ClientIT.java | 10 +- .../core/annotations/mapkeytemporal/build.xml | 63 --- .../jpa/core/annotations/mapsid/ClientIT.java | 10 +- .../jpa/core/annotations/mapsid/build.xml | 59 --- .../annotations/nativequery/ClientIT.java | 10 +- .../core/annotations/nativequery/build.xml | 64 --- .../annotations/onexmanyuni/ClientIT.java | 10 +- .../core/annotations/onexmanyuni/build.xml | 52 --- .../core/annotations/orderby/Client1IT.java | 10 +- .../core/annotations/orderby/Client2IT.java | 10 +- .../core/annotations/orderby/Client3IT.java | 10 +- .../jpa/core/annotations/orderby/build.xml | 67 --- .../annotations/ordercolumn/Client1IT.java | 10 +- .../annotations/ordercolumn/Client2IT.java | 10 +- .../core/annotations/ordercolumn/build.xml | 60 --- .../annotations/tableGenerator/Client.java | 10 +- .../core/annotations/tableGenerator/build.xml | 61 --- .../core/annotations/temporal/ClientIT.java | 10 +- .../jpa/core/annotations/temporal/build.xml | 61 --- .../jpa/core/annotations/version/Client.java | 10 +- .../jpa/core/annotations/version/build.xml | 72 --- .../sun/ts/tests/jpa/core/basic/ClientIT.java | 10 +- .../com/sun/ts/tests/jpa/core/basic/build.xml | 57 --- .../java/com/sun/ts/tests/jpa/core/build.xml | 22 - .../jpa/core/cache/basicTests/ClientIT.java | 10 +- .../tests/jpa/core/cache/basicTests/build.xml | 61 --- .../com/sun/ts/tests/jpa/core/cache/build.xml | 22 - .../sun/ts/tests/jpa/core/callback/build.xml | 22 - .../core/callback/inheritance/ClientIT.java | 10 +- .../jpa/core/callback/inheritance/build.xml | 85 ---- .../jpa/core/callback/listener/ClientIT.java | 10 +- .../jpa/core/callback/listener/build.xml | 85 ---- .../callback/listeneroverride/ClientIT.java | 10 +- .../core/callback/listeneroverride/build.xml | 86 ---- .../jpa/core/callback/method/ClientIT.java | 10 +- .../tests/jpa/core/callback/method/build.xml | 84 ---- .../core/callback/methodoverride/build.xml | 84 ---- .../tests/jpa/core/callback/xml/ClientIT.java | 10 +- .../ts/tests/jpa/core/callback/xml/build.xml | 86 ---- .../criteriaapi/CriteriaBuilder/build.xml | 68 --- .../core/criteriaapi/CriteriaDelete/build.xml | 68 --- .../core/criteriaapi/CriteriaQuery/build.xml | 71 --- .../core/criteriaapi/CriteriaUpdate/build.xml | 69 --- .../tests/jpa/core/criteriaapi/From/build.xml | 69 --- .../tests/jpa/core/criteriaapi/Join/build.xml | 69 --- .../tests/jpa/core/criteriaapi/Root/build.xml | 70 --- .../ts/tests/jpa/core/criteriaapi/build.xml | 23 - .../criteriaapi/metamodelquery/Client2IT.java | 54 +++ .../criteriaapi/metamodelquery/Client5IT.java | 252 +++++++++++ .../criteriaapi/metamodelquery/Client6IT.java | 111 +++++ .../criteriaapi/metamodelquery/Client7IT.java | 114 +++++ .../core/criteriaapi/metamodelquery/build.xml | 70 --- .../tests/jpa/core/criteriaapi/misc/build.xml | 68 --- .../core/criteriaapi/parameter/Client.java | 22 +- .../core/criteriaapi/parameter/Client1IT.java | 410 ++++++++++++++++++ .../core/criteriaapi/parameter/Client2IT.java | 17 + .../jpa/core/criteriaapi/parameter/build.xml | 56 --- .../jpa/core/criteriaapi/strquery/build.xml | 71 --- .../sun/ts/tests/jpa/core/derivedid/build.xml | 22 - .../jpa/core/derivedid/ex1a/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex1a/build.xml | 57 --- .../jpa/core/derivedid/ex1b/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex1b/build.xml | 57 --- .../jpa/core/derivedid/ex2a/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex2a/build.xml | 58 --- .../jpa/core/derivedid/ex2b/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex2b/build.xml | 58 --- .../jpa/core/derivedid/ex3a/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex3a/build.xml | 58 --- .../jpa/core/derivedid/ex3b/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex3b/build.xml | 58 --- .../jpa/core/derivedid/ex4a/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex4a/build.xml | 56 --- .../jpa/core/derivedid/ex4b/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex4b/build.xml | 56 --- .../jpa/core/derivedid/ex5a/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex5a/build.xml | 57 --- .../jpa/core/derivedid/ex5b/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex5b/build.xml | 57 --- .../jpa/core/derivedid/ex6a/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex6a/build.xml | 57 --- .../jpa/core/derivedid/ex6b/ClientIT.java | 10 +- .../tests/jpa/core/derivedid/ex6b/build.xml | 57 --- .../jpa/core/entityManager/Client1IT.java | 6 +- .../jpa/core/entityManager/Client2IT.java | 6 +- .../jpa/core/entityManager/Client3IT.java | 8 +- .../ts/tests/jpa/core/entityManager/build.xml | 58 --- .../jpa/core/entityManager2/Client1IT.java | 6 +- .../jpa/core/entityManager2/Client2IT.java | 8 +- .../tests/jpa/core/entityManager2/build.xml | 59 --- .../core/entityManagerFactory/Client1IT.java | 8 +- .../core/entityManagerFactory/Client2IT.java | 4 +- .../core/entityManagerFactory/Client3IT.java | 4 +- .../jpa/core/entityManagerFactory/build.xml | 60 --- .../ClientIT.java | 4 +- .../build.xml | 49 --- .../jpa/core/entityTransaction/ClientIT.java | 6 +- .../jpa/core/entityTransaction/build.xml | 57 --- .../core/entitytest/apitests/ClientIT.java | 10 +- .../jpa/core/entitytest/apitests/build.xml | 70 --- .../core/entitytest/bigdecimal/ClientIT.java | 10 +- .../jpa/core/entitytest/bigdecimal/build.xml | 54 --- .../core/entitytest/biginteger/ClientIT.java | 10 +- .../jpa/core/entitytest/biginteger/build.xml | 54 --- .../ts/tests/jpa/core/entitytest/build.xml | 22 - .../jpa/core/entitytest/cascadeall/build.xml | 22 - .../cascadeall/manyXmany/ClientIT.java | 10 +- .../entitytest/cascadeall/manyXmany/build.xml | 59 --- .../cascadeall/manyXone/ClientIT.java | 10 +- .../entitytest/cascadeall/manyXone/build.xml | 59 --- .../cascadeall/oneXmany/ClientIT.java | 10 +- .../entitytest/cascadeall/oneXmany/build.xml | 59 --- .../cascadeall/oneXone/ClientIT.java | 10 +- .../entitytest/cascadeall/oneXone/build.xml | 59 --- .../entitytest/detach/basic/ClientIT.java | 10 +- .../core/entitytest/detach/basic/build.xml | 58 --- .../jpa/core/entitytest/detach/build.xml | 22 - .../entitytest/detach/manyXmany/ClientIT.java | 12 +- .../entitytest/detach/manyXmany/build.xml | 59 --- .../entitytest/detach/manyXone/ClientIT.java | 10 +- .../core/entitytest/detach/manyXone/build.xml | 59 --- .../entitytest/detach/oneXmany/ClientIT.java | 10 +- .../core/entitytest/detach/oneXmany/build.xml | 59 --- .../entitytest/detach/oneXone/ClientIT.java | 10 +- .../core/entitytest/detach/oneXone/build.xml | 59 --- .../entitytest/persist/basic/ClientIT.java | 10 +- .../core/entitytest/persist/basic/build.xml | 58 --- .../jpa/core/entitytest/persist/build.xml | 22 - .../persist/manyXmany/ClientIT.java | 10 +- .../entitytest/persist/manyXmany/build.xml | 59 --- .../entitytest/persist/manyXone/ClientIT.java | 10 +- .../entitytest/persist/manyXone/build.xml | 59 --- .../entitytest/persist/oneXmany/ClientIT.java | 10 +- .../entitytest/persist/oneXmany/build.xml | 59 --- .../persist/oneXmanyFetchEager/ClientIT.java | 10 +- .../persist/oneXmanyFetchEager/build.xml | 59 --- .../entitytest/persist/oneXone/ClientIT.java | 12 +- .../core/entitytest/persist/oneXone/build.xml | 59 --- .../entitytest/remove/basic/ClientIT.java | 10 +- .../core/entitytest/remove/basic/build.xml | 58 --- .../jpa/core/entitytest/remove/build.xml | 22 - .../entitytest/remove/oneXmany/ClientIT.java | 10 +- .../core/entitytest/remove/oneXmany/build.xml | 59 --- .../entitytest/remove/oneXone/ClientIT.java | 10 +- .../core/entitytest/remove/oneXone/build.xml | 59 --- .../sun/ts/tests/jpa/core/enums/ClientIT.java | 14 +- .../com/sun/ts/tests/jpa/core/enums/build.xml | 57 --- .../tests/jpa/core/exceptions/ClientIT.java | 14 +- .../ts/tests/jpa/core/exceptions/build.xml | 58 --- .../inheritance/abstractentity/ClientIT.java | 10 +- .../core/inheritance/abstractentity/build.xml | 64 --- .../ts/tests/jpa/core/inheritance/build.xml | 22 - .../mappedsc/annotation/ClientIT.java | 10 +- .../inheritance/mappedsc/annotation/build.xml | 64 --- .../jpa/core/inheritance/mappedsc/build.xml | 22 - .../mappedsc/descriptors/ClientIT.java | 10 +- .../mappedsc/descriptors/build.xml | 65 --- .../core/inheritance/nonentity/ClientIT.java | 10 +- .../jpa/core/inheritance/nonentity/build.xml | 64 --- .../com/sun/ts/tests/jpa/core/lock/build.xml | 22 - .../jpa/core/lock/entitymanager/ClientIT.java | 10 +- .../jpa/core/lock/entitymanager/build.xml | 60 --- .../tests/jpa/core/lock/query/ClientIT.java | 10 +- .../ts/tests/jpa/core/lock/query/build.xml | 60 --- .../core/metamodelapi/attribute/ClientIT.java | 10 +- .../jpa/core/metamodelapi/attribute/build.xml | 55 --- .../jpa/core/metamodelapi/basictype/build.xml | 55 --- .../core/metamodelapi/bindable/ClientIT.java | 10 +- .../jpa/core/metamodelapi/bindable/build.xml | 60 --- .../ts/tests/jpa/core/metamodelapi/build.xml | 23 - .../collectionattribute/ClientIT.java | 22 +- .../collectionattribute/build.xml | 56 --- .../metamodelapi/embeddabletype/ClientIT.java | 10 +- .../metamodelapi/embeddabletype/build.xml | 59 --- .../metamodelapi/entitytype/ClientIT.java | 10 +- .../core/metamodelapi/entitytype/build.xml | 63 --- .../identifiabletype/ClientIT.java | 10 +- .../metamodelapi/identifiabletype/build.xml | 63 --- .../metamodelapi/listattribute/ClientIT.java | 10 +- .../core/metamodelapi/listattribute/build.xml | 56 --- .../metamodelapi/managedtype/ClientIT.java | 10 +- .../core/metamodelapi/managedtype/build.xml | 65 --- .../metamodelapi/mapattribute/ClientIT.java | 10 +- .../core/metamodelapi/mapattribute/build.xml | 57 --- .../mappedsuperclasstype/ClientIT.java | 10 +- .../mappedsuperclasstype/build.xml | 61 --- .../core/metamodelapi/metamodel/ClientIT.java | 10 +- .../jpa/core/metamodelapi/metamodel/build.xml | 60 --- .../pluralattribute/ClientIT.java | 10 +- .../metamodelapi/pluralattribute/build.xml | 56 --- .../metamodelapi/setattribute/ClientIT.java | 10 +- .../core/metamodelapi/setattribute/build.xml | 60 --- .../singularattribute/ClientIT.java | 10 +- .../metamodelapi/singularattribute/build.xml | 60 --- .../jpa/core/metamodelapi/type/ClientIT.java | 10 +- .../jpa/core/metamodelapi/type/build.xml | 62 --- .../jpa/core/nestedembedding/ClientIT.java | 10 +- .../tests/jpa/core/nestedembedding/build.xml | 65 --- .../override/attributeoverride/ClientIT.java | 10 +- .../core/override/attributeoverride/build.xml | 53 --- .../sun/ts/tests/jpa/core/override/build.xml | 23 - .../override/callbacklistener/ClientIT.java | 10 +- .../core/override/callbacklistener/build.xml | 53 --- .../core/override/embeddable/ClientIT.java | 10 +- .../jpa/core/override/embeddable/build.xml | 57 --- .../jpa/core/override/entity/ClientIT.java | 10 +- .../tests/jpa/core/override/entity/build.xml | 53 --- .../override/entitylistener/ClientIT.java | 10 +- .../core/override/entitylistener/build.xml | 68 --- .../core/override/joincolumn/ClientIT.java | 10 +- .../jpa/core/override/joincolumn/build.xml | 59 --- .../core/override/manytomany/ClientIT.java | 10 +- .../jpa/core/override/manytomany/build.xml | 51 --- .../jpa/core/override/mapkey/ClientIT.java | 10 +- .../tests/jpa/core/override/mapkey/build.xml | 61 --- .../override/nocallbacklistener/ClientIT.java | 10 +- .../override/nocallbacklistener/build.xml | 55 --- .../jpa/core/override/table/ClientIT.java | 10 +- .../tests/jpa/core/override/table/build.xml | 55 --- .../jpa/core/persistenceUtil/ClientIT.java | 10 +- .../tests/jpa/core/persistenceUtil/build.xml | 56 --- .../core/persistenceUtilUtil/ClientIT.java | 10 +- .../jpa/core/persistenceUtilUtil/build.xml | 56 --- .../jpa/core/query/apitests/Client1IT.java | 10 +- .../jpa/core/query/apitests/Client2IT.java | 6 +- .../jpa/core/query/apitests/Client3IT.java | 6 +- .../tests/jpa/core/query/apitests/build.xml | 66 --- .../com/sun/ts/tests/jpa/core/query/build.xml | 22 - .../tests/jpa/core/query/flushmode/build.xml | 75 ---- .../tests/jpa/core/query/language/build.xml | 72 --- .../jpa/core/query/parameter/Client1IT.java | 6 +- .../jpa/core/query/parameter/Client2IT.java | 10 +- .../tests/jpa/core/query/parameter/build.xml | 58 --- .../relationship/annotations/ClientIT.java | 10 +- .../core/relationship/annotations/build.xml | 61 --- .../relationship/bidirmanyxmany/ClientIT.java | 10 +- .../relationship/bidirmanyxmany/build.xml | 56 --- .../relationship/bidirmanyxone/ClientIT.java | 10 +- .../core/relationship/bidirmanyxone/build.xml | 56 --- .../relationship/bidironexmany/ClientIT.java | 10 +- .../core/relationship/bidironexmany/build.xml | 56 --- .../relationship/bidironexone/ClientIT.java | 10 +- .../core/relationship/bidironexone/build.xml | 56 --- .../ts/tests/jpa/core/relationship/build.xml | 22 - .../core/relationship/defaults/ClientIT.java | 10 +- .../jpa/core/relationship/defaults/build.xml | 62 --- .../relationship/descriptors/ClientIT.java | 10 +- .../core/relationship/descriptors/build.xml | 64 --- .../relationship/unimanyxmany/ClientIT.java | 10 +- .../core/relationship/unimanyxmany/build.xml | 56 --- .../relationship/unimanyxone/ClientIT.java | 10 +- .../core/relationship/unimanyxone/build.xml | 56 --- .../relationship/unionexmany/ClientIT.java | 10 +- .../core/relationship/unionexmany/build.xml | 56 --- .../relationship/unionexone/ClientIT.java | 10 +- .../core/relationship/unionexone/build.xml | 56 --- .../tests/jpa/core/types/auto/ClientIT.java | 10 +- .../ts/tests/jpa/core/types/auto/build.xml | 58 --- .../com/sun/ts/tests/jpa/core/types/build.xml | 22 - .../tests/jpa/core/types/field/ClientIT.java | 10 +- .../ts/tests/jpa/core/types/field/build.xml | 59 --- .../jpa/core/types/generator/Client.java | 10 +- .../tests/jpa/core/types/generator/build.xml | 61 --- .../tests/jpa/core/types/primarykey/build.xml | 22 - .../types/primarykey/compound/ClientIT.java | 10 +- .../core/types/primarykey/compound/build.xml | 63 --- .../jpa/core/types/property/Client1IT.java | 10 +- .../jpa/core/types/property/Client2IT.java | 10 +- .../tests/jpa/core/types/property/build.xml | 65 --- .../tests/jpa/core/versioning/ClientIT.java | 10 +- .../ts/tests/jpa/core/versioning/build.xml | 58 --- .../java/com/sun/ts/tests/jpa/ee/build.xml | 22 - .../com/sun/ts/tests/jpa/ee/common/build.xml | 22 - .../ts/tests/jpa/ee/entityManager/build.xml | 57 --- .../jpa/ee/entityManagerFactory/build.xml | 57 --- .../packaging/appclient/annotation/build.xml | 46 -- .../jpa/ee/packaging/appclient/build.xml | 22 - .../packaging/appclient/descriptor/build.xml | 45 -- .../sun/ts/tests/jpa/ee/packaging/build.xml | 22 - .../ts/tests/jpa/ee/packaging/ejb/build.xml | 22 - .../jpa/ee/packaging/ejb/descriptor/build.xml | 55 --- .../jpa/ee/packaging/ejb/exclude/build.xml | 58 --- .../ee/packaging/ejb/resource_local/build.xml | 57 --- .../jpa/ee/packaging/ejb/standalone/build.xml | 56 --- .../ts/tests/jpa/ee/packaging/jar/build.xml | 96 ---- .../ts/tests/jpa/ee/packaging/web/build.xml | 22 - .../jpa/ee/packaging/web/scope/build.xml | 57 --- .../jpa/ee/packaging/web/standalone/build.xml | 64 --- .../ts/tests/jpa/ee/pluggability/build.xml | 22 - .../jpa/ee/pluggability/contracts/build.xml | 22 - .../ee/pluggability/contracts/jta/build.xml | 97 ----- .../contracts/resource_local/build.xml | 97 ----- .../ts/tests/jpa/ee/propagation/am/build.xml | 76 ---- .../sun/ts/tests/jpa/ee/propagation/build.xml | 22 - .../ts/tests/jpa/ee/propagation/cm/build.xml | 22 - .../jpa/ee/propagation/cm/extended/build.xml | 77 ---- .../tests/jpa/ee/propagation/cm/jta/build.xml | 90 ---- .../java/com/sun/ts/tests/jpa/jpa22/build.xml | 22 - .../ts/tests/jpa/jpa22/datetime/ClientIT.java | 20 +- .../sun/ts/tests/jpa/jpa22/datetime/build.xml | 54 --- .../ts/tests/jpa/jpa22/generators/build.xml | 22 - .../generators/tablegenerators/ClientIT.java | 10 +- .../generators/tablegenerators/build.xml | 58 --- .../sun/ts/tests/jpa/jpa22/query/build.xml | 22 - .../jpa/jpa22/query/stream/ClientIT.java | 10 +- .../ts/tests/jpa/jpa22/query/stream/build.xml | 64 --- .../repeatable/attroverride/ClientIT.java | 10 +- .../jpa22/repeatable/attroverride/build.xml | 65 --- .../ts/tests/jpa/jpa22/repeatable/build.xml | 22 - .../jpa22/repeatable/convert/ClientIT.java | 10 +- .../jpa/jpa22/repeatable/convert/build.xml | 62 --- .../jpa22/repeatable/joincolumn/ClientIT.java | 10 +- .../jpa/jpa22/repeatable/joincolumn/build.xml | 58 --- .../repeatable/mapkeyjoincolumn/ClientIT.java | 10 +- .../repeatable/mapkeyjoincolumn/build.xml | 51 --- .../repeatable/namedentitygraph/ClientIT.java | 8 +- .../repeatable/namedentitygraph/build.xml | 59 --- .../repeatable/namednativequery/ClientIT.java | 10 +- .../repeatable/namednativequery/build.xml | 56 --- .../namedstoredprocedurequery/ClientIT.java | 8 +- .../namedstoredprocedurequery/build.xml | 57 --- .../com/sun/ts/tests/jpa/jpa22/se/build.xml | 22 - .../tests/jpa/jpa22/se/generators/build.xml | 22 - .../sequencegenerators/ClientIT.java | 10 +- .../generators/sequencegenerators/build.xml | 56 --- .../tests/jpa/jpa22/se/repeatable/build.xml | 22 - .../repeatable/secondarytable/ClientIT.java | 10 +- .../se/repeatable/secondarytable/build.xml | 51 --- .../java/com/sun/ts/tests/jpa/se/build.xml | 22 - .../tests/jpa/se/cache/inherit/ClientIT.java | 10 +- .../ts/tests/jpa/se/cache/inherit/build.xml | 54 --- .../tests/jpa/se/cache/xml/all/ClientIT.java | 10 +- .../ts/tests/jpa/se/cache/xml/all/build.xml | 49 --- .../sun/ts/tests/jpa/se/cache/xml/build.xml | 22 - .../cache/xml/disableselective/ClientIT.java | 10 +- .../se/cache/xml/disableselective/build.xml | 51 --- .../cache/xml/enableselective/ClientIT.java | 10 +- .../se/cache/xml/enableselective/build.xml | 50 --- .../tests/jpa/se/cache/xml/none/ClientIT.java | 10 +- .../ts/tests/jpa/se/cache/xml/none/build.xml | 48 -- .../ts/tests/jpa/se/descriptor/ClientIT.java | 8 +- .../sun/ts/tests/jpa/se/descriptor/build.xml | 45 -- .../tests/jpa/se/entityManager/ClientIT.java | 8 +- .../ts/tests/jpa/se/entityManager/build.xml | 48 -- .../jpa/se/entityManagerFactory/ClientIT.java | 4 +- .../jpa/se/entityManagerFactory/build.xml | 48 -- .../ts/tests/jpa/se/pluggability/build.xml | 22 - .../jpa/se/pluggability/contracts/build.xml | 22 - .../contracts/resource_local/ClientIT.java | 18 +- .../contracts/resource_local/build.xml | 59 --- .../jpa/se/resource_local/Client2IT.java | 6 +- .../ts/tests/jpa/se/resource_local/build.xml | 45 -- .../se/schemaGeneration/annotations/build.xml | 22 - .../discriminatorColumn/ClientIT.java | 10 +- .../annotations/discriminatorColumn/build.xml | 47 -- .../annotations/enumerated/ClientIT.java | 10 +- .../annotations/enumerated/build.xml | 47 -- .../annotations/id/ClientIT.java | 10 +- .../schemaGeneration/annotations/id/build.xml | 46 -- .../annotations/index/ClientIT.java | 10 +- .../annotations/index/build.xml | 46 -- .../annotations/joinTable/ClientIT.java | 10 +- .../annotations/joinTable/build.xml | 47 -- .../annotations/orderColumn/ClientIT.java | 10 +- .../annotations/orderColumn/build.xml | 47 -- .../annotations/secondaryTable/ClientIT.java | 10 +- .../annotations/secondaryTable/build.xml | 46 -- .../sequenceGenerator/ClientIT.java | 10 +- .../annotations/sequenceGenerator/build.xml | 46 -- .../annotations/table/ClientIT.java | 10 +- .../annotations/table/build.xml | 46 -- .../annotations/tableGenerator/ClientIT.java | 10 +- .../annotations/tableGenerator/build.xml | 46 -- .../annotations/temporal/ClientIT.java | 10 +- .../annotations/temporal/build.xml | 46 -- .../uniqueConstraint/ClientIT.java | 10 +- .../annotations/uniqueConstraint/build.xml | 46 -- .../annotations/version/ClientIT.java | 10 +- .../annotations/version/build.xml | 46 -- .../tests/jpa/se/schemaGeneration/build.xml | 22 - .../se/schemaGeneration/scripts/ClientIT.java | 10 +- .../jpa/se/schemaGeneration/scripts/build.xml | 46 -- jpa_extras/pom.xml | 76 ++++ 445 files changed, 2247 insertions(+), 13812 deletions(-) delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/util/build.xml create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasOnlyData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustAliasProductData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustomerData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilDepartmentEmployeeData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilOrderData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilPhoneData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilProductData.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilSetup.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilTrimData.java delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/field/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/build.xml create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client.java delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/methodoverride/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/From/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Join/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Root/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/build.xml create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client5IT.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client6IT.java create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client7IT.java delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/misc/build.xml create mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client1IT.java delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/strquery/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/basictype/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/build.xml delete mode 100755 jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/query/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/query/flushmode/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/query/language/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/common/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManager/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManagerFactory/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/descriptor/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/jar/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/scope/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/standalone/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/jta/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/resource_local/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/am/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/extended/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/jta/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/build.xml delete mode 100644 jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/build.xml create mode 100644 jpa_extras/pom.xml diff --git a/glassfish-runner/jpa-tck/pom.xml b/glassfish-runner/jpa-tck/pom.xml index b29efeef9c..881d0674ea 100644 --- a/glassfish-runner/jpa-tck/pom.xml +++ b/glassfish-runner/jpa-tck/pom.xml @@ -278,8 +278,6 @@ verify - **/jpa/ee/**/*.* @@ -312,10 +310,6 @@ jakartatck:jpa-tck ${project.build.directory}/${glassfish.toplevel.dir} - j2ee - j2ee - javajoe - javajoe standalone JPATCK JPATCK2 @@ -326,8 +320,6 @@ ${jakarta.persistence.jdbc.password} eclipselink.logging.level=OFF true - localhost - 8080 standalone /tmp true @@ -343,6 +335,29 @@ + + exec-maven-plugin + org.codehaus.mojo + + + stop-database-final + post-integration-test + + exec + + + ${exec.asadmin} + + stop-database + + + 0 + 1 + + + + + \ No newline at end of file diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/build.xml deleted file mode 100644 index 529d38f071..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/build.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/build.xml deleted file mode 100644 index cc3dcca14d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/common/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/build.xml deleted file mode 100644 index d7b55dad75..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/altprovider/build.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/util/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/util/build.xml deleted file mode 100644 index 220a942c9c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/common/pluggability/util/build.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/Util.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/Util.java index 38f5139d40..a04a9cd26c 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/Util.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/Util.java @@ -99,21 +99,16 @@ public String toString(Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } - public void cleanupNoData() throws Exception { - logger.log(Logger.Level.TRACE, "in cleanupNoData"); - super.cleanup(); - } - public void createTrimData() throws Exception { logger.log(Logger.Level.TRACE, "createTrimData"); getEntityTransaction().begin(); diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasData.java new file mode 100644 index 0000000000..ca12a91636 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasData.java @@ -0,0 +1,26 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilAliasData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilAliasData.class.getName()); + + @BeforeEach + public void setupAliasData() throws Exception { + logger.log(Logger.Level.TRACE, "setupAliasData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createCustomerData(); + createAliasData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupAliasData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasOnlyData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasOnlyData.java new file mode 100644 index 0000000000..186fa7c2eb --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilAliasOnlyData.java @@ -0,0 +1,25 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilAliasOnlyData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilAliasOnlyData.class.getName()); + + @BeforeEach + public void setupAliasOnlyData() throws Exception { + logger.log(Logger.Level.TRACE, "setupAliasOnlyData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createAliasOnlyData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupCustomerData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustAliasProductData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustAliasProductData.java new file mode 100644 index 0000000000..1c85f57910 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustAliasProductData.java @@ -0,0 +1,27 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilCustAliasProductData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilCustAliasProductData.class.getName()); + + @BeforeEach + public void setupCustAliasProductData() throws Exception { + logger.log(Logger.Level.TRACE, "setupCustAliasProductData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createCustomerData(); + createProductData(); + createAliasData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupCustAliasProductData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustomerData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustomerData.java new file mode 100644 index 0000000000..ff69a050d4 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilCustomerData.java @@ -0,0 +1,25 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilCustomerData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilCustomerData.class.getName()); + + @BeforeEach + public void setupCustomerData() throws Exception { + logger.log(Logger.Level.TRACE, "setupCustomerData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createCustomerData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupCustomerData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilDepartmentEmployeeData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilDepartmentEmployeeData.java new file mode 100644 index 0000000000..0961cc9f98 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilDepartmentEmployeeData.java @@ -0,0 +1,25 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilDepartmentEmployeeData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilDepartmentEmployeeData.class.getName()); + + @BeforeEach + public void setupDepartmentEmployeeData() throws Exception { + logger.log(Logger.Level.TRACE, "setupDepartmentEmployeeData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createDepartmentEmployeeData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupDepartmentEmployeeData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilOrderData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilOrderData.java new file mode 100644 index 0000000000..318aa8f6e7 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilOrderData.java @@ -0,0 +1,27 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilOrderData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilOrderData.class.getName()); + + @BeforeEach + public void setupOrderData() throws Exception { + logger.log(Logger.Level.TRACE, "setupOrderData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createCustomerData(); + createProductData(); + createOrderData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupCustomerData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilPhoneData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilPhoneData.java new file mode 100644 index 0000000000..d7066e6c62 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilPhoneData.java @@ -0,0 +1,26 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilPhoneData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilPhoneData.class.getName()); + + @BeforeEach + public void setupPhoneData() throws Exception { + logger.log(Logger.Level.TRACE, "setupPhoneData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createCustomerData(); + createPhoneData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupCustomerData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilProductData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilProductData.java new file mode 100644 index 0000000000..78f7799740 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilProductData.java @@ -0,0 +1,25 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilProductData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilProductData.class.getName()); + + @BeforeEach + public void setupProductData() throws Exception { + logger.log(Logger.Level.TRACE, "setupProductData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createProductData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupProductData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilSetup.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilSetup.java new file mode 100644 index 0000000000..7d9cfc74a4 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilSetup.java @@ -0,0 +1,24 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilSetup extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilSetup.class.getName()); + + @BeforeEach + public void setup() throws Exception { + logger.log(Logger.Level.TRACE, "setup"); + try { + super.setup(); + createDeployment(); + getEntityManager(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("Setup failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilTrimData.java b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilTrimData.java new file mode 100644 index 0000000000..c525c25c9e --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/UtilTrimData.java @@ -0,0 +1,25 @@ +package com.sun.ts.tests.jpa.common.schema30; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.BeforeEach; + +public abstract class UtilTrimData extends Util { + + private static final Logger logger = (Logger) System.getLogger(UtilTrimData.class.getName()); + + @BeforeEach + public void setupTrimData() throws Exception { + logger.log(Logger.Level.TRACE, "setupTrimData"); + try { + super.setup(); + createDeployment(); + removeTestData(); + createTrimData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("setupTrimData failed:", e); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/build.xml deleted file mode 100644 index 87ae8ae254..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/common/schema30/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/ClientIT.java index a865a44223..b9887f991f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/ClientIT.java @@ -74,11 +74,11 @@ public void setupEmployeeData() throws Exception { @AfterEach public void cleanupEmployeeData() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/build.xml deleted file mode 100644 index 77196ae5cd..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/EntityGraph/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/Client.java index 5fe2997daf..6d056547aa 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/Client.java @@ -56,12 +56,12 @@ public Client() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/build.xml deleted file mode 100644 index fce219df0d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/StoredProcedureQuery/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/build.xml deleted file mode 100644 index 4e0eade7fb..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/field/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/field/build.xml deleted file mode 100644 index a02d909c18..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/field/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/ClientIT.java index 98cbf2f527..97b45b66d2 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/ClientIT.java @@ -200,12 +200,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/build.xml deleted file mode 100644 index 71304ccb10..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/mappedsc/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client.java new file mode 100644 index 0000000000..739bf8838e --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client.java @@ -0,0 +1,54 @@ +package com.sun.ts.tests.jpa.core.annotations.access.property; + +import java.lang.System.Logger; + +import org.junit.jupiter.api.AfterEach; + +import com.sun.ts.tests.jpa.common.PMClientBase; + +public class Client extends PMClientBase { + + protected DataTypes d1; + + protected DataTypes2 d2; + + final protected java.util.Date dateId = getPKDate(2006, 04, 15); + + private static final Logger logger = (Logger) System.getLogger(Client.class.getName()); + + @AfterEach + public void cleanup() throws Exception { + try { + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); + } finally { + removeTestJarFromCP(); + } + } + + protected void removeTestData() { + logger.log(Logger.Level.TRACE, "removeTestData"); + if (getEntityTransaction().isActive()) { + getEntityTransaction().rollback(); + } + try { + getEntityTransaction().begin(); + getEntityManager().createNativeQuery("Delete from DATATYPES").executeUpdate(); + getEntityManager().createNativeQuery("Delete from DATATYPES2").executeUpdate(); + getEntityTransaction().commit(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception encountered while removing entities:", e); + } finally { + try { + if (getEntityTransaction().isActive()) { + getEntityTransaction().rollback(); + } + } catch (Exception re) { + logger.log(Logger.Level.ERROR, "Unexpected Exception in removeTestData:", re); + } + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client1IT.java index b4b3e8dfc9..e491e0e67d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/Client1IT.java @@ -30,8 +30,8 @@ public class Client1IT extends Client { private static final Logger logger = (Logger) System.getLogger(Client1IT.class.getName()); public JavaArchive createDeployment() throws Exception { - String pkgNameWithoutSuffix = Client.class.getPackageName(); - String pkgName = Client.class.getPackageName() + "."; + String pkgNameWithoutSuffix = Client1IT.class.getPackageName(); + String pkgName = Client1IT.class.getPackageName() + "."; String[] classes = { pkgName + "DataTypes", pkgName + "DataTypes2", "com.sun.ts.tests.jpa.core.types.common.Grade" }; return createDeploymentJar("jpa_core_annotations_access_property1.jar", pkgNameWithoutSuffix, classes); @@ -48,7 +48,6 @@ public void setup() throws Exception { super.setup(); createDeployment(); - removeTestData(); createTestData(); logger.log(Logger.Level.TRACE, "Done creating test data"); diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/build.xml deleted file mode 100644 index 26f95f157c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/access/property/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/ClientIT.java index 174c8edaea..27dcb71b0a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/ClientIT.java @@ -160,12 +160,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/build.xml deleted file mode 100644 index e5cb159e15..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/assocoverride/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/Client.java index 11cded0f87..bdbdf9a484 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/Client.java @@ -84,12 +84,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/build.xml deleted file mode 100644 index f494a1a0d2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/basic/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/build.xml deleted file mode 100644 index f95621ebdd..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/ClientIT.java index b7af396576..2ab2f736d2 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/ClientIT.java @@ -163,12 +163,12 @@ private void dumpAddresses(final Set
addr) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/build.xml deleted file mode 100644 index 572521136c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/collectiontable/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/ClientIT.java index 998fe64e7e..1e3094223f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/ClientIT.java @@ -737,12 +737,12 @@ public void elementCollectionBasicType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/build.xml deleted file mode 100644 index 5a84fbf9fb..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/convert/build.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/ClientIT.java index a15f670a0d..6bb4a465fd 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/ClientIT.java @@ -180,12 +180,12 @@ public void discriminatorValueTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/build.xml deleted file mode 100644 index 4d6a44ebfa..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/discriminatorValue/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client1IT.java index ef8ba832a6..89e3611c8b 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client1IT.java @@ -160,12 +160,12 @@ private void dumpAddresses(final Set
addr) { @AfterEach public void cleanupA() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeATestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeATestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client2IT.java index b1a1bee4e1..3dc3d1044f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/Client2IT.java @@ -191,12 +191,12 @@ public void elementCollectionBasicTypeXMLTest() throws Exception { @AfterEach public void cleanupCust() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeCustTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeCustTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/build.xml deleted file mode 100644 index 66e0824d3a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/elementcollection/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/ClientIT.java index 41c5d9bf20..b00d79d208 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/ClientIT.java @@ -167,12 +167,12 @@ private B findB(String id) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/build.xml deleted file mode 100644 index cab5929edd..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddable/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/ClientIT.java index 0ed2ccbce4..ac50d48d22 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/ClientIT.java @@ -167,12 +167,12 @@ public void embeddableMapValue() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/build.xml deleted file mode 100644 index e5e33418ed..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/embeddableMapValue/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/ClientIT.java index 7aef860875..4df08daf22 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/ClientIT.java @@ -248,12 +248,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/build.xml deleted file mode 100644 index 622822e230..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/entity/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/ClientIT.java index b138d1665a..ce4cad2046 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/ClientIT.java @@ -721,12 +721,12 @@ public void PropertyUtilDateIdTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/build.xml deleted file mode 100644 index f51d9fe2d4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/id/build.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/ClientIT.java index a4248d58f6..b4ec724f3b 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/ClientIT.java @@ -200,12 +200,12 @@ private Byte[] createLargeByteArray() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/build.xml deleted file mode 100644 index fd3134e34f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/lob/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/Client.java index dc97e2d719..d249ff0fea 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/Client.java @@ -137,12 +137,12 @@ public void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/build.xml deleted file mode 100644 index d9536b2474..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkey/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/ClientIT.java index 438e81d8d3..a7ff71b601 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/ClientIT.java @@ -172,12 +172,12 @@ public void createEntities() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/build.xml deleted file mode 100644 index 9645d1ecc2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyclass/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/ClientIT.java index 1f91a6f480..68e4fc3caa 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/ClientIT.java @@ -572,12 +572,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/build.xml deleted file mode 100644 index 2c96e98584..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeycolumn/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/ClientIT.java index 060f0792de..71b8f39ce5 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/ClientIT.java @@ -622,12 +622,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/build.xml deleted file mode 100644 index 04f1caf015..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyenumerated/build.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/ClientIT.java index c8bf85f7a1..bb5496508c 100755 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/ClientIT.java @@ -267,12 +267,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/build.xml deleted file mode 100755 index 32c0017f06..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeyjoincolumn/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/ClientIT.java index 37d3a54534..53d6bfb492 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/ClientIT.java @@ -485,12 +485,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanupCust() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeCustTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeCustTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/build.xml deleted file mode 100644 index 6e0defd364..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapkeytemporal/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/ClientIT.java index 407b0312be..f0ebc85612 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/ClientIT.java @@ -142,12 +142,12 @@ public void persistMX1Test1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/build.xml deleted file mode 100644 index e14091c94f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/mapsid/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/ClientIT.java index 0b7fb5d21b..7af2aa0098 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/ClientIT.java @@ -941,12 +941,12 @@ public void getSingleResultTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/build.xml deleted file mode 100644 index 75d81f7188..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/nativequery/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/ClientIT.java index 926b4f0391..33156fde1c 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/ClientIT.java @@ -150,12 +150,12 @@ private Customer1 createCustomer(final long id, final String name) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/build.xml deleted file mode 100755 index 78787d7743..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/onexmanyuni/build.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client1IT.java index 33d68c9658..c761c6a7df 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client1IT.java @@ -446,12 +446,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client2IT.java index f8aa25daba..c482eed21a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client2IT.java @@ -255,12 +255,12 @@ private void createAddressData() throws Exception { @AfterEach public void cleanupAddress() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeAddressData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeAddressData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client3IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client3IT.java index b45147bc32..25d0600f75 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client3IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/Client3IT.java @@ -197,12 +197,12 @@ public void fieldElementCollectionBasicType() throws Exception { @AfterEach public void cleanupCust() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeCustTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeCustTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/build.xml deleted file mode 100644 index 9d07866b9b..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/orderby/build.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client1IT.java index 8e197305dc..f96b48949c 100755 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client1IT.java @@ -258,12 +258,12 @@ public void createStudentTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client2IT.java index 902028fe86..6550531bc3 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/Client2IT.java @@ -429,12 +429,12 @@ private void createEmployeeTestData() throws Exception { @AfterEach public void cleanupEmployee() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanupEmployee"); - removeEmployeeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanupEmployee"); + removeEmployeeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/build.xml deleted file mode 100755 index a5bfb631b7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/ordercolumn/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/Client.java index 9478d6a6e8..039e0d3932 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/Client.java @@ -32,12 +32,12 @@ public Client() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/build.xml deleted file mode 100644 index 153f9bb8c6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/tableGenerator/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/ClientIT.java index a5e7ca0c4a..505cfae6e6 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/ClientIT.java @@ -300,12 +300,12 @@ public void idPropertyTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/build.xml deleted file mode 100644 index b4bb14f7b1..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/temporal/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/Client.java index 0b3f7bcae2..1b9b1234e2 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/Client.java @@ -32,12 +32,12 @@ public Client() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/build.xml deleted file mode 100644 index e6eb4a1f63..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/annotations/version/build.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/ClientIT.java index d0e6a9755d..da61697ebc 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/ClientIT.java @@ -152,12 +152,12 @@ public void newEntityTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/build.xml deleted file mode 100644 index 249f1d9c02..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/basic/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/build.xml deleted file mode 100644 index 977019644a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/ClientIT.java index 3edc70172b..52509bcdc0 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/ClientIT.java @@ -371,12 +371,12 @@ public void evictallTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/build.xml deleted file mode 100644 index f2721a461f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/basicTests/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/build.xml deleted file mode 100644 index 456f46613f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/cache/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/build.xml deleted file mode 100644 index 5314edb295..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/ClientIT.java index 3755f89d8b..3a461f1720 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/ClientIT.java @@ -469,12 +469,12 @@ public void findProductTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/build.xml deleted file mode 100644 index b91aa3b93b..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/inheritance/build.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/ClientIT.java index b2c6e9043a..f4d71c4bec 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/ClientIT.java @@ -570,12 +570,12 @@ private LineItem newLineItem(final String testName) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/build.xml deleted file mode 100644 index eeafbd19eb..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listener/build.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/ClientIT.java index 20b0528f18..52555c8fe1 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/ClientIT.java @@ -562,12 +562,12 @@ private LineItem newLineItem(final String testName) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/build.xml deleted file mode 100644 index e47b83da6a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/listeneroverride/build.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/ClientIT.java index e9c1582f77..ac4b3abba4 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/ClientIT.java @@ -576,12 +576,12 @@ private LineItem newLineItem(final String testName) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/build.xml deleted file mode 100644 index c07cacecaf..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/method/build.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/methodoverride/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/methodoverride/build.xml deleted file mode 100644 index 87c1cea7ce..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/methodoverride/build.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/ClientIT.java index b6f7bff166..56dd145271 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/ClientIT.java @@ -676,12 +676,12 @@ private Customer newCustomer(final String testName) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/build.xml deleted file mode 100644 index 79334b98ae..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/callback/xml/build.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/build.xml deleted file mode 100644 index ed24826d1c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaBuilder/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/build.xml deleted file mode 100644 index 042294a353..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaDelete/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/build.xml deleted file mode 100644 index 8ce363924c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaQuery/build.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/build.xml deleted file mode 100644 index df7c2ef153..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/CriteriaUpdate/build.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/From/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/From/build.xml deleted file mode 100644 index 4efc6df9b8..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/From/build.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Join/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Join/build.xml deleted file mode 100644 index 8a9cb3a07d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Join/build.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Root/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Root/build.xml deleted file mode 100644 index 3a1db51aae..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/Root/build.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/build.xml deleted file mode 100644 index 6b658d8802..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/build.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client2IT.java index 4aa8793beb..e7f43a8ddb 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client2IT.java @@ -575,6 +575,60 @@ public void queryTest14() throws Exception { } } + /* + * @testName: queryTest27 + * + * @assertion_ids: PERSISTENCE:SPEC:369.5 + * + * @test_Strategy: Execute a query which includes the arithmetic function ABS in + * a functional expression within the WHERE clause. Verify the results were + * accurately returned. + */ + @SetupMethod(name = "setupOrderData") + @Test + public void queryTest27() throws Exception { + boolean pass = false; + String expectedPKs[]; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + logger.log(Logger.Level.TRACE, "find all Orders with a total price greater than 1180"); + CriteriaQuery cquery = cbuilder.createQuery(Order.class); + Root order = cquery.from(Order.class); + cquery.where( + cbuilder.lt(cbuilder.parameter(Double.class, "dbl"), cbuilder.abs(order.get(Order_.totalPrice)))); + cquery.select(order); + TypedQuery tquery = getEntityManager().createQuery(cquery); + tquery.setParameter("dbl", 1180D); + tquery.setMaxResults(orderRef.length); + List olist = tquery.getResultList(); + + expectedPKs = new String[9]; + expectedPKs[0] = "1"; + expectedPKs[1] = "2"; + expectedPKs[2] = "4"; + expectedPKs[3] = "5"; + expectedPKs[4] = "6"; + expectedPKs[5] = "11"; + expectedPKs[6] = "16"; + expectedPKs[7] = "17"; + expectedPKs[8] = "18"; + if (!checkEntityPK(olist, expectedPKs)) { + logger.log(Logger.Level.ERROR, + "Did not get expected results. Expected 9 references, got: " + olist.size()); + } else { + logger.log(Logger.Level.TRACE, "Expected results received"); + pass = true; + } + getEntityTransaction().commit(); + } catch (Exception e) { + logger.log(Logger.Level.TRACE, "Caught unexpected exception:", e); + + } + } + /* * @testName: queryTest29 * diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client5IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client5IT.java new file mode 100644 index 0000000000..d5c3c3765c --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client5IT.java @@ -0,0 +1,252 @@ +/* + * Copyright (c) 2009, 2023 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package com.sun.ts.tests.jpa.core.criteriaapi.metamodelquery; + +import java.lang.System.Logger; +import java.util.List; + +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; + +import com.sun.ts.lib.harness.SetupMethod; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.jpa.common.schema30.Alias; +import com.sun.ts.tests.jpa.common.schema30.Alias_; +import com.sun.ts.tests.jpa.common.schema30.UtilAliasOnlyData; + +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; + +public class Client5IT extends UtilAliasOnlyData { + + private static final Logger logger = (Logger) System.getLogger(Client5IT.class.getName()); + + public JavaArchive createDeployment() throws Exception { + String pkgNameWithoutSuffix = Client5IT.class.getPackageName(); + String pkgName = pkgNameWithoutSuffix + "."; + String[] classes = getSchema30classes(); + return createDeploymentJar("jpa_core_criteriaapi_metamodelquery5.jar", pkgNameWithoutSuffix, classes); + } + + /* + * @testName: queryTest24 + * + * @assertion_ids: PERSISTENCE:SPEC:369.1 + * + * @test_Strategy: Execute a query which includes the string function CONCAT in + * a functional expression within the WHERE clause. Verify the results were + * accurately returned. + */ + @SetupMethod(name = "setupAliasOnlyData") + @Test + public void queryTest24() throws Exception { + boolean pass = false; + String expectedPKs[]; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + logger.log(Logger.Level.TRACE, "find all aliases who have match: stevie"); + CriteriaQuery cquery = cbuilder.createQuery(Alias.class); + Root alias = cquery.from(Alias.class); + cquery.where(cbuilder.equal(alias.get(Alias_.alias), cbuilder.concat(cbuilder.literal("ste"), "vie"))); + cquery.select(alias); + TypedQuery tquery = getEntityManager().createQuery(cquery); + tquery.setMaxResults(aliasRef.length); + List alist = tquery.getResultList(); + + expectedPKs = new String[1]; + expectedPKs[0] = "14"; + if (!checkEntityPK(alist, expectedPKs)) { + logger.log(Logger.Level.ERROR, + "Did not get expected results. Expected 1 reference, got: " + alist.size()); + } else { + logger.log(Logger.Level.TRACE, "Expected results received"); + pass = true; + } + getEntityTransaction().commit(); + } catch (Exception e) { + TestUtil.logErr("Caught unexpected exception:", e); + + } + + if (!pass) { + throw new Exception("queryTest24 failed"); + } + } + + /* + * @testName: queryTest25 + * + * @assertion_ids: PERSISTENCE:SPEC:369.2 + * + * @test_Strategy: Execute a query which includes the string function SUBSTRING + * in a functional expression within the WHERE clause. Verify the results were + * accurately returned. + */ + @SetupMethod(name = "setupAliasOnlyData") + @Test + public void queryTest25() throws Exception { + boolean pass = false; + String expectedPKs[]; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + logger.log(Logger.Level.TRACE, "find all aliases containing the substring: iris"); + CriteriaQuery cquery = cbuilder.createQuery(Alias.class); + Root alias = cquery.from(Alias.class); + cquery.where(cbuilder.equal(alias.get(Alias_.alias), + cbuilder.substring(cbuilder.parameter(String.class, "string1"), + cbuilder.parameter(Integer.class, "int2"), cbuilder.parameter(Integer.class, "int3")))); + cquery.select(alias); + TypedQuery tquery = getEntityManager().createQuery(cquery); + tquery.setParameter("string1", "iris"); + tquery.setParameter("int2", Integer.valueOf(1)); + tquery.setParameter("int3", Integer.valueOf(4)); + tquery.setMaxResults(aliasRef.length); + List alist = tquery.getResultList(); + + expectedPKs = new String[1]; + expectedPKs[0] = "20"; + if (!checkEntityPK(alist, expectedPKs)) { + logger.log(Logger.Level.ERROR, + "Did not get expected results. Expected 1 reference, got: " + alist.size()); + } else { + logger.log(Logger.Level.TRACE, "Expected results received"); + pass = true; + } + getEntityTransaction().commit(); + } catch (Exception e) { + TestUtil.logErr("Caught unexpected exception:", e); + + } + + if (!pass) { + throw new Exception("queryTest25 failed"); + } + } + + /* + * @testName: queryTest26 + * + * @assertion_ids: PERSISTENCE:SPEC:369.4 + * + * @test_Strategy: Execute a query which includes the string function LENGTH in + * a functional expression within the WHERE clause. Verify the results were + * accurately returned. + */ + @SetupMethod(name = "setupAliasOnlyData") + @Test + public void queryTest26() throws Exception { + boolean pass = false; + String expectedPKs[]; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + logger.log(Logger.Level.TRACE, "find aliases whose alias name is greater than 4 characters"); + CriteriaQuery cquery = cbuilder.createQuery(Alias.class); + Root alias = cquery.from(Alias.class); + cquery.where(cbuilder.gt(cbuilder.length(alias.get(Alias_.alias)), 4)); + cquery.select(alias); + TypedQuery tquery = getEntityManager().createQuery(cquery); + tquery.setMaxResults(aliasRef.length); + List alist = tquery.getResultList(); + + expectedPKs = new String[7]; + expectedPKs[0] = "8"; + expectedPKs[1] = "10"; + expectedPKs[2] = "13"; + expectedPKs[3] = "14"; + expectedPKs[4] = "18"; + expectedPKs[5] = "28"; + expectedPKs[6] = "29"; + if (!checkEntityPK(alist, expectedPKs)) { + logger.log(Logger.Level.ERROR, + "Did not get expected results. Expected 7 references, got: " + alist.size()); + } else { + logger.log(Logger.Level.TRACE, "Expected results received"); + pass = true; + } + getEntityTransaction().commit(); + } catch (Exception e) { + TestUtil.logErr("Caught unexpected exception:", e); + + } + + if (!pass) { + throw new Exception("queryTest26 failed"); + } + } + + /* + * @testName: queryTest28 + * + * @assertion_ids: PERSISTENCE:SPEC:369.3 + * + * @test_Strategy: Execute a query which includes the string function LOCATE in + * a functional expression within the WHERE clause. Verify the results were + * accurately returned. + */ + @SetupMethod(name = "setupAliasOnlyData") + @Test + public void queryTest28() throws Exception { + boolean pass = false; + String expectedPKs[]; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + logger.log(Logger.Level.TRACE, "find all aliases who contain the string: ev in their alias name"); + CriteriaQuery cquery = cbuilder.createQuery(Alias.class); + Root alias = cquery.from(Alias.class); + cquery.where(cbuilder.equal(cbuilder.locate(alias.get(Alias_.alias), "ev"), 3)); + cquery.select(alias); + TypedQuery tquery = getEntityManager().createQuery(cquery); + tquery.setMaxResults(aliasRef.length); + List alist = tquery.getResultList(); + + expectedPKs = new String[3]; + expectedPKs[0] = "13"; + expectedPKs[1] = "14"; + expectedPKs[2] = "18"; + if (!checkEntityPK(alist, expectedPKs)) { + logger.log(Logger.Level.ERROR, + "Did not get expected results. Expected 3 references, got: " + alist.size()); + } else { + logger.log(Logger.Level.TRACE, "Expected results received"); + pass = true; + } + getEntityTransaction().commit(); + } catch (Exception e) { + TestUtil.logErr("Caught unexpected exception:", e); + + } + + if (!pass) { + throw new Exception("queryTest28 failed"); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client6IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client6IT.java new file mode 100644 index 0000000000..97da7fbb57 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client6IT.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2009, 2023 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package com.sun.ts.tests.jpa.core.criteriaapi.metamodelquery; + +import java.lang.System.Logger; +import java.util.List; + +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; + +import com.sun.ts.lib.harness.SetupMethod; +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.jpa.common.schema30.Address; +import com.sun.ts.tests.jpa.common.schema30.Address_; +import com.sun.ts.tests.jpa.common.schema30.Customer; +import com.sun.ts.tests.jpa.common.schema30.Customer_; +import com.sun.ts.tests.jpa.common.schema30.Phone; +import com.sun.ts.tests.jpa.common.schema30.Phone_; +import com.sun.ts.tests.jpa.common.schema30.UtilPhoneData; + +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; + + +public class Client6IT extends UtilPhoneData { + + private static final Logger logger = (Logger) System.getLogger(Client6IT.class.getName()); + + public JavaArchive createDeployment() throws Exception { + String pkgNameWithoutSuffix = Client6IT.class.getPackageName(); + String pkgName = pkgNameWithoutSuffix + "."; + String[] classes = getSchema30classes(); + return createDeploymentJar("jpa_core_criteriaapi_metamodelquery6.jar", pkgNameWithoutSuffix, classes); + } + + /* + * @testName: queryTest55 + * + * @assertion_ids: PERSISTENCE:SPEC:358; PERSISTENCE:SPEC:1712; + * PERSISTENCE:SPEC:1713 + * + * @test_Strategy: The LIKE expression uses an input parameter for the + * condition. Verify the results were accurately returned. + * + */ + @SetupMethod(name = "setupPhoneData") + @Test + public void queryTest55() throws Exception { + boolean pass = false; + String expectedPKs[]; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + logger.log(Logger.Level.TRACE, + "determine which customers have an area code beginning with 9"); + CriteriaQuery cquery = cbuilder.createQuery(Customer.class); + Root customer = cquery.from(Customer.class); + Join p = customer.join(Customer_.home) + .join(Address_.phones); + cquery.where(cbuilder.like(p.get(Phone_.area), + cbuilder.parameter(String.class, "area"))); + cquery.select(customer); + TypedQuery tquery = getEntityManager().createQuery(cquery); + tquery.setParameter("area", "9%"); + tquery.setMaxResults(customerRef.length); + List clist = tquery.getResultList(); + + expectedPKs = new String[3]; + expectedPKs[0] = "3"; + expectedPKs[1] = "12"; + expectedPKs[2] = "16"; + + if (!checkEntityPK(clist, expectedPKs)) { + logger.log(Logger.Level.ERROR, + "Did not get expected results. Expected 3 references, got: " + + clist.size()); + } else { + logger.log(Logger.Level.TRACE,"Expected results received"); + pass = true; + } + getEntityTransaction().commit(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR,"Caught unexpected exception:", e); + + } + + if (!pass) { + throw new Exception("queryTest55 failed"); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client7IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client7IT.java new file mode 100644 index 0000000000..1e36e3eeb8 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/Client7IT.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2009, 2023 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package com.sun.ts.tests.jpa.core.criteriaapi.metamodelquery; + +import java.lang.System.Logger; +import java.util.Set; + +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.Test; + +import com.sun.ts.lib.util.TestUtil; +import com.sun.ts.tests.jpa.common.schema30.Customer; +import com.sun.ts.tests.jpa.common.schema30.Customer_; +import com.sun.ts.tests.jpa.common.schema30.Order; +import com.sun.ts.tests.jpa.common.schema30.UtilSetup; + +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; + + +public class Client7IT extends UtilSetup { + + private static final Logger logger = (Logger) System.getLogger(Client7IT.class.getName()); + + public JavaArchive createDeployment() throws Exception { + String pkgNameWithoutSuffix = Client7IT.class.getPackageName(); + String pkgName = pkgNameWithoutSuffix + "."; + String[] classes = getSchema30classes(); + return createDeploymentJar("jpa_core_criteriaapi_metamodelquery7.jar", pkgNameWithoutSuffix, classes); + } + + /* + * @testName: getCorrelatedJoinsTest + * + * @assertion_ids: PERSISTENCE:JAVADOC:1179; + * + * @test_Strategy: Test getting correlated joins from subquery. + */ + @Test + public void getCorrelatedJoinsTest() throws Exception { + boolean pass = false; + + CriteriaBuilder cbuilder = getEntityManager().getCriteriaBuilder(); + + try { + getEntityTransaction().begin(); + CriteriaQuery cquery = cbuilder.createQuery(Customer.class); + Root customer = cquery.from(Customer.class); + cquery.select(customer); + Subquery sq = cquery.subquery(Order.class); + Set cJoins = sq.getCorrelatedJoins(); + if (cJoins != null) { + if (cJoins.size() == 0) { + logger.log(Logger.Level.ERROR, + "Received expected 0 correlated joins from subquery.getCorrelatedJoins() when none exist"); + + // correlate subquery + Join sqo = sq.correlate(customer.join(Customer_.orders)); + sq.select(sqo); + cJoins = sq.getCorrelatedJoins(); + if (cJoins != null) { + if (cJoins.size() == 1) { + logger.log(Logger.Level.TRACE, + "Received expected 1 correlated join from subquery.getCorrelatedJoins()"); + pass = true; + } else { + logger.log(Logger.Level.ERROR, "Received " + cJoins.size() + + " correlated joins from subquery.getCorrelatedJoins() when 1 exist"); + + } + } else { + logger.log(Logger.Level.ERROR, + "Received null from subquery.getCorrelatedJoins() when 1 correlated join exists"); + + } + } else { + logger.log(Logger.Level.ERROR, "Received " + cJoins.size() + + " unexpected correlated joins from subquery.getCorrelatedJoins() when non exist"); + + } + } else { + logger.log(Logger.Level.ERROR, + "Received null from subquery.getCorrelatedJoins() instead of empty set when non exist"); + + } + getEntityTransaction().commit(); + } catch (Exception e) { + TestUtil.logErr("Caught unexpected exception:", e); + + } + + if (!pass) { + throw new Exception(" getCorrelatedJoinsTest failed"); + } + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/build.xml deleted file mode 100644 index 94c03d21f4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/metamodelquery/build.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/misc/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/misc/build.xml deleted file mode 100644 index eee6580446..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/misc/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client.java index 54cca5c0fc..6b8c79513d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client.java @@ -32,31 +32,17 @@ public abstract class Client extends PMClientBase { final java.sql.Date d1 = getSQLDate("2000-02-14"); - @BeforeEach - public void setup() throws Exception { - logger.log(Logger.Level.TRACE, "setup"); - try { - super.setup(); - createDeployment(); - getEntityManager(); - removeTestData(); - createTestData(); - } catch (Exception e) { - logger.log(Logger.Level.ERROR, "Exception: ", e); - throw new Exception("Setup failed:", e); - } - } abstract public JavaArchive createDeployment() throws Exception; @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "calling super.cleanup"); - removeTestData(); - super.cleanup(); + logger.log(Logger.Level.TRACE, "calling super.cleanup"); + removeTestData(); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client1IT.java new file mode 100644 index 0000000000..1796274fa7 --- /dev/null +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client1IT.java @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +package com.sun.ts.tests.jpa.core.criteriaapi.parameter; + +import java.lang.System.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + + +import jakarta.persistence.Parameter; +import jakarta.persistence.Query; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.ParameterExpression; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + +public class Client1IT extends Client { + + private static final Logger logger = (Logger) System.getLogger(Client1IT.class.getName()); + + public JavaArchive createDeployment() throws Exception { + + String pkgNameWithoutSuffix = Client1IT.class.getPackageName(); + String pkgName = pkgNameWithoutSuffix + "."; + String[] classes = { pkgName + "Employee" }; + return createDeploymentJar("jpa_core_criteriaapi_parameter1.jar", pkgNameWithoutSuffix, classes); + } + + @BeforeEach + public void setup() throws Exception { + logger.log(Logger.Level.TRACE, "setup"); + try { + super.setup(); + createDeployment(); + getEntityManager(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("Setup failed:", e); + } + } + + + + /* + * @testName: parameterTest1 + * + * @assertion_ids: PERSISTENCE:JAVADOC:381; PERSISTENCE:JAVADOC:382; + * PERSISTENCE:JAVADOC:383; PERSISTENCE:JAVADOC:1093; PERSISTENCE:JAVADOC:1092; + * + * @test_Strategy: Create a query with 2 named parameters and retrieve + * information about the parameters. + */ + @Test + public void parameterTest1() throws Exception { + logger.log(Logger.Level.TRACE, "Starting parameterTest1"); + boolean pass1 = false; + boolean pass2 = false; + boolean pass3 = false; + boolean pass4 = false; + boolean pass5 = false; + boolean pass6 = false; + boolean pass7 = false; + boolean pass8 = false; + boolean pass9 = false; + CriteriaBuilder qbuilder = getEntityManagerFactory().getCriteriaBuilder(); + CriteriaQuery cquery = qbuilder.createQuery(Employee.class); + if (cquery != null) { + Root employee = cquery.from(Employee.class); + + cquery.select(employee); + + List criteria = new ArrayList(); + ParameterExpression pe = qbuilder.parameter(String.class, "first"); + Class c = pe.getParameterType(); + if (c.isAssignableFrom(java.lang.String.class)) { + logger.log(Logger.Level.TRACE, "Received expected type from getParameterType()"); + pass1 = true; + } else { + logger.log(Logger.Level.ERROR, "Expected type String from getParameterType(), instead got:" + c); + } + String name = pe.getName(); + if (name != null) { + if (!name.equals("first")) { + logger.log(Logger.Level.ERROR, "getName() returned wrong name, expected: first, actual:" + name); + } else { + pass2 = true; + } + } else { + logger.log(Logger.Level.ERROR, "getName() returned null"); + } + Integer position = pe.getPosition(); + if (position != null) { + logger.log(Logger.Level.ERROR, "getPosition() returned:" + position + ", instead of null"); + } else { + pass3 = true; + } + + ParameterExpression pe2 = qbuilder.parameter(String.class, "last"); + criteria.add(qbuilder.equal(employee.get("firstName"), pe)); + criteria.add(qbuilder.equal(employee.get("lastName"), pe2)); + + cquery.where(qbuilder.or(criteria.toArray(new Predicate[0]))); + + Query q = getEntityManager().createQuery(cquery); + + List list = new ArrayList(q.getParameters()); + for (int i = 0; i < list.size(); i++) { + Parameter p = (Parameter) list.get(i); + logger.log(Logger.Level.TRACE, "parameter name = " + p.getName()); + logger.log(Logger.Level.TRACE, "parameter position = " + p.getPosition()); + logger.log(Logger.Level.TRACE, "parameter type =" + p.getParameterType()); + } + + String sExpected = "first"; + Parameter p1 = q.getParameter(sExpected); + String sActual = p1.getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, "p1.getName() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass4 = true; + } + + sExpected = null; + Integer iActual = p1.getPosition(); + if (iActual != null) { + logger.log(Logger.Level.ERROR, "p1.getPosition() - Expected: " + sExpected + ", actual:" + iActual); + } else { + pass5 = true; + } + sExpected = "java.lang.String"; + sActual = p1.getParameterType().getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, + "p1.getParameterType() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass6 = true; + } + + sExpected = "last"; + Parameter p2 = q.getParameter(sExpected); + sActual = p2.getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, "p2.getName() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass7 = true; + } + sExpected = null; + iActual = p2.getPosition(); + if (iActual != null) { + logger.log(Logger.Level.ERROR, "p2.getPosition() - Expected: " + sExpected + ", actual:" + iActual); + } else { + pass8 = true; + } + + sExpected = "java.lang.String"; + sActual = p2.getParameterType().getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, + "p2.getParameterType() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass9 = true; + } + + } else { + logger.log(Logger.Level.ERROR, "Failed to get Non-null Criteria Query"); + } + + if (!pass1 || !pass2 || !pass3 || !pass4 || !pass5 || !pass6 || !pass7 || !pass8 || !pass9) { + throw new Exception("parameterTest1 test failed"); + + } + + } + + /* + * @testName: parameterTest2 + * + * @assertion_ids: PERSISTENCE:JAVADOC:381; PERSISTENCE:JAVADOC:382; + * PERSISTENCE:JAVADOC:383; + * + * @test_Strategy: Create a query with a named parameter that is a float and + * retrieve information about the parameter. + */ + @Test + public void parameterTest2() throws Exception { + logger.log(Logger.Level.TRACE, "Starting parameterTest2"); + boolean pass1 = false; + boolean pass2 = false; + boolean pass3 = false; + CriteriaBuilder qbuilder = getEntityManagerFactory().getCriteriaBuilder(); + + CriteriaQuery cquery = qbuilder.createQuery(Employee.class); + if (cquery != null) { + Root employee = cquery.from(Employee.class); + cquery.select(employee); + + List criteria = new ArrayList(); + ParameterExpression pe = qbuilder.parameter(Float.class, "salary"); + criteria.add(qbuilder.equal(employee.get("salary"), pe)); + + cquery.where(qbuilder.or(criteria.toArray(new Predicate[0]))); + + Query q = getEntityManager().createQuery(cquery); + + List list = new ArrayList(q.getParameters()); + for (int i = 0; i < list.size(); i++) { + Parameter p = (Parameter) list.get(i); + logger.log(Logger.Level.TRACE, "parameter name = " + p.getName()); + logger.log(Logger.Level.TRACE, "parameter position = " + p.getPosition()); + logger.log(Logger.Level.TRACE, "parameter type =" + p.getParameterType()); + } + + String sExpected = "salary"; + Parameter p1 = q.getParameter(sExpected); + String sActual = p1.getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, "p1.getName() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass1 = true; + } + + sExpected = null; + Integer iActual = p1.getPosition(); + if (iActual != null) { + logger.log(Logger.Level.ERROR, "p1.getPosition() - Expected: " + sExpected + ", actual:" + iActual); + } else { + pass2 = true; + } + sExpected = "java.lang.Float"; + sActual = p1.getParameterType().getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, + "p1.getParameterType() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass3 = true; + } + + } else { + logger.log(Logger.Level.ERROR, "Failed to get Non-null Criteria Query"); + } + + if (!pass1 || !pass2 || !pass3) { + throw new Exception("parameterTest2 test failed"); + + } + } + + /* + * @testName: parameterTest3 + * + * @assertion_ids: PERSISTENCE:JAVADOC:381; PERSISTENCE:JAVADOC:382; + * PERSISTENCE:JAVADOC:383; + * + * @test_Strategy: Create a query with a named parameter that is a date and and + * retrieve information about the parameter. + */ + @Test + public void parameterTest3() throws Exception { + logger.log(Logger.Level.TRACE, "Starting parameterTest3"); + boolean pass1 = false; + boolean pass2 = false; + boolean pass3 = false; + CriteriaBuilder qbuilder = getEntityManagerFactory().getCriteriaBuilder(); + + CriteriaQuery cquery = qbuilder.createQuery(Employee.class); + if (cquery != null) { + Root employee = cquery.from(Employee.class); + cquery.select(employee); + + List criteria = new ArrayList(); + ParameterExpression pe = qbuilder.parameter(java.sql.Date.class, "hdate"); + criteria.add(qbuilder.equal(employee.get("hireDate"), pe)); + + cquery.where(qbuilder.or(criteria.toArray(new Predicate[0]))); + + Query q = getEntityManager().createQuery(cquery); + + List list = new ArrayList(q.getParameters()); + for (int i = 0; i < list.size(); i++) { + Parameter p = (Parameter) list.get(i); + logger.log(Logger.Level.TRACE, "parameter name = " + p.getName()); + logger.log(Logger.Level.TRACE, "parameter position = " + p.getPosition()); + logger.log(Logger.Level.TRACE, "parameter type =" + p.getParameterType()); + } + + String sExpected = "hdate"; + Parameter p1 = q.getParameter(sExpected); + String sActual = p1.getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, "p1.getName() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass1 = true; + } + + sExpected = null; + Integer iActual = p1.getPosition(); + if (iActual != null) { + logger.log(Logger.Level.ERROR, "p1.getPosition() - Expected: " + sExpected + ", actual:" + iActual); + } else { + pass2 = true; + } + sExpected = "java.sql.Date"; + sActual = p1.getParameterType().getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, + "p1.getParameterType() - Expected: " + sExpected + ", actual:" + sActual); + } else { + pass3 = true; + } + + } else { + logger.log(Logger.Level.ERROR, "Failed to get Non-null Criteria Query"); + } + + if (!pass1 || !pass2 || !pass3) { + throw new Exception("parameterTest3 test failed"); + + } + } + + /* + * @testName: parameterTest4 + * + * @assertion_ids: PERSISTENCE:JAVADOC:382; PERSISTENCE:JAVADOC:383; + * + * @test_Strategy: Create a query with a parameter where the name is not + * specified and retrieve information about the parameter. + */ + @Test + public void parameterTest4() throws Exception { + logger.log(Logger.Level.TRACE, "Starting parameterTest4"); + boolean pass1 = false; + boolean pass2 = true; + CriteriaBuilder qbuilder = getEntityManagerFactory().getCriteriaBuilder(); + + CriteriaQuery cquery = qbuilder.createQuery(Employee.class); + if (cquery != null) { + Root employee = cquery.from(Employee.class); + cquery.select(employee); + + List criteria = new ArrayList(); + + // No name is being assigned to the parameter + ParameterExpression pe = qbuilder.parameter(String.class); + + criteria.add(qbuilder.equal(employee.get("firstName"), pe)); + + cquery.where(qbuilder.or(criteria.toArray(new Predicate[0]))); + + Query q = getEntityManager().createQuery(cquery); + List list = new ArrayList(q.getParameters()); + for (int i = 0; i < list.size(); i++) { + Parameter p = (Parameter) list.get(i); + logger.log(Logger.Level.TRACE, "parameter position = " + p.getPosition()); + logger.log(Logger.Level.TRACE, "parameter type =" + p.getParameterType()); + } + + for (int i = 0; i < list.size(); i++) { + Parameter p = (Parameter) list.get(i); + pass1 = true; + // the value returned by getName() in this instance where no name has + // been assigned to the parameter is undefined in the spec therefore + // we will not test for it. + + String sExpected = null; + Integer iActual = p.getPosition(); + if (iActual != null) { + logger.log(Logger.Level.ERROR, "p1.getPosition() - Expected: " + sExpected + ", actual:" + iActual); + } + sExpected = "java.lang.String"; + String sActual = p.getParameterType().getName(); + if (!sActual.equals(sExpected)) { + logger.log(Logger.Level.ERROR, + "p1.getParameterType() - Expected: " + sExpected + ", actual:" + sActual); + } + } + + } else { + logger.log(Logger.Level.ERROR, "Failed to get Non-null Criteria Query"); + } + + if (!pass1 || !pass2) { + throw new Exception("parameterTest4 test failed"); + + } + + } + +} diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client2IT.java index a4204ca164..5743b8e1b7 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/Client2IT.java @@ -23,6 +23,7 @@ import java.util.List; import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import com.sun.ts.lib.harness.SetupMethod; @@ -46,6 +47,22 @@ public JavaArchive createDeployment() throws Exception { String[] classes = { pkgName + "Employee" }; return createDeploymentJar("jpa_core_criteriaapi_parameter2.jar", pkgNameWithoutSuffix, classes); } + + @BeforeEach + public void setup() throws Exception { + logger.log(Logger.Level.TRACE, "setup"); + try { + super.setup(); + createDeployment(); + getEntityManager(); + removeTestData(); + createTestData(); + } catch (Exception e) { + logger.log(Logger.Level.ERROR, "Exception: ", e); + throw new Exception("Setup failed:", e); + } + } + /* * @testName: parameterExpressionInObjectArrayTest diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/build.xml deleted file mode 100644 index 4f9ff1b6c2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/parameter/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/strquery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/strquery/build.xml deleted file mode 100644 index 11fee7b805..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/criteriaapi/strquery/build.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/build.xml deleted file mode 100644 index 9a013cc91d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/ClientIT.java index b6d6a0e032..0af4cfa534 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/ClientIT.java @@ -131,12 +131,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/build.xml deleted file mode 100644 index 3d7e8a9d58..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1a/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/ClientIT.java index 573c8d9d69..1ff7b63557 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/ClientIT.java @@ -128,12 +128,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/build.xml deleted file mode 100644 index 0635c17aec..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex1b/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/ClientIT.java index f53a5b9647..5a4eb3b993 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/ClientIT.java @@ -131,12 +131,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/build.xml deleted file mode 100644 index 3a36dc3243..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2a/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/ClientIT.java index ce67382aa0..305c815ddb 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/ClientIT.java @@ -145,12 +145,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/build.xml deleted file mode 100644 index 95779e21a2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex2b/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/ClientIT.java index 8be76beac1..dbfe5cb5f3 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/ClientIT.java @@ -132,12 +132,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/build.xml deleted file mode 100644 index 8e8ead3e4f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3a/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/ClientIT.java index a535b78e51..4cd957215e 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/ClientIT.java @@ -160,12 +160,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/build.xml deleted file mode 100644 index 19612260c6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex3b/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/ClientIT.java index 5a0192850d..b206c83f86 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/ClientIT.java @@ -120,12 +120,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/build.xml deleted file mode 100644 index e50ca1ad0a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4a/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/ClientIT.java index bdafae8113..246fe56b44 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/ClientIT.java @@ -122,12 +122,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/build.xml deleted file mode 100644 index f3196430e6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex4b/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/ClientIT.java index 6214f16195..6d8f26a93f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/ClientIT.java @@ -123,12 +123,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/build.xml deleted file mode 100644 index 79fdb92c46..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5a/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/ClientIT.java index 37d332ec55..75311bdd09 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/ClientIT.java @@ -143,12 +143,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/build.xml deleted file mode 100644 index ac8646b98d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex5b/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/ClientIT.java index 645410e168..2edb934547 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/ClientIT.java @@ -124,12 +124,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/build.xml deleted file mode 100644 index 5af63f8e31..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6a/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/ClientIT.java index 6dd309c465..6fd0fbde32 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/ClientIT.java @@ -143,12 +143,12 @@ public void DIDTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/build.xml deleted file mode 100644 index 9127b3a9d1..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/derivedid/ex6b/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client1IT.java index 4e536619e1..846f02514a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client1IT.java @@ -99,10 +99,10 @@ public void setup() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client2IT.java index 50a58bdce5..deab152cd0 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client2IT.java @@ -97,10 +97,10 @@ public void setupOrderData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client3IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client3IT.java index ff60b1829d..78c6c16026 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client3IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/Client3IT.java @@ -92,11 +92,11 @@ public void setupEmployeeData() throws Exception { @AfterEach public void cleanupData() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/build.xml deleted file mode 100644 index d94c42a769..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client1IT.java index a3d0e170dd..b021624067 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client1IT.java @@ -92,10 +92,10 @@ public void setup() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client2IT.java index b0da111601..af2c19263f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/Client2IT.java @@ -87,11 +87,11 @@ public void setupOrderData() throws Exception { @AfterEach public void cleanupData() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/build.xml deleted file mode 100644 index 4f6c516295..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManager2/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client1IT.java index aeabe29d6d..be4c98d4bb 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client1IT.java @@ -70,11 +70,11 @@ public void setup() throws Exception { @AfterEach public void cleanup() throws Exception { try { - removeTestData(); - logger.log(Logger.Level.TRACE, "done cleanup, calling super.cleanup"); - super.cleanup(); + removeTestData(); + logger.log(Logger.Level.TRACE, "done cleanup, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client2IT.java index c97a828520..b352a00348 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client2IT.java @@ -66,9 +66,9 @@ public void setupNoData() throws Exception { @AfterEach public void cleanupNoData() throws Exception { try { - super.cleanup(); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client3IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client3IT.java index 479a7ba054..3c098f4957 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client3IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/Client3IT.java @@ -69,9 +69,9 @@ public void setupMember() throws Exception { @AfterEach public void cleanupNoData() throws Exception { try { - super.cleanup(); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/build.xml deleted file mode 100644 index 891f06d8f0..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactory/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/ClientIT.java index e66d11dd24..3d387dea55 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/ClientIT.java @@ -64,9 +64,9 @@ public void setup() throws Exception { @AfterEach public void cleanup() throws Exception { try { - super.cleanup(); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/build.xml deleted file mode 100644 index cda0d0e3d4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityManagerFactoryCloseExceptions/build.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/ClientIT.java index f17ac5f291..e72796b3d7 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/ClientIT.java @@ -63,10 +63,10 @@ public void setup() throws Exception { public void cleanup() throws Exception { // Nothing to cleanup try { - logger.log(Logger.Level.TRACE, "done cleanup, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "done cleanup, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/build.xml deleted file mode 100644 index fd0918800f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entityTransaction/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/ClientIT.java index b9c1e344fb..db3a58833c 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/ClientIT.java @@ -976,12 +976,12 @@ private int verifyEntity(List result) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/build.xml deleted file mode 100644 index 82d5fdc812..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/apitests/build.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/ClientIT.java index afbe865f72..70e3cbdd17 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/ClientIT.java @@ -536,12 +536,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/build.xml deleted file mode 100644 index 804b8059e2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/bigdecimal/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/ClientIT.java index 3c377389eb..2e1789671a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/ClientIT.java @@ -535,12 +535,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/build.xml deleted file mode 100644 index 17cff301d4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/biginteger/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/build.xml deleted file mode 100644 index e123e9affa..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/build.xml deleted file mode 100644 index 9607cf96d7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/ClientIT.java index 356a2dde39..54b3cfdd9e 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/ClientIT.java @@ -770,12 +770,12 @@ private void dumpCollectionDataB(Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/build.xml deleted file mode 100644 index a5d85e1730..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/ClientIT.java index 41452aca86..3d67bb583a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/ClientIT.java @@ -630,12 +630,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/build.xml deleted file mode 100644 index 563d85c950..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/manyXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/ClientIT.java index 500d3a87db..7d24d5d097 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/ClientIT.java @@ -762,12 +762,12 @@ private void dumpCollectionDataB(final Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/build.xml deleted file mode 100644 index d4f4e7195d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/ClientIT.java index 6590d2df10..3e45c26db2 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/ClientIT.java @@ -689,12 +689,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/build.xml deleted file mode 100644 index 3ad6e26b5e..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/cascadeall/oneXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/ClientIT.java index 5d923cc5d7..8b84b52dc5 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/ClientIT.java @@ -210,12 +210,12 @@ private void createA(final A a) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/build.xml deleted file mode 100644 index 6c1e1c2f0b..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/basic/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/build.xml deleted file mode 100644 index 242b5bf2dc..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/ClientIT.java index 99a13077de..0c7b7c6241 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/ClientIT.java @@ -183,13 +183,13 @@ private void createA(final A a) { @AfterEach public void cleanup() throws Exception { try { - - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/build.xml deleted file mode 100644 index 8d83cbff2d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/ClientIT.java index 7c49990880..74c14e5611 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/ClientIT.java @@ -155,12 +155,12 @@ private void createA(final A a) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/build.xml deleted file mode 100644 index 74cc1f7938..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/manyXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/ClientIT.java index b7520cc600..08f221152e 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/ClientIT.java @@ -247,12 +247,12 @@ private void dumpCollectionDataB(Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/build.xml deleted file mode 100644 index 4e8713c3f5..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/ClientIT.java index 63bc932471..cfd93c3be9 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/ClientIT.java @@ -223,12 +223,12 @@ private void createB(final B b) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/build.xml deleted file mode 100644 index ca2d618eac..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/detach/oneXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/ClientIT.java index 9a03c54bc7..d17694441f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/ClientIT.java @@ -390,12 +390,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/build.xml deleted file mode 100644 index 494ff761b3..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/basic/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/build.xml deleted file mode 100644 index c2178704b5..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/ClientIT.java index cbd4ff7d3b..dec6e9a6aa 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/ClientIT.java @@ -795,12 +795,12 @@ private void dumpCollectionDataB(final Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/build.xml deleted file mode 100644 index edc38b28c5..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/ClientIT.java index 8cafab8665..842544a9ba 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/ClientIT.java @@ -664,12 +664,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/build.xml deleted file mode 100644 index 58a1b1bc6e..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/manyXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/ClientIT.java index 053512a6b3..a2571b830e 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/ClientIT.java @@ -951,12 +951,12 @@ private void dumpCollectionDataB(final Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/build.xml deleted file mode 100644 index 99b8330c90..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/ClientIT.java index a2f65983a6..b7f7d13c73 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/ClientIT.java @@ -1032,12 +1032,12 @@ private void dumpCollectionDataB(final List c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/build.xml deleted file mode 100644 index fcd593b6e1..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXmanyFetchEager/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/ClientIT.java index 5cc67e0c90..948f26df5d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/ClientIT.java @@ -752,12 +752,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); - }finally { - removeTestJarFromCP(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); + } finally { + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/build.xml deleted file mode 100644 index 04de9e7944..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/persist/oneXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/ClientIT.java index fb68ad9171..73da1f5621 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/ClientIT.java @@ -392,12 +392,12 @@ private A findA(final String id) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/build.xml deleted file mode 100644 index d66166c1e7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/basic/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/build.xml deleted file mode 100644 index d2add3898c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/ClientIT.java index bd73d1d0c2..a052592e68 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/ClientIT.java @@ -627,12 +627,12 @@ private void dumpCollectionDataB(final Collection c) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/build.xml deleted file mode 100644 index bc25bede17..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXmany/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/ClientIT.java index eb2de4d1c1..eb9a04c57d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/ClientIT.java @@ -612,12 +612,12 @@ private boolean getInstanceStatus(final Object o) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/build.xml deleted file mode 100644 index 849ba46df2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/entitytest/remove/oneXone/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/ClientIT.java index 397ad2fb86..53f20558a0 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/ClientIT.java @@ -3115,14 +3115,14 @@ public void synchronizationTypeValuesTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - if (getEntityManager().isOpen()) { - removeTestData(); - } - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + if (getEntityManager().isOpen()) { + removeTestData(); + } + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/build.xml deleted file mode 100644 index 421bc3c3ac..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/enums/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/ClientIT.java index 85d1a21e31..4952065043 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/ClientIT.java @@ -1719,14 +1719,14 @@ public void NoResultExceptionTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - if (getEntityManager().isOpen()) { - removeTestData(); - } - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + if (getEntityManager().isOpen()) { + removeTestData(); + } + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/build.xml deleted file mode 100644 index 61497a7fda..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/exceptions/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/ClientIT.java index a7e91fb976..5b2e4dc4f5 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/ClientIT.java @@ -283,12 +283,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/build.xml deleted file mode 100644 index 109a9ab715..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/abstractentity/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/build.xml deleted file mode 100644 index 33bbc8b2d9..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/ClientIT.java index d128c58c2e..81ee0ad8e9 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/ClientIT.java @@ -205,12 +205,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/build.xml deleted file mode 100644 index fc3a3c9568..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/annotation/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/build.xml deleted file mode 100644 index cf8223756f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/ClientIT.java index aeca0fd64c..96e1bb24cf 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/ClientIT.java @@ -205,12 +205,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/build.xml deleted file mode 100644 index ad6f04873b..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/mappedsc/descriptors/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/ClientIT.java index 620a0bb9dc..a8e7fa4fb1 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/ClientIT.java @@ -272,12 +272,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/build.xml deleted file mode 100644 index 326ff1c16f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/inheritance/nonentity/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/build.xml deleted file mode 100644 index 5eabf45800..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/ClientIT.java index 501bb08b91..ff2ed25bfd 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/ClientIT.java @@ -593,12 +593,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/build.xml deleted file mode 100644 index d8d938a416..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/entitymanager/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/ClientIT.java index b9d1ec76b8..ca2d07111a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/ClientIT.java @@ -770,12 +770,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/build.xml deleted file mode 100644 index 924ad79e37..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/lock/query/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/ClientIT.java index cbc4c6b6ca..c4b07e2745 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/ClientIT.java @@ -357,12 +357,12 @@ public void isCollection() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/build.xml deleted file mode 100644 index e35cd2b0c4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/attribute/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/basictype/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/basictype/build.xml deleted file mode 100644 index bc55551af7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/basictype/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/ClientIT.java index b03c9320ed..171f179c82 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/ClientIT.java @@ -143,12 +143,12 @@ public void getBindableJavaType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/build.xml deleted file mode 100644 index d93f31da96..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/bindable/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/build.xml deleted file mode 100644 index 6b658d8802..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/build.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/ClientIT.java index 4351cd472f..365db202c4 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/ClientIT.java @@ -149,20 +149,20 @@ public void getElementType() throws Exception { } @AfterEach - public void cleanup() throws Exception { + public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "in cleanup"); - try { - if (getEntityTransaction().isActive()) { - getEntityTransaction().rollback(); + logger.log(Logger.Level.TRACE, "in cleanup"); + try { + if (getEntityTransaction().isActive()) { + getEntityTransaction().rollback(); + } + } catch (Exception fe) { + logger.log(Logger.Level.ERROR, "Unexpected exception rolling back TX:", fe); } - } catch (Exception fe) { - logger.log(Logger.Level.ERROR, "Unexpected exception rolling back TX:", fe); - } - logger.log(Logger.Level.TRACE, "done cleanup, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "done cleanup, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/build.xml deleted file mode 100644 index aaaa453e0c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/collectionattribute/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/ClientIT.java index 27302fca2d..f14af5568f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/ClientIT.java @@ -2523,12 +2523,12 @@ public void getDeclaredPluralAttributes() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/build.xml deleted file mode 100644 index eccddde263..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/embeddabletype/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/ClientIT.java index 2a31a457b6..3c8083f76d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/ClientIT.java @@ -805,12 +805,12 @@ public void getBindableType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/build.xml deleted file mode 100644 index 47d0937c94..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/entitytype/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/ClientIT.java index 11e8e664d1..7bcf5c175b 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/ClientIT.java @@ -3066,12 +3066,12 @@ public void getSingularAttributes() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/build.xml deleted file mode 100644 index 86456959ed..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/identifiabletype/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/ClientIT.java index 51e8605e97..4f8e91c35c 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/ClientIT.java @@ -286,12 +286,12 @@ public void getDeclaredList2() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/build.xml deleted file mode 100644 index bfa516dab8..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/listattribute/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/ClientIT.java index 53957f510f..bb9e14dc7d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/ClientIT.java @@ -2845,12 +2845,12 @@ public void getPersistenceType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/build.xml deleted file mode 100644 index 2b42d8b4f9..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/managedtype/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/ClientIT.java index b2bd8c4e7b..92d78fd6ed 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/ClientIT.java @@ -250,12 +250,12 @@ public void getElementType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/build.xml deleted file mode 100644 index 1eee09d169..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mapattribute/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/ClientIT.java index ad8dac71e4..7fa502d98b 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/ClientIT.java @@ -762,12 +762,12 @@ public void hasVersionAttribute() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/build.xml deleted file mode 100644 index 6283b51531..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/mappedsuperclasstype/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/ClientIT.java index aba40c8641..39272f7429 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/ClientIT.java @@ -495,12 +495,12 @@ public void embeddableIllegalArgumentException() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/build.xml deleted file mode 100644 index aa31168380..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/metamodel/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/ClientIT.java index 3952660447..db3906b24d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/ClientIT.java @@ -528,12 +528,12 @@ public void getDeclaringType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/build.xml deleted file mode 100644 index 88d29cc1f8..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/pluralattribute/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/ClientIT.java index 0c8ba0097d..6f53d0fe65 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/ClientIT.java @@ -182,12 +182,12 @@ public void getElementType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/build.xml deleted file mode 100644 index 467738a88f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/setattribute/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/ClientIT.java index 577e14417c..d60a2fe9be 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/ClientIT.java @@ -623,12 +623,12 @@ public void getBindableJavaType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/build.xml deleted file mode 100644 index 8d998c805c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/singularattribute/build.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/ClientIT.java index c9d0dc01d5..d16c564a59 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/ClientIT.java @@ -170,12 +170,12 @@ public void getJavaType() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/build.xml deleted file mode 100644 index 5eef20233b..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/metamodelapi/type/build.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/ClientIT.java index a6cd907efe..24ba51c20d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/ClientIT.java @@ -437,12 +437,12 @@ public B getBFromCollection(final Collection c, final B b) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/build.xml deleted file mode 100644 index 94f178eea9..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/nestedembedding/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/ClientIT.java index bf6ca12117..9b8c60f002 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/ClientIT.java @@ -105,12 +105,12 @@ public void testNoAttributeOverrideAnnotation() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/build.xml deleted file mode 100755 index 36d56b63a7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/attributeoverride/build.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/build.xml deleted file mode 100644 index b1dcff9acb..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/build.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/ClientIT.java index 86ba82c4df..6d20e6899c 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/ClientIT.java @@ -231,12 +231,12 @@ private boolean test(final String callBackName, final int expectedCount) throws @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/build.xml deleted file mode 100755 index ae9cb02a47..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/callbacklistener/build.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/ClientIT.java index 89dd12a8c4..a84813491f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/ClientIT.java @@ -275,12 +275,12 @@ public void testMetadataCompleteness() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/build.xml deleted file mode 100755 index 3125d31f32..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/embeddable/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/ClientIT.java index 1116370583..b5ebe61936 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/ClientIT.java @@ -214,12 +214,12 @@ public void testNoEntityAnnotation() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/build.xml deleted file mode 100755 index 23a4aa6eaa..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entity/build.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/ClientIT.java index 6825e4f7cc..4257ed35bb 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/ClientIT.java @@ -223,12 +223,12 @@ private boolean test(final String callBackName, final int expectedCount) throws @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/build.xml deleted file mode 100755 index 8828808de3..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/entitylistener/build.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/ClientIT.java index 9b25662b1b..63cef6d09f 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/ClientIT.java @@ -396,12 +396,12 @@ private Customer1 createCustomer(final long id, final String name) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/build.xml deleted file mode 100755 index 541b0a3d80..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/joincolumn/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/ClientIT.java index dfbdda5ced..697a86b404 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/ClientIT.java @@ -150,12 +150,12 @@ private Course createCourse(final int id, final String courseName) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/build.xml deleted file mode 100755 index 66da4064f6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/manytomany/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/ClientIT.java index c68f787595..4f6651c24d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/ClientIT.java @@ -420,12 +420,12 @@ private RetailOrder createOrder(final long id, final Consumer consumer, final do @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/build.xml deleted file mode 100755 index 7564fcee67..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/mapkey/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/ClientIT.java index 8cf983a97f..07ed8d52a8 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/ClientIT.java @@ -176,12 +176,12 @@ private boolean test(final String callBackName, final int expectedCount) throws @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/build.xml deleted file mode 100755 index 62621bd106..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/nocallbacklistener/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/ClientIT.java index e20f6b4b66..f9434942a8 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/ClientIT.java @@ -85,12 +85,12 @@ public void testNoTableAnnotation() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/build.xml deleted file mode 100755 index ac542f9cb7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/override/table/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/ClientIT.java index 467250922c..6b5b81b436 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/ClientIT.java @@ -83,12 +83,12 @@ public void getPersistenceUtilTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/build.xml deleted file mode 100644 index 548da18365..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtil/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/ClientIT.java index 76bedbfe2d..acc1ad2ad0 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/ClientIT.java @@ -156,12 +156,12 @@ public void getIdentifierIllegalArgumentExceptionTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/build.xml deleted file mode 100644 index bfd04455b7..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/persistenceUtilUtil/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client1IT.java index 7237fb7837..51680fb50d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client1IT.java @@ -4366,12 +4366,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client2IT.java index 31e17f05f1..7eafa88601 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client2IT.java @@ -64,10 +64,10 @@ public void setupNoData() throws Exception { @AfterEach public void cleanupNoData() throws Exception { try { - logger.log(Logger.Level.TRACE, "in cleanupNoData"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "in cleanupNoData"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client3IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client3IT.java index 393fbac445..7185329a6b 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client3IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/Client3IT.java @@ -78,10 +78,10 @@ public void setupDataTypes2() throws Exception { @AfterEach public void cleanupNoData() throws Exception { try { - logger.log(Logger.Level.TRACE, "in cleanupNoData"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "in cleanupNoData"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/build.xml deleted file mode 100644 index c44336ff63..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/apitests/build.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/build.xml deleted file mode 100644 index d70178c378..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/flushmode/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/flushmode/build.xml deleted file mode 100644 index 2d15d8592d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/flushmode/build.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/language/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/language/build.xml deleted file mode 100644 index ea06cedcd8..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/language/build.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client1IT.java index a887f09085..48544a8d14 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client1IT.java @@ -697,10 +697,10 @@ public void getParametersNoParametersTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client2IT.java index c6d53ac415..dac43b3e60 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/Client2IT.java @@ -245,12 +245,12 @@ public void createEmployeeData() throws Exception { @AfterEach public void cleanupEmployee() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/build.xml deleted file mode 100644 index 12b4b6734d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/query/parameter/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/ClientIT.java index 11533a64b1..82656fdaf2 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/ClientIT.java @@ -1283,12 +1283,12 @@ private void createReviews() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/build.xml deleted file mode 100644 index ebe0bcf32f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/annotations/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/ClientIT.java index b4acf49426..42170ab674 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/ClientIT.java @@ -176,12 +176,12 @@ public void biDirMXMTest1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/build.xml deleted file mode 100644 index 4bf46cc7b5..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxmany/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/ClientIT.java index 5c72720003..17e4064fd4 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/ClientIT.java @@ -160,12 +160,12 @@ public void biDirMX1Test1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/build.xml deleted file mode 100644 index ee56fa8163..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidirmanyxone/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/ClientIT.java index 08633c55d3..dc9e3b0c38 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/ClientIT.java @@ -197,12 +197,12 @@ public void biDir1XMTest1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/build.xml deleted file mode 100644 index 2fd9c16fdc..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexmany/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/ClientIT.java index 0a9f23d903..675627c12a 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/ClientIT.java @@ -121,12 +121,12 @@ public void biDir1X1Test1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/build.xml deleted file mode 100644 index b7258adc4a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/bidironexone/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/build.xml deleted file mode 100644 index 49fb3f61f6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/ClientIT.java index b3ea47e9f8..3d3e647288 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/ClientIT.java @@ -1179,12 +1179,12 @@ private void createReviews() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/build.xml deleted file mode 100644 index d798a31fcb..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/defaults/build.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/ClientIT.java index 36eb034fae..a2277af6aa 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/ClientIT.java @@ -1181,12 +1181,12 @@ private void createReviews() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/build.xml deleted file mode 100644 index 6995aadb15..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/descriptors/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/ClientIT.java index cc727dc2bd..d02ecc22bc 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/ClientIT.java @@ -165,12 +165,12 @@ public void uniMXMTest1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/build.xml deleted file mode 100644 index 0b7d991e9b..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxmany/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/ClientIT.java index 583066f3f7..6491fd5f5e 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/ClientIT.java @@ -148,12 +148,12 @@ public void uniMX1Test1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/build.xml deleted file mode 100644 index 64c76eddad..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unimanyxone/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/ClientIT.java index 542628614f..6f570ae61d 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/ClientIT.java @@ -138,12 +138,12 @@ public void uni1XMTest1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/build.xml deleted file mode 100644 index 039fae2f8a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexmany/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/ClientIT.java index e92098db57..2fa0241d8c 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/ClientIT.java @@ -108,12 +108,12 @@ public void uni1X1Test1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/build.xml deleted file mode 100644 index 74efc8814f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/relationship/unionexone/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/ClientIT.java index c06f31f8b1..20bf80ce18 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/ClientIT.java @@ -493,12 +493,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/build.xml deleted file mode 100644 index 46d37e0056..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/auto/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/build.xml deleted file mode 100644 index c447622d6f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/ClientIT.java index 0ee9c2100a..d81a469bfe 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/ClientIT.java @@ -1246,12 +1246,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/build.xml deleted file mode 100644 index a750513a2f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/field/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/Client.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/Client.java index 5f5374ca3d..2ba07416f8 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/Client.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/Client.java @@ -49,12 +49,12 @@ protected void createSequenceGenerator() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/build.xml deleted file mode 100644 index 7493156420..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/generator/build.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/build.xml deleted file mode 100644 index b547d5df1e..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/ClientIT.java index aacb83ae37..cd0813da98 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/ClientIT.java @@ -341,12 +341,12 @@ public void testCompoundPK3() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/build.xml deleted file mode 100644 index c026826a4a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/primarykey/compound/build.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client1IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client1IT.java index 89f3ece7e7..a735384c73 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client1IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client1IT.java @@ -931,12 +931,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client2IT.java index f5332fc9c7..35cc46a928 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/Client2IT.java @@ -126,12 +126,12 @@ public void elementCollectionTest() throws Exception { @AfterEach public void cleanupCust() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeCustTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeCustTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/build.xml deleted file mode 100644 index 6292f1ca51..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/types/property/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/ClientIT.java index 61d3d81f68..225e731340 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/ClientIT.java @@ -160,12 +160,12 @@ public void versionTest1() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/build.xml deleted file mode 100644 index e5bdeff05a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/core/versioning/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/build.xml deleted file mode 100644 index fe23807bfb..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/common/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/common/build.xml deleted file mode 100644 index fc90e50532..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/common/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManager/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManager/build.xml deleted file mode 100644 index 86bd951a93..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManager/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManagerFactory/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManagerFactory/build.xml deleted file mode 100644 index 8278b70934..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/entityManagerFactory/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/build.xml deleted file mode 100644 index 00e2e8cc00..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/annotation/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/build.xml deleted file mode 100644 index de4f210d44..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/descriptor/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/descriptor/build.xml deleted file mode 100644 index ebcdb1e6ab..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/appclient/descriptor/build.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/build.xml deleted file mode 100644 index 129d6cdef4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/build.xml deleted file mode 100644 index f3fad3d112..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/build.xml deleted file mode 100644 index 4258b58842..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/descriptor/build.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/build.xml deleted file mode 100644 index 7135cdda34..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/exclude/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/build.xml deleted file mode 100644 index 2d5f519d8a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/resource_local/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/build.xml deleted file mode 100644 index 8e3d18a5e3..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/ejb/standalone/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/jar/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/jar/build.xml deleted file mode 100644 index 47c68188fe..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/jar/build.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/build.xml deleted file mode 100644 index 525ea9dd27..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/scope/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/scope/build.xml deleted file mode 100644 index 143bded49c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/scope/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/standalone/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/standalone/build.xml deleted file mode 100644 index e77ca33543..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/packaging/web/standalone/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/build.xml deleted file mode 100644 index 316298e36c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/build.xml deleted file mode 100644 index 387d4cabc1..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/jta/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/jta/build.xml deleted file mode 100644 index 5a38528f4d..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/jta/build.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/resource_local/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/resource_local/build.xml deleted file mode 100644 index 1855f47764..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/pluggability/contracts/resource_local/build.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/am/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/am/build.xml deleted file mode 100644 index 9e03ad38be..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/am/build.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/build.xml deleted file mode 100644 index 5fcbe46652..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/build.xml deleted file mode 100644 index d89a8a7d50..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/extended/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/extended/build.xml deleted file mode 100644 index 8ab5a693f9..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/extended/build.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/jta/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/jta/build.xml deleted file mode 100644 index 5e52554eb8..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/ee/propagation/cm/jta/build.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/build.xml deleted file mode 100644 index da27a75b78..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/ClientIT.java index aafda189fd..badc5dda94 100755 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/ClientIT.java @@ -83,16 +83,16 @@ public void setup() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.INFO, "Cleanup: JPA 2.2 Java 8 date and time types test"); - Properties props = getPersistenceUnitProperties(); - props.put("jakarta.persistence.schema-generation.database.action", "drop"); - displayProperties(props); - logger.log(Logger.Level.INFO, " - executing persistence schema cleanup"); - Persistence.generateSchema(getPersistenceUnitName(), props); - closeEMAndEMF(); - super.cleanup(); - }finally { - removeTestJarFromCP(); + logger.log(Logger.Level.INFO, "Cleanup: JPA 2.2 Java 8 date and time types test"); + Properties props = getPersistenceUnitProperties(); + props.put("jakarta.persistence.schema-generation.database.action", "drop"); + displayProperties(props); + logger.log(Logger.Level.INFO, " - executing persistence schema cleanup"); + Persistence.generateSchema(getPersistenceUnitName(), props); + closeEMAndEMF(); + super.cleanup(); + } finally { + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/build.xml deleted file mode 100644 index 04783bb249..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/datetime/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/build.xml deleted file mode 100644 index 9c8d5dbcd4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/ClientIT.java index e812ff3f4d..413f4aa380 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/ClientIT.java @@ -115,12 +115,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/build.xml deleted file mode 100644 index 2e84ecde86..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/generators/tablegenerators/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/build.xml deleted file mode 100644 index 8863703d08..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/ClientIT.java index a2e748b027..d0de1d1440 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/ClientIT.java @@ -315,12 +315,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/build.xml deleted file mode 100644 index db2ae82540..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/query/stream/build.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/ClientIT.java index 7aa309d073..90b0d30664 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/ClientIT.java @@ -193,12 +193,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/build.xml deleted file mode 100644 index 366c70c643..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/attroverride/build.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/build.xml deleted file mode 100644 index 1f9b431cd5..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/ClientIT.java index 242908f896..7153d65273 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/ClientIT.java @@ -127,12 +127,12 @@ public void convertsTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/build.xml deleted file mode 100644 index e24c1ca480..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/convert/build.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/ClientIT.java index 0617a5d68b..38500c7854 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/ClientIT.java @@ -132,12 +132,12 @@ public void didTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/build.xml deleted file mode 100644 index d80feebe3a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/joincolumn/build.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/ClientIT.java index 0f77f4201b..c6f62c93f7 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/ClientIT.java @@ -260,12 +260,12 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/build.xml deleted file mode 100644 index 9c17423f58..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/mapkeyjoincolumn/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/ClientIT.java index 06348dfaae..7860ac7660 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/ClientIT.java @@ -73,11 +73,11 @@ public void setupEmployeeData() throws Exception { @AfterEach public void cleanupEmployeeData() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/build.xml deleted file mode 100644 index 04908531d3..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedentitygraph/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/ClientIT.java index 02af55a071..5281b7ee12 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/ClientIT.java @@ -146,12 +146,12 @@ private void createTestData() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/build.xml deleted file mode 100644 index 90ee74471a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namednativequery/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/ClientIT.java index cf20ab2fbd..6ef9f8e6e5 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/ClientIT.java @@ -93,11 +93,11 @@ public void setupEmployeeData() throws Exception { @AfterEach public void cleanupData() throws Exception { try { - logger.log(Logger.Level.TRACE, "Cleanup data"); - removeTestData(); - cleanup(); + logger.log(Logger.Level.TRACE, "Cleanup data"); + removeTestData(); + cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/build.xml deleted file mode 100644 index c3bfdd5c28..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/repeatable/namedstoredprocedurequery/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/build.xml deleted file mode 100644 index adaa56a421..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/build.xml deleted file mode 100644 index 92cdfa0a41..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/ClientIT.java index 1a5aa8991f..59e1b3d8f8 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/ClientIT.java @@ -225,12 +225,12 @@ public void sequenceGeneratorTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/build.xml deleted file mode 100644 index fe1a152123..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/generators/sequencegenerators/build.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/build.xml deleted file mode 100644 index aeee6ddca5..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/ClientIT.java index 6718ec30ec..0480f011fb 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/ClientIT.java @@ -158,12 +158,12 @@ public void subClassInheritsCacheableTrue() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/build.xml deleted file mode 100644 index 3540350dc4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/jpa22/se/repeatable/secondarytable/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/build.xml deleted file mode 100644 index 76b7d3837e..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/ClientIT.java index 4286e6e563..5985800321 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/ClientIT.java @@ -251,12 +251,12 @@ public void subClassInheritsCacheableFalse() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/build.xml deleted file mode 100644 index 9072e59ace..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/inherit/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/ClientIT.java index 7f36eda982..64236d7a87 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/ClientIT.java @@ -629,12 +629,12 @@ public void createDataVIAJDBC(Properties p) { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/build.xml deleted file mode 100644 index 1d6803440c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/all/build.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/build.xml deleted file mode 100644 index 25bb6c5371..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/ClientIT.java index f0aa180d9a..96fd783900 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/ClientIT.java @@ -139,12 +139,12 @@ public void containsTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/build.xml deleted file mode 100644 index 577fb94628..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/disableselective/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/ClientIT.java index e1aed79143..a502a2c0f5 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/ClientIT.java @@ -152,12 +152,12 @@ public void containsTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/build.xml deleted file mode 100644 index 3f1b52aeb6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/enableselective/build.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/ClientIT.java index e7783869e2..9ccb218775 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/ClientIT.java @@ -121,12 +121,12 @@ public void containsTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/build.xml deleted file mode 100644 index a4241fdb2a..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/cache/xml/none/build.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/ClientIT.java index e26350057a..a60da1f9c9 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/ClientIT.java @@ -122,11 +122,11 @@ public void createTestData() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/build.xml deleted file mode 100644 index 5e3d538657..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/descriptor/build.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/ClientIT.java index 94191c4af6..073700fc12 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/ClientIT.java @@ -90,11 +90,11 @@ public void setupOrderData() throws Exception { @AfterEach public void cleanupData() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanupData"); - removeTestData(); - cleanup(); + logger.log(Logger.Level.TRACE, "cleanupData"); + removeTestData(); + cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/build.xml deleted file mode 100644 index 3e5e709d96..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManager/build.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/ClientIT.java index 399c88ec4b..519c3d7792 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/ClientIT.java @@ -64,9 +64,9 @@ public void setupNoData() throws Exception { @AfterEach public void cleanupNoData() throws Exception { try { - super.cleanup(); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/build.xml deleted file mode 100644 index d1e9d268f0..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/entityManagerFactory/build.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/build.xml deleted file mode 100644 index 316298e36c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/build.xml deleted file mode 100644 index 387d4cabc1..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/ClientIT.java index 6b55922804..bb4df511d0 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/ClientIT.java @@ -126,10 +126,10 @@ public JavaArchive createPluggabilityJar() throws Exception { @BeforeEach public void setup() throws Exception { logger.log(Logger.Level.TRACE, "setup"); - super.setup(); - createDeployment(); - createPluggabilityJar(); - initEntityManager("ALTPROVIDERPU", false); + super.setup(); + createDeployment(); + createPluggabilityJar(); + initEntityManager("ALTPROVIDERPU", false); } public void getLogProcessor() { @@ -677,12 +677,12 @@ public void getClassObjects() { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - logger.log(Logger.Level.TRACE, "calling super.cleanup"); - super.cleanup(); - removeTestJarFromCP(); + logger.log(Logger.Level.TRACE, "cleanup"); + logger.log(Logger.Level.TRACE, "calling super.cleanup"); + super.cleanup(); + removeTestJarFromCP(); } finally { - removePluggabilityJarFromCP(); + removePluggabilityJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/build.xml deleted file mode 100644 index dbbb2efc5c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/pluggability/contracts/resource_local/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/Client2IT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/Client2IT.java index 1dd36ef915..ecfa6aa7d3 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/Client2IT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/Client2IT.java @@ -110,9 +110,9 @@ public void createEntityManagerSynchronizationTypeIllegalStateExceptionTest() th @AfterEach public void cleanupOnly() throws Exception { - logger.log(Logger.Level.TRACE, "cleanupOnly"); - super.cleanup(); - removeTestJarFromCP(); + logger.log(Logger.Level.TRACE, "cleanupOnly"); + super.cleanup(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/build.xml deleted file mode 100644 index e4d02dcb27..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/resource_local/build.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/build.xml deleted file mode 100644 index 2bc6e89585..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/ClientIT.java index 14c095c407..f960feccbd 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/ClientIT.java @@ -202,12 +202,12 @@ public void discriminatorColumnTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/build.xml deleted file mode 100644 index 69ee3d6a02..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/discriminatorColumn/build.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/ClientIT.java index 16126c1de4..b53c2f8889 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/ClientIT.java @@ -202,12 +202,12 @@ public void enumeratedTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/build.xml deleted file mode 100644 index 82b2a39927..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/enumerated/build.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/ClientIT.java index a5fd242bcb..2a951bba04 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/ClientIT.java @@ -202,12 +202,12 @@ public void idTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/build.xml deleted file mode 100644 index 4dc993eb03..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/id/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/ClientIT.java index 34fcc5e48e..eb1ec82f05 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/ClientIT.java @@ -280,12 +280,12 @@ public void indexTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/build.xml deleted file mode 100644 index 72de2256d9..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/index/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/ClientIT.java index 49ed4108db..6129561b52 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/ClientIT.java @@ -337,12 +337,12 @@ public void joinTableTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/build.xml deleted file mode 100644 index 50bf940f1f..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/joinTable/build.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/ClientIT.java index bd62eca0bd..21c80032c5 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/ClientIT.java @@ -274,12 +274,12 @@ public void orderColumnTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/build.xml deleted file mode 100644 index ce4e9c63ac..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/orderColumn/build.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/ClientIT.java index 08b4c013be..65993d61b6 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/ClientIT.java @@ -231,12 +231,12 @@ public void secondaryTableTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/build.xml deleted file mode 100644 index 9a8d9536ef..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/secondaryTable/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/ClientIT.java index b775cfc92f..584eb38a76 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/ClientIT.java @@ -228,12 +228,12 @@ public void sequenceGeneratorTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/build.xml deleted file mode 100644 index 5906f97ad1..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/sequenceGenerator/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/ClientIT.java index 33357c386b..07b19172e6 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/ClientIT.java @@ -193,12 +193,12 @@ public void tableTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/build.xml deleted file mode 100644 index b51b9afe28..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/table/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/ClientIT.java index 62e063a8c2..db791402c3 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/ClientIT.java @@ -226,12 +226,12 @@ public void tableGeneratorTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(true); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(true); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/build.xml deleted file mode 100644 index 73d490eaa6..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/tableGenerator/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/ClientIT.java index c0dd6dcb8c..141d55210e 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/ClientIT.java @@ -206,12 +206,12 @@ public void temporalTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/build.xml deleted file mode 100644 index 49ca9df64c..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/temporal/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/ClientIT.java index 79b1642549..42eb866648 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/ClientIT.java @@ -226,12 +226,12 @@ public void uniqueConstraintTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/build.xml deleted file mode 100644 index b51b9afe28..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/uniqueConstraint/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/ClientIT.java index 109188ab38..914ae0dde2 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/ClientIT.java @@ -203,12 +203,12 @@ public void versionTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/build.xml deleted file mode 100644 index 4081407190..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/annotations/version/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/build.xml deleted file mode 100644 index 5783eb58d2..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/build.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/ClientIT.java b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/ClientIT.java index 7c678adcd7..15fc009cd4 100644 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/ClientIT.java +++ b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/ClientIT.java @@ -1086,12 +1086,12 @@ public void executeDropScriptReaderTest() throws Exception { @AfterEach public void cleanup() throws Exception { try { - logger.log(Logger.Level.TRACE, "cleanup"); - removeTestData(); - logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); - super.cleanup(); + logger.log(Logger.Level.TRACE, "cleanup"); + removeTestData(); + logger.log(Logger.Level.TRACE, "cleanup complete, calling super.cleanup"); + super.cleanup(); } finally { - removeTestJarFromCP(); + removeTestJarFromCP(); } } diff --git a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/build.xml b/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/build.xml deleted file mode 100644 index 8189d0eef4..0000000000 --- a/jpa/src/main/java/com/sun/ts/tests/jpa/se/schemaGeneration/scripts/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jpa_extras/pom.xml b/jpa_extras/pom.xml new file mode 100644 index 0000000000..c481c01fdf --- /dev/null +++ b/jpa_extras/pom.xml @@ -0,0 +1,76 @@ + + + + 4.0.0 + + jakartatck + project + 10.0.0-SNAPSHOT + + dbprocedures + JPA + JPA + + 1.7.0.Alpha14 + 5.9.1 + 11 + 11 + ${project.version} + + + + +