5.1 GA & 5.5 M2 Database Explorer error

There’s an error in MyEclipse 5.1 GA and 5.5 M2 when connecting to Oracle 10g using Oracle Thin driver. As the template indicates it expects a <database-name>. It’s fine, but with Oracle 10g you shouldn’t use OracleDataSource.setDataBaseName to specify it, because it would never connect. You should use OracleDataSource.setServiceName instead. To add insult to injury Oracle gives a very misleading error message. It tries to find the SID set by setServiceName, but in the Connector descriptor of the returned error message shows the SID set by setDataBaseName. So the Connector descriptor seems to be completely OK, but Oracle service listener will never find the given service/database.
(Former version of Oracle works well by both types of <database-name> specification.)

OracleDataSource ods = new OracleDataSource();
ods.setDriverType(driverType);
    if ( driverType.equals( "oci" ) ) {
        ods.setTNSEntryName(tnsName);
    } else { // thin
        ods.setServerName(host);
        ods.setNetworkProtocol("tcp");
/* BAD */        ods.setDatabaseName(dbName); // doesn't work with 10g
/* GOOD */    ods.setServiceName(dbName ); // works with 10g and previous
        ods.setPortNumber(new Integer(port).intValue());
    }
    ods.setUser(uname);
    ods.setPassword(pwd);
            
    conn = ods.getConnection();