Kaydet (Commit) 95af641c authored tarafından Michael Stahl's avatar Michael Stahl

remove vestigial Adabas D references in tests etc.

Adabas D connector was removed in 8256eb02

Change-Id: Ie142763ac32728c1596c196d919cbe84e6735c96
üst eca4c54e
......@@ -110,24 +110,23 @@ public class sdbcx
public void createConnection() throws com.sun.star.uno.Exception
// create the Driver with the implementation name
Object aDriver = xORB.createInstance("com.sun.star.comp.sdbcx.adabas.ODriver");
Object aDriver = xORB.createInstance("org.openoffice.comp.connectivity.pq.Driver.noext");
// query for the interface
com.sun.star.sdbc.XDriver xDriver;
xDriver = UnoRuntime.queryInterface(XDriver.class,aDriver);
if(xDriver != null)
// first create the needed url
String adabasURL = "sdbc:adabas::MYDB0";
String URL = "sdbc:postgresql:dbname=MYDB0";
// second create the necessary properties
com.sun.star.beans.PropertyValue [] adabasProps = new com.sun.star.beans.PropertyValue[]
com.sun.star.beans.PropertyValue [] Props = new com.sun.star.beans.PropertyValue[]
new com.sun.star.beans.PropertyValue("user",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE),
new com.sun.star.beans.PropertyValue("password",0,"test1",com.sun.star.beans.PropertyState.DIRECT_VALUE)
// now create a connection to adabas
con = xDriver.connect(adabasURL,adabasProps);
// now create a connection to the database
con = xDriver.connect(URL, Props);
if(con != null)
System.out.println("Connection could be created!");
......@@ -853,7 +853,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/xml/_UserDefinedAttributesSupplier \
qadevOOo/tests/java/mod/_acceptor/Acceptor \
qadevOOo/tests/java/mod/_acceptor/uno/Acceptor \
qadevOOo/tests/java/mod/_adabas/ODriver \
qadevOOo/tests/java/mod/_ado/ODriver \
qadevOOo/tests/java/mod/_basctl/AccessibleShape \
qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory \
* This file is part of the LibreOffice project.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
* This file incorporates work covered by the following license notice:
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
package mod._adabas;
import java.io.PrintWriter;
import lib.Status;
import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
import com.sun.star.beans.PropertyValue;
import com.sun.star.uno.XInterface;
* Here <code>com.sun.star.sdbc.Driver</code> service is tested.<p>
* Test allows to run object tests in several threads concurrently.
* @see com.sun.star.sdbc.Driver
* @see com.sun.star.sdbc.XDriver
* @see com.sun.star.sdbcx.XCreateCatalog
* @see com.sun.star.sdbcx.XDropCatalog
* @see ifc.sdbc._XDriver
* @see ifc.sdbcx._XCreateCatalog
* @see ifc.sdbcx._XDropCatalog
public class ODriver extends TestCase {
* Creates an instance of the service
* <code>com.sun.star.sdbc.Driver</code>. <p>
* Object relations created :
* <ul>
* <li> <code>'XDriver.URL'</code> for {@link ifc.sdbc._XDriver}:
* is the URL of the database to which to connect.
* The URL is obtained from the parameter <code>adabas.url</code></li>
* <li> <code>'XDriver.UNSUITABLE_URL'</code> for {@link ifc.sdbc._XDriver}:
* the wrong kind of URL to connect using given driver.
* The URL is obtained from the parameter <code>jdbc.url</code></li>
* <li> <code>'XDriver.INFO'</code> for {@link ifc.sdbc._XDriver}:
* a list of arbitrary string tag/value pairs as connection arguments.
* The values for list are obtained from the parameter
* <code>adabas.user</code> and <code>adabas.password</code>.</li>
* </ul>
protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
XInterface oObj = (XInterface)Param.getMSF().
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oObj);
//adding relation for sdbc.XDriver
String adabasURL = (String) Param.get("adabas.url");
if (adabasURL == null) {
throw new StatusException(Status.failed(
"Couldn't get 'adabas.url' from ini-file"));
tEnv.addObjRelation("XDriver.URL", "sdbc:adabas:" + adabasURL);
String user = (String) Param.get("adabas.user");
if (user == null) {
throw new StatusException(Status.failed(
"Couldn't get 'adabas.user' from ini-file"));
String password = (String) Param.get("adabas.password");
if (password == null) {
throw new StatusException(Status.failed(
"Couldn't get 'adabas.password' from ini-file"));
PropertyValue[] info = new PropertyValue[2];
info[0] = new PropertyValue();
info[0].Name = "user"; info[0].Value = user;
info[1] = new PropertyValue();
info[1].Name = "password"; info[1].Value = password;
tEnv.addObjRelation("XDriver.INFO", info);
String jdbcUrl = (String) Param.get("jdbc.url");
if (jdbcUrl == null) {
throw new StatusException(Status.failed(
"Couldn't get 'jdbc.url' from ini-file"));
tEnv.addObjRelation("XDriver.UNSUITABLE_URL", "jdbc:" + jdbcUrl);
return tEnv;
......@@ -166,7 +166,6 @@ else
cat > /tmp/userinstall_filer.$$ << EOF
......@@ -17,7 +17,7 @@ It's a solution for people requiring an easy-to-understand, simple-to-use system
For power users and enterprise requirements, it provides native-support drivers
for some of the most-widely employed multi-user database engines:
MySQL, Adabas D, MS Access and PostgreSQL.
PostgreSQL, MySQL and MS Access.
In addition, the built-in support for JDBC- and ODBC-standard drivers allows you
to connect to virtually any other existing database engine as well.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment