Merge pull request #24204 from dmatej/removals-of-unused

Removals of unused code
eclipse-ee4j · Dec 12, 2022 · 8500adb · 8500adb
2 parents f52a13b + d509d5b
commit 8500adb
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 450 deletions.
diff --git a/appserver/tests/appserv-tests/config/common.xml b/appserver/tests/appserv-tests/config/common.xml
@@ -1488,18 +1488,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <property file="${env.APS_HOME}/config/pointbase.properties" />
 </target>
 
-<!-- setup IMQ for RI Build -->
-<target name="setup-mq-common" depends="init-common">
-    <echo message="Executing Datastore setup for S1MQ. Required only for RI" level="verbose" />
-    <echo
-        message="${IMQDBMGR} -javahome ${java.home}
-        -b ${admin.domain}_${appserver.instance.name} create all"
-        level="verbose" />
-    <exec executable="${IMQDBMGR}" failonerror="true">
-        <arg line="-javahome ${java.home} -b ${admin.domain}_${appserver.instance.name} create all" />
-    </exec>
-</target>
-
 <target name="import-wsdl" depends="init-common">
     <mkdir dir="${build.classes.dir}" />
     <exec executable="${WSCOMPILE}">

diff --git a/appserver/tests/appserv-tests/config/properties.xml b/appserver/tests/appserv-tests/config/properties.xml
@@ -176,7 +176,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}</echo>
     <property name="WSIMPORT" value="${env.S1AS_HOME}/bin/wsimport.bat" />
     <property name="pb.start.server" value="${env.S1AS_HOME}/pointbase/server/StartServer.bat" />
     <property name="pb.start.server1" value="${env.S1AS_HOME}/pointbase/server/StartServer1.bat" />
-    <property name="IMQDBMGR" value="${env.S1AS_HOME}/imq/bin/imqdbmgr.bat" />
     <property name="ld.library.path" location="${env.S1AS_HOME}/lib;${env.S1AS_HOME}/bin" />
 </target>
 
@@ -201,7 +200,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}</echo>
     <property name="WSIMPORT" value="${env.S1AS_HOME}/bin/wsimport" />
     <property name="pb.start.server" value="${env.S1AS_HOME}/pointbase/server/StartServer" />
     <property name="pb.start.server1" value="${env.S1AS_HOME}/pointbase/server/StartServer1" />
-    <property name="IMQDBMGR" value="${env.S1AS_HOME}/imq/bin/imqdbmgr" />
     <property name="ld.library.path" location="${env.S1AS_HOME}/lib:${env.S1AS_HOME}/bin" />
 </target>
 

diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/Jps.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/Jps.java
diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/SmartFile.java b/appserver/tests/appserv-tests/devtests/admin/cli/src/admin/util/SmartFile.java
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
@@ -1571,18 +1571,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
   <property file="${env.APS_HOME}/config/pointbase.properties"/>
 </target>
 
-<!-- setup IMQ for RI Build -->
-<target name="setup-mq-common" depends="init-common">
-    <echo message="Executing Datastore setup for S1MQ. Required only for RI"
-        level="verbose"/>
-    <echo message="${IMQDBMGR} -javahome ${java.home}
-        -b ${admin.domain}_${appserver.instance.name} create all"
-        level="verbose"/>
-  <exec executable="${IMQDBMGR}" failonerror="true">
-     <arg line="-javahome ${java.home} -b ${admin.domain}_${appserver.instance.name} create all" />
-  </exec>
-</target>
-
 <target name="import-wsdl" depends="init-common">
     <mkdir dir="${build.classes.dir}"/>
     <exec executable="${WSCOMPILE}">

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
@@ -1571,18 +1571,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
   <property file="${env.APS_HOME}/config/pointbase.properties"/>
 </target>
 
-<!-- setup IMQ for RI Build -->
-<target name="setup-mq-common" depends="init-common">
-    <echo message="Executing Datastore setup for S1MQ. Required only for RI"
-        level="verbose"/>
-    <echo message="${IMQDBMGR} -javahome ${java.home}
-        -b ${admin.domain}_${appserver.instance.name} create all"
-        level="verbose"/>
-  <exec executable="${IMQDBMGR}" failonerror="true">
-     <arg line="-javahome ${java.home} -b ${admin.domain}_${appserver.instance.name} create all" />
-  </exec>
-</target>
-
 <target name="import-wsdl" depends="init-common">
     <mkdir dir="${build.classes.dir}"/>
     <exec executable="${WSCOMPILE}">

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml b/appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml
@@ -187,9 +187,7 @@ includes="*.jar"/>
     refid="jwsdp_classpath_jars"/>
 </target>
 
-<target name="setToolProperty"
-  depends="setOSConditions,setToolWin,setToolUnix">
-</target>
+<target name="setToolProperty" depends="setOSConditions" />
 
 <target name="setOSConditions">
   <condition property="isUnix">
@@ -200,42 +198,6 @@ includes="*.jar"/>
   </condition>
 </target>
 
-<target name="setToolWin" if="isWindows">
-  <property name="APPCLIENT" value="${env.S1AS_HOME}/bin/appclient.bat"/>
-  <property name="ASADMIN" value="${env.S1AS_HOME}/bin/asadmin.bat"/>
-  <property name="IMQCMD" value="${env.S1AS_HOME}/imq/bin/imqcmd.exe"/>
-  <property name="IMQBROKERD" value="${env.S1AS_HOME}/imq/bin/imqbrokerd.exe"/>
-  <property name="ASANT" value="${env.S1AS_HOME}/bin/asant.bat"/>
-  <property name="CAPTURESCHEMA" value="${env.S1AS_HOME}/bin/capture-schema.bat"/>
-  <property name="CHECKPATCH" value="${env.S1AS_HOME}/bin/checkpatch.bat"/>
-  <property name="INSTALLPATCH" value="${env.S1AS_HOME}/bin/installpatch.bat"/>
-  <property name="JSPC" value="${env.S1AS_HOME}/bin/jspc.bat"/>
-  <property name="LISTPATCH" value="${env.S1AS_HOME}/bin/listpatch.bat"/>
-  <property name="PACKAGE-APPCLIENT" value="${env.S1AS_HOME}/bin/package-appclient.bat"/>
-  <property name="VERIFIER" value="${env.S1AS_HOME}/bin/verifier.bat"/>
-  <property name="RMIC" value="${env.S1AS_HOME}/jdk/bin/rmic.exe"/>
-  <property name="TNAMESERV" value="${env.S1AS_HOME}/jdk/bin/tnameserv.exe"/>
-  <property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wscompile.bat"/>
-</target>
-
-<target name="setToolUnix" if="isUnix">
-  <property name="APPCLIENT" value="${env.S1AS_HOME}/bin/appclient"/>
-  <property name="ASADMIN" value="${env.S1AS_HOME}/bin/asadmin"/>
-  <property name="IMQCMD" value="${env.S1AS_HOME}/imq/bin/imqcmd"/>
-  <property name="IMQBROKERD" value="${env.S1AS_HOME}/imq/bin/imqbrokerd"/>
-  <property name="ASANT" value="${env.S1AS_HOME}/bin/asant"/>
-  <property name="CAPTURESCHEMA" value="${env.S1AS_HOME}/bin/capture-schema"/>
-  <property name="CHECKPATCH" value="${env.S1AS_HOME}/bin/checkpatch"/>
-  <property name="INSTALLPATCH" value="${env.S1AS_HOME}/bin/installpatch"/>
-  <property name="JSPC" value="${env.S1AS_HOME}/bin/jspc"/>
-  <property name="LISTPATCH" value="${env.S1AS_HOME}/bin/listpatch"/>
-  <property name="PACKAGE-APPCLIENT" value="${env.S1AS_HOME}/bin/package-appclient"/>
-  <property name="VERIFIER" value="${env.S1AS_HOME}/bin/verifier"/>
-  <property name="RMIC" value="${env.S1AS_HOME}/jdk/bin/rmic"/>
-  <property name="TNAMESERV" value="${env.S1AS_HOME}/jdk/bin/tnameserv"/>
-  <property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wscompile"/>
-</target>
-
 <target name="fixFiles" depends="setOSConditions" >
   <antcall target="convUnix" />
   <antcall target="convWin" />