1 files changed, 99 insertions, 44 deletions
diff --git a/dbaccess/qa/complex/dbaccess/makefile.mk b/dbaccess/qa/complex/dbaccess/makefile.mk
index 56a24c0292fc..4a3e0426fe1d 100755
--- a/dbaccess/qa/complex/dbaccess/makefile.mk
+++ b/dbaccess/qa/complex/dbaccess/makefile.mk
@@ -25,54 +25,109 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = DbaComplexTests
-PRJNAME = $(TARGET)
-PACKAGE = complex$/dbaccess
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-.IF "$(SOLAR_JAVA)" == ""
-all:
-    @echo "Java not available. Build skipped"
-
-.INCLUDE :  target.mk
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
 .ELSE
 
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar
-JAVAFILES       := $(shell @$(FIND) ./*.java)
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-RUNNER_ARGS = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar" org.openoffice.Runner -TestBase java_complex 
+PRJ = ../../..
+PRJNAME = dbaccess
+TARGET = qa_complex_dbaccess
+
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/dbaccess
+
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    ApplicationController.java \
+    Beamer.java \
+    CRMBasedTestCase.java \
+    CopyTableWizard.java \
+    DataSource.java \
+    DatabaseDocument.java \
+    Parser.java \
+    PropertyBag.java \
+    Query.java \
+    QueryInQuery.java \
+    RowSet.java \
+    SingleSelectQueryComposer.java \
+    UISettings.java \
+    TestCase.java 
+
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+    CopyTableInterActionHandler.java \
+    DatabaseApplication.java \
+    FileHelper.java \
+    RowSetEventListener.java 
+
+
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
+
+.END
 
-RUNNER_CALL = $(AUGMENT_LIBRARY_PATH) java
-
-# --- Targets ------------------------------------------------------
-
-.IF "$(depend)" == ""
-ALL :   ALLTAR
-.ELSE
-ALL: 	ALLDEP
-.ENDIF
-
-.INCLUDE :  target.mk
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
+ALLTAR : javatest
 
-run: $(CLASSDIR)$/$(JARTARGET)
-    +$(RUNNER_CALL) $(RUNNER_ARGS) -sce dbaccess.sce
+.END
 
-run_%: $(CLASSDIR)$/$(JARTARGET)
-    +$(RUNNER_CALL) $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//)
 
-.ENDIF # "$(SOLAR_JAVA)" == ""
+# 
+# 
+# PRJ = ..$/..$/..
+# TARGET  = DbaComplexTests
+# PRJNAME = $(TARGET)
+# PACKAGE = complex$/dbaccess
+# 
+# # --- Settings -----------------------------------------------------
+# .INCLUDE: settings.mk
+# 
+# .IF "$(SOLAR_JAVA)" == ""
+# all:
+# 	@echo "Java not available. Build skipped"
+# 
+# .INCLUDE :  target.mk
+# .ELSE
+# 
+# #----- compile .java files -----------------------------------------
+# 
+# JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar
+# JAVAFILES       := $(shell @$(FIND) ./*.java)
+# JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
+# 
+# #----- make a jar from compiled files ------------------------------
+# 
+# MAXLINELENGTH = 100000
+# 
+# JARCLASSDIRS    = $(PACKAGE)
+# JARTARGET       = $(TARGET).jar
+# JARCOMPRESS 	= TRUE
+# 
+# RUNNER_ARGS = -cp "$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/OOoRunner.jar" org.openoffice.Runner -TestBase java_complex 
+# 
+# RUNNER_CALL = $(AUGMENT_LIBRARY_PATH) java
+# 
+# # --- Targets ------------------------------------------------------
+# 
+# .IF "$(depend)" == ""
+# ALL :   ALLTAR
+# .ELSE
+# ALL: 	ALLDEP
+# .ENDIF
+# 
+# .INCLUDE :  target.mk
+# 
+# 
+# run: $(CLASSDIR)$/$(JARTARGET)
+#     +$(RUNNER_CALL) $(RUNNER_ARGS) -sce dbaccess.sce
+# 
+# run_%: $(CLASSDIR)$/$(JARTARGET)
+#     +$(RUNNER_CALL) $(RUNNER_ARGS) -o complex.dbaccess.$(@:s/run_//)
+# 
+# .ENDIF # "$(SOLAR_JAVA)" == ""