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

hg merge b251024c0cc7

This commit is contained in:
Carlos Ruiz 2012-10-22 18:55:15 -05:00
parent 1e7cc19d54 09fa7bc35b
commit 58a0b5424d
17 changed files with 481 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
org.adempiere.base-feature/feature.xml
View File

@ -40,28 +40,28 @@
id="org.adempiere.base"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.adempiere.base.callout"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.adempiere.base.process"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.adempiere.extend"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
fragment="true"
unpack="false"/>
@ -69,208 +69,201 @@
id="org.adempiere.ui"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.ecs"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.restlet"
download-size="0"
install-size="0"
version="0.0.0"
version="2.0.15.0"
unpack="false"/>
<plugin
id="org.apache.ant"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.7.1.v20100518-1145"/>
<plugin
id="com.springsource.javax.mail"
download-size="0"
install-size="0"
version="0.0.0"
version="1.4.5"
unpack="false"/>
<plugin
id="com.springsource.javax.jms"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0"
unpack="false"/>
<plugin
id="javax.servlet"
download-size="0"
install-size="0"
version="0.0.0"
version="3.0.0.v201103241009"
unpack="false"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"
version="4.8.2.v4_8_2_v20110321-1705"
unpack="false"/>
<plugin
id="com.springsource.net.sf.cglib"
download-size="0"
install-size="0"
version="0.0.0"
version="2.2.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.activemq"
download-size="0"
install-size="0"
version="0.0.0"
version="5.3.0"
unpack="false"/>
<plugin
id="org.apache.commons.collections"
download-size="0"
install-size="0"
version="0.0.0"
version="3.2.0.v201005080500"
unpack="false"/>
<plugin
id="org.apache.commons.net"
download-size="0"
install-size="0"
version="0.0.0"
version="2.2.0.v201101241833"
unpack="false"/>
<plugin
id="org.apache.poi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.activation"
download-size="0"
install-size="0"
version="0.0.0"
version="3.7.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.kahadb"
download-size="0"
install-size="0"
version="0.0.0"
version="5.3.0"
unpack="false"/>
<plugin
id="com.springsource.javax.management.j2ee"
download-size="0"
install-size="0"
version="0.0.0"
version="1.0.1"
unpack="false"/>
<plugin
id="com.springsource.org.apache.commons.logging"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.1"
unpack="false"/>
<plugin
id="com.springsource.javax.ejb"
download-size="0"
install-size="0"
version="0.0.0"
version="3.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.rpc"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0.v20110517"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.soap"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.0"
unpack="false"/>
<plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.0.v201101211617"
unpack="false"/>
<plugin
id="org.apache.xml.resolver"
download-size="0"
install-size="0"
version="0.0.0"
version="1.2.0.v201005080400"
unpack="false"/>
<plugin
id="org.apache.xerces"
download-size="0"
install-size="0"
version="0.0.0"
version="2.9.0.v201101211617"
unpack="false"/>
<plugin
id="org.apache.xml.serializer"
download-size="0"
install-size="0"
version="0.0.0"
version="2.7.1.v201005080400"
unpack="false"/>
<plugin
id="com.springsource.org.apache.xmlcommons"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.4"
unpack="false"/>
<plugin
id="javax.xml"
download-size="0"
install-size="0"
version="0.0.0"
version="1.3.4.v201005080400"
unpack="false"/>
<plugin
id="javax.el"
download-size="0"
install-size="0"
version="0.0.0"
version="2.2.0.v201105051105"
unpack="false"/>
<plugin
id="org.adempiere.install"
download-size="0"
install-size="0"
version="0.0.0"/>
version="1.0.0.qualifier"/>
<plugin
id="org.eclipse.osgi.services"
download-size="0"
install-size="0"
version="0.0.0"
version="3.3.0.v20110513"
unpack="false"/>
<plugin
id="org.hamcrest.core"
download-size="0"
install-size="0"
version="0.0.0"
version="1.1.0.v20090501071000"
unpack="false"/>
</feature>

4
org.adempiere.base.process/META-INF/MANIFEST.MF
View File

@ -7,8 +7,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
Export-Package: org.adempiere.process,
org.compiere.process
Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
Import-Package: javax.mail;version="1.4.5",
javax.mail.internet;version="1.4.5",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
org.apache.commons.collections.keyvalue;version="3.2.0"

15
org.adempiere.base/META-INF/MANIFEST.MF
View File

@ -247,10 +247,19 @@ Export-Package: bsh,
org.supercsv.prefs,
org.supercsv.util
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.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
javax.mail;version="1.4.5",
javax.mail.internet;version="1.4.5",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
junit.framework;version="3.8.2",

19
org.adempiere.base/src/org/compiere/model/GridField.java
View File

@ -178,9 +178,7 @@ public class GridField
m_vo.lookupInfo.DisplayType = DisplayType.Search;
}
//
m_vo.lookupInfo.IsKey = isKey();
MLookup ml = new MLookup (m_vo.lookupInfo, m_vo.TabNo);
m_lookup = ml;
loadLookupNoValidate();
}
else if (m_vo.displayType == DisplayType.Location) // not cached
{
@ -209,6 +207,21 @@ public class GridField
}
} // 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
*/

38
org.adempiere.base/src/org/compiere/model/GridFieldVO.java
View File

@ -582,24 +582,32 @@ public class GridFieldVO implements Serializable
// Create Lookup, if not ID
if (DisplayType.isLookup(displayType) && IsDisplayed)
{
try
{
lookupInfo = MLookupFactory.getLookupInfo (ctx, WindowNo, AD_Column_ID, displayType,
Env.getLanguage(ctx), ColumnName, AD_Reference_Value_ID,
IsParent, ValidationCode);
if (lookupInfo == null)
displayType = DisplayType.ID;
else
lookupInfo.InfoFactoryClass = this.InfoFactoryClass;
}
catch (Exception e) // Cannot create Lookup
{
CLogger.get().log(Level.SEVERE, "No LookupInfo for " + ColumnName, e);
displayType = DisplayType.ID;
}
loadLookupInfo();
}
} // initFinish
/**
* load lookup info.
* used by findwindow to loadlookupinfo for invisible field
*/
public void loadLookupInfo() {
try
{
lookupInfo = MLookupFactory.getLookupInfo (ctx, WindowNo, AD_Column_ID, displayType,
Env.getLanguage(ctx), ColumnName, AD_Reference_Value_ID,
IsParent, ValidationCode);
if (lookupInfo == null)
displayType = DisplayType.ID;
else
lookupInfo.InfoFactoryClass = this.InfoFactoryClass;
}
catch (Exception e) // Cannot create Lookup
{
CLogger.get().log(Level.SEVERE, "No LookupInfo for " + ColumnName, e);
displayType = DisplayType.ID;
}
}
/**
* Clone Field.
* @param Ctx ctx

7
org.adempiere.base/src/org/compiere/util/Ini.java
View File

@ -141,9 +141,6 @@ public final class Ini implements Serializable
/** Role */
public static final String P_ROLE = "Role";
private static final String DEFAULT_ROLE = "";
/**Server Name */
public static final String P_SERVERNAME = "ServerName";
private static final String DEFAULT_SERVERNAME = "";
/** Client Name */
public static final String P_CLIENT = "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_SHOW_ADVANCED, P_CACHE_WINDOW,
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_VALIDATE_CONNECTION_ON_STARTUP,
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_SHOW_ADVANCED?"Y":"N", DEFAULT_CACHE_WINDOW?"Y":"N",
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_VALIDATE_CONNECTION_ON_STARTUP?"Y":"N",
DEFAULT_SINGLE_INSTANCE_PER_WINDOW?"Y":"N",

57
org.adempiere.base/src/org/compiere/util/WebUtil.java
View File

@ -25,6 +25,8 @@ import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.net.UnknownHostException;
@ -32,6 +34,7 @@ import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Enumeration;
import java.util.Properties;
import java.util.logging.Level;
@ -1259,24 +1262,56 @@ public final class WebUtil
*/
public static String getServerName(){
StringBuilder strBuilder = new StringBuilder();
String serverName = Ini.getProperties().getProperty("ServerName");
try {
strBuilder.append(InetAddress.getLocalHost().getHostName());
} catch (UnknownHostException e) {
log.log(Level.WARNING, "Local host or IP not found", e);
}
strBuilder.append(":");
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);
strBuilder.append(":").append(getHostIP());
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

4
org.adempiere.install/META-INF/MANIFEST.MF
View File

@ -9,8 +9,8 @@ Export-Package: org.adempiere.install,
org.compiere.install
Require-Bundle: org.adempiere.base;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
Import-Package: javax.mail;version="1.4.5",
javax.mail.internet;version="1.4.5",
org.apache.tools.ant,
org.eclipse.ant.core,
org.eclipse.core.runtime;version="3.4.0",

4
org.adempiere.sdk-feature/adempiere.cquery
View File

@ -9,4 +9,8 @@
<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: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>

9
org.adempiere.sdk-feature/adempiere.rmap
View File

@ -1,6 +1,7 @@
<?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: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\.sat4j(\..+)?" searchPathRef="equinox"/>
<rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
@ -37,10 +38,10 @@
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
<rm:uri format="file:///{0}/lib/plugins/{1}_{2}.jar">
<bc:replace>
<bc:propertyRef key="workspace.root"/>
<bc:match pattern="\s" replacement="%20" />
</bc:replace>
<bc:replace>
<bc:propertyRef key="workspace.root"/>
<bc:match pattern="\s" replacement="%20"/>
</bc:replace>
<bc:propertyRef key="buckminster.component"/>
<bc:propertyRef key="jar.version"/>
</rm:uri>

643
org.adempiere.server-feature/feature.xml
View File

@ -1,318 +1,325 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.server"
label="iDempiere Server-feature"
version="1.0.0.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<includes
id="org.adempiere.replication.server"
version="0.0.0"
optional="true"/>
<includes
id="org.adempiere.ui.zk"
version="0.0.0"/>
<includes
id="org.adempiere.webstore"
version="0.0.0"
optional="true"/>
<includes
id="org.eclipse.gemini.web.feature"
version="0.0.0"/>
<requires>
<import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
</requires>
<plugin
id="javax.servlet.jsp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.servlet.jsp.jstl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.stream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.aopalliance"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.catalina"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.coyote"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.el"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.eclipse.jdt.core.compiler.batch"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.jasper"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.juli.extras"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.taglibs.standard.glassfish"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.report.jasper.webapp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.tomcat.config"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
<plugin
id="org.eclipse.virgo.util.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.math"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.osgi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.parser.manifest"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.restlet.ext.servlet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.aop"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.beans"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.context"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.bind"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.annotation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.persistence"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.slf4j.jcl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.catalina.ha"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.catalina.tribes"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.adempiere.install"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.adempiere.eclipse.equinox.http.servlet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.eclipse.equinox.http.servletbridge"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.eclipse.equinox.servletbridge"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.http.registry"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.idempiere.webservices"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.adempiere.server"
label="iDempiere Server-feature"
version="1.0.0.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<includes
id="org.adempiere.replication.server"
version="0.0.0"
optional="true"/>
<includes
id="org.adempiere.ui.zk"
version="0.0.0"/>
<includes
id="org.adempiere.webstore"
version="0.0.0"
optional="true"/>
<includes
id="org.eclipse.gemini.web.feature"
version="0.0.0"/>
<requires>
<import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
</requires>
<plugin
id="javax.servlet.jsp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.servlet.jsp.jstl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.stream"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.aopalliance"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.catalina"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.coyote"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.el"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.eclipse.jdt.core.compiler.batch"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.org.apache.jasper"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.juli.extras"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.taglibs.standard.glassfish"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.slf4j.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.report.jasper.webapp"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.server"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.tomcat.config"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"/>
<plugin
id="org.eclipse.virgo.util.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.math"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.osgi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.virgo.util.parser.manifest"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.restlet.ext.servlet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.aop"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.beans"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.context"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.springframework.osgi.io"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.xml.bind"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="javax.annotation"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.persistence"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.slf4j.jcl"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.catalina.ha"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="com.springsource.org.apache.catalina.tribes"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.adempiere.install"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.adempiere.eclipse.equinox.http.servlet"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.eclipse.equinox.http.servletbridge"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.adempiere.eclipse.equinox.servletbridge"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.http.registry"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.idempiere.webservices"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.springsource.javax.mail"
download-size="0"
install-size="0"
version="1.4.5"
unpack="false"/>
</feature>

2
org.adempiere.server-feature/setup/configuration/config.ini
View File

@ -1,5 +1,5 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.2.v20120110-1415.jar
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.bundles.defaultStartLevel=4

2
org.adempiere.server/META-INF/MANIFEST.MF
View File

@ -13,7 +13,7 @@ Bundle-ClassPath: WEB-INF/lib/jardiff.jar,
WEB-INF/lib/jnlp-servlet.jar,
.
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.http;version="2.5.0",
org.apache.activemq;version="5.3.0",

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
View File

@ -282,7 +282,7 @@ public class GridView extends Vbox implements EventListener<Event>
gridField = fieldList.toArray(new GridField[0]);
if (customComponent.length == 2) {
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]);
}
}

3
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
View File

@ -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
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;
for (final MDashboardPreference dp : dps)
{

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
View File

@ -25,7 +25,6 @@ import java.util.List;
import java.util.logging.Level;
import org.adempiere.util.Callback;
import org.adempiere.webui.AdempiereWebUI;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Button;
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.zk.au.out.AuScript;
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.EventListener;
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.Div;
import org.zkoss.zul.Filedownload;
import org.zkoss.zul.Fileupload;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.Iframe;
@ -295,9 +292,7 @@ public class WAttachment extends Window implements EventListener<Event>
confirmPanel.appendChild(bCancel);
text.setTooltiptext(Msg.getElement(Env.getCtx(), "TextMsg"));
this.addEventListener(Events.ON_UPLOAD, this);
text.setTooltiptext(Msg.getElement(Env.getCtx(), "TextMsg"));
}
/**

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java
View File

@ -1626,7 +1626,11 @@ public class FindWindow extends Window implements EventListener<Event>, ValueCha
}
else
{
editor = WebEditorFactory.getEditor(field, true);
//lookupinfo is null for invisible field
if (DisplayType.isLookup(field.getDisplayType()) && field.getLookup() == null) {
field.loadLookupNoValidate();
}
editor = WebEditorFactory.getEditor(field, true);
}
if (editor == null)
editor = new WStringEditor(field);