midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* remove derby and fyracle from trunk

This commit is contained in:
Heng Sin Low 2007-04-09 14:10:18 +00:00
parent d9c376cc8c
commit 5941d4224a
4 changed files with 4 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/Adempiere/build.xml
View File

@ -177,7 +177,6 @@
<unjar src="lib/oracle.jar" dest="buildCLib" />
<unjar src="lib/postgresql.jar" dest="buildCLib" />
<!--end vpj-cd e-evolution-->
<unjar src="lib/fyracle.jar" dest="buildCLib" />
<unjar src="lib/${ADEMPIERE_APPS_TYPE}.jar" dest="buildCLib" />
@ -221,7 +220,6 @@
<unjar src="lib/oracle.jar" dest="buildSLib" />
<unjar src="lib/postgresql.jar" dest="buildSLib" />
<!--end vpj-cd e-evolution-->
<unjar src="lib/fyracle.jar" dest="buildSLib" />
<!-- adding the specific CompiereJasper libs -->
<unjar src="lib/CompiereJasperReqs.jar" dest="buildSLib" />

1
install/build.xml
View File

@ -34,7 +34,6 @@
<pathelement path="${lib.dir}/Adempiere.jar"/>
<pathelement path="${lib.dir}/oracle.jar"/>
<pathelement path="${lib.dir}/postgresql.jar"/>
<pathelement path="${lib.dir}/fyracle.jar"/>
<pathelement path="../tools/lib/ant.jar"/>
<pathelement path="../tools/lib/ant-launcher.jar"/>
</path>

201
install/src/org/compiere/install/ConfigFyracle.java
View File

@ -1,201 +0,0 @@
/******************************************************************************
* The contents of this file are subject to the Compiere License Version 1.1
* ("License"); You may not use this file except in compliance with the License
* You may obtain a copy of the License at http://www.compiere.org/license.html
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
* the specific language governing rights and limitations under the License.
* The Original Code is Compiere ERP & CRM Smart Business Solution. The Initial
* Developer of the Original Code is Jorg Janke. Portions created by Jorg Janke
* are Copyright (C) 1999-2005 Jorg Janke.
* All parts are Copyright (C) 1999-2005 ComPiere, Inc. All Rights Reserved.
* Contributor(s): ______________________________________.
*****************************************************************************/
package org.compiere.install;
import java.net.*;
import java.sql.*;
import org.compiere.db.*;
/**
* Firebird Fyracle Configuration
*
* @author Marek Mosiewicz
* @version $Id: ConfigFyracle.java,v 1.4 2005/03/11 20:30:23 jjanke Exp $
*/
public class ConfigFyracle extends Config
{
/**
* ConfigFyracle
* @param data
*/
public ConfigFyracle (ConfigurationData data)
{
super (data);
} // ConfigFirebird
/** Discoverd TNS */
private String[] p_discovered = null;
/** Fyracle DB Info */
private DB_Fyracle p_db = new DB_Fyracle();
/**
* Init
*/
public void init()
{
p_data.setDatabasePort(String.valueOf(DB_Fyracle.DEFAULT_PORT));
} // init
/**
* Discover Databases.
* To be overwritten by database configs
* @param selected selected database
* @return array of databases
*/
public String[] discoverDatabases(String selected)
{
if (p_discovered != null)
return p_discovered;
p_discovered = new String[]{};
return p_discovered;
} // discoveredDatabases
/**************************************************************************
* Test
* @return error message or null if OK
*/
public String test()
{
// Database Server
String server = p_data.getDatabaseServer();
boolean pass = server != null && server.length() > 0
&& server.toLowerCase().indexOf("localhost") == -1
&& !server.equals("127.0.0.1");
String error = "Not correct: DB Server = " + server;
InetAddress databaseServer = null;
try
{
if (pass)
databaseServer = InetAddress.getByName(server);
}
catch (Exception e)
{
error += " - " + e.getMessage();
pass = false;
}
if (getPanel() != null)
signalOK(getPanel().okDatabaseServer, "ErrorDatabaseServer",
pass, true, error);
log.info("OK: Database Server = " + databaseServer);
setProperty(ConfigurationData.ADEMPIERE_DB_SERVER, databaseServer.getHostName());
setProperty(ConfigurationData.ADEMPIERE_DB_TYPE, p_data.getDatabaseType());
// Database Port
int databasePort = p_data.getDatabasePort();
pass = p_data.testPort (databaseServer, databasePort, true);
error = "DB Server Port = " + databasePort;
if (getPanel() != null)
signalOK(getPanel().okDatabaseServer, "ErrorDatabasePort",
pass, true, error);
if (!pass)
return error;
log.info("OK: Database Port = " + databasePort);
setProperty(ConfigurationData.ADEMPIERE_DB_PORT, String.valueOf(databasePort));
// JDBC Database Info
String databaseName = p_data.getDatabaseName(); // Service Name
String systemPassword = p_data.getDatabaseSystemPassword();
String urlSystem = p_db.getConnectionURL(databaseServer.getHostName(), databasePort,
p_db.getSystemDatabase(databaseName), p_db.getSystemUser());
pass = testJDBC(urlSystem, p_db.getSystemUser(), systemPassword);
error = "Error connecting: " + urlSystem
+ " - " + p_db.getSystemUser() + "/" + systemPassword;
if (getPanel() != null)
signalOK(getPanel().okDatabaseSystem, "ErrorJDBC",
pass, true, error);
if (!pass)
return error;
log.info("OK: System Connection = " + urlSystem);
setProperty(ConfigurationData.ADEMPIERE_DB_SYSTEM, systemPassword);
// Database User Info
String databaseUser = p_data.getDatabaseUser(); // UID
String databasePassword = p_data.getDatabasePassword(); // PWD
pass = databasePassword != null && databasePassword.length() > 0;
error = "No Database User Password entered";
if (getPanel() != null)
signalOK(getPanel().okDatabaseUser, "ErrorJDBC",
pass, true, error);
if (!pass)
return error;
//
String url= p_db.getConnectionURL(databaseServer.getHostName(), databasePort,
databaseName, databaseUser);
// Ignore result as it might not be imported
pass = testJDBC(url, databaseUser, databasePassword);
error = "Database imported? Cannot connect to User: " + databaseUser + "/" + databasePassword;
if (getPanel() != null)
signalOK(getPanel().okDatabaseUser, "ErrorJDBC",
pass, false, error);
if (pass)
log.info("OK: Database User = " + databaseUser);
else
log.warning(error);
setProperty(ConfigurationData.ADEMPIERE_DB_URL, url);
setProperty(ConfigurationData.ADEMPIERE_DB_NAME, databaseName);
setProperty(ConfigurationData.ADEMPIERE_DB_USER, databaseUser);
setProperty(ConfigurationData.ADEMPIERE_DB_PASSWORD, databasePassword);
/**
// TNS Name Info
String sqlplus = "sqlplus system/" + systemPassword + "@" + databaseName
+ " @utils/oracle/Test.sql";
log.config(sqlplus);
pass = testSQL(sqlplus);
error = "Error connecting via: " + sqlplus;
signalOK(getPanel().okDatabaseSQL, "ErrorTNS",
pass, true, error);
if (pass)
log.info("OK: Database SQL Connection");
// OCI Test
url = "jdbc:oracle:oci8:@" + databaseName;
pass = testJDBC(url, "system", systemPassword);
if (pass)
log.info("OK: Connection = " + url);
else
log.warning("Cannot connect via Net8: " + url);
setProperty(ConfigurationData.COMPIERE_DB_TNS, databaseName);
**/
return null;
} // test
/**
* Test JDBC Connection to Server
* @param url connection string
* @param uid user id
* @param pwd password
* @return true if OK
*/
private boolean testJDBC (String url, String uid, String pwd)
{
try
{
Connection conn = p_db.getDriverConnection(url, uid, pwd);
}
catch (Exception e)
{
log.severe(e.toString());
return false;
}
return true;
} // testJDBC
} // ConfigFirebird

23
install/src/org/compiere/install/ConfigurationData.java
View File

@ -820,16 +820,6 @@ public class ConfigurationData
String ccType = Database.DB_ORACLE;
if (getDatabaseType().equals(DBTYPE_POSTGRESQL))
ccType = Database.DB_POSTGRESQL;
/*
if (getDatabaseType().equals(DBTYPE_DERBY))
ccType = Database.DB_DERBY;
//begin vpj-cd e-evolution 03/17/2005 PostgreSQL
else if (getDatabaseType().equals(DBTYPE_POSTGRESQL))
ccType = Database.DB_POSTGRESQL;
else if (getDatabaseType().equals(DBTYPE_FYRACLE))
ccType = Database.DB_FYRACLE;*/
//end vpj-cd e-evolution 03/17/2005 PostgreSQL
CConnection cc = null;
try
{
@ -1292,29 +1282,20 @@ public class ConfigurationData
* Database Settings
*************************************************************************/
/** Derby/Cloudscape */
//private static String DBTYPE_DERBY = "<derby>";
/** Oracle directory */
private static String DBTYPE_ORACLE = "oracle";
/** Oracle XP */
private static String DBTYPE_ORACLEXE = "oracleXE";
// begin e-evolution vpj-cd 02/07/2005 PostgreSQL
/** PostgreSQL */
private static String DBTYPE_POSTGRESQL = "postgresql";
//private static String DBTYPE_EDB = "enterprisedb";
//private static String DBTYPE_FYRACLE = "fyracle";
// end e-evolution vpj-cd 02/07/2005 PostgreSQL
/** Database Types */
static String[] DBTYPE = new String[]
{ DBTYPE_ORACLEXE,
DBTYPE_ORACLE,
//DBTYPE_FYRACLE,
//begin e-evolution vpj-cd 02/07/2005 PostgreSQL
DBTYPE_POSTGRESQL
};
//end e-evolution vpj-cd 02/07/2005 PostgreSQL
@ -1324,11 +1305,7 @@ public class ConfigurationData
new ConfigOracle(this,true),
new ConfigOracle(this,false),
//begin e-evolution vpj-cd 02/07/2005 PostgreSQL
//null
//null,
// new ConfigFyracle(this),
new ConfigPostgreSQL(this)
// new ConfigEDB(this)
// end e-evolution vpj-cd 02/07/2005 PostgreSQL
};