#23507 Fixed connectors build - removed missing jar from classpath
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
index c3e3339..1ecbd34 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
@@ -33,84 +33,83 @@
&commonRun;
&testproperties;
- <target name="all" depends="configure-container,build,setup,deploy,run,undeploy,unsetup"/>
- <target name="test" depends="build,setup,deploy,run,undeploy,unsetup"/>
- <target name="run-test" depends="build,deploy,run,undeploy"/>
+ <target name="all" depends="configure-container,build,setup,deploy,run,undeploy,unsetup" />
+ <target name="test" depends="build,setup,deploy,run,undeploy,unsetup" />
+ <target name="run-test" depends="build,deploy,run,undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="client" />
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <antcall target="build-ear-common">
- <param name="ejbjar.classes"
- value="**/*Bean*.class" />
- <param name="appclientjar.classes"
- value="**/*Client*.class" />
- </antcall>
- </target>
+ <target name="build" depends="compile">
+ <antcall target="build-ear-common">
+ <param name="ejbjar.classes" value="**/*Bean*.class" />
+ <param name="appclientjar.classes" value="**/*Client*.class" />
+ </antcall>
+ </target>
- <target name="configure-container" depends="init-common">
- <!-- Workaround for issue 18783 -->
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-module-config"/>
- <param name="operand.props"
- value="mdb-container"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.mdb-container.property.cmt-max-runtime-exceptions=4"/>
- </antcall>
- <antcall target="restart-server-instance-common"/>
- </target>
+ <target name="configure-container" depends="init-common">
+ <!-- Workaround for issue 18783 -->
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-module-config" />
+ <param name="operand.props" value="mdb-container" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.mdb-container.property.cmt-max-runtime-exceptions=4"
+ />
+ </antcall>
+ <antcall target="restart-server-instance-common" />
+ </target>
- <target name="setup" depends="init-common">
- <antcall target="deploy-jms-common"/>
- </target>
+ <target name="setup" depends="init-common">
+ <antcall target="deploy-jms-common" />
+ </target>
- <target name="deploy" depends="init-common">
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/create_pointbase.sql"/>
- </antcall>
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy" depends="init-common">
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/create_pointbase.sql" />
+ </antcall>
+ <antcall target="deploy-common" />
+ </target>
- <target name="run" depends="init-common">
- <property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
- <exec executable="${APPCLIENT}" failonerror="false">
- <env key="APPCPATH" value="${env.S1AS_HOME}/domains/domain1/lib/ext/Oranxo.jar:${env.APS_HOME}/lib/reporter.jar"/>
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line=" ${oracleForConnector.driver} ${oracleForConnector.url} ${oracleForConnector.user} ${oracleForConnector.pwd} "/>
- <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
- </exec>
- </target>
+ <target name="run" depends="init-common">
+ <property file="${env.APS_HOME}/config/derby.properties" />
+ <exec executable="${APPCLIENT}" failonerror="true">
+ <env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar" />
+ <arg line="-client ${assemble.dir}/${appname}AppClient.jar" />
+ <arg line="-name ${appname}Client" />
+ <arg line="-textauth" />
+ <arg line="-user j2ee" />
+ <arg line="-password j2ee" />
+ <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml" />
+ <arg line=" ${db.driver} ${db.url} ${db.user} ${db.pwd} " />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- <antcall target="execute-sql-connector">
- <param name="sql.file" value="sql/drop_pointbase.sql"/>
- </antcall>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ <antcall target="execute-sql-connector">
+ <param name="sql.file" value="sql/drop_pointbase.sql" />
+ </antcall>
+ </target>
- <target name="unsetup" depends="init-common">
- <antcall target="undeploy-jms-common"/>
- </target>
+ <target name="unsetup" depends="init-common">
+ <antcall target="undeploy-jms-common" />
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
index 12436bb..a0208a8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
@@ -22,9 +22,10 @@
<!ENTITY commonRun SYSTEM "./../../../../config/run.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
<!ENTITY database SYSTEM "../../config/database.xml">
+
]>
-<project name="excptApp" default="usage" basedir=".">
+<project name="excptApp" default="all" basedir=".">
&database;
&commonSetup;
&commonBuild;
@@ -70,16 +71,16 @@
</target>
<target name="run" depends="init-common">
- <property file="${env.APS_HOME}/devtests/connector/config/oracle.properties"/>
+ <property file="${env.APS_HOME}/config/derby.properties"/>
<exec executable="${APPCLIENT}" failonerror="true">
- <env key="APPCPATH" value="${env.S1AS_HOME}/domains/domain1/lib/ext/Oranxo.jar:${env.APS_HOME}/lib/reporter.jar"/>
+ <env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
<arg line="-name ${appname}Client"/>
<arg line="-textauth"/>
<arg line="-user j2ee"/>
<arg line="-password j2ee"/>
- <arg line=" ${oracleForConnector.driver} ${oracleForConnector.url} ${oracleForConnector.user} ${oracleForConnector.pwd} "/>
<arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
+ <arg line=" ${db.driver} ${db.url} ${db.user} ${db.pwd} "/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
index ce62e11..dfe5965 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/build.xml
@@ -25,7 +25,7 @@
<!ENTITY database SYSTEM "../config/database.xml">
]>
-<project name="web2connector" default="usage" basedir=".">
+<project name="web2connector" default="all" basedir=".">
&database;
&commonSetup;
&commonBuild;
