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

Adempiere 3.1.2

This commit is contained in:
vpj-cd 2006-12-07 03:23:16 +00:00
parent 8a0bf1e3c7
commit b4c4d18be1
6 changed files with 3042 additions and 3128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install/src/org/compiere/install/Config.java
View File

@ -98,6 +98,15 @@ public abstract class Config
p_data.p_properties.setProperty(key, value); p_data.p_properties.setProperty(key, value);
} // setProperty } // setProperty
/**
* Get Configuration Property
* @param key key
* @return value or ""
*/
protected String getProperty(String key)
{
return p_data.p_properties.getProperty(key, "");
} // getProperty
/** /**
* UI Signal OK * UI Signal OK

4
install/src/org/compiere/install/ConfigDB2.java
View File

@ -193,7 +193,7 @@ public class ConfigDB2 extends Config
} }
catch (Exception e) catch (Exception e)
{ {
log.severe(e.toString()); log.warning(e.toString());
return false; return false;
} }
return true; return true;
@ -241,7 +241,7 @@ public class ConfigDB2 extends Config
} }
catch (Exception ex) catch (Exception ex)
{ {
log.severe(ex.toString()); log.warning(ex.toString());
} }
log.finer(sbOut.toString()); log.finer(sbOut.toString());
if (sbErr.length() > 0) if (sbErr.length() > 0)

126
install/src/org/compiere/install/ConfigOracle.java
View File

@ -36,20 +36,22 @@ public class ConfigOracle extends Config
/** /**
* ConfigOracle * ConfigOracle
* @param data configuration * @param data configuration
* @param XE express edition
*/ */
public ConfigOracle (ConfigurationData data) public ConfigOracle (ConfigurationData data, boolean XE)
{ {
super (data); super (data);
m_XE = XE;
} // ConfigOracle } // ConfigOracle
/** Oracle Driver */ /** Oracle Driver */
private static OracleDriver s_oracleDriver = null; private static OracleDriver s_oracleDriver = null;
/** Discovered TNS */ /** Discoverd TNS */
private String[] p_discovered = null; private String[] p_discovered = null;
/** Discovered Database Name */
private String[] p_dbname = null;
/** Last Connection */ /** Last Connection */
private Connection m_con = null; private Connection m_con = null;
/** Express Edition */
private boolean m_XE = false;
/** /**
* Init * Init
@ -73,100 +75,47 @@ public class ConfigOracle extends Config
return p_discovered; return p_discovered;
// //
ArrayList<String> list = new ArrayList<String>(); ArrayList<String> list = new ArrayList<String>();
ArrayList<String> dblist = new ArrayList<String>();
// default value to lowercase or null // default value to lowercase or null
String def = selected; String def = selected;
if (def != null && def.trim().length() == 0) if (def != null && def.trim().length() == 0)
def = null; def = null;
if (def != null) { if (def != null)
list.add(def.toLowerCase()); list.add(def.toLowerCase());
dblist.add(def.toLowerCase());
}
String path = System.getenv("ORACLE_HOME"); if (m_XE)
if (path == null)
{ {
// Search for Oracle Info String serviceName = "xe";
path = System.getProperty("java.library.path"); if (!list.contains(serviceName))
String[] entries = path.split(File.pathSeparator); list.add(serviceName);
for (int e = 0; e < entries.length; e++)
{
String entry = entries[e].toLowerCase();
if (entry.indexOf("ora") != -1 && entry.endsWith("bin"))
{
StringBuffer sb = getTNS_File (entries[e].substring(0, entries[e].length()-4));
String[] tnsnames = getTNS_Names (sb, true);
String[] dbNames = getTNS_Names (sb, false);
if (tnsnames != null)
{
for (int i = 0; i < tnsnames.length; i++)
{
String tns = tnsnames[i]; // is lower case
String db = dbNames[i];
if (!tns.equals(def)) {
list.add(tns);
dblist.add(db);
} else {
dblist.remove(0);
dblist.add(0, db);
}
}
break;
}
}
} // for all path entries
} }
else // Search for Oracle Info
String path = System.getProperty("java.library.path");
String[] entries = path.split(File.pathSeparator);
for (int e = 0; e < entries.length; e++)
{ {
StringBuffer sb = getTNS_File (path); String entry = entries[e].toLowerCase();
String[] tnsnames = getTNS_Names (sb, true); if (entry.indexOf("ora") != -1 && entry.endsWith("bin"))
String[] dbNames = getTNS_Names (sb, false);
if (tnsnames != null)
{ {
for (int i = 0; i < tnsnames.length; i++) StringBuffer sb = getTNS_File (entries[e].substring(0, entries[e].length()-4));
String[] serviceNames = getTNS_Names (sb);
if (serviceNames != null)
{ {
String tns = tnsnames[i]; // is lower case for (int i = 0; i < serviceNames.length; i++)
String db = dbNames[i]; {
if (!tns.equals(def)) { String serviceName = serviceNames[i].toLowerCase();
list.add(tns); if (!list.contains(serviceName))
dblist.add(db); list.add(serviceName);
} else {
dblist.remove(0);
dblist.add(0, db);
} }
break;
} }
} }
} } // for all path entries
p_discovered = new String[list.size()]; p_discovered = new String[list.size()];
list.toArray(p_discovered); list.toArray(p_discovered);
p_dbname = new String[dblist.size()];
dblist.toArray(p_dbname);
return p_discovered; return p_discovered;
} // discoverDatabases } // discoverDatabases
@Override
public String getDatabaseName(String nativeConnectioName)
{
int idx = -1;
if (p_discovered == null) return nativeConnectioName;
for (int i = 0; i < p_discovered.length; i++)
{
if (p_discovered[i].equals(nativeConnectioName))
{
idx = i;
break;
}
}
if (idx >= 0
&& p_dbname != null
&& idx < p_dbname.length)
return p_dbname[idx];
else
return nativeConnectioName;
}
/** /**
* Get File tnmsnames.ora in StringBuffer * Get File tnmsnames.ora in StringBuffer
* @param oraHome ORACLE_HOME * @param oraHome ORACLE_HOME
@ -193,7 +142,7 @@ public class ConfigOracle extends Config
} }
catch (IOException ex) catch (IOException ex)
{ {
log.severe("Error Reading " + tnsnames); log.warning("Error Reading " + tnsnames);
ex.printStackTrace(); ex.printStackTrace();
return null; return null;
} }
@ -206,9 +155,9 @@ public class ConfigOracle extends Config
* Get TNS Names entries. * Get TNS Names entries.
* Assumes standard tnsmanes.ora formatting of NetMgr * Assumes standard tnsmanes.ora formatting of NetMgr
* @param tnsnames content of tnsnames.ora * @param tnsnames content of tnsnames.ora
* @return tns names or null * @return service names or null
*/ */
private String[] getTNS_Names (StringBuffer tnsnames, boolean tns) private String[] getTNS_Names (StringBuffer tnsnames)
{ {
if (tnsnames == null) if (tnsnames == null)
return null; return null;
@ -220,7 +169,7 @@ public class ConfigOracle extends Config
{ {
String line = lines[i].trim(); String line = lines[i].trim();
log.finest(i + ": " + line); log.finest(i + ": " + line);
if (tns) // get TNS Name if (false) // get TNS Name
{ {
if (line.length() > 0 if (line.length() > 0
&& Character.isLetter(line.charAt(0)) // no # ( && Character.isLetter(line.charAt(0)) // no # (
@ -285,6 +234,7 @@ public class ConfigOracle extends Config
log.info("OK: Database Server = " + databaseServer); log.info("OK: Database Server = " + databaseServer);
setProperty(ConfigurationData.ADEMPIERE_DB_SERVER, databaseServer.getHostName()); setProperty(ConfigurationData.ADEMPIERE_DB_SERVER, databaseServer.getHostName());
setProperty(ConfigurationData.ADEMPIERE_DB_TYPE, p_data.getDatabaseType()); setProperty(ConfigurationData.ADEMPIERE_DB_TYPE, p_data.getDatabaseType());
setProperty(ConfigurationData.ADEMPIERE_DB_PATH, "oracle");
// Database Port // Database Port
int databasePort = p_data.getDatabasePort(); int databasePort = p_data.getDatabasePort();
@ -337,7 +287,7 @@ public class ConfigOracle extends Config
return error; return error;
// Ignore result as it might not be imported // Ignore result as it might not be imported
pass = testJDBC(url, databaseUser, databasePassword); pass = testJDBC(url, databaseUser, databasePassword);
error = "Database imported? Cannot connect to User: " + databaseUser + "/" + databasePassword; error = "Cannot connect to User: " + databaseUser + "/" + databasePassword + " - Database may not be imported yet (OK on initial run).";
signalOK(getPanel().okDatabaseUser, "ErrorJDBC", signalOK(getPanel().okDatabaseUser, "ErrorJDBC",
pass, false, error); pass, false, error);
if (pass) if (pass)
@ -354,9 +304,9 @@ public class ConfigOracle extends Config
// TNS Name Info via sqlplus - if not tomcat // TNS Name Info via sqlplus - if not tomcat
if (!p_data.getAppsServerType().equals(ConfigurationData.APPSTYPE_TOMCAT)) if (!p_data.getAppsServerType().equals(ConfigurationData.APPSTYPE_TOMCAT))
{ {
String sqlplus = "sqlplus system/" + systemPassword + "@" String sqlplus = "sqlplus system/" + systemPassword + "@" + databaseName
+ databaseServer.getHostName() + "/" + databaseName + " @" + getProperty(ConfigurationData.ADEMPIERE_HOME)
+ " @utils/oracle/Test.sql"; + "/utils/oracle/Test.sql";
log.config(sqlplus); log.config(sqlplus);
pass = testSQL(sqlplus); pass = testSQL(sqlplus);
error = "Error connecting via: " + sqlplus; error = "Error connecting via: " + sqlplus;
@ -410,7 +360,7 @@ public class ConfigOracle extends Config
} }
catch (Exception e) catch (Exception e)
{ {
log.severe(e.toString()); log.warning(e.toString());
return false; return false;
} }
return true; return true;
@ -455,7 +405,7 @@ public class ConfigOracle extends Config
} }
catch (Exception ex) catch (Exception ex)
{ {
log.severe(ex.toString()); log.warning(ex.toString());
} }
log.finer(sbOut.toString()); log.finer(sbOut.toString());
if (sbErr.length() > 0) if (sbErr.length() > 0)

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

@ -97,8 +97,11 @@ public class ConfigurationData
/** */ /** */
public static final String ADEMPIERE_KEYSTOREWEBALIAS = "ADEMPIERE_KEYSTOREWEBALIAS"; public static final String ADEMPIERE_KEYSTOREWEBALIAS = "ADEMPIERE_KEYSTOREWEBALIAS";
/** */ /** DB Type */
public static final String ADEMPIERE_DB_TYPE = "ADEMPIERE_DB_TYPE"; public static final String ADEMPIERE_DB_TYPE = "ADEMPIERE_DB_TYPE";
/** DB Path */
public static final String ADEMPIERE_DB_PATH = "ADEMPIEREe_DB_PATH";
/** */
/** */ /** */
public static final String ADEMPIERE_DB_SERVER = "ADEMPIERE_DB_SERVER"; public static final String ADEMPIERE_DB_SERVER = "ADEMPIERE_DB_SERVER";
/** */ /** */
@ -164,7 +167,7 @@ public class ConfigurationData
} }
catch (Exception e) catch (Exception e)
{ {
log.severe(e.toString()); log.warning(e.toString());
} }
log.info(env.toString()); log.info(env.toString());
if (p_properties.size() > 5) if (p_properties.size() > 5)
@ -231,10 +234,7 @@ public class ConfigurationData
setAppsServer(hostName); setAppsServer(hostName);
// Database Server // Database Server
initDatabase(""); initDatabase("");
String connectionName = getDatabaseDiscovered(); setDatabaseName(getDatabaseDiscovered());
if (connectionName != null) {
setDatabaseName(resolveDatabaseName(connectionName));
}
setDatabaseSystemPassword(""); setDatabaseSystemPassword("");
setDatabaseServer(hostName); setDatabaseServer(hostName);
setDatabaseUser("adempiere"); setDatabaseUser("adempiere");
@ -274,18 +274,6 @@ public class ConfigurationData
} // load } // load
public String resolveDatabaseName(String connectionName) {
int index = p_panel.fDatabaseType.getSelectedIndex();
if (index < 0 || index >= DBTYPE.length)
log.warning("DatabaseType Index invalid: " + index);
else if (m_databaseConfig[index] == null)
log.warning("DatabaseType Config missing: " + DBTYPE[index]);
else
return m_databaseConfig[index].getDatabaseName(connectionName);
return connectionName;
}
/************************************************************************** /**************************************************************************
* test * test
* @return true if test ok * @return true if test ok
@ -302,7 +290,7 @@ public class ConfigurationData
error = testAdempiere(); error = testAdempiere();
if (error != null) if (error != null)
{ {
log.severe(error); log.warning(error);
return false; return false;
} }
@ -310,7 +298,7 @@ public class ConfigurationData
error = testAppsServer(); error = testAppsServer();
if (error != null) if (error != null)
{ {
log.severe(error); log.warning(error);
return false; return false;
} }
@ -318,7 +306,7 @@ public class ConfigurationData
error = testDatabase(); error = testDatabase();
if (error != null) if (error != null)
{ {
log.severe(error); log.warning(error);
return false; return false;
} }
@ -326,7 +314,7 @@ public class ConfigurationData
error = testMail(); error = testMail();
if (error != null) if (error != null)
{ {
log.severe(error); log.warning(error);
return false; return false;
} }
@ -599,7 +587,10 @@ public class ConfigurationData
{ {
URLConnection c = url.openConnection(); URLConnection c = url.openConnection();
Object o = c.getContent(); Object o = c.getContent();
log.severe("In use=" + url); // error if (o == null)
log.warning("In use=" + url); // error
else
log.warning("In Use=" + url); // error
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -624,7 +615,7 @@ public class ConfigurationData
} }
catch (Exception ex) catch (Exception ex)
{ {
log.severe("Port " + port + ": " + ex.getMessage()); log.warning("Port " + port + ": " + ex.getMessage());
return false; return false;
} }
return true; return true;
@ -648,13 +639,13 @@ public class ConfigurationData
catch (Exception e) catch (Exception e)
{ {
if (shouldBeUsed) if (shouldBeUsed)
log.severe("Open Socket " + host + ":" + port + " - " + e.getMessage()); log.warning("Open Socket " + host + ":" + port + " - " + e.getMessage());
else else
log.fine(host + ":" + port + " - " + e.getMessage()); log.fine(host + ":" + port + " - " + e.getMessage());
return false; return false;
} }
if (!shouldBeUsed) if (!shouldBeUsed)
log.severe("Open Socket " + host + ":" + port + " - " + pingSocket); log.warning("Open Socket " + host + ":" + port + " - " + pingSocket);
log.fine(host + ":" + port + " - " + pingSocket); log.fine(host + ":" + port + " - " + pingSocket);
if (pingSocket == null) if (pingSocket == null)
@ -666,7 +657,7 @@ public class ConfigurationData
} }
catch (IOException e) catch (IOException e)
{ {
log.severe("close socket=" + e.toString()); log.warning("close socket=" + e.toString());
} }
return true; return true;
} // testPort } // testPort
@ -760,7 +751,7 @@ public class ConfigurationData
} }
if (cc == null) if (cc == null)
{ {
log.severe("No Connection"); log.warning("No Connection");
return false; return false;
} }
Ini.setProperty(Ini.P_CONNECTION, cc.toStringLong()); Ini.setProperty(Ini.P_CONNECTION, cc.toStringLong());
@ -1128,9 +1119,11 @@ public class ConfigurationData
*************************************************************************/ *************************************************************************/
/** Derby/Cloudscape */ /** Derby/Cloudscape */
private static String DBTYPE_DERBY = "derby"; private static String DBTYPE_DERBY = "<derby>";
/** Oracle directory */ /** Oracle directory */
private static String DBTYPE_ORACLE = "oracle"; private static String DBTYPE_ORACLE = "oracle";
/** Oracle XP */
private static String DBTYPE_ORACLEXE = "oracleXE";
/** DB/2 */ /** DB/2 */
private static String DBTYPE_DB2 = "<db2>"; private static String DBTYPE_DB2 = "<db2>";
/** MS SQL Server */ /** MS SQL Server */
@ -1146,7 +1139,7 @@ public class ConfigurationData
/** Database Types */ /** Database Types */
static String[] DBTYPE = new String[] static String[] DBTYPE = new String[]
{//DBTYPE_DERBY, {DBTYPE_ORACLEXE,
DBTYPE_ORACLE, DBTYPE_ORACLE,
//DBTYPE_DB2, //DBTYPE_DB2,
//DBTYPE_MS, //DBTYPE_MS,
@ -1160,8 +1153,8 @@ public class ConfigurationData
/** Database Configs */ /** Database Configs */
private Config[] m_databaseConfig = new Config[] private Config[] m_databaseConfig = new Config[]
{ {
//new ConfigDerby(this), new ConfigOracle(this,true),
new ConfigOracle(this), new ConfigOracle(this,false),
//new ConfigDB2(this), //new ConfigDB2(this),
//begin e-evolution vpj-cd 02/07/2005 PostgreSQL //begin e-evolution vpj-cd 02/07/2005 PostgreSQL
//null //null
@ -1193,6 +1186,8 @@ public class ConfigurationData
DefaultComboBoxModel model = new DefaultComboBoxModel(databases); DefaultComboBoxModel model = new DefaultComboBoxModel(databases);
p_panel.fDatabaseDiscovered.setModel(model); p_panel.fDatabaseDiscovered.setModel(model);
p_panel.fDatabaseDiscovered.setEnabled(databases.length != 0); p_panel.fDatabaseDiscovered.setEnabled(databases.length != 0);
if (databases.length > 0)
p_panel.fDatabaseName.setText(databases[0]);
} }
} // initDatabase } // initDatabase

303
install/src/org/compiere/install/ConfigurationPanel.java
View File

@ -177,27 +177,18 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lJavaType.setToolTipText(res.getString("JavaTypeInfo")); lJavaType.setToolTipText(res.getString("JavaTypeInfo"));
lJavaType.setText(res.getString("JavaType")); lJavaType.setText(res.getString("JavaType"));
fJavaType.setPreferredSize(fJavaHome.getPreferredSize()); fJavaType.setPreferredSize(fJavaHome.getPreferredSize());
this.add(lJavaHome, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
JLabel sectionLabel = new JLabel("Java"); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
sectionLabel.setForeground(titledBorder.getTitleColor()); this.add(fJavaHome, new GridBagConstraints(1, 0, 1, 1, 0.5, 0.0
JSeparator separator = new JSeparator(); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(sectionLabel, new GridBagConstraints(0, 0, 7, 1, 0.0, 0.0 this.add(okJavaHome, new GridBagConstraints(2, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 0, 10), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
this.add(separator, new GridBagConstraints(0, 1, 7, 1, 1.0, 0.0 this.add(bJavaHome, new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 10), 0, 0));
this.add(lJavaHome, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0));
this.add(fJavaHome, new GridBagConstraints(1, 2, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 5, 0), 0, 0));
this.add(okJavaHome, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 2, 5), 0, 0));
this.add(bJavaHome, new GridBagConstraints(3, 2, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
this.add(lJavaType, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0 this.add(lJavaType, new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fJavaType, new GridBagConstraints(5, 2, 1, 1, 0.0, 0.0 this.add(fJavaType, new GridBagConstraints(5, 0, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
// AdempiereHome - KeyStore // AdempiereHome - KeyStore
lAdempiereHome.setToolTipText(res.getString("AdempiereHomeInfo")); lAdempiereHome.setToolTipText(res.getString("AdempiereHomeInfo"));
lAdempiereHome.setText(res.getString("AdempiereHome")); lAdempiereHome.setText(res.getString("AdempiereHome"));
@ -209,28 +200,20 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lKeyStore.setToolTipText(res.getString("KeyStorePasswordInfo")); lKeyStore.setToolTipText(res.getString("KeyStorePasswordInfo"));
fKeyStore.setText(""); fKeyStore.setText("");
okKeyStore.setEnabled(false); okKeyStore.setEnabled(false);
this.add(lAdempiereHome, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0
sectionLabel = new JLabel("Adempiere"); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
sectionLabel.setForeground(titledBorder.getTitleColor()); this.add(fAdempiereHome, new GridBagConstraints(1, 1, 1, 1, 0.5, 0.0
separator = new JSeparator(); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(sectionLabel, new GridBagConstraints(0, 3, 7, 1, 0.0, 0.0 this.add(okAdempiereHome, new GridBagConstraints(2, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 0, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
this.add(separator, new GridBagConstraints(0, 4, 7, 1, 1.0, 0.0 this.add(bAdempiereHome, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 10), 0, 0));
this.add(lAdempiereHome, new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0));
this.add(fAdempiereHome, new GridBagConstraints(1, 5, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 2, 0), 0, 0));
this.add(okAdempiereHome, new GridBagConstraints(2, 5, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 2, 5), 0, 0));
this.add(bAdempiereHome, new GridBagConstraints(3, 5, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
this.add(lKeyStore, new GridBagConstraints(4, 5, 1, 1, 0.0, 0.0 this.add(lKeyStore, new GridBagConstraints(4, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); ,GridBagConstraints.CENTER, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
this.add(fKeyStore, new GridBagConstraints(5, 5, 1, 1, 0.0, 0.0 this.add(fKeyStore, new GridBagConstraints(5, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okKeyStore, new GridBagConstraints(6, 5, 1, 1, 0.0, 0.0 this.add(okKeyStore, new GridBagConstraints(6, 1, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
// Apps Server - Type // Apps Server - Type
lAppsServer.setToolTipText(res.getString("AppsServerInfo")); lAppsServer.setToolTipText(res.getString("AppsServerInfo"));
lAppsServer.setText(res.getString("AppsServer")); lAppsServer.setText(res.getString("AppsServer"));
@ -240,23 +223,16 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lAppsType.setToolTipText(res.getString("AppsTypeInfo")); lAppsType.setToolTipText(res.getString("AppsTypeInfo"));
lAppsType.setText(res.getString("AppsType")); lAppsType.setText(res.getString("AppsType"));
fAppsType.setPreferredSize(fAppsServer.getPreferredSize()); fAppsType.setPreferredSize(fAppsServer.getPreferredSize());
sectionLabel = new JLabel(res.getString("AppsServer")); this.add(lAppsServer, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0
sectionLabel.setForeground(titledBorder.getTitleColor()); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 5, 5), 0, 0));
separator = new JSeparator(); this.add(fAppsServer, new GridBagConstraints(1, 2, 1, 1, 0.5, 0.0
this.add(sectionLabel, new GridBagConstraints(0, 6, 6, 1, 0.0, 0.0 ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 5, 0), 0, 0));
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 0, 0), 0, 0)); this.add(okAppsServer, new GridBagConstraints(2, 2, 1, 1, 0.0, 0.0
this.add(separator, new GridBagConstraints(0, 7, 7, 1, 1.0, 0.0 ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 0, 5, 5), 0, 0));
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 10), 0, 0)); this.add(lAppsType, new GridBagConstraints(4, 2, 1, 1, 0.0, 0.0
this.add(lAppsServer, new GridBagConstraints(0, 8, 1, 1, 0.0, 0.0 ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 5, 5), 0, 0));
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0)); this.add(fAppsType, new GridBagConstraints(5, 2, 1, 1, 0.0, 0.0
this.add(fAppsServer, new GridBagConstraints(1, 8, 1, 1, 0.5, 0.0 ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 5, 0), 0, 0));
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 2, 0), 0, 0));
this.add(okAppsServer, new GridBagConstraints(2, 8, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 2, 5), 0, 0));
this.add(lAppsType, new GridBagConstraints(4, 8, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0));
this.add(fAppsType, new GridBagConstraints(5, 8, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 2, 0), 0, 0));
// Deployment - JNP // Deployment - JNP
lDeployDir.setToolTipText(res.getString("DeployDirInfo")); lDeployDir.setToolTipText(res.getString("DeployDirInfo"));
lDeployDir.setText(res.getString("DeployDir")); lDeployDir.setText(res.getString("DeployDir"));
@ -268,20 +244,20 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lJNPPort.setText(res.getString("JNPPort")); lJNPPort.setText(res.getString("JNPPort"));
fJNPPort.setText("."); fJNPPort.setText(".");
okJNPPort.setEnabled(false); okJNPPort.setEnabled(false);
this.add(lDeployDir, new GridBagConstraints(0, 9, 1, 1, 0.0, 0.0 this.add(lDeployDir, new GridBagConstraints(0, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fDeployDir, new GridBagConstraints(1, 9, 1, 1, 0.5, 0.0 this.add(fDeployDir, new GridBagConstraints(1, 3, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okDeployDir, new GridBagConstraints(2, 9, 1, 1, 0.0, 0.0 this.add(okDeployDir, new GridBagConstraints(2, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
this.add(bDeployDir, new GridBagConstraints(3, 9, 1, 1, 0.0, 0.0 this.add(bDeployDir, new GridBagConstraints(3, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
this.add(lJNPPort, new GridBagConstraints(4, 9, 1, 1, 0.0, 0.0 this.add(lJNPPort, new GridBagConstraints(4, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fJNPPort, new GridBagConstraints(5, 9, 1, 1, 0.5, 0.0 this.add(fJNPPort, new GridBagConstraints(5, 3, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okJNPPort, new GridBagConstraints(6, 9, 1, 1, 0.0, 0.0 this.add(okJNPPort, new GridBagConstraints(6, 3, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
// Web Ports // Web Ports
lWebPort.setToolTipText(res.getString("WebPortInfo")); lWebPort.setToolTipText(res.getString("WebPortInfo"));
lWebPort.setText(res.getString("WebPort")); lWebPort.setText(res.getString("WebPort"));
@ -290,18 +266,18 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lSSLPort.setText("SSL"); lSSLPort.setText("SSL");
fSSLPort.setText("."); fSSLPort.setText(".");
okSSLPort.setEnabled(false); okSSLPort.setEnabled(false);
this.add(lWebPort, new GridBagConstraints(0, 10, 1, 1, 0.0, 0.0 this.add(lWebPort, new GridBagConstraints(0, 4, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fWebPort, new GridBagConstraints(1, 10, 1, 1, 0.5, 0.0 this.add(fWebPort, new GridBagConstraints(1, 4, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okWebPort, new GridBagConstraints(2, 10, 1, 1, 0.0, 0.0 this.add(okWebPort, new GridBagConstraints(2, 4, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
this.add(lSSLPort, new GridBagConstraints(4, 10, 1, 1, 0.0, 0.0 this.add(lSSLPort, new GridBagConstraints(4, 4, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fSSLPort, new GridBagConstraints(5, 10, 1, 1, 0.0, 0.0 this.add(fSSLPort, new GridBagConstraints(5, 4, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okSSLPort, new GridBagConstraints(6, 10, 1, 1, 0.0, 0.0 this.add(okSSLPort, new GridBagConstraints(6, 4, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
// Database Server - Type // Database Server - Type
lDatabaseServer.setToolTipText(res.getString("DatabaseServerInfo")); lDatabaseServer.setToolTipText(res.getString("DatabaseServerInfo"));
lDatabaseServer.setText(res.getString("DatabaseServer")); lDatabaseServer.setText(res.getString("DatabaseServer"));
@ -310,44 +286,35 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lDatabaseType.setToolTipText(res.getString("DatabaseTypeInfo")); lDatabaseType.setToolTipText(res.getString("DatabaseTypeInfo"));
lDatabaseType.setText(res.getString("DatabaseType")); lDatabaseType.setText(res.getString("DatabaseType"));
fDatabaseType.setPreferredSize(fDatabaseServer.getPreferredSize()); fDatabaseType.setPreferredSize(fDatabaseServer.getPreferredSize());
sectionLabel = new JLabel(res.getString("DatabaseServer")); this.add(lDatabaseServer, new GridBagConstraints(0, 5, 1, 1, 0.0, 0.0
sectionLabel.setForeground(titledBorder.getTitleColor()); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 5, 5), 0, 0));
separator = new JSeparator(); this.add(fDatabaseServer, new GridBagConstraints(1, 5, 1, 1, 0.5, 0.0
this.add(sectionLabel, new GridBagConstraints(0, 11, 6, 1, 0.0, 0.0 ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 5, 0), 0, 0));
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 0, 0), 0, 0)); this.add(okDatabaseServer, new GridBagConstraints(2, 5, 1, 1, 0.0, 0.0
this.add(separator, new GridBagConstraints(0, 12, 7, 1, 1.0, 0.0 ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 0, 5, 5), 0, 0));
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 10), 0, 0)); this.add(lDatabaseType, new GridBagConstraints(4, 5, 1, 1, 0.0, 0.0
this.add(lDatabaseServer, new GridBagConstraints(0, 13, 1, 1, 0.0, 0.0 ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 5, 5), 0, 0));
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0)); this.add(fDatabaseType, new GridBagConstraints(5, 5, 1, 1, 0.0, 0.0
this.add(fDatabaseServer, new GridBagConstraints(1, 13, 1, 1, 0.5, 0.0 ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 5, 0), 0, 0));
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 2, 0), 0, 0)); // DB Name - TNS
this.add(okDatabaseServer, new GridBagConstraints(2, 13, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 2, 5), 0, 0));
this.add(lDatabaseType, new GridBagConstraints(4, 13, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0));
this.add(fDatabaseType, new GridBagConstraints(5, 13, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 2, 0), 0, 0));
//Database/Service Name
lDatabaseName.setToolTipText(res.getString("DatabaseNameInfo")); lDatabaseName.setToolTipText(res.getString("DatabaseNameInfo"));
lDatabaseName.setText(res.getString("DatabaseName")); lDatabaseName.setText(res.getString("DatabaseName"));
fDatabaseName.setText("."); fDatabaseName.setText(".");
//TNS/Native connection
lDatabaseDiscovered.setToolTipText(res.getString("TNSNameInfo")); lDatabaseDiscovered.setToolTipText(res.getString("TNSNameInfo"));
lDatabaseDiscovered.setText(res.getString("TNSName")); lDatabaseDiscovered.setText(res.getString("TNSName"));
fDatabaseDiscovered.setEditable(true); fDatabaseDiscovered.setEditable(true);
fDatabaseDiscovered.setPreferredSize(fDatabaseName.getPreferredSize()); fDatabaseDiscovered.setPreferredSize(fDatabaseName.getPreferredSize());
okDatabaseSQL.setEnabled(false); okDatabaseSQL.setEnabled(false);
this.add(lDatabaseName, new GridBagConstraints(0, 14, 1, 1, 0.0, 0.0 this.add(lDatabaseName, new GridBagConstraints(0, 6, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fDatabaseName, new GridBagConstraints(1, 14, 1, 1, 0.5, 0.0 this.add(fDatabaseName, new GridBagConstraints(1, 6, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okDatabaseSQL, new GridBagConstraints(2, 14, 1, 1, 0.0, 0.0 this.add(okDatabaseSQL, new GridBagConstraints(2, 6, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
this.add(lDatabaseDiscovered, new GridBagConstraints(4, 14, 1, 1, 0.0, 0.0 this.add(lDatabaseDiscovered, new GridBagConstraints(4, 6, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
this.add(fDatabaseDiscovered, new GridBagConstraints(5, 14, 1, 1, 0.5, 0.0 this.add(fDatabaseDiscovered, new GridBagConstraints(5, 6, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
// Port - System // Port - System
lDatabasePort.setToolTipText(res.getString("DatabasePortInfo")); lDatabasePort.setToolTipText(res.getString("DatabasePortInfo"));
lDatabasePort.setText(res.getString("DatabasePort")); lDatabasePort.setText(res.getString("DatabasePort"));
@ -356,16 +323,16 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lSystemPassword.setText(res.getString("SystemPassword")); lSystemPassword.setText(res.getString("SystemPassword"));
fSystemPassword.setText("."); fSystemPassword.setText(".");
okDatabaseSystem.setEnabled(false); okDatabaseSystem.setEnabled(false);
this.add(lDatabasePort, new GridBagConstraints(0, 15, 1, 1, 0.0, 0.0 this.add(lDatabasePort, new GridBagConstraints(0, 7, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fDatabasePort, new GridBagConstraints(1, 15, 1, 1, 0.5, 0.0 this.add(fDatabasePort, new GridBagConstraints(1, 7, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(lSystemPassword, new GridBagConstraints(4, 15, 1, 1, 0.0, 0.0 this.add(lSystemPassword, new GridBagConstraints(4, 7, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fSystemPassword, new GridBagConstraints(5, 15, 1, 1, 0.5, 0.0 this.add(fSystemPassword, new GridBagConstraints(5, 7, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okDatabaseSystem, new GridBagConstraints(6, 15, 1, 1, 0.0, 0.0 this.add(okDatabaseSystem, new GridBagConstraints(6, 7, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
// User - Password // User - Password
lDatabaseUser.setToolTipText(res.getString("DatabaseUserInfo")); lDatabaseUser.setToolTipText(res.getString("DatabaseUserInfo"));
@ -375,24 +342,17 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lDatabasePassword.setText(res.getString("DatabasePassword")); lDatabasePassword.setText(res.getString("DatabasePassword"));
fDatabasePassword.setText("."); fDatabasePassword.setText(".");
okDatabaseUser.setEnabled(false); okDatabaseUser.setEnabled(false);
this.add(lDatabaseUser, new GridBagConstraints(0, 16, 1, 1, 0.0, 0.0 this.add(lDatabaseUser, new GridBagConstraints(0, 8, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fDatabaseUser, new GridBagConstraints(1, 16, 1, 1, 0.5, 0.0 this.add(fDatabaseUser, new GridBagConstraints(1, 8, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(lDatabasePassword, new GridBagConstraints(4, 16, 1, 1, 0.0, 0.0 this.add(lDatabasePassword, new GridBagConstraints(4, 8, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fDatabasePassword, new GridBagConstraints(5, 16, 1, 1, 0.5, 0.0 this.add(fDatabasePassword, new GridBagConstraints(5, 8, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okDatabaseUser, new GridBagConstraints(6, 16, 1, 1, 0.0, 0.0 this.add(okDatabaseUser, new GridBagConstraints(6, 8, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
sectionLabel = new JLabel(res.getString("MailServer"));
sectionLabel.setForeground(titledBorder.getTitleColor());
separator = new JSeparator();
this.add(sectionLabel, new GridBagConstraints(0, 17, 6, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 0, 0), 0, 0));
this.add(separator, new GridBagConstraints(0, 18, 7, 1, 1.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 10), 0, 0));
// Mail Server - Email // Mail Server - Email
lMailServer.setToolTipText(res.getString("MailServerInfo")); lMailServer.setToolTipText(res.getString("MailServerInfo"));
lMailServer.setText(res.getString("MailServer")); lMailServer.setText(res.getString("MailServer"));
@ -402,16 +362,16 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lAdminEMail.setText(res.getString("AdminEMail")); lAdminEMail.setText(res.getString("AdminEMail"));
fAdminEMail.setText("."); fAdminEMail.setText(".");
okMailServer.setEnabled(false); okMailServer.setEnabled(false);
this.add(lMailServer, new GridBagConstraints(0, 19, 1, 1, 0.0, 0.0 this.add(lMailServer, new GridBagConstraints(0, 9, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 5, 5), 0, 0));
this.add(fMailServer, new GridBagConstraints(1, 19, 1, 1, 0.5, 0.0 this.add(fMailServer, new GridBagConstraints(1, 9, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 5, 0), 0, 0));
this.add(okMailServer, new GridBagConstraints(2, 19, 1, 1, 0.0, 0.0 this.add(okMailServer, new GridBagConstraints(2, 9, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 0, 5, 5), 0, 0));
this.add(lAdminEMail, new GridBagConstraints(4, 19, 1, 1, 0.0, 0.0 this.add(lAdminEMail, new GridBagConstraints(4, 9, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 5, 5), 0, 0));
this.add(fAdminEMail, new GridBagConstraints(5, 19, 1, 1, 0.5, 0.0 this.add(fAdminEMail, new GridBagConstraints(5, 9, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(5, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 5, 0), 0, 0));
// Mail User = Password // Mail User = Password
lMailUser.setToolTipText(res.getString("MailUserInfo")); lMailUser.setToolTipText(res.getString("MailUserInfo"));
@ -421,23 +381,16 @@ public class ConfigurationPanel extends CPanel implements ActionListener
lMailPassword.setText(res.getString("MailPassword")); lMailPassword.setText(res.getString("MailPassword"));
fMailPassword.setText("."); fMailPassword.setText(".");
okMailUser.setEnabled(false); okMailUser.setEnabled(false);
this.add(lMailUser, new GridBagConstraints(0, 20, 1, 1, 0.0, 0.0 this.add(lMailUser, new GridBagConstraints(0, 10, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fMailUser, new GridBagConstraints(1, 20, 1, 1, 0.5, 0.0 this.add(fMailUser, new GridBagConstraints(1, 10, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(lMailPassword, new GridBagConstraints(4, 20, 1, 1, 0.0, 0.0 this.add(lMailPassword, new GridBagConstraints(4, 10, 1, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(2, 5, 2, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
this.add(fMailPassword, new GridBagConstraints(5, 20, 1, 1, 0.5, 0.0 this.add(fMailPassword, new GridBagConstraints(5, 10, 1, 1, 0.5, 0.0
,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 0), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 0), 0, 0));
this.add(okMailUser, new GridBagConstraints(6, 20, 1, 1, 0.0, 0.0 this.add(okMailUser, new GridBagConstraints(6, 10, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(2, 0, 2, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 5, 5), 0, 0));
//grap extra space when window is maximized
CPanel filler = new CPanel();
filler.setOpaque(false);
filler.setBorder(null);
this.add(filler, new GridBagConstraints(0, 21, 1, 1, 0.0, 1.0
,GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
// End // End
bTest.setToolTipText(res.getString("TestInfo")); bTest.setToolTipText(res.getString("TestInfo"));
@ -445,12 +398,12 @@ public class ConfigurationPanel extends CPanel implements ActionListener
bSave.setToolTipText(res.getString("SaveInfo")); bSave.setToolTipText(res.getString("SaveInfo"));
bSave.setText(res.getString("Save")); bSave.setText(res.getString("Save"));
bHelp.setToolTipText(res.getString("HelpInfo")); bHelp.setToolTipText(res.getString("HelpInfo"));
this.add(bTest, new GridBagConstraints(0, 22, 1, 1, 0.0, 0.0 this.add(bTest, new GridBagConstraints(0, 11, 1, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 10, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 5, 10, 5), 0, 0));
this.add(bHelp, new GridBagConstraints(3, 22, 2, 1, 0.0, 0.0 this.add(bHelp, new GridBagConstraints(3, 11, 2, 1, 0.0, 0.0
,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(15, 5, 10, 5), 0, 0)); ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 5, 10, 5), 0, 0));
this.add(bSave, new GridBagConstraints(5, 22, 2, 1, 0.0, 0.0 this.add(bSave, new GridBagConstraints(5, 11, 2, 1, 0.0, 0.0
,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(15, 5, 10, 5), 0, 0)); ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(10, 5, 10, 5), 0, 0));
// //
bAdempiereHome.addActionListener(this); bAdempiereHome.addActionListener(this);
bJavaHome.addActionListener(this); bJavaHome.addActionListener(this);
@ -497,7 +450,7 @@ public class ConfigurationPanel extends CPanel implements ActionListener
{ {
String dbName = (String)fDatabaseDiscovered.getSelectedItem(); String dbName = (String)fDatabaseDiscovered.getSelectedItem();
if (dbName != null && dbName.length() > 0) if (dbName != null && dbName.length() > 0)
fDatabaseName.setText(m_data.resolveDatabaseName(dbName)); fDatabaseName.setText(dbName);
} }
// //
else if (e.getSource() == fJavaType) else if (e.getSource() == fJavaType)
@ -544,9 +497,9 @@ public class ConfigurationPanel extends CPanel implements ActionListener
* @param saveIt save * @param saveIt save
* @return SwingWorker * @return SwingWorker
*/ */
private SwingWorker startTest(final boolean saveIt) private org.compiere.apps.SwingWorker startTest(final boolean saveIt)
{ {
SwingWorker worker = new SwingWorker() org.compiere.apps.SwingWorker worker = new org.compiere.apps.SwingWorker()
{ {
// Start it // Start it
public Object construct() public Object construct()

15
install/src/org/compiere/install/KeyStoreMgt.java
View File

@ -263,22 +263,22 @@ public class KeyStoreMgt
// //
if (cn == null || cn.length() == 0) if (cn == null || cn.length() == 0)
{ {
log.severe("No Common Name (CN)"); log.warning("No Common Name (CN)");
return null; return null;
} }
if (ou == null || ou.length() == 0) if (ou == null || ou.length() == 0)
{ {
log.severe("No Organization Unit (OU)"); log.warning("No Organization Unit (OU)");
return null; return null;
} }
if (o == null || o.length() == 0) if (o == null || o.length() == 0)
{ {
log.severe("No Organization (O)"); log.warning("No Organization (O)");
return null; return null;
} }
if (c == null || c.length() == 0) if (c == null || c.length() == 0)
{ {
log.severe("No Country (C)"); log.warning("No Country (C)");
return null; return null;
} }
@ -392,7 +392,14 @@ public class KeyStoreMgt
String[] args = new String[list.size()]; String[] args = new String[list.size()];
list.toArray(args); list.toArray(args);
// System.out.println(" args #" + args.length); // System.out.println(" args #" + args.length);
//vpj-cd add support java 6
try
{
KeyTool.main(args); KeyTool.main(args);
}
catch (Exception e)
{
}
} // ketyool } // ketyool
/** /**