CWS-TOOLING: integrate CWS sb118

18 files changed, 79 insertions, 104 deletions

diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
index 0b6122d413ab..d5c6eacc7d2a 100644
--- a/dbaccess/prj/build.lst
+++ b/dbaccess/prj/build.lst
@@ -28,3 +28,4 @@ ba	dbaccess\source\ui\imagelists			nmake	-	all	ba_uiimglst ba_inc NULL
 ba  dbaccess\util                           nmake   -   all ba_util ba_uiimglst ba_capi ba_cdaccess ba_cmisc ba_crecovery ba_shared ba_uibrowser ba_uiapp ba_uicontrol ba_uidlg ba_uimisc ba_uiquery ba_uitabledesign ba_uirelationdesign ba_uiuno ba_conntools ba_misctools ba_miscres ba_ext_adabasui NULL
 ba  dbaccess\win32\source\odbcconfig        nmake   -   w ba_odbcconfig ba_inc NULL
 ba  dbaccess\qa\complex\dbaccess            nmake   -   all ba_complex_tests NULL
+ba dbaccess\qa\unoapi nmake - all ba_q_unoapi NULL
diff --git a/dbaccess/qa/unoapi/Test.java b/dbaccess/qa/unoapi/Test.java
new file mode 100644
index 000000000000..4f2409fdc8bd
--- /dev/null
+++ b/dbaccess/qa/unoapi/Test.java
@@ -0,0 +1,52 @@
+/*************************************************************************
+* 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.
+************************************************************************/
+
+package org.openoffice.dbaccess.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", "dbaccess.sce", "-xcl", "knownissues.xcl", "-ini",
+                "dbaccess.props", "-tdoc", "testdocuments", "-cs",
+                connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/dbaccess/qa/unoapi/makefile.mk b/dbaccess/qa/unoapi/makefile.mk
index 0429e8c3dd46..41ed9480f526 100644
--- a/dbaccess/qa/unoapi/makefile.mk
+++ b/dbaccess/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # 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
@@ -22,28 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-PRJNAME=dbaccess
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = dbaccess
+TARGET = qa_unoapi
 
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/dbaccess/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
+.INCLUDE: settings.mk
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
+ALLTAR : javatest
 
-ALLTAR : UNOAPI_TEST
-
-UNOAPI_TEST:	
-    +$(SOLARENV)$/bin$/checkapi -sce dbaccess.sce -ini dbaccess.props -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
-    @echo =======================================================================
-    @echo In case of problems make sure that you put valid values in the dbaccess.props and added an appropriate jdbc-driver to your office installation
-    @echo =======================================================================
-    @echo In case of problems with TableWindowAccessibility or JoinViewAccessibility this might be because of connection problems, just re-run the testcases 
-    @echo =======================================================================		
-
-run_%:
-    +$(SOLARENV)$/bin$/checkapi -o dbaccess.$(@:s/run_//) -ini dbaccess.props -xcl knownissues.xcl -tdoc $(PWD)$/testdocuments
+.END
diff --git a/dbaccess/source/ext/adabas/adabasui.map b/dbaccess/source/ext/adabas/adabasui.map
deleted file mode 100644
index 26ba4ca31813..000000000000
--- a/dbaccess/source/ext/adabas/adabasui.map
+++ /dev/null
@@ -1,8 +0,0 @@
-ADABASUI_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/dbaccess/source/ext/adabas/makefile.mk b/dbaccess/source/ext/adabas/makefile.mk
index 72f5e8d511f3..e23310ac92f3 100644
--- a/dbaccess/source/ext/adabas/makefile.mk
+++ b/dbaccess/source/ext/adabas/makefile.mk
@@ -76,7 +76,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=$(TARGET).dxp
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- .res file ----------------------------------------------------------
 RES1FILELIST=\
diff --git a/dbaccess/source/ext/macromigration/dbmm.map b/dbaccess/source/ext/macromigration/dbmm.map
deleted file mode 100644
index 397b86886982..000000000000
--- a/dbaccess/source/ext/macromigration/dbmm.map
+++ /dev/null
@@ -1,8 +0,0 @@
-DBMM_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/dbaccess/source/ext/macromigration/makefile.mk b/dbaccess/source/ext/macromigration/makefile.mk
index 8a17d9f18c36..41898091c26a 100644
--- a/dbaccess/source/ext/macromigration/makefile.mk
+++ b/dbaccess/source/ext/macromigration/makefile.mk
@@ -62,7 +62,7 @@ SLOFILES=   $(SLO)$/macromigrationwizard.obj \
 # --- library -----------------------------------
 
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(CPPULIB)          \
diff --git a/dbaccess/source/filter/migration/exports.map b/dbaccess/source/filter/migration/exports.map
deleted file mode 100644
index 8faa43a8aa07..000000000000
--- a/dbaccess/source/filter/migration/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-DBACCESS_FLT_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-}; 
\ No newline at end of file
diff --git a/dbaccess/source/filter/migration/makefile.mk b/dbaccess/source/filter/migration/makefile.mk
index 71615d560f2a..7bb53208d9d0 100644
--- a/dbaccess/source/filter/migration/makefile.mk
+++ b/dbaccess/source/filter/migration/makefile.mk
@@ -64,7 +64,7 @@ SHL1DEPN=
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=	i$(SHL1TARGET)
 # SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/dbaccess/source/filter/xml/exports.map b/dbaccess/source/filter/xml/exports.map
deleted file mode 100644
index 8faa43a8aa07..000000000000
--- a/dbaccess/source/filter/xml/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-DBACCESS_FLT_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-}; 
\ No newline at end of file
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 1f1bcbea65ab..6c6091c5f69e 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -104,7 +104,7 @@ SHL1DEPN=
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=	i$(SHL1TARGET)
 # SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/dbaccess/util/dba.map b/dbaccess/util/dba.map
deleted file mode 100644
index 9a3ed2329fc1..000000000000
--- a/dbaccess/util/dba.map
+++ /dev/null
@@ -1,8 +0,0 @@
-DBACCESS_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/dbaccess/util/dbu.map b/dbaccess/util/dbu.map
deleted file mode 100644
index f5c9cb31fd3c..000000000000
--- a/dbaccess/util/dbu.map
+++ /dev/null
@@ -1,8 +0,0 @@
-DBACCESS_UI_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index 94152b941476..8430b5edf8dc 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -79,7 +79,6 @@ DEF1NAME=$(SHL1TARGET)
 DEFLIB1NAME=$(TARGET)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
             $(SLB)$/$(TARGET).lib
-# SHL1VERSIONMAP=$(TARGET).map
 SHL1USE_EXPORTS=name
 
 .ENDIF
@@ -151,7 +150,6 @@ DEF2NAME=$(SHL2TARGET)
 DEFLIB2NAME=$(TARGET2)
 DEF2DEPN=	$(MISC)$/$(SHL2TARGET).flt \
             $(SLB)$/$(TARGET2).lib
-# SHL2VERSIONMAP=$(TARGET2).map
 SHL2USE_EXPORTS=name
 
 ALL: \
@@ -207,7 +205,7 @@ SHL3STDLIBS= \
 SHL3LIBS=$(LIB3TARGET)
 SHL3DEF=$(MISC)$/$(SHL3TARGET).def
 DEF3NAME=$(SHL3TARGET)
-SHL3VERSIONMAP=$(TARGET3).map
+SHL3VERSIONMAP=$(SOLARENV)/src/component.map
 
 .END
 
diff --git a/dbaccess/util/sdbt.map b/dbaccess/util/sdbt.map
deleted file mode 100644
index b2aca0c07ad0..000000000000
--- a/dbaccess/util/sdbt.map
+++ /dev/null
@@ -1,8 +0,0 @@
-DBACCESS_SDBTOOLS_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index 3a0e89134ddf..32fe4eb2a5d6 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -164,7 +164,7 @@ SHL2DEPN=$(SHL1TARGETN)
 SHL2LIBS=$(LIB2TARGET)
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=$(SHL2TARGET)
-SHL2VERSIONMAP=$(TARGET2).map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 .ENDIF
 # --- .res file ----------------------------------------------------------
 RES2FILELIST=\
@@ -219,7 +219,7 @@ SHL3STDLIBS+= \
 SHL3DEPN=$(SHL1TARGETN)
 SHL3LIBS=$(LIB3TARGET)
 SHL3IMPLIB=	i$(SHL3TARGET)
-SHL3VERSIONMAP=rptui.map
+SHL3VERSIONMAP=$(SOLARENV)/src/component.map
 SHL3DEF=	$(MISC)$/$(SHL3TARGET).def
 
 DEF3NAME=$(SHL3TARGET)
diff --git a/reportdesign/util/rpt.map b/reportdesign/util/rpt.map
deleted file mode 100644
index 82864090dff7..000000000000
--- a/reportdesign/util/rpt.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/reportdesign/util/rptui.map b/reportdesign/util/rptui.map
deleted file mode 100644
index b34eff63c44f..000000000000
--- a/reportdesign/util/rptui.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};