hg merge b251024c0cc7
This commit is contained in:
commit
58a0b5424d
|
@ -40,28 +40,28 @@
|
||||||
id="org.adempiere.base"
|
id="org.adempiere.base"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.base.callout"
|
id="org.adempiere.base.callout"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.base.process"
|
id="org.adempiere.base.process"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.extend"
|
id="org.adempiere.extend"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.0.qualifier"
|
||||||
fragment="true"
|
fragment="true"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
@ -69,208 +69,201 @@
|
||||||
id="org.adempiere.ui"
|
id="org.adempiere.ui"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.ecs"
|
id="org.apache.ecs"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.0.qualifier"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.restlet"
|
id="org.restlet"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.0.15.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.ant"
|
id="org.apache.ant"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="1.7.1.v20100518-1145"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.mail"
|
id="com.springsource.javax.mail"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.4.5"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.jms"
|
id="com.springsource.javax.jms"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.1.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="javax.servlet"
|
id="javax.servlet"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="3.0.0.v201103241009"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.junit"
|
id="org.junit"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="4.8.2.v4_8_2_v20110321-1705"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.net.sf.cglib"
|
id="com.springsource.net.sf.cglib"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.2.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.org.apache.activemq"
|
id="com.springsource.org.apache.activemq"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="5.3.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.commons.collections"
|
id="org.apache.commons.collections"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="3.2.0.v201005080500"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.commons.net"
|
id="org.apache.commons.net"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.2.0.v201101241833"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.poi"
|
id="org.apache.poi"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="3.7.0"
|
||||||
unpack="false"/>
|
|
||||||
|
|
||||||
<plugin
|
|
||||||
id="com.springsource.javax.activation"
|
|
||||||
download-size="0"
|
|
||||||
install-size="0"
|
|
||||||
version="0.0.0"
|
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.org.apache.kahadb"
|
id="com.springsource.org.apache.kahadb"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="5.3.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.management.j2ee"
|
id="com.springsource.javax.management.j2ee"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.0.1"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.org.apache.commons.logging"
|
id="com.springsource.org.apache.commons.logging"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.1.1"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.ejb"
|
id="com.springsource.javax.ejb"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="3.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.xml.rpc"
|
id="com.springsource.javax.xml.rpc"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.1.0.v20110517"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.javax.xml.soap"
|
id="com.springsource.javax.xml.soap"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.3.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.commons.codec"
|
id="org.apache.commons.codec"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.3.0.v201101211617"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.xml.resolver"
|
id="org.apache.xml.resolver"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.2.0.v201005080400"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.xerces"
|
id="org.apache.xerces"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.9.0.v201101211617"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.apache.xml.serializer"
|
id="org.apache.xml.serializer"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.7.1.v201005080400"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="com.springsource.org.apache.xmlcommons"
|
id="com.springsource.org.apache.xmlcommons"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.3.4"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="javax.xml"
|
id="javax.xml"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.3.4.v201005080400"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="javax.el"
|
id="javax.el"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="2.2.0.v201105051105"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.adempiere.install"
|
id="org.adempiere.install"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"/>
|
version="1.0.0.qualifier"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.eclipse.osgi.services"
|
id="org.eclipse.osgi.services"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="3.3.0.v20110513"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.hamcrest.core"
|
id="org.hamcrest.core"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
install-size="0"
|
install-size="0"
|
||||||
version="0.0.0"
|
version="1.1.0.v20090501071000"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -7,8 +7,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
|
||||||
Export-Package: org.adempiere.process,
|
Export-Package: org.adempiere.process,
|
||||||
org.compiere.process
|
org.compiere.process
|
||||||
Import-Package: javax.mail;version="1.4.0",
|
Import-Package: javax.mail;version="1.4.5",
|
||||||
javax.mail.internet;version="1.4.0",
|
javax.mail.internet;version="1.4.5",
|
||||||
javax.servlet;version="2.5.0",
|
javax.servlet;version="2.5.0",
|
||||||
javax.servlet.http;version="2.5.0",
|
javax.servlet.http;version="2.5.0",
|
||||||
org.apache.commons.collections.keyvalue;version="3.2.0"
|
org.apache.commons.collections.keyvalue;version="3.2.0"
|
||||||
|
|
|
@ -247,10 +247,19 @@ Export-Package: bsh,
|
||||||
org.supercsv.prefs,
|
org.supercsv.prefs,
|
||||||
org.supercsv.util
|
org.supercsv.util
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: com.sun.mail.smtp;version="1.4.0",
|
Import-Package: com.sun.mail.auth;version="1.4.5",
|
||||||
|
com.sun.mail.handlers;version="1.4.5",
|
||||||
|
com.sun.mail.iap;version="1.4.5",
|
||||||
|
com.sun.mail.imap;version="1.4.5",
|
||||||
|
com.sun.mail.imap.protocol;version="1.4.5",
|
||||||
|
com.sun.mail.pop3;version="1.4.5",
|
||||||
|
com.sun.mail.smtp;version="1.4.5",
|
||||||
|
com.sun.mail.util;version="1.4.5",
|
||||||
|
com.sun.mail.util.logging;version="1.4.5",
|
||||||
|
javax.activation;version="1.1.1",
|
||||||
javax.jms;version="1.1.0",
|
javax.jms;version="1.1.0",
|
||||||
javax.mail;version="1.4.0",
|
javax.mail;version="1.4.5",
|
||||||
javax.mail.internet;version="1.4.0",
|
javax.mail.internet;version="1.4.5",
|
||||||
javax.servlet;version="2.5.0",
|
javax.servlet;version="2.5.0",
|
||||||
javax.servlet.http;version="2.5.0",
|
javax.servlet.http;version="2.5.0",
|
||||||
junit.framework;version="3.8.2",
|
junit.framework;version="3.8.2",
|
||||||
|
|
|
@ -178,9 +178,7 @@ public class GridField
|
||||||
m_vo.lookupInfo.DisplayType = DisplayType.Search;
|
m_vo.lookupInfo.DisplayType = DisplayType.Search;
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
m_vo.lookupInfo.IsKey = isKey();
|
loadLookupNoValidate();
|
||||||
MLookup ml = new MLookup (m_vo.lookupInfo, m_vo.TabNo);
|
|
||||||
m_lookup = ml;
|
|
||||||
}
|
}
|
||||||
else if (m_vo.displayType == DisplayType.Location) // not cached
|
else if (m_vo.displayType == DisplayType.Location) // not cached
|
||||||
{
|
{
|
||||||
|
@ -209,6 +207,21 @@ public class GridField
|
||||||
}
|
}
|
||||||
} // m_lookup
|
} // m_lookup
|
||||||
|
|
||||||
|
/***
|
||||||
|
* bypass isdisplay validation, used by findwindow
|
||||||
|
*/
|
||||||
|
public void loadLookupNoValidate() {
|
||||||
|
if (m_vo.lookupInfo == null) {
|
||||||
|
m_vo.loadLookupInfo();
|
||||||
|
}
|
||||||
|
if (m_vo.lookupInfo == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
m_vo.lookupInfo.IsKey = isKey();
|
||||||
|
MLookup ml = new MLookup (m_vo.lookupInfo, m_vo.TabNo);
|
||||||
|
m_lookup = ml;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wait until Load is complete
|
* Wait until Load is complete
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -582,6 +582,15 @@ public class GridFieldVO implements Serializable
|
||||||
// Create Lookup, if not ID
|
// Create Lookup, if not ID
|
||||||
if (DisplayType.isLookup(displayType) && IsDisplayed)
|
if (DisplayType.isLookup(displayType) && IsDisplayed)
|
||||||
{
|
{
|
||||||
|
loadLookupInfo();
|
||||||
|
}
|
||||||
|
} // initFinish
|
||||||
|
|
||||||
|
/**
|
||||||
|
* load lookup info.
|
||||||
|
* used by findwindow to loadlookupinfo for invisible field
|
||||||
|
*/
|
||||||
|
public void loadLookupInfo() {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
lookupInfo = MLookupFactory.getLookupInfo (ctx, WindowNo, AD_Column_ID, displayType,
|
lookupInfo = MLookupFactory.getLookupInfo (ctx, WindowNo, AD_Column_ID, displayType,
|
||||||
|
@ -598,7 +607,6 @@ public class GridFieldVO implements Serializable
|
||||||
displayType = DisplayType.ID;
|
displayType = DisplayType.ID;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // initFinish
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clone Field.
|
* Clone Field.
|
||||||
|
|
|
@ -141,9 +141,6 @@ public final class Ini implements Serializable
|
||||||
/** Role */
|
/** Role */
|
||||||
public static final String P_ROLE = "Role";
|
public static final String P_ROLE = "Role";
|
||||||
private static final String DEFAULT_ROLE = "";
|
private static final String DEFAULT_ROLE = "";
|
||||||
/**Server Name */
|
|
||||||
public static final String P_SERVERNAME = "ServerName";
|
|
||||||
private static final String DEFAULT_SERVERNAME = "";
|
|
||||||
/** Client Name */
|
/** Client Name */
|
||||||
public static final String P_CLIENT = "Client";
|
public static final String P_CLIENT = "Client";
|
||||||
private static final String DEFAULT_CLIENT = "";
|
private static final String DEFAULT_CLIENT = "";
|
||||||
|
@ -199,7 +196,7 @@ public final class Ini implements Serializable
|
||||||
P_ADEMPIERESYS, P_LOGMIGRATIONSCRIPT, P_SHOW_ACCT, P_SHOW_TRL,
|
P_ADEMPIERESYS, P_LOGMIGRATIONSCRIPT, P_SHOW_ACCT, P_SHOW_TRL,
|
||||||
P_SHOW_ADVANCED, P_CACHE_WINDOW,
|
P_SHOW_ADVANCED, P_CACHE_WINDOW,
|
||||||
P_CONTEXT, P_TEMP_DIR,
|
P_CONTEXT, P_TEMP_DIR,
|
||||||
P_ROLE, P_SERVERNAME, P_CLIENT, P_ORG, P_PRINTER, P_WAREHOUSE, P_TODAY,
|
P_ROLE, P_CLIENT, P_ORG, P_PRINTER, P_WAREHOUSE, P_TODAY,
|
||||||
P_PRINTPREVIEW,
|
P_PRINTPREVIEW,
|
||||||
P_VALIDATE_CONNECTION_ON_STARTUP,
|
P_VALIDATE_CONNECTION_ON_STARTUP,
|
||||||
P_SINGLE_INSTANCE_PER_WINDOW,
|
P_SINGLE_INSTANCE_PER_WINDOW,
|
||||||
|
@ -217,7 +214,7 @@ public final class Ini implements Serializable
|
||||||
DEFAULT_ADEMPIERESYS?"Y":"N", DEFAULT_LOGMIGRATIONSCRIPT?"Y":"N", DEFAULT_SHOW_ACCT?"Y":"N", DEFAULT_SHOW_TRL?"Y":"N",
|
DEFAULT_ADEMPIERESYS?"Y":"N", DEFAULT_LOGMIGRATIONSCRIPT?"Y":"N", DEFAULT_SHOW_ACCT?"Y":"N", DEFAULT_SHOW_TRL?"Y":"N",
|
||||||
DEFAULT_SHOW_ADVANCED?"Y":"N", DEFAULT_CACHE_WINDOW?"Y":"N",
|
DEFAULT_SHOW_ADVANCED?"Y":"N", DEFAULT_CACHE_WINDOW?"Y":"N",
|
||||||
DEFAULT_CONTEXT, DEFAULT_TEMP_DIR,
|
DEFAULT_CONTEXT, DEFAULT_TEMP_DIR,
|
||||||
DEFAULT_ROLE, DEFAULT_SERVERNAME, DEFAULT_CLIENT, DEFAULT_ORG, DEFAULT_PRINTER, DEFAULT_WAREHOUSE, DEFAULT_TODAY.toString(),
|
DEFAULT_ROLE, DEFAULT_CLIENT, DEFAULT_ORG, DEFAULT_PRINTER, DEFAULT_WAREHOUSE, DEFAULT_TODAY.toString(),
|
||||||
DEFAULT_PRINTPREVIEW?"Y":"N",
|
DEFAULT_PRINTPREVIEW?"Y":"N",
|
||||||
DEFAULT_VALIDATE_CONNECTION_ON_STARTUP?"Y":"N",
|
DEFAULT_VALIDATE_CONNECTION_ON_STARTUP?"Y":"N",
|
||||||
DEFAULT_SINGLE_INSTANCE_PER_WINDOW?"Y":"N",
|
DEFAULT_SINGLE_INSTANCE_PER_WINDOW?"Y":"N",
|
||||||
|
|
|
@ -25,6 +25,8 @@ import java.io.PrintWriter;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
|
import java.net.NetworkInterface;
|
||||||
|
import java.net.SocketException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
|
@ -32,6 +34,7 @@ import java.sql.Timestamp;
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.util.Enumeration;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
@ -1259,24 +1262,56 @@ public final class WebUtil
|
||||||
*/
|
*/
|
||||||
public static String getServerName(){
|
public static String getServerName(){
|
||||||
StringBuilder strBuilder = new StringBuilder();
|
StringBuilder strBuilder = new StringBuilder();
|
||||||
String serverName = Ini.getProperties().getProperty("ServerName");
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
strBuilder.append(InetAddress.getLocalHost().getHostName());
|
strBuilder.append(InetAddress.getLocalHost().getHostName());
|
||||||
} catch (UnknownHostException e) {
|
} catch (UnknownHostException e) {
|
||||||
log.log(Level.WARNING, "Local host or IP not found", e);
|
log.log(Level.WARNING, "Local host or IP not found", e);
|
||||||
}
|
}
|
||||||
strBuilder.append(":");
|
strBuilder.append(":").append(getHostIP());
|
||||||
try {
|
|
||||||
strBuilder.append(InetAddress.getLocalHost().getHostAddress());
|
|
||||||
} catch (UnknownHostException e) {
|
|
||||||
log.log(Level.WARNING, "Local host or IP not found", e);
|
|
||||||
}
|
|
||||||
strBuilder.append(":");
|
|
||||||
if(serverName!=null)
|
|
||||||
strBuilder.append(serverName);
|
|
||||||
|
|
||||||
return strBuilder.toString();
|
return strBuilder.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getHostIP() {
|
||||||
|
String retVal = null;
|
||||||
|
try {
|
||||||
|
InetAddress localAddress= InetAddress.getLocalHost();
|
||||||
|
if (!localAddress.isLinkLocalAddress() && !localAddress.isLoopbackAddress() && localAddress.isSiteLocalAddress())
|
||||||
|
return localAddress.getHostAddress();
|
||||||
|
} catch (UnknownHostException e) {
|
||||||
|
log.log(Level.WARNING,
|
||||||
|
"UnknownHostException while retrieving host ip");
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
for (Enumeration<NetworkInterface> en = NetworkInterface
|
||||||
|
.getNetworkInterfaces(); en.hasMoreElements();) {
|
||||||
|
NetworkInterface intf = en.nextElement();
|
||||||
|
for (Enumeration<InetAddress> enumIpAddr = intf
|
||||||
|
.getInetAddresses(); enumIpAddr.hasMoreElements();) {
|
||||||
|
InetAddress inetAddress = enumIpAddr.nextElement();
|
||||||
|
if (!inetAddress.isLoopbackAddress()
|
||||||
|
&& !inetAddress.isLinkLocalAddress()
|
||||||
|
&& inetAddress.isSiteLocalAddress()) {
|
||||||
|
retVal = inetAddress.getHostAddress().toString();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SocketException e) {
|
||||||
|
log.log(Level.WARNING, "Socket Exeception while retrieving host ip");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (retVal == null) {
|
||||||
|
try {
|
||||||
|
retVal = InetAddress.getLocalHost().getHostAddress();
|
||||||
|
} catch (UnknownHostException e) {
|
||||||
|
log.log(Level.WARNING,
|
||||||
|
"UnknownHostException while retrieving host ip");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
} // WUtil
|
} // WUtil
|
||||||
|
|
|
@ -9,8 +9,8 @@ Export-Package: org.adempiere.install,
|
||||||
org.compiere.install
|
org.compiere.install
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
||||||
Import-Package: javax.mail;version="1.4.0",
|
Import-Package: javax.mail;version="1.4.5",
|
||||||
javax.mail.internet;version="1.4.0",
|
javax.mail.internet;version="1.4.5",
|
||||||
org.apache.tools.ant,
|
org.apache.tools.ant,
|
||||||
org.eclipse.ant.core,
|
org.eclipse.ant.core,
|
||||||
org.eclipse.core.runtime;version="3.4.0",
|
org.eclipse.core.runtime;version="3.4.0",
|
||||||
|
|
|
@ -9,4 +9,8 @@
|
||||||
<cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.7.0,4.0.0)">
|
<cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.7.0,4.0.0)">
|
||||||
<cq:property key="jar.version" value="3.7.0"/>
|
<cq:property key="jar.version" value="3.7.0"/>
|
||||||
</cq:advisorNode>
|
</cq:advisorNode>
|
||||||
|
<cq:advisorNode namePattern="^com\.springsource\.javax\.mail$" componentType="osgi.bundle" versionOverride="[1.4.5,1.4.5]">
|
||||||
|
<cq:property key="jar.version" value="1.4.5"/>
|
||||||
|
</cq:advisorNode>
|
||||||
|
<cq:advisorNode namePattern="^com\.springsource\.javax\.activation$" componentType="osgi.bundle" skipComponent="true"/>
|
||||||
</cq:componentQuery>
|
</cq:componentQuery>
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
|
<rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
|
||||||
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="workspace.bundle.jar"/>
|
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="workspace.bundle.jar"/>
|
||||||
|
<rm:locator pattern="^com\.springsource\.javax\.mail$" searchPathRef="workspace.bundle.jar"/>
|
||||||
<rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
|
<rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
|
||||||
<rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
|
<rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
|
||||||
<rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
|
<rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
|
||||||
|
|
|
@ -315,4 +315,11 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="com.springsource.javax.mail"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="1.4.5"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar
|
osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar
|
||||||
equinox.use.ds=true
|
equinox.use.ds=true
|
||||||
osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,com.springsource.javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,com.springsource.javax.activation,javax.xml
|
osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,com.springsource.javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,javax.xml
|
||||||
osgi.framework.extensions=
|
osgi.framework.extensions=
|
||||||
osgi.bundles.defaultStartLevel=4
|
osgi.bundles.defaultStartLevel=4
|
||||||
|
|
|
@ -13,7 +13,7 @@ Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
|
||||||
WEB-INF/lib/jnlp-servlet.jar,
|
WEB-INF/lib/jnlp-servlet.jar,
|
||||||
.
|
.
|
||||||
Import-Package: javax.jms;version="1.1.0",
|
Import-Package: javax.jms;version="1.1.0",
|
||||||
javax.mail;version="1.4.0",
|
javax.mail;version="1.4.5",
|
||||||
javax.servlet;version="2.5.0",
|
javax.servlet;version="2.5.0",
|
||||||
javax.servlet.http;version="2.5.0",
|
javax.servlet.http;version="2.5.0",
|
||||||
org.apache.activemq;version="5.3.0",
|
org.apache.activemq;version="5.3.0",
|
||||||
|
|
|
@ -282,7 +282,7 @@ public class GridView extends Vbox implements EventListener<Event>
|
||||||
gridField = fieldList.toArray(new GridField[0]);
|
gridField = fieldList.toArray(new GridField[0]);
|
||||||
if (customComponent.length == 2) {
|
if (customComponent.length == 2) {
|
||||||
String[] widths = customComponent[1].split("[,]");
|
String[] widths = customComponent[1].split("[,]");
|
||||||
for(int i = 0; i< gridField.length; i++) {
|
for(int i = 0; i< gridField.length && i<widths.length; i++) {
|
||||||
columnWidthMap.put(gridField[i].getAD_Field_ID(), widths[i]);
|
columnWidthMap.put(gridField[i].getAD_Field_ID(), widths[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,7 +137,8 @@ public class DashboardController implements EventListener<Event> {
|
||||||
dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role
|
dps = MDashboardPreference.getForSession(isShowInDashboard, AD_User_ID, AD_Role_ID); // based on user and role
|
||||||
noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID);
|
noOfCols = MDashboardPreference.getForSessionColumnCount(isShowInDashboard, AD_User_ID, AD_Role_ID);
|
||||||
|
|
||||||
width = noOfCols <= 0 ? 100 : 100 / noOfCols;
|
int dashboardWidth = isShowInDashboard ? 98 : 100;
|
||||||
|
width = noOfCols <= 0 ? dashboardWidth : dashboardWidth / noOfCols;
|
||||||
int useWidth = 0;
|
int useWidth = 0;
|
||||||
for (final MDashboardPreference dp : dps)
|
for (final MDashboardPreference dp : dps)
|
||||||
{
|
{
|
||||||
|
|
|
@ -25,7 +25,6 @@ import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.adempiere.util.Callback;
|
import org.adempiere.util.Callback;
|
||||||
import org.adempiere.webui.AdempiereWebUI;
|
|
||||||
import org.adempiere.webui.apps.AEnv;
|
import org.adempiere.webui.apps.AEnv;
|
||||||
import org.adempiere.webui.component.Button;
|
import org.adempiere.webui.component.Button;
|
||||||
import org.adempiere.webui.component.Label;
|
import org.adempiere.webui.component.Label;
|
||||||
|
@ -45,7 +44,6 @@ import org.zkoss.util.media.AMedia;
|
||||||
import org.zkoss.util.media.Media;
|
import org.zkoss.util.media.Media;
|
||||||
import org.zkoss.zk.au.out.AuScript;
|
import org.zkoss.zk.au.out.AuScript;
|
||||||
import org.zkoss.zk.au.out.AuEcho;
|
import org.zkoss.zk.au.out.AuEcho;
|
||||||
import org.zkoss.zk.ui.Page;
|
|
||||||
import org.zkoss.zk.ui.event.Event;
|
import org.zkoss.zk.ui.event.Event;
|
||||||
import org.zkoss.zk.ui.event.EventListener;
|
import org.zkoss.zk.ui.event.EventListener;
|
||||||
import org.zkoss.zk.ui.event.Events;
|
import org.zkoss.zk.ui.event.Events;
|
||||||
|
@ -57,7 +55,6 @@ import org.zkoss.zul.North;
|
||||||
import org.zkoss.zul.South;
|
import org.zkoss.zul.South;
|
||||||
import org.zkoss.zul.Div;
|
import org.zkoss.zul.Div;
|
||||||
import org.zkoss.zul.Filedownload;
|
import org.zkoss.zul.Filedownload;
|
||||||
import org.zkoss.zul.Fileupload;
|
|
||||||
import org.zkoss.zul.Hbox;
|
import org.zkoss.zul.Hbox;
|
||||||
import org.zkoss.zul.Iframe;
|
import org.zkoss.zul.Iframe;
|
||||||
|
|
||||||
|
@ -296,8 +293,6 @@ public class WAttachment extends Window implements EventListener<Event>
|
||||||
|
|
||||||
|
|
||||||
text.setTooltiptext(Msg.getElement(Env.getCtx(), "TextMsg"));
|
text.setTooltiptext(Msg.getElement(Env.getCtx(), "TextMsg"));
|
||||||
|
|
||||||
this.addEventListener(Events.ON_UPLOAD, this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1626,6 +1626,10 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//lookupinfo is null for invisible field
|
||||||
|
if (DisplayType.isLookup(field.getDisplayType()) && field.getLookup() == null) {
|
||||||
|
field.loadLookupNoValidate();
|
||||||
|
}
|
||||||
editor = WebEditorFactory.getEditor(field, true);
|
editor = WebEditorFactory.getEditor(field, true);
|
||||||
}
|
}
|
||||||
if (editor == null)
|
if (editor == null)
|
||||||
|
|
Loading…
Reference in New Issue