sb123:#i111449# remove all subdirs in complex tests

5 files changed, 4 insertions, 56 deletions

diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst
index 19fbdbeae4f7..e159c6a7b6cc 100644
--- a/qadevOOo/prj/build.lst
+++ b/qadevOOo/prj/build.lst
@@ -4,6 +4,4 @@ qa  qadevOOo			                         nmake   -   all qa_runner_ant_build NULL
 qa  qadevOOo\runner			                 nmake   -   all qa_make_package qa_runner_ant_build NULL
 
 qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi qa_make_package NULL
-# subdir has to remove
-# qa qadevOOo\qa\complex\junitskeleton\helper nmake - all qa_complex_junitskel_helper qa_make_package NULL
-# qa qadevOOo\qa\complex\junitskeleton        nmake - all qa_complex_junitskel qa_make_package qa_complex_junitskel_helper NULL
+qa qadevOOo\qa\complex\junitskeleton        nmake - all qa_complex_junitskel qa_make_package NULL
diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
index f00d93f81b03..3ae5d3dad120 100644
--- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@ -135,7 +135,7 @@ public class Skeleton
         try
         {
             XComponent aDocument = SOF.loadDocument(sREADME);
-            complex.junitskeleton.helper.justatest.shortWait();
+            complex.junitskeleton.justatest.shortWait();
             XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDocument);
             xClose.close(true);
         }
diff --git a/qadevOOo/qa/complex/junitskeleton/helper/makefile.mk b/qadevOOo/qa/complex/junitskeleton/helper/makefile.mk
deleted file mode 100644
index 1ed0a1a82b03..000000000000
--- a/qadevOOo/qa/complex/junitskeleton/helper/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ../../../..
-TARGET  = helper
-PRJNAME = $(TARGET)
-PACKAGE = complex/junitskeleton/helper
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = \
-    justatest.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/qadevOOo/qa/complex/junitskeleton/helper/justatest.java b/qadevOOo/qa/complex/junitskeleton/justatest.java
index a277e011c9ba..5c11360b0717 100644
--- a/qadevOOo/qa/complex/junitskeleton/helper/justatest.java
+++ b/qadevOOo/qa/complex/junitskeleton/justatest.java
@@ -3,7 +3,7 @@
  * @copyright: Sun Microsystems Inc. 2010
  */
 
-package complex.junitskeleton.helper;
+package complex.junitskeleton;
 
 public class justatest /* extends *//* implements */ {
     //public static void main( String[] argv ) {
diff --git a/qadevOOo/qa/complex/junitskeleton/makefile.mk b/qadevOOo/qa/complex/junitskeleton/makefile.mk
index 675d3096f5b5..301b8cf88fd7 100644
--- a/qadevOOo/qa/complex/junitskeleton/makefile.mk
+++ b/qadevOOo/qa/complex/junitskeleton/makefile.mk
@@ -43,14 +43,12 @@ JAVATESTFILES = \
 
 # put here all other files
 JAVAFILES = $(JAVATESTFILES) \
+    justatest.java \
     TestDocument.java
 
 JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
 EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# subdirectories
-SUBDIRS         = helper
-
 # Sample how to debug
 # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y