hg merge release-6.2 (merge release6.2 into default)
This commit is contained in:
commit
36a3817acc
|
@ -0,0 +1,11 @@
|
||||||
|
SET SQLBLANKLINES ON
|
||||||
|
SET DEFINE OFF
|
||||||
|
|
||||||
|
-- Dec 18, 2018 10:50:26 AM MYT
|
||||||
|
-- AP2-825 Match PO | M_MatchPO unposted in Prod
|
||||||
|
INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200448,'0630b5d2-0fe4-4ef8-9d2f-a14791c02c7d','Deferred','Y',100,100,0,TO_DATE('2018-12-18 10:50:25','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2018-12-18 10:50:25','YYYY-MM-DD HH24:MI:SS'),'D',234,'d',0)
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201812181500_Ticket_AP2-825.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
-- Dec 18, 2018 10:50:26 AM MYT
|
||||||
|
-- AP2-825 Match PO | M_MatchPO unposted in Prod
|
||||||
|
INSERT INTO AD_Ref_List (AD_Ref_List_ID,AD_Ref_List_UU,Name,IsActive,CreatedBy,UpdatedBy,AD_Client_ID,Created,Updated,EntityType,AD_Reference_ID,Value,AD_Org_ID) VALUES (200448,'0630b5d2-0fe4-4ef8-9d2f-a14791c02c7d','Deferred','Y',100,100,0,TO_TIMESTAMP('2018-12-18 10:50:25','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2018-12-18 10:50:25','YYYY-MM-DD HH24:MI:SS'),'D',234,'d',0)
|
||||||
|
;
|
||||||
|
|
||||||
|
SELECT register_migration_script('201812181500_Ticket_AP2-825.sql') FROM dual
|
||||||
|
;
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Callout
|
Bundle-Name: iDempiere Callout
|
||||||
Bundle-SymbolicName: org.adempiere.base.callout
|
Bundle-SymbolicName: org.adempiere.base.callout
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Eclipse-RegisterBuddy: org.adempiere.base
|
Eclipse-RegisterBuddy: org.adempiere.base
|
||||||
Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml
|
Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml
|
||||||
|
@ -12,4 +13,3 @@ Export-Package: org.compiere.model
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Automatic-Module-Name: org.adempiere.base.callout
|
Automatic-Module-Name: org.adempiere.base.callout
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Processes
|
Bundle-Name: iDempiere Processes
|
||||||
Bundle-SymbolicName: org.adempiere.base.process
|
Bundle-SymbolicName: org.adempiere.base.process
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Export-Package: org.adempiere.process,
|
Export-Package: org.adempiere.process,
|
||||||
org.compiere.process,
|
org.compiere.process,
|
||||||
|
|
|
@ -148,7 +148,7 @@ public class ClientAcctProcessor extends SvrProcess
|
||||||
|
|
||||||
StringBuilder sql = new StringBuilder("SELECT DISTINCT ProcessedOn FROM ").append(TableName)
|
StringBuilder sql = new StringBuilder("SELECT DISTINCT ProcessedOn FROM ").append(TableName)
|
||||||
.append(" WHERE AD_Client_ID=? AND ProcessedOn<?")
|
.append(" WHERE AD_Client_ID=? AND ProcessedOn<?")
|
||||||
.append(" AND Processed='Y' AND Posted='N' AND IsActive='Y'");
|
.append(" AND Processed='Y' AND Posted IN ('N','d') AND IsActive='Y'");
|
||||||
PreparedStatement pstmt = null;
|
PreparedStatement pstmt = null;
|
||||||
ResultSet rs = null;
|
ResultSet rs = null;
|
||||||
try
|
try
|
||||||
|
@ -202,7 +202,7 @@ public class ClientAcctProcessor extends SvrProcess
|
||||||
sql.append("=?");
|
sql.append("=?");
|
||||||
else
|
else
|
||||||
sql.append(" IS NULL OR ProcessedOn=0");
|
sql.append(" IS NULL OR ProcessedOn=0");
|
||||||
sql.append(") AND Processed='Y' AND Posted='N' AND IsActive='Y'")
|
sql.append(") AND Processed='Y' AND Posted IN ('N','d') AND IsActive='Y'")
|
||||||
.append(" ORDER BY Created");
|
.append(" ORDER BY Created");
|
||||||
//
|
//
|
||||||
PreparedStatement pstmt = null;
|
PreparedStatement pstmt = null;
|
||||||
|
|
|
@ -56,6 +56,7 @@ Export-Package: bsh,
|
||||||
org.idempiere.broadcast,
|
org.idempiere.broadcast,
|
||||||
org.idempiere.distributed,
|
org.idempiere.distributed,
|
||||||
org.idempiere.model
|
org.idempiere.model
|
||||||
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: com.sun.mail.smtp;version="1.5",
|
Import-Package: com.sun.mail.smtp;version="1.5",
|
||||||
javax.jms;version="1.1.0",
|
javax.jms;version="1.1.0",
|
||||||
|
@ -127,4 +128,3 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0",
|
||||||
com.sun.activation.jakarta.activation;bundle-version="1.2.1"
|
com.sun.activation.jakarta.activation;bundle-version="1.2.1"
|
||||||
Automatic-Module-Name: org.adempiere.base
|
Automatic-Module-Name: org.adempiere.base
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ import org.compiere.Adempiere;
|
||||||
import org.compiere.model.MPInstance;
|
import org.compiere.model.MPInstance;
|
||||||
import org.compiere.process.ProcessCall;
|
import org.compiere.process.ProcessCall;
|
||||||
import org.compiere.process.ProcessInfo;
|
import org.compiere.process.ProcessInfo;
|
||||||
|
import org.compiere.process.ProcessInfoUtil;
|
||||||
import org.compiere.util.CLogMgt;
|
import org.compiere.util.CLogMgt;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.eclipse.equinox.app.IApplication;
|
import org.eclipse.equinox.app.IApplication;
|
||||||
|
@ -49,12 +50,24 @@ public class PackInFolderApplication implements IApplication {
|
||||||
@Override
|
@Override
|
||||||
public Object start(IApplicationContext context) throws Exception {
|
public Object start(IApplicationContext context) throws Exception {
|
||||||
Adempiere.startup(false);
|
Adempiere.startup(false);
|
||||||
CLogMgt.setLevel(Level.FINE);
|
String logLevel = System.getProperty("LogLevel");
|
||||||
|
if (logLevel == null)
|
||||||
|
logLevel = "INFO";
|
||||||
|
switch (logLevel) {
|
||||||
|
case "SEVERE": CLogMgt.setLevel(Level.SEVERE); break;
|
||||||
|
case "WARNING": CLogMgt.setLevel(Level.WARNING); break;
|
||||||
|
case "INFO": CLogMgt.setLevel(Level.INFO); break;
|
||||||
|
case "CONFIG": CLogMgt.setLevel(Level.CONFIG); break;
|
||||||
|
case "FINE": CLogMgt.setLevel(Level.FINE); break;
|
||||||
|
case "FINER": CLogMgt.setLevel(Level.FINER); break;
|
||||||
|
case "FINEST": CLogMgt.setLevel(Level.FINEST); break;
|
||||||
|
default: CLogMgt.setLevel(Level.INFO); break;
|
||||||
|
}
|
||||||
Map<?, ?> args = context.getArguments();
|
Map<?, ?> args = context.getArguments();
|
||||||
String commandlineArgs[] = (String[]) args.get("application.args");
|
String commandlineArgs[] = (String[]) args.get("application.args");
|
||||||
if (commandlineArgs.length == 1) {
|
if (commandlineArgs.length == 1) {
|
||||||
Properties ctx = Env.getCtx();
|
Properties ctx = Env.getCtx();
|
||||||
|
Env.setContext(ctx, "org.adempiere.base.PackInFolderApplication", "Y");
|
||||||
String directory = commandlineArgs[0];
|
String directory = commandlineArgs[0];
|
||||||
ProcessInfo pi = new ProcessInfo("PackInFolder", 200099);
|
ProcessInfo pi = new ProcessInfo("PackInFolder", 200099);
|
||||||
pi.setAD_Client_ID(0);
|
pi.setAD_Client_ID(0);
|
||||||
|
@ -64,14 +77,19 @@ public class PackInFolderApplication implements IApplication {
|
||||||
instance.createParameter(10, "Folder", directory);
|
instance.createParameter(10, "Folder", directory);
|
||||||
pi.setAD_PInstance_ID(instance.getAD_PInstance_ID());
|
pi.setAD_PInstance_ID(instance.getAD_PInstance_ID());
|
||||||
ProcessCall process = Core.getProcess("org.adempiere.pipo2.PackInFolder");
|
ProcessCall process = Core.getProcess("org.adempiere.pipo2.PackInFolder");
|
||||||
process.startProcess(ctx, pi, null);
|
boolean success = process.startProcess(ctx, pi, null);
|
||||||
|
ProcessInfoUtil.setLogFromDB(pi);
|
||||||
StringBuilder msgout = new StringBuilder("Process=").append(pi.getTitle())
|
StringBuilder msgout = new StringBuilder("Process=").append(pi.getTitle())
|
||||||
.append(" Error=").append(pi.isError()).append(" Summary=")
|
.append("\n Error=").append(pi.isError())
|
||||||
.append(pi.getSummary());
|
.append("\n Summary=").append(pi.getSummary())
|
||||||
|
.append("\n Logs=\n").append(pi.getLogInfo(false).replaceAll("<br>", "\n"));
|
||||||
System.out.println(msgout.toString());
|
System.out.println(msgout.toString());
|
||||||
|
if (!success)
|
||||||
|
return new Integer(1);
|
||||||
} else {
|
} else {
|
||||||
System.out.println("Apply PackIn from Folder usage:");
|
System.out.println("Apply PackIn from Folder usage:");
|
||||||
System.out.println("RUN_ApplyPackInFromFolder.sh folder");
|
System.out.println("RUN_ApplyPackInFromFolder.sh folder");
|
||||||
|
return new Integer(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class GenericPO extends PO {
|
||||||
PropertiesWrapper wrapper = (PropertiesWrapper)ctx;
|
PropertiesWrapper wrapper = (PropertiesWrapper)ctx;
|
||||||
p_ctx = wrapper.source;
|
p_ctx = wrapper.source;
|
||||||
tableName = wrapper.tableName;
|
tableName = wrapper.tableName;
|
||||||
tableID = MTable.getTable_ID(tableName);
|
tableID = MTable.getTable_ID(tableName, this.get_TrxName());
|
||||||
// log.info("Table_ID: "+Table_ID);
|
// log.info("Table_ID: "+Table_ID);
|
||||||
POInfo poi = POInfo.getPOInfo(ctx, tableID, this.get_TrxName());
|
POInfo poi = POInfo.getPOInfo(ctx, tableID, this.get_TrxName());
|
||||||
return poi;
|
return poi;
|
||||||
|
|
|
@ -199,6 +199,8 @@ public abstract class Doc
|
||||||
public static final String STATUS_Posted = "Y";
|
public static final String STATUS_Posted = "Y";
|
||||||
/** Document Status */
|
/** Document Status */
|
||||||
public static final String STATUS_Error = "E";
|
public static final String STATUS_Error = "E";
|
||||||
|
/** Document Status */
|
||||||
|
public static final String STATUS_Deferred = "d";
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -539,7 +541,7 @@ public abstract class Doc
|
||||||
if (!force)
|
if (!force)
|
||||||
sql.append(" AND (Processing='N' OR Processing IS NULL)");
|
sql.append(" AND (Processing='N' OR Processing IS NULL)");
|
||||||
if (!repost)
|
if (!repost)
|
||||||
sql.append(" AND Posted='N'");
|
sql.append(" AND Posted IN ('N','d')");
|
||||||
if (DB.executeUpdate(sql.toString(), trxName) == 1) {
|
if (DB.executeUpdate(sql.toString(), trxName) == 1) {
|
||||||
if (log.isLoggable(Level.INFO)) log.info("Locked: " + get_TableName() + "_ID=" + get_ID());
|
if (log.isLoggable(Level.INFO)) log.info("Locked: " + get_TableName() + "_ID=" + get_ID());
|
||||||
} else {
|
} else {
|
||||||
|
@ -558,7 +560,7 @@ public abstract class Doc
|
||||||
if (isDeferPosting())
|
if (isDeferPosting())
|
||||||
{
|
{
|
||||||
unlock();
|
unlock();
|
||||||
p_Status = STATUS_NotPosted;
|
p_Status = STATUS_Deferred;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -648,7 +650,7 @@ public abstract class Doc
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create Note
|
// Create Note
|
||||||
if (!p_Status.equals(STATUS_Posted))
|
if (!p_Status.equals(STATUS_Posted) && !p_Status.equals(STATUS_Deferred))
|
||||||
{
|
{
|
||||||
// Insert Note
|
// Insert Note
|
||||||
String AD_MessageValue = "PostingError-" + p_Status;
|
String AD_MessageValue = "PostingError-" + p_Status;
|
||||||
|
|
|
@ -41,6 +41,7 @@ import org.compiere.model.MProduct;
|
||||||
import org.compiere.model.MTax;
|
import org.compiere.model.MTax;
|
||||||
import org.compiere.model.ProductCost;
|
import org.compiere.model.ProductCost;
|
||||||
import org.compiere.model.X_M_InOut;
|
import org.compiere.model.X_M_InOut;
|
||||||
|
import org.compiere.util.DB;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Util;
|
import org.compiere.util.Util;
|
||||||
|
|
||||||
|
@ -122,6 +123,24 @@ public class Doc_MatchPO extends Doc
|
||||||
{
|
{
|
||||||
m_deferPosting = true;
|
m_deferPosting = true;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
String posted = DB.getSQLValueStringEx(getTrxName(), "SELECT Posted FROM M_MatchPO WHERE M_MatchPO_ID=?", m_matchPO.getM_MatchPO_ID());
|
||||||
|
if (STATUS_Deferred.equals(posted))
|
||||||
|
{
|
||||||
|
int M_InOut_ID = DB.getSQLValueEx(getTrxName(), "SELECT M_InOut_ID FROM M_InOutLine WHERE M_InOutLine_ID=?", m_M_InOutLine_ID);
|
||||||
|
MInOut inout = new MInOut(getCtx(), M_InOut_ID, getTrxName());
|
||||||
|
if (inout.getDateAcct().after(m_matchPO.getDateAcct()))
|
||||||
|
{
|
||||||
|
m_matchPO.setDateAcct(inout.getDateAcct());
|
||||||
|
m_matchPO.setDateTrx(inout.getDateAcct());
|
||||||
|
setDateAcct(inout.getDateAcct());
|
||||||
|
setDateDoc(inout.getDateAcct());
|
||||||
|
m_matchPO.saveEx();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
} // loadDocumentDetails
|
} // loadDocumentDetails
|
||||||
|
|
||||||
|
|
|
@ -206,6 +206,13 @@ public interface AdempiereDatabase
|
||||||
public String TO_NUMBER (BigDecimal number, int displayType);
|
public String TO_NUMBER (BigDecimal number, int displayType);
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return next sequence this Sequence
|
||||||
|
* @param Sequence Name
|
||||||
|
* @param Transaction
|
||||||
|
*/
|
||||||
|
public int getNextID(String Name, String trxName);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return next sequence this Sequence
|
* Return next sequence this Sequence
|
||||||
* @param Sequence Name
|
* @param Sequence Name
|
||||||
|
|
|
@ -28,6 +28,7 @@ import java.util.Map;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import javax.xml.XMLConstants;
|
||||||
import javax.xml.parsers.DocumentBuilder;
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
import javax.xml.parsers.SAXParser;
|
import javax.xml.parsers.SAXParser;
|
||||||
|
@ -204,7 +205,7 @@ public class Translation implements IApplication
|
||||||
// System.out.println(factory.getClass().getName());
|
// System.out.println(factory.getClass().getName());
|
||||||
DocumentBuilder builder = factory.newDocumentBuilder();
|
DocumentBuilder builder = factory.newDocumentBuilder();
|
||||||
// <!DOCTYPE idempiereTrl SYSTEM "http://www.idempiere.org/dtd/idempiereTrl.dtd">
|
// <!DOCTYPE idempiereTrl SYSTEM "http://www.idempiere.org/dtd/idempiereTrl.dtd">
|
||||||
// <!DOCTYPE idempiereTrl PUBLIC "-//ComPiere, Inc.//DTD iDempiere Translation 1.0//EN" "http://www.idempiere.org/dtd/idempiereTrl.dtd">
|
// <!DOCTYPE idempiereTrl PUBLIC "-//ComPiere, Inc.//DTD iDempiere Translation 1.0//EN" "http://www.idempiere.com/dtd/idempiereTrl.dtd">
|
||||||
Document document = builder.newDocument();
|
Document document = builder.newDocument();
|
||||||
document.appendChild(document.createComment(Adempiere.getSummaryAscii()));
|
document.appendChild(document.createComment(Adempiere.getSummaryAscii()));
|
||||||
document.appendChild(document.createComment(DTD));
|
document.appendChild(document.createComment(DTD));
|
||||||
|
@ -277,6 +278,7 @@ public class Translation implements IApplication
|
||||||
valueString = "";
|
valueString = "";
|
||||||
value.setAttribute(XML_VALUE_ATTRIBUTE_ORIGINAL, origString);
|
value.setAttribute(XML_VALUE_ATTRIBUTE_ORIGINAL, origString);
|
||||||
if (valueString.indexOf("<") != -1 || valueString.indexOf(">") != -1 || valueString.indexOf("&") != -1) {
|
if (valueString.indexOf("<") != -1 || valueString.indexOf(">") != -1 || valueString.indexOf("&") != -1) {
|
||||||
|
value.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
|
||||||
value.appendChild(document.createCDATASection(valueString));
|
value.appendChild(document.createCDATASection(valueString));
|
||||||
} else {
|
} else {
|
||||||
value.appendChild(document.createTextNode(valueString));
|
value.appendChild(document.createTextNode(valueString));
|
||||||
|
|
|
@ -1867,7 +1867,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
|
||||||
return DocAction.STATUS_Invalid;
|
return DocAction.STATUS_Invalid;
|
||||||
}
|
}
|
||||||
matchPO++;
|
matchPO++;
|
||||||
if (!po.isPosted() && po.getM_InOutLine_ID() > 0) // match po don't post if receipt is not assigned, and it doesn't create avg po record
|
if (!po.isPosted())
|
||||||
addDocsPostProcess(po);
|
addDocsPostProcess(po);
|
||||||
|
|
||||||
MMatchInv[] matchInvoices = MMatchInv.getInvoiceLine(getCtx(), line.getC_InvoiceLine_ID(), get_TrxName());
|
MMatchInv[] matchInvoices = MMatchInv.getInvoiceLine(getCtx(), line.getC_InvoiceLine_ID(), get_TrxName());
|
||||||
|
|
|
@ -58,7 +58,7 @@ public class MTable extends X_AD_Table
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private static final long serialVersionUID = 7527235342324308477L;
|
private static final long serialVersionUID = 4974471096496488963L;
|
||||||
|
|
||||||
public final static int MAX_OFFICIAL_ID = 999999;
|
public final static int MAX_OFFICIAL_ID = 999999;
|
||||||
|
|
||||||
|
@ -614,19 +614,22 @@ public class MTable extends X_AD_Table
|
||||||
} // getSQLCreate
|
} // getSQLCreate
|
||||||
|
|
||||||
// globalqss
|
// globalqss
|
||||||
|
public static int getTable_ID(String tableName) {
|
||||||
|
return getTable_ID(tableName, null);
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Grant independence to GenerateModel from AD_Table_ID
|
* Grant independence to GenerateModel from AD_Table_ID
|
||||||
* @param String tableName
|
* @param String tableName
|
||||||
* @return int retValue
|
* @return int retValue
|
||||||
*/
|
*/
|
||||||
public static int getTable_ID(String tableName) {
|
public static int getTable_ID(String tableName, String trxName) {
|
||||||
int retValue = 0;
|
int retValue = 0;
|
||||||
String SQL = "SELECT AD_Table_ID FROM AD_Table WHERE tablename = ?";
|
String SQL = "SELECT AD_Table_ID FROM AD_Table WHERE tablename = ?";
|
||||||
PreparedStatement pstmt = null;
|
PreparedStatement pstmt = null;
|
||||||
ResultSet rs = null;
|
ResultSet rs = null;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
pstmt = DB.prepareStatement(SQL, null);
|
pstmt = DB.prepareStatement(SQL, trxName);
|
||||||
pstmt.setString(1, tableName);
|
pstmt.setString(1, tableName);
|
||||||
rs = pstmt.executeQuery();
|
rs = pstmt.executeQuery();
|
||||||
if (rs.next())
|
if (rs.next())
|
||||||
|
|
|
@ -38,6 +38,7 @@ import java.util.Properties;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import javax.xml.XMLConstants;
|
||||||
import javax.xml.parsers.DocumentBuilder;
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
import javax.xml.transform.Transformer;
|
import javax.xml.transform.Transformer;
|
||||||
|
@ -4577,7 +4578,10 @@ public abstract class PO
|
||||||
if (value == null || value.equals (Null.NULL))
|
if (value == null || value.equals (Null.NULL))
|
||||||
;
|
;
|
||||||
else if (c == Object.class)
|
else if (c == Object.class)
|
||||||
|
{
|
||||||
|
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
|
||||||
col.appendChild(document.createCDATASection(value.toString()));
|
col.appendChild(document.createCDATASection(value.toString()));
|
||||||
|
}
|
||||||
else if (value instanceof Integer || value instanceof BigDecimal)
|
else if (value instanceof Integer || value instanceof BigDecimal)
|
||||||
col.appendChild(document.createTextNode(value.toString()));
|
col.appendChild(document.createTextNode(value.toString()));
|
||||||
else if (c == Boolean.class)
|
else if (c == Boolean.class)
|
||||||
|
@ -4592,11 +4596,20 @@ public abstract class PO
|
||||||
else if (value instanceof Timestamp)
|
else if (value instanceof Timestamp)
|
||||||
col.appendChild(document.createTextNode(value.toString()));
|
col.appendChild(document.createTextNode(value.toString()));
|
||||||
else if (c == String.class)
|
else if (c == String.class)
|
||||||
|
{
|
||||||
|
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
|
||||||
col.appendChild(document.createCDATASection((String)value));
|
col.appendChild(document.createCDATASection((String)value));
|
||||||
|
}
|
||||||
else if (DisplayType.isLOB(dt))
|
else if (DisplayType.isLOB(dt))
|
||||||
|
{
|
||||||
|
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
|
||||||
col.appendChild(document.createCDATASection(value.toString()));
|
col.appendChild(document.createCDATASection(value.toString()));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
|
||||||
col.appendChild(document.createCDATASection(value.toString()));
|
col.appendChild(document.createCDATASection(value.toString()));
|
||||||
|
}
|
||||||
//
|
//
|
||||||
root.appendChild(col);
|
root.appendChild(col);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1829,11 +1829,11 @@ public final class DB
|
||||||
|
|
||||||
if(SYSTEM_NATIVE_SEQUENCE && !adempiereSys)
|
if(SYSTEM_NATIVE_SEQUENCE && !adempiereSys)
|
||||||
{
|
{
|
||||||
int m_sequence_id = CConnection.get().getDatabase().getNextID(TableName+"_SQ");
|
int m_sequence_id = CConnection.get().getDatabase().getNextID(TableName+"_SQ", trxName);
|
||||||
if (m_sequence_id == -1) {
|
if (m_sequence_id == -1) {
|
||||||
// try to create the sequence and try again
|
// try to create the sequence and try again
|
||||||
MSequence.createTableSequence(Env.getCtx(), TableName, trxName, true);
|
MSequence.createTableSequence(Env.getCtx(), TableName, trxName, true);
|
||||||
m_sequence_id = CConnection.get().getDatabase().getNextID(TableName+"_SQ");
|
m_sequence_id = CConnection.get().getDatabase().getNextID(TableName+"_SQ", trxName);
|
||||||
}
|
}
|
||||||
return m_sequence_id;
|
return m_sequence_id;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet
|
Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet
|
||||||
Eclipse-LazyStart: true
|
Eclipse-LazyStart: true
|
||||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Bundle-Name: %bundleName
|
Bundle-Name: %bundleName
|
||||||
Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true
|
Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true
|
||||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
||||||
|
@ -17,4 +18,3 @@ Import-Package: javax.servlet;version="2.3",javax.servlet.http;version
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servletbridge
|
Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servletbridge
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
Manifest-Version: 1.0
|
Manifest-Version: 1.0
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Bundle-Name: %bundleName
|
Bundle-Name: %bundleName
|
||||||
Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true
|
Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true
|
||||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
||||||
|
|
|
@ -4,7 +4,8 @@ Bundle-Name: iDempiere extend
|
||||||
Bundle-SymbolicName: org.adempiere.extend;singleton:=true
|
Bundle-SymbolicName: org.adempiere.extend;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Eclipse-RegisterBuddy: org.adempiere.tools
|
Eclipse-RegisterBuddy: org.adempiere.tools
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Export-Package: compiere.model,
|
Export-Package: compiere.model,
|
||||||
test
|
test
|
||||||
Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
|
Fragment-Host: org.adempiere.base;bundle-version="0.0.0"
|
||||||
|
|
|
@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier
|
||||||
Export-Package: org.adempiere.install,
|
Export-Package: org.adempiere.install,
|
||||||
org.compiere.install
|
org.compiere.install
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: javax.mail;version="1.5",
|
Import-Package: javax.mail;version="1.5",
|
||||||
javax.mail.internet;version="1.5",
|
javax.mail.internet;version="1.5",
|
||||||
org.apache.tools.ant,
|
org.apache.tools.ant,
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Payment Processor
|
Bundle-Name: iDempiere Payment Processor
|
||||||
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
|
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
lib/jpayment.jar,
|
lib/jpayment.jar,
|
||||||
|
@ -11,4 +12,3 @@ Bundle-ClassPath: .,
|
||||||
lib/Verisign.jar
|
lib/Verisign.jar
|
||||||
Automatic-Module-Name: org.adempiere.payment.processor
|
Automatic-Module-Name: org.adempiere.payment.processor
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere 2Pack Handlers
|
Bundle-Name: iDempiere 2Pack Handlers
|
||||||
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
|
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
|
||||||
org.adempiere.base;bundle-version="0.0.0"
|
org.adempiere.base;bundle-version="0.0.0"
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere 2Pack Core
|
Bundle-Name: iDempiere 2Pack Core
|
||||||
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
|
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: org.apache.commons.codec,
|
Import-Package: org.apache.commons.codec,
|
||||||
org.apache.commons.codec.binary,
|
org.apache.commons.codec.binary,
|
||||||
org.apache.tools.ant,
|
org.apache.tools.ant,
|
||||||
|
@ -20,3 +21,4 @@ Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Automatic-Module-Name: org.adempiere.pipo
|
Automatic-Module-Name: org.adempiere.pipo
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
Bundle-ActivationPolicy: lazy
|
||||||
|
|
|
@ -110,6 +110,7 @@ public class PipoDictionaryService implements IDictionaryService {
|
||||||
Trx.get(trxName, false).commit(true);
|
Trx.get(trxName, false).commit(true);
|
||||||
if (logger.isLoggable(Level.INFO)) logger.info("commit " + trxName);
|
if (logger.isLoggable(Level.INFO)) logger.info("commit " + trxName);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
Trx.get(trxName, false).rollback();
|
||||||
adPackageImp.setP_Msg(e.getLocalizedMessage());
|
adPackageImp.setP_Msg(e.getLocalizedMessage());
|
||||||
packIn.getNotifier().addFailureLine(e.getLocalizedMessage());
|
packIn.getNotifier().addFailureLine(e.getLocalizedMessage());
|
||||||
packIn.setSuccess(false);
|
packIn.setSuccess(false);
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Plugin Utils
|
Bundle-Name: iDempiere Plugin Utils
|
||||||
Bundle-SymbolicName: org.adempiere.plugin.utils
|
Bundle-SymbolicName: org.adempiere.plugin.utils
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: org.adempiere.base,
|
Import-Package: org.adempiere.base,
|
||||||
org.adempiere.util,
|
org.adempiere.util,
|
||||||
org.apache.xerces.dom;version="2.9.0",
|
org.apache.xerces.dom;version="2.9.0",
|
||||||
|
|
|
@ -159,6 +159,10 @@ public abstract class AbstractActivator implements BundleActivator, ServiceTrack
|
||||||
m_processInfo = processInfo;
|
m_processInfo = processInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ProcessInfo getProcessInfo() {
|
||||||
|
return m_processInfo;
|
||||||
|
}
|
||||||
|
|
||||||
public void setProcessUI(IProcessUI processUI) {
|
public void setProcessUI(IProcessUI processUI) {
|
||||||
m_processUI = processUI;
|
m_processUI = processUI;
|
||||||
};
|
};
|
||||||
|
|
|
@ -118,6 +118,7 @@ public class PackInApplicationActivator extends AbstractActivator {
|
||||||
t.schedule(new TimerTask() {
|
t.schedule(new TimerTask() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
|
if (! "Y".equals(Env.getContext(Env.getCtx(), "org.adempiere.base.PackInFolderApplication"))) {
|
||||||
ClassLoader cl = Thread.currentThread().getContextClassLoader();
|
ClassLoader cl = Thread.currentThread().getContextClassLoader();
|
||||||
try {
|
try {
|
||||||
Thread.currentThread().setContextClassLoader(PackInApplicationActivator.class.getClassLoader());
|
Thread.currentThread().setContextClassLoader(PackInApplicationActivator.class.getClassLoader());
|
||||||
|
@ -128,6 +129,7 @@ public class PackInApplicationActivator extends AbstractActivator {
|
||||||
service = null;
|
service = null;
|
||||||
Thread.currentThread().setContextClassLoader(cl);
|
Thread.currentThread().setContextClassLoader(cl);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
t.cancel();
|
t.cancel();
|
||||||
}
|
}
|
||||||
}, timeout);
|
}, timeout);
|
||||||
|
@ -167,7 +169,12 @@ public class PackInApplicationActivator extends AbstractActivator {
|
||||||
currentFile = zipFile;
|
currentFile = zipFile;
|
||||||
if (!packIn(zipFile)) {
|
if (!packIn(zipFile)) {
|
||||||
// stop processing further packages if one fail
|
// stop processing further packages if one fail
|
||||||
addLog(Level.WARNING, "Failed application of " + zipFile);
|
String msg = "Failed application of " + zipFile;
|
||||||
|
addLog(Level.WARNING, msg);
|
||||||
|
if (getProcessInfo() != null) {
|
||||||
|
getProcessInfo().setError(true);
|
||||||
|
getProcessInfo().setSummary("@Error@: " + msg);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
addLog(Level.INFO, "Successful application of " + zipFile);
|
addLog(Level.INFO, "Successful application of " + zipFile);
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Replication Server
|
Bundle-Name: iDempiere Replication Server
|
||||||
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
|
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
|
||||||
org.adempiere.replication;bundle-version="0.0.0",
|
org.adempiere.replication;bundle-version="0.0.0",
|
||||||
org.adempiere.base;bundle-version="0.0.0"
|
org.adempiere.base;bundle-version="0.0.0"
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Replication
|
Bundle-Name: iDempiere Replication
|
||||||
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
|
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Export-Package: org.adempiere.process.rpl,
|
Export-Package: org.adempiere.process.rpl,
|
||||||
org.adempiere.process.rpl.exp,
|
org.adempiere.process.rpl.exp,
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: Library
|
Bundle-Name: Library
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1"
|
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
lib/castor-core.jar,
|
lib/castor-core.jar,
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: JasperReports Swing Client
|
Bundle-Name: JasperReports Swing Client
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||||
org.adempiere.ui.swing;bundle-version="0.0.0",
|
org.adempiere.ui.swing;bundle-version="0.0.0",
|
||||||
org.adempiere.report.jasper;bundle-version="0.0.0"
|
org.adempiere.report.jasper;bundle-version="0.0.0"
|
||||||
|
|
|
@ -4,7 +4,8 @@ Bundle-Name: iDempiere JasperReport Web App
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Web-ContextPath: JasperReportFiles
|
Web-ContextPath: JasperReportFiles
|
||||||
Import-Package: javax.servlet;version="2.5.0",
|
Import-Package: javax.servlet;version="2.5.0",
|
||||||
javax.servlet.http;version="2.5.0",
|
javax.servlet.http;version="2.5.0",
|
||||||
|
@ -14,5 +15,3 @@ Import-Package: javax.servlet;version="2.5.0",
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Automatic-Module-Name: org.adempiere.report.jasper.webapp
|
Automatic-Module-Name: org.adempiere.report.jasper.webapp
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere JasperReport integration
|
Bundle-Name: iDempiere JasperReport integration
|
||||||
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
|
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: net.sourceforge.barbecue,
|
Import-Package: net.sourceforge.barbecue,
|
||||||
org.apache.commons.codec,
|
org.apache.commons.codec,
|
||||||
org.apache.commons.codec.binary,
|
org.apache.commons.codec.binary,
|
||||||
|
|
|
@ -11,6 +11,36 @@
|
||||||
<packaging>eclipse-feature</packaging>
|
<packaging>eclipse-feature</packaging>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>auto-clean</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>clean</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}/data/seed</directory>
|
||||||
|
<includes>
|
||||||
|
<include>*.jar</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}/../fitnesse/FitNesseRoot/FitLibraryWeb</directory>
|
||||||
|
<includes>
|
||||||
|
<include>*.zip</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
</launcher>
|
</launcher>
|
||||||
|
|
||||||
<vm>
|
<vm>
|
||||||
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10</linux>
|
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
|
||||||
</vm>
|
</vm>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
|
@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||||
org.eclipse.equinox.app;bundle-version="0.0.0",
|
org.eclipse.equinox.app;bundle-version="0.0.0",
|
||||||
org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
|
org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Web-ContextPath: /
|
Web-ContextPath: /
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
WEB-INF/lib/jnlp-jardiff.jar,
|
WEB-INF/lib/jnlp-jardiff.jar,
|
||||||
|
|
|
@ -12,6 +12,29 @@
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>auto-clean</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>clean</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}/WEB-INF/lib</directory>
|
||||||
|
<includes>
|
||||||
|
<include>*.jar</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
|
|
|
@ -157,7 +157,7 @@ public class AcctProcessor extends AdempiereServer
|
||||||
|
|
||||||
StringBuffer sql = new StringBuffer ("SELECT DISTINCT ProcessedOn FROM ").append(TableName)
|
StringBuffer sql = new StringBuffer ("SELECT DISTINCT ProcessedOn FROM ").append(TableName)
|
||||||
.append(" WHERE AD_Client_ID=? AND ProcessedOn<?")
|
.append(" WHERE AD_Client_ID=? AND ProcessedOn<?")
|
||||||
.append(" AND Processed='Y' AND Posted='N' AND IsActive='Y'");
|
.append(" AND Processed='Y' AND Posted IN ('N','d') AND IsActive='Y'");
|
||||||
PreparedStatement pstmt = null;
|
PreparedStatement pstmt = null;
|
||||||
ResultSet rs = null;
|
ResultSet rs = null;
|
||||||
try
|
try
|
||||||
|
@ -211,7 +211,7 @@ public class AcctProcessor extends AdempiereServer
|
||||||
sql.append("=?");
|
sql.append("=?");
|
||||||
else
|
else
|
||||||
sql.append(" IS NULL OR ProcessedOn=0");
|
sql.append(" IS NULL OR ProcessedOn=0");
|
||||||
sql.append(") AND Processed='Y' AND Posted='N' AND IsActive='Y'")
|
sql.append(") AND Processed='Y' AND Posted IN ('N','d') AND IsActive='Y'")
|
||||||
.append(" ORDER BY Created");
|
.append(" ORDER BY Created");
|
||||||
//
|
//
|
||||||
PreparedStatement pstmt = null;
|
PreparedStatement pstmt = null;
|
||||||
|
|
|
@ -75,7 +75,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||||
org.jfree.chart-osgi;bundle-version="1.0.19"
|
org.jfree.chart-osgi;bundle-version="1.0.19"
|
||||||
Eclipse-ExtensibleAPI: true
|
Eclipse-ExtensibleAPI: true
|
||||||
Eclipse-RegisterBuddy: org.adempiere.base
|
Eclipse-RegisterBuddy: org.adempiere.base
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: groovy.beans;version="2.5.3",
|
Import-Package: groovy.beans;version="2.5.3",
|
||||||
groovy.cli;version="2.5.3",
|
groovy.cli;version="2.5.3",
|
||||||
groovy.grape;version="2.5.3",
|
groovy.grape;version="2.5.3",
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Web Client
|
Bundle-Name: iDempiere Web Client
|
||||||
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
|
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: groovy.transform.stc;version="2.4.7",
|
Import-Package: groovy.transform.stc;version="2.4.7",
|
||||||
javax.annotation,
|
javax.annotation,
|
||||||
javax.annotation.processing,
|
javax.annotation.processing,
|
||||||
|
|
|
@ -11,6 +11,36 @@
|
||||||
<packaging>eclipse-plugin</packaging>
|
<packaging>eclipse-plugin</packaging>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>auto-clean</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>clean</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}/WEB-INF/lib</directory>
|
||||||
|
<includes>
|
||||||
|
<include>*.jar</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}</directory>
|
||||||
|
<includes>
|
||||||
|
<include>labelapplet.jar</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere UI base
|
Bundle-Name: iDempiere UI base
|
||||||
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
|
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||||
org.apache.xerces;bundle-version="0.0.0",
|
org.apache.xerces;bundle-version="0.0.0",
|
||||||
org.eclipse.equinox.app;bundle-version="0.0.0"
|
org.eclipse.equinox.app;bundle-version="0.0.0"
|
||||||
|
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.adempiere.webstore.resource
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Vendor: Adempiere.org
|
Bundle-Vendor: Adempiere.org
|
||||||
Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
|
Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: org.compiere.wstore
|
Import-Package: org.compiere.wstore
|
||||||
Jetty-WarPatchFragmentFolderPath: /
|
Jetty-WarPatchFragmentFolderPath: /
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
|
|
|
@ -4,7 +4,8 @@ Bundle-Name: iDempiere Web Store Servlets
|
||||||
Bundle-SymbolicName: org.adempiere.webstore.servlet
|
Bundle-SymbolicName: org.adempiere.webstore.servlet
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Vendor: Adempiere.org
|
Bundle-Vendor: Adempiere.org
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Export-Package: org.compiere.wstore
|
Export-Package: org.compiere.wstore
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Import-Package: javax.servlet,
|
Import-Package: javax.servlet,
|
||||||
|
|
|
@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||||
org.adempiere.report.jasper.webapp;bundle-version="0.0.0",
|
org.adempiere.report.jasper.webapp;bundle-version="0.0.0",
|
||||||
org.eclipse.jdt.core;bundle-version="3.15.0"
|
org.eclipse.jdt.core;bundle-version="3.15.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Web-ContextPath: wstore
|
Web-ContextPath: wstore
|
||||||
Import-Package: javax.servlet;version="3.0.0",
|
Import-Package: javax.servlet;version="3.0.0",
|
||||||
javax.servlet.http;version="3.0.0",
|
javax.servlet.http;version="3.0.0",
|
||||||
|
@ -84,8 +85,3 @@ Bundle-Activator: org.adempiere.webstore.Activator
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Automatic-Module-Name: org.adempiere.webstore
|
Automatic-Module-Name: org.adempiere.webstore
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.apache.ecs
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Activator: org.apache.ecs.Activator
|
Bundle-Activator: org.apache.ecs.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: org.osgi.framework;version="1.3.0"
|
Import-Package: org.osgi.framework;version="1.3.0"
|
||||||
Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
|
Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
|
||||||
org.apache.ecs.filter;uses:="org.apache.ecs",
|
org.apache.ecs.filter;uses:="org.apache.ecs",
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Oracle Provider
|
Bundle-Name: iDempiere Oracle Provider
|
||||||
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
|
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||||
org.adempiere.install;bundle-version="0.0.0"
|
org.adempiere.install;bundle-version="0.0.0"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
|
@ -19,4 +20,3 @@ Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator
|
||||||
Service-Component: OSGI-INF/oracleprovider.xml
|
Service-Component: OSGI-INF/oracleprovider.xml
|
||||||
Automatic-Module-Name: org.compiere.db.oracle.provider
|
Automatic-Module-Name: org.compiere.db.oracle.provider
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
||||||
|
|
|
@ -1248,8 +1248,12 @@ public class DB_Oracle implements AdempiereDatabase
|
||||||
return m_convert;
|
return m_convert;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNextID(String Name) {
|
public int getNextID(String name) {
|
||||||
int m_sequence_id = DB.getSQLValueEx(null, "SELECT "+Name.toUpperCase()+".nextval FROM DUAL");
|
return getNextID(name, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getNextID(String name, String trxName) {
|
||||||
|
int m_sequence_id = DB.getSQLValueEx(trxName, "SELECT "+name.toUpperCase()+".nextval FROM DUAL");
|
||||||
return m_sequence_id;
|
return m_sequence_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: iDempiere Postgresql Provider
|
Bundle-Name: iDempiere Postgresql Provider
|
||||||
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
|
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
lib/c3p0.jar,
|
lib/c3p0.jar,
|
||||||
lib/mchange-commons-java.jar,
|
lib/mchange-commons-java.jar,
|
||||||
|
|
|
@ -966,8 +966,11 @@ public class DB_PostgreSQL implements AdempiereDatabase
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNextID(String name) {
|
public int getNextID(String name) {
|
||||||
|
return getNextID(name, null);
|
||||||
|
}
|
||||||
|
|
||||||
int m_sequence_id = DB.getSQLValueEx(null, "SELECT nextval('"+name.toLowerCase()+"')");
|
public int getNextID(String name, String trxName) {
|
||||||
|
int m_sequence_id = DB.getSQLValueEx(trxName, "SELECT nextval('"+name.toLowerCase()+"')");
|
||||||
return m_sequence_id;
|
return m_sequence_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Activator: org.idempiere.felix.webconsole.Activator
|
Bundle-Activator: org.idempiere.felix.webconsole.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: javax.servlet;version="2.5.0",
|
Import-Package: javax.servlet;version="2.5.0",
|
||||||
javax.servlet.http;version="2.5.0",
|
javax.servlet.http;version="2.5.0",
|
||||||
javax.servlet.jsp;version="2.1.0",
|
javax.servlet.jsp;version="2.1.0",
|
||||||
|
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.fitnesse.fixture
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
|
Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: fit,
|
Import-Package: fit,
|
||||||
fit.decorator,
|
fit.decorator,
|
||||||
fit.decorator.exceptions,
|
fit.decorator.exceptions,
|
||||||
|
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.fitnesse.server
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Activator: org.idempiere.fitnesse.server.Activator
|
Bundle-Activator: org.idempiere.fitnesse.server.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: javax.servlet;version="3.0.0",
|
Import-Package: javax.servlet;version="3.0.0",
|
||||||
javax.servlet.http;version="3.0.0",
|
javax.servlet.http;version="3.0.0",
|
||||||
org.adempiere.base,
|
org.adempiere.base,
|
||||||
|
|
|
@ -8,7 +8,8 @@ Import-Package: org.adempiere.base,
|
||||||
org.adempiere.plugin.utils,
|
org.adempiere.plugin.utils,
|
||||||
org.compiere.model,
|
org.compiere.model,
|
||||||
org.osgi.framework;version="1.3.0"
|
org.osgi.framework;version="1.3.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Service-Component: plugin.xml
|
Service-Component: plugin.xml
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
|
|
|
@ -4,7 +4,8 @@ Bundle-Name: iDempiere Hazelcast Service Configuration
|
||||||
Bundle-SymbolicName: org.idempiere.hazelcast.service.config
|
Bundle-SymbolicName: org.idempiere.hazelcast.service.config
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0"
|
Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0"
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Bundle-ClassPath: .
|
Bundle-ClassPath: .
|
||||||
Automatic-Module-Name: org.idempiere.hazelcast.service.config
|
Automatic-Module-Name: org.idempiere.hazelcast.service.config
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
|
@ -30,7 +30,8 @@ Bundle-ClassPath: .,
|
||||||
lib/hazelcast-aws.jar,
|
lib/hazelcast-aws.jar,
|
||||||
lib/hazelcast.jar
|
lib/hazelcast.jar
|
||||||
Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
|
Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Require-Bundle: org.eclipse.osgi
|
Require-Bundle: org.eclipse.osgi
|
||||||
Automatic-Module-Name: org.idempiere.hazelcast.service
|
Automatic-Module-Name: org.idempiere.hazelcast.service
|
||||||
Bundle-Vendor: iDempiere Community
|
Bundle-Vendor: iDempiere Community
|
||||||
|
|
|
@ -1,12 +1,10 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
|
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
||||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||||
org.eclipse.jdt.core.compiler.compliance=10
|
|
||||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.release=enabled
|
org.eclipse.jdt.core.compiler.release=enabled
|
||||||
org.eclipse.jdt.core.compiler.source=10
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
</launcher>
|
</launcher>
|
||||||
|
|
||||||
<vm>
|
<vm>
|
||||||
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10</linux>
|
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
|
||||||
</vm>
|
</vm>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions -->
|
<!-- https://www.eclipse.org/jetty/documentation/9.3.x/alpn-chapter.html#alpn-versions -->
|
||||||
<jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
|
<jetty.alpn-boot.version>8.1.12.v20180117</jetty.alpn-boot.version>
|
||||||
<netbeans.lib.version>RELEASE731</netbeans.lib.version>
|
<netbeans.lib.version>RELEASE731</netbeans.lib.version>
|
||||||
|
<maven-clean-plugin.version>2.5</maven-clean-plugin.version><!-- get from master, update when mave have update-->
|
||||||
<!-- default value of properties, use when run without profile -->
|
<!-- default value of properties, use when run without profile -->
|
||||||
<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
|
<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
|
||||||
<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
|
<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
|
||||||
|
@ -33,14 +34,16 @@
|
||||||
<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
|
<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group</extra.ui.install>
|
||||||
<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
|
<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
|
||||||
<codehaus.plexus>2.8.5</codehaus.plexus>
|
<codehaus.plexus>2.8.5</codehaus.plexus>
|
||||||
<!-- override from tycho to get latest version of jdt -->
|
|
||||||
<jdtVersion>3.15.0</jdtVersion>
|
|
||||||
<jdtAptVersion>1.3.300</jdtAptVersion>
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<pluginManagement>
|
<pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<version>${maven-clean-plugin.version}</version>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<!-- https://www.eclipse.org/m2e/documentation/m2e-execution-not-covered.html -->
|
<!-- https://www.eclipse.org/m2e/documentation/m2e-execution-not-covered.html -->
|
||||||
<groupId>org.eclipse.m2e</groupId>
|
<groupId>org.eclipse.m2e</groupId>
|
||||||
|
@ -62,6 +65,20 @@
|
||||||
<ignore/>
|
<ignore/>
|
||||||
</action>
|
</action>
|
||||||
</pluginExecution>
|
</pluginExecution>
|
||||||
|
|
||||||
|
<pluginExecution>
|
||||||
|
<pluginExecutionFilter>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<versionRange>[2.5,)</versionRange>
|
||||||
|
<goals>
|
||||||
|
<goal>clean</goal>
|
||||||
|
</goals>
|
||||||
|
</pluginExecutionFilter>
|
||||||
|
<action>
|
||||||
|
<ignore/>
|
||||||
|
</action>
|
||||||
|
</pluginExecution>
|
||||||
</pluginExecutions>
|
</pluginExecutions>
|
||||||
</lifecycleMappingMetadata>
|
</lifecycleMappingMetadata>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@ -371,6 +388,29 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>auto-clean</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>clean</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}/lib</directory>
|
||||||
|
<includes>
|
||||||
|
<include>*.jar</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<!-- enable the Tycho build extension -->
|
<!-- enable the Tycho build extension -->
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
|
|
@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.ui.zk.selenium
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
|
Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Import-Package: fit,
|
Import-Package: fit,
|
||||||
fit.decorator,
|
fit.decorator,
|
||||||
fit.decorator.exceptions,
|
fit.decorator.exceptions,
|
||||||
|
|
|
@ -4,7 +4,8 @@ Bundle-Name: iDempiere Webservices
|
||||||
Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
|
Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Bundle-Activator: org.idempiere.webservices.Activator
|
Bundle-Activator: org.idempiere.webservices.Activator
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Service-Component: OSGI-INF/ws_modelfactory.xml
|
Service-Component: OSGI-INF/ws_modelfactory.xml
|
||||||
Import-Package: javax.activation,
|
Import-Package: javax.activation,
|
||||||
javax.jws;version="1.1.0",
|
javax.jws;version="1.1.0",
|
||||||
|
|
|
@ -12,6 +12,29 @@
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>auto-clean</id>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>clean</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>${project.basedir}/WEB-INF/lib</directory>
|
||||||
|
<includes>
|
||||||
|
<include>*.jar</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-compiler-plugin</artifactId>
|
<artifactId>tycho-compiler-plugin</artifactId>
|
||||||
|
|
|
@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: extra zk library
|
Bundle-Name: extra zk library
|
||||||
Bundle-SymbolicName: org.idempiere.zk.extra
|
Bundle-SymbolicName: org.idempiere.zk.extra
|
||||||
Bundle-Version: 6.2.0.qualifier
|
Bundle-Version: 6.2.0.qualifier
|
||||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))"
|
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||||
|
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
|
||||||
Bundle-ClassPath: .,
|
Bundle-ClassPath: .,
|
||||||
lib/breeze.jar,
|
lib/breeze.jar,
|
||||||
lib/calendar.jar,
|
lib/calendar.jar,
|
||||||
|
|
Loading…
Reference in New Issue