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:33:40 +00:00
parent 5941d4224a
commit 2ab855db8b
2 changed files with 3 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sqlj/src/org/compiere/sqlj/Adempiere.java
View File

@ -73,13 +73,8 @@ public class Adempiere implements Serializable
/** Oracle Server */ /** Oracle Server */
public static final String TYPE_ORACLE = "oracle"; public static final String TYPE_ORACLE = "oracle";
/** Derby Server */
public static final String TYPE_DERBY = "derby";
//begin e-evolution vpj-cd 02/02/2005 PostgreSQL
/** PostgreSQL **/ /** PostgreSQL **/
public static final String TYPE_POSTGRESQL = "PostgreSQL"; public static final String TYPE_POSTGRESQL = "PostgreSQL";
public static final String TYPE_EDB = "EDB";
//end e-evolution vpj-cd 02/02/2005 PostgreSQL
/** Server Type */ /** Server Type */
public static String s_type = null; public static String s_type = null;
@ -94,8 +89,6 @@ public class Adempiere implements Serializable
String vendor = System.getProperty("java.vendor"); String vendor = System.getProperty("java.vendor");
if (vendor.startsWith("Oracle")) if (vendor.startsWith("Oracle"))
s_type = TYPE_ORACLE; s_type = TYPE_ORACLE;
else if (vendor.startsWith("Derby"))
s_type = TYPE_DERBY;
else else
s_type = "??"; s_type = "??";
} }
@ -115,20 +108,8 @@ public class Adempiere implements Serializable
return false; return false;
} // isOracle } // isOracle
/**
* Is this Derby ?
* @return true if Derby
*/
static boolean isDerby()
{
if (s_type == null)
getServerType();
if (s_type != null)
return TYPE_DERBY.equals(s_type);
return false;
} // isDerby
//begin vpj-cd e-evolution 02/22/2005 PostgreSQL //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
/** /**
* Is this PostgreSQL ? * Is this PostgreSQL ?
* @return true if PostgreSQL * @return true if PostgreSQL

35
sqlj/src/org/compiere/sqlj/Compiere.java
View File

@ -73,13 +73,10 @@ public class Compiere implements Serializable
/** Oracle Server */ /** Oracle Server */
public static final String TYPE_ORACLE = "oracle"; public static final String TYPE_ORACLE = "oracle";
/** Derby Server */
public static final String TYPE_DERBY = "derby";
//begin e-evolution vpj-cd 02/02/2005 PostgreSQL //begin e-evolution vpj-cd 02/02/2005 PostgreSQL
/** PostgreSQL **/ /** PostgreSQL **/
public static final String TYPE_POSTGRESQL = "PostgreSQL"; public static final String TYPE_POSTGRESQL = "PostgreSQL";
public static final String TYPE_EDB = "EDB";
//end e-evolution vpj-cd 02/02/2005 PostgreSQL //end e-evolution vpj-cd 02/02/2005 PostgreSQL
/** Server Type */ /** Server Type */
@ -96,8 +93,6 @@ public class Compiere implements Serializable
String vendor = System.getProperty("java.vendor"); String vendor = System.getProperty("java.vendor");
if (vendor.startsWith("Oracle")) if (vendor.startsWith("Oracle"))
s_type = TYPE_ORACLE; s_type = TYPE_ORACLE;
else if (vendor.startsWith("Derby"))
s_type = TYPE_DERBY;
else else
s_type = "??"; s_type = "??";
} }
@ -117,20 +112,7 @@ public class Compiere implements Serializable
return false; return false;
} // isOracle } // isOracle
/** //begin vpj-cd e-evolution 02/22/2005 PostgreSQL
* Is this Derby ?
* @return true if Derby
*/
static boolean isDerby()
{
if (s_type == null)
getServerType();
if (s_type != null)
return TYPE_DERBY.equals(s_type);
return false;
} // isDerby
//begin vpj-cd e-evolution 02/22/2005 PostgreSQL
/** /**
* Is this PostgreSQL ? * Is this PostgreSQL ?
* @return true if PostgreSQL * @return true if PostgreSQL
@ -143,16 +125,8 @@ public class Compiere implements Serializable
return TYPE_POSTGRESQL.equals(s_type); return TYPE_POSTGRESQL.equals(s_type);
return false; return false;
} }
// isEDB
static boolean isEDB()
{
if (s_type == null)
getServerType();
if (s_type != null)
return TYPE_EDB.equals(s_type);
return false;
} // isEDB
//end vpj-cd e-evolution 02/22/2005 PostgreSQL //end vpj-cd e-evolution 02/22/2005 PostgreSQL
/** /**
* Get Connection URL * Get Connection URL
* @return connection URL * @return connection URL
@ -164,13 +138,8 @@ public class Compiere implements Serializable
if (isOracle()) if (isOracle())
s_url = "jdbc:default:connection:"; s_url = "jdbc:default:connection:";
else if (isDerby())
s_url = "jdbc:default:connection";
//begin vpj-cd e-evolution 02/22/2005 PostgreSQL
else if (isPostgreSQL()) else if (isPostgreSQL())
return "jdbc:default:connection"; return "jdbc:default:connection";
else if (isEDB())
return "jdbc:default:connection";
return "jdbc:default:connection"; return "jdbc:default:connection";
// //
//return s_url; //return s_url;