Ant build - clean target fix (eclipse-ee4j#2029)

To clean some generated files in: - dbws/eclipselink.dbws.test/ reports - foundation/eclipselink.extension.oracle.test/ eclipselink-proxyauthentication-model.jar eclipselink-timestamptz-model.jar - jpa/eclipselink.jpa.test/ reports run - jpa/eclipselink.jpa.wdf.test/ build reports run - jpa/org.eclipse.persistence.jpa.jpql.test/ reports run - moxy/eclipselink.moxy.test/ reports target - sdo/eclipselink.sdo.test/ classes reports - utils/eclipselink.dbws.builder.test/ reports Signed-off-by: Radek Felcman <[email protected]>
rfelcman · Jan 4, 2024 · 2b8457f · 2b8457f
1 parent 6fb42b5
commit 2b8457f
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 11 deletions.
diff --git a/dbws/eclipselink.dbws.test/antbuild.xml b/dbws/eclipselink.dbws.test/antbuild.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -367,6 +367,7 @@
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${classes.dir}"/>
             <fileset dir="." includes="${dbws_util.jar}"/>
+            <fileset dir="${report.dir}"/>
             <fileset file="${dbws_test.build.location}/${eclipselink.dbws.test.common.jar}"/>
         </delete>
     </target>

diff --git a/foundation/eclipselink.extension.oracle.test/antbuild.xml b/foundation/eclipselink.extension.oracle.test/antbuild.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -100,6 +100,8 @@
         <echo message="    ${oracle_test.build.location}/eclipselink-struct-converter-model.jar"/>
         <echo message="    ${oracle_test.build.location}/eclipselink-customfeatures-model.jar"/>
         <echo message="    ${oracle_test.build.location}/eclipselink-dcn-model.jar"/>
+        <echo message="    ${oracle_test.build.location}/eclipselink-proxyauthentication-model.jar"/>
+        <echo message="    ${oracle_test.build.location}/eclipselink-timestamptz-model.jar"/>
         <echo message="    ${oracle_test.build.location}/${oracle.jpa.test.jar}"/>
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${oracle_test.classes.dir}"/>
@@ -109,6 +111,8 @@
             <fileset dir="${oracle_test.build.location}" includes="eclipselink-struct-converter-model.jar"/>
             <fileset dir="${oracle_test.build.location}" includes="eclipselink-customfeatures-model.jar"/>
             <fileset dir="${oracle_test.build.location}" includes="eclipselink-dcn-model.jar"/>
+            <fileset dir="${oracle_test.build.location}" includes="eclipselink-proxyauthentication-model.jar"/>
+            <fileset dir="${oracle_test.build.location}" includes="eclipselink-timestamptz-model.jar"/>
             <fileset dir="${oracle_test.build.location}" includes="${oracle.jpa.test.jar}"/>
         </delete>
     </target>

diff --git a/jpa/eclipselink.jpa.test/antbuild.xml b/jpa/eclipselink.jpa.test/antbuild.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 1998, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1998, 2024 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
@@ -559,6 +559,9 @@
             <fileset dir="${jpatest.basedir}/classes21"/>
             <fileset dir="${jpatest.basedir}/classes22"/>
             <fileset dir="${jpatest.basedir}/${build.dir}"/>
+            <fileset dir="${jpatest.basedir}/temp"/>
+            <fileset dir="${jpatest.basedir}/${report.dir}"/>
+            <fileset dir="${jpatest.basedir}/${run.dir}"/>
             <fileset file="${jpatest.basedir}/${jpa.test.jar}"/>
             <fileset file="${jpatest.basedir}/${jpa21.test.jar}"/>
             <fileset file="${jpatest.basedir}/${jpa22.test.jar}"/>
@@ -602,6 +605,24 @@
             <fileset file="${jpatest.basedir}/${eclipselink.xml.extended.composite.advanced.model.member_3}.jar"/>
             <fileset file="${jpatest.basedir}/eclipselink-remote.jar"/>
             <fileset file="${jpatest.basedir}/${eclipselink.xml.mapping.metadata.complete}.jar"/>
+            <!--Server test generated files-->
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-delimited-model/server/orm.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-extensibility-model/server/extension.properties"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-extensibility-model/server/extension.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-extensibility-model/server/extension2.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/advanced-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/advanced-multitenant-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/cacheable-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/incomplete-nonowning-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/incomplete-owning-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/inherited-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/metadata-complete-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/orm-annotation-merge-advanced-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/orm-annotation-merge-relationships-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/orm.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/relationships-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/unidirectional-relationships-entity-mappings.xml"/>
+            <fileset file="${jpatest.basedir}/${resource.dir}/eclipselink-xml-servertest-model/server/xml-mapping-metadata-complete-mappings.xml"/>
         </delete>
     </target>
 

diff --git a/jpa/eclipselink.jpa.wdf.test/antbuild.xml b/jpa/eclipselink.jpa.wdf.test/antbuild.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -105,6 +105,8 @@
     <target name="clean" description="Clean the build">
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${wdf_test.build.location}/${classes.dir}"/>
+            <fileset dir="${wdf_test.build.location}/${report.dir}"/>
+            <fileset dir="${wdf_test.build.location}/${run.dir}"/>
             <fileset file="${wdf_test.build.location}/${wdf.tests.jar}"/>
             <fileset file="${wdf_test.build.location}/${eclipselink.wdf.jpa1.model}.jar"/>
             <fileset file="${wdf_test.build.location}/${eclipselink.wdf.jpa2.model}.jar"/>

diff --git a/jpa/org.eclipse.persistence.jpa.jpql.test/antbuild.xml b/jpa/org.eclipse.persistence.jpa.jpql.test/antbuild.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -135,6 +135,8 @@
     <target name="clean" description="Clean the build" depends="">
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${hermes.test.basedir}/${classes.dir}"/>
+            <fileset dir="${hermes.test.basedir}/${report.dir}"/>
+            <fileset dir="${hermes.test.basedir}/${run.dir}"/>
             <fileset file="${hermes.test.basedir}/${hermes.test.jar}"/>
         </delete>
     </target>

diff --git a/moxy/eclipselink.moxy.test/antbuild.xml b/moxy/eclipselink.moxy.test/antbuild.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -530,6 +530,8 @@
     </target>
     <target name="clean" description="clean the build">
         <delete dir="${build.dir}" failonerror="false"/>
+        <delete dir="${report.dir}" failonerror="false"/>
+        <delete dir="target" failonerror="false"/>
     </target>
 
     <!-- Test run macros -->

diff --git a/sdo/eclipselink.sdo.test/antbuild.xml b/sdo/eclipselink.sdo.test/antbuild.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -154,8 +154,10 @@
     <target name="clean" description="clean the build">
         <delete includeEmptyDirs="true" failonerror="false">
             <fileset dir="${classes.dir}"/>
+            <fileset dir="${report.dir}"/>
         </delete>
-        <mkdir dir="${classes.dir}"/>
+        <!-- Clean up generated files -->
+        <clean_up_generated_files/>
     </target>
 
     <!-- Build targets -->
@@ -300,8 +302,8 @@
             <delete dir="${resource.dir}/invalidtypename"/>
             <delete dir="${resource.dir}/list"/>
             <delete dir="${resource.dir}/nestedBaseTypes"/>
-            <delete dir="${resource.dir}/poJavaDocs"/>
-            <delete dir="${resource.dir}/poJavaDocsListener"/>
+            <delete dir="${resource.dir}/poJavadocs"/>
+            <delete dir="${resource.dir}/poJavadocsListener"/>
             <delete dir="${resource.dir}/schemaTypes"/>
             <delete dir="${resource.dir}/srcImports"/>
             <delete dir="${resource.dir}/srcImportsDontProcess"/>
@@ -315,6 +317,7 @@
     <macrodef name="compile_sdo_tests">
         <attribute name="compilepathref"/>
         <sequential>
+            <mkdir dir="${classes.dir}"/>
             <javac
                 srcdir="${src.dir}"
                 destdir="${classes.dir}"

diff --git a/utils/eclipselink.dbws.builder.test/antbuild.xml b/utils/eclipselink.dbws.builder.test/antbuild.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2024 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
@@ -99,6 +99,7 @@
     <target name="clean" description="Clean all generated content">
         <delete dir="${classes.dir}" failonerror="false"/>
         <delete dir="${run.dir}" failonerror="false"/>
+        <delete dir="${report.dir}" failonerror="false"/>
         <delete file="${dbwsbldrtest.jar}" failonerror="false"/>
     </target>