--- a/javauis/runtimeui_qt/tsrc.s60/build/build.xml	Mon Oct 04 11:29:25 2010 +0300
+++ b/javauis/runtimeui_qt/tsrc.s60/build/build.xml	Fri Oct 15 12:29:39 2010 +0300
@@ -1,6 +1,6 @@
 <!--
 #
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of "Eclipse Public License v1.0"
@@ -12,81 +12,36 @@
 #
 # Contributors:
 #
-# Description: 
+# Description:
 #
 -->
 
-<project name="runtimeuiqttests" default="deploy.ut" basedir=".">
+<project name="runtimeuiunittests" basedir="." default="deploy">
 
   <import file="../../../../build/utilities.xml"/>
+  <property file="../../../../build/unittest.properties"/>
 
-  <property environment="env"/>
-  <property name="java.src.root" location="${env.JAVA_SRC_ROOT}"/>
-  <property name="java.bin.root" location="${env.JAVA_BIN_ROOT}"/>
+  <property name="java.src.paths" value="../javasrc"/>
+  <property name="java.bin.root" value="${env.JAVA_BIN_ROOT}"/>
 
-  <property name="src.dir" location="../javasrc"/>
-  <property name="build.dir" location="../build"/>
-  <property name="classes.dir" location="${build.dir}/javabuild"/>
-  <property name="installer.jar.filename" value="javainstaller.jar"/>
-  <property name="runtimeuiqttests.jar.filename" value="runtimeuiqttests.jar"/>
-  <property name="utils.jar.filename" value="javacommonutils.jar"/>
-  <property name="logger.jar.filename" value="logger.jar"/>
-  <property name="junit.jar.dir" location="${java.src.root}/tools/junit"/>
-  <property name="junit.jar.filename" value="j2meunit1.1.1.jar"/>
-  <property name="junit.omj.jar.filename" value="j2meunitomj.jar"/>
-
-  <property name="bootclasspath.cdc" location="${java.src.root}/javaruntime/jvm/ibm/j9_23/ibmdelivery/resource/lib/jclCdc11/classes.zip"/>
-
-  <property name="javac.source" value="1.3"/>
-  <property name="javac.target" value="1.3"/>
-
-  <target name="init.my.properties" depends="init.properties">
-    <property name="dist" location="${vm.extension.directory}"/>
+<!-- Appending classpath like this is illegal to normal components. Don't copy
+       paste this!!! -->
+  <target name="compile">
+    <omj.javac classpath="${compile.result.root}/javaruntimeui/classes/first"/>
   </target>
 
-  <target name="clean">
-    <delete dir="${classes.dir}"/>
-    <delete file="${dist}/${runtimeuiqttests.jar.filename}"/>
-    <delete file="${dist}/${junit.jar.filename}"/>
-    <delete file="${dist}/${junit.omj.jar.filename}"/>
-  </target>
+  <target name="run" depends="deploy">
+      <echo>Running TestRuntimeUI</echo>
+      <exec executable="${java.bin.root}/bin/javaunittester">
+          <arg line="-mainclass=com.nokia.mj.impl.rt.ui.qt.RuntimeUiQtTests"/>
+      </exec>
 
-  <target name="compile.ut" depends="init.my.properties">
-    <property name="jars.dir" location="${jarfiles.collect.root}"/>
-    <property name="jars.dir.cdc" location="${jarfiles.collect.cdc.root}"/>
-    <mkdir dir="${classes.dir}"/>
-    <javac source="${javac.source}" target="${javac.target}"
-           destdir="${classes.dir}"
-           bootclasspath="${bootclasspath.cdc}">
-           <classpath>
-               <pathelement
-                 location="${jars.dir.cdc}/${installer.jar.filename}"/>
-               <pathelement location="${impl.cldc.jar}"/>
-               <pathelement location="${impl.cdc.jar}"/>
-               <pathelement location="${public.api.jar}"/>
-               <pathelement location="${platform.api.jar}"/>
-               <pathelement location="${junit.jar.dir}/${junit.jar.filename}"/>
-               <pathelement location="${junit.jar.dir}/${junit.omj.jar.filename}"/>
-           </classpath>
-      <src path="${src.dir}"/>
-    </javac>
-  </target>
-
-  <target name="deploy.ut" depends="compile.ut">
-      <mkdir dir="${dist}"/>
-      <jar destfile="${dist}/${runtimeuiqttests.jar.filename}" basedir="${classes.dir}"/>
-      <copy file="${junit.jar.dir}/${junit.jar.filename}"
-            tofile="${dist}/${junit.jar.filename}"/>
-      <copy file="${junit.jar.dir}/${junit.omj.jar.filename}"
-            tofile="${dist}/${junit.omj.jar.filename}"/>
+      <echo>Running TestRuntimeUI Icons</echo>
+      <exec executable="${java.bin.root}/bin/javaunittester">
+          <arg line="-mainclass=com.nokia.mj.impl.rt.ui.RuntimeUiQtIconTest"/>
+      </exec>
   </target>
 
   <target name="main" depends="clean,run"/>
 
-  <target name="run" depends="deploy.ut">
-      <echo>Running RuntimeUiQtTests</echo>
-      <exec executable="${env.JAVA_BIN_ROOT}/bin/javainstaller">
-          <arg line="test -mainclass=com.nokia.mj.impl.rt.ui.qt.RuntimeUiQtTests"/>
-      </exec>
-  </target>
 </project>