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

hg merge release-6.2 (merge release6.2 into default)

This commit is contained in:
Carlos Ruiz 2019-01-15 19:22:43 +01:00
parent a8cd37a676 d7065224fa
commit 36a3817acc
64 changed files with 355 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/i6.2/oracle/201812181500_Ticket_AP2-825.sql Normal file
View File

@ -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
;

8
migration/i6.2/postgresql/201812181500_Ticket_AP2-825.sql Normal file
View File

@ -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
;

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

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Callout
Bundle-SymbolicName: org.adempiere.base.callout
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"
Eclipse-RegisterBuddy: org.adempiere.base
Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml
@ -12,4 +13,3 @@ Export-Package: org.compiere.model
Bundle-ClassPath: .
Automatic-Module-Name: org.adempiere.base.callout
Bundle-Vendor: iDempiere Community

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

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Processes
Bundle-SymbolicName: org.adempiere.base.process
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"
Export-Package: org.adempiere.process,
org.compiere.process,

4
org.adempiere.base.process/src/org/adempiere/process/ClientAcctProcessor.java
View File

@ -148,7 +148,7 @@ public class ClientAcctProcessor extends SvrProcess
StringBuilder sql = new StringBuilder("SELECT DISTINCT ProcessedOn FROM ").append(TableName)
.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;
ResultSet rs = null;
try
@ -202,7 +202,7 @@ public class ClientAcctProcessor extends SvrProcess
sql.append("=?");
else
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");
//
PreparedStatement pstmt = null;

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

@ -56,6 +56,7 @@ Export-Package: bsh,
org.idempiere.broadcast,
org.idempiere.distributed,
org.idempiere.model
Comment: Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.11))"
Import-Package: com.sun.mail.smtp;version="1.5",
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"
Automatic-Module-Name: org.adempiere.base
Bundle-Vendor: iDempiere Community
Bundle-RequiredExecutionEnvironment: JavaSE-11

28
org.adempiere.base/src/org/adempiere/base/PackInFolderApplication.java
View File

@ -32,6 +32,7 @@ import org.compiere.Adempiere;
import org.compiere.model.MPInstance;
import org.compiere.process.ProcessCall;
import org.compiere.process.ProcessInfo;
import org.compiere.process.ProcessInfoUtil;
import org.compiere.util.CLogMgt;
import org.compiere.util.Env;
import org.eclipse.equinox.app.IApplication;
@ -49,12 +50,24 @@ public class PackInFolderApplication implements IApplication {
@Override
public Object start(IApplicationContext context) throws Exception {
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();
String commandlineArgs[] = (String[]) args.get("application.args");
if (commandlineArgs.length == 1) {
Properties ctx = Env.getCtx();
Env.setContext(ctx, "org.adempiere.base.PackInFolderApplication", "Y");
String directory = commandlineArgs[0];
ProcessInfo pi = new ProcessInfo("PackInFolder", 200099);
pi.setAD_Client_ID(0);
@ -64,14 +77,19 @@ public class PackInFolderApplication implements IApplication {
instance.createParameter(10, "Folder", directory);
pi.setAD_PInstance_ID(instance.getAD_PInstance_ID());
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())
.append(" Error=").append(pi.isError()).append(" Summary=")
.append(pi.getSummary());
.append("\n Error=").append(pi.isError())
.append("\n Summary=").append(pi.getSummary())
.append("\n Logs=\n").append(pi.getLogInfo(false).replaceAll("<br>", "\n"));
System.out.println(msgout.toString());
if (!success)
return new Integer(1);
} else {
System.out.println("Apply PackIn from Folder usage:");
System.out.println("RUN_ApplyPackInFromFolder.sh folder");
return new Integer(1);
}

2
org.adempiere.base/src/org/adempiere/model/GenericPO.java
View File

@ -93,7 +93,7 @@ public class GenericPO extends PO {
PropertiesWrapper wrapper = (PropertiesWrapper)ctx;
p_ctx = wrapper.source;
tableName = wrapper.tableName;
tableID = MTable.getTable_ID(tableName);
tableID = MTable.getTable_ID(tableName, this.get_TrxName());
// log.info("Table_ID: "+Table_ID);
POInfo poi = POInfo.getPOInfo(ctx, tableID, this.get_TrxName());
return poi;

8
org.adempiere.base/src/org/compiere/acct/Doc.java
View File

@ -199,6 +199,8 @@ public abstract class Doc
public static final String STATUS_Posted = "Y";
/** Document Status */
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)
sql.append(" AND (Processing='N' OR Processing IS NULL)");
if (!repost)
sql.append(" AND Posted='N'");
sql.append(" AND Posted IN ('N','d')");
if (DB.executeUpdate(sql.toString(), trxName) == 1) {
if (log.isLoggable(Level.INFO)) log.info("Locked: " + get_TableName() + "_ID=" + get_ID());
} else {
@ -558,7 +560,7 @@ public abstract class Doc
if (isDeferPosting())
{
unlock();
p_Status = STATUS_NotPosted;
p_Status = STATUS_Deferred;
return null;
}
@ -648,7 +650,7 @@ public abstract class Doc
}
// Create Note
if (!p_Status.equals(STATUS_Posted))
if (!p_Status.equals(STATUS_Posted) && !p_Status.equals(STATUS_Deferred))
{
// Insert Note
String AD_MessageValue = "PostingError-" + p_Status;

21
org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java
View File

@ -41,6 +41,7 @@ import org.compiere.model.MProduct;
import org.compiere.model.MTax;
import org.compiere.model.ProductCost;
import org.compiere.model.X_M_InOut;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.compiere.util.Util;
@ -60,7 +61,7 @@ public class Doc_MatchPO extends Doc
* @param as accounting schemata
* @param rs record
* @param trxName trx
*/
*/
public Doc_MatchPO (MAcctSchema as, ResultSet rs, String trxName)
{
super(as, MMatchPO.class, rs, DOCTYPE_MatMatchPO, trxName);
@ -122,6 +123,24 @@ public class Doc_MatchPO extends Doc
{
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;
} // loadDocumentDetails

7
org.adempiere.base/src/org/compiere/db/AdempiereDatabase.java
View File

@ -206,6 +206,13 @@ public interface AdempiereDatabase
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
* @param Sequence Name

4
org.adempiere.base/src/org/compiere/install/Translation.java
View File

@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.logging.Level;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParser;
@ -204,7 +205,7 @@ public class Translation implements IApplication
// System.out.println(factory.getClass().getName());
DocumentBuilder builder = factory.newDocumentBuilder();
// <!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.appendChild(document.createComment(Adempiere.getSummaryAscii()));
document.appendChild(document.createComment(DTD));
@ -277,6 +278,7 @@ public class Translation implements IApplication
valueString = "";
value.setAttribute(XML_VALUE_ATTRIBUTE_ORIGINAL, origString);
if (valueString.indexOf("<") != -1 || valueString.indexOf(">") != -1 || valueString.indexOf("&") != -1) {
value.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
value.appendChild(document.createCDATASection(valueString));
} else {
value.appendChild(document.createTextNode(valueString));

2
org.adempiere.base/src/org/compiere/model/MInvoice.java
View File

@ -1867,7 +1867,7 @@ public class MInvoice extends X_C_Invoice implements DocAction
return DocAction.STATUS_Invalid;
}
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);
MMatchInv[] matchInvoices = MMatchInv.getInvoiceLine(getCtx(), line.getC_InvoiceLine_ID(), get_TrxName());

9
org.adempiere.base/src/org/compiere/model/MTable.java
View File

@ -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;
@ -614,19 +614,22 @@ public class MTable extends X_AD_Table
} // getSQLCreate
// globalqss
public static int getTable_ID(String tableName) {
return getTable_ID(tableName, null);
}
/**
* Grant independence to GenerateModel from AD_Table_ID
* @param String tableName
* @return int retValue
*/
public static int getTable_ID(String tableName) {
public static int getTable_ID(String tableName, String trxName) {
int retValue = 0;
String SQL = "SELECT AD_Table_ID FROM AD_Table WHERE tablename = ?";
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
pstmt = DB.prepareStatement(SQL, null);
pstmt = DB.prepareStatement(SQL, trxName);
pstmt.setString(1, tableName);
rs = pstmt.executeQuery();
if (rs.next())

13
org.adempiere.base/src/org/compiere/model/PO.java
View File

@ -38,6 +38,7 @@ import java.util.Properties;
import java.util.UUID;
import java.util.logging.Level;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Transformer;
@ -4577,7 +4578,10 @@ public abstract class PO
if (value == null || value.equals (Null.NULL))
;
else if (c == Object.class)
{
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
col.appendChild(document.createCDATASection(value.toString()));
}
else if (value instanceof Integer || value instanceof BigDecimal)
col.appendChild(document.createTextNode(value.toString()));
else if (c == Boolean.class)
@ -4592,11 +4596,20 @@ public abstract class PO
else if (value instanceof Timestamp)
col.appendChild(document.createTextNode(value.toString()));
else if (c == String.class)
{
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
col.appendChild(document.createCDATASection((String)value));
}
else if (DisplayType.isLOB(dt))
{
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
col.appendChild(document.createCDATASection(value.toString()));
}
else
{
col.setAttributeNS(XMLConstants.XML_NS_URI, "space", "preserve");
col.appendChild(document.createCDATASection(value.toString()));
}
//
root.appendChild(col);
}

4
org.adempiere.base/src/org/compiere/util/DB.java
View File

@ -1829,11 +1829,11 @@ public final class DB
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) {
// try to create the sequence and try again
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;
}

3
org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF
View File

@ -1,6 +1,7 @@
Manifest-Version: 1.0
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
Eclipse-LazyStart: true
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:

4
org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF
View File

@ -1,7 +1,8 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
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-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true
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-ClassPath: .
Automatic-Module-Name: org.adempiere.eclipse.equinox.http.servletbridge

3
org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF
View File

@ -1,7 +1,8 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
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-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:

3
org.adempiere.extend/META-INF/MANIFEST.MF
View File

@ -4,7 +4,8 @@ Bundle-Name: iDempiere extend
Bundle-SymbolicName: org.adempiere.extend;singleton:=true
Bundle-Version: 6.2.0.qualifier
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,
test
Fragment-Host: org.adempiere.base;bundle-version="0.0.0"

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

@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier
Export-Package: org.adempiere.install,
org.compiere.install
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",
javax.mail.internet;version="1.5",
org.apache.tools.ant,

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

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Payment Processor
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
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"
Bundle-ClassPath: .,
lib/jpayment.jar,
@ -11,4 +12,3 @@ Bundle-ClassPath: .,
lib/Verisign.jar
Automatic-Module-Name: org.adempiere.payment.processor
Bundle-Vendor: iDempiere Community

3
org.adempiere.pipo.handlers/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere 2Pack Handlers
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
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",
org.adempiere.base;bundle-version="0.0.0"
Bundle-ClassPath: .

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

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere 2Pack Core
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
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,
org.apache.commons.codec.binary,
org.apache.tools.ant,
@ -20,3 +21,4 @@ Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator
Bundle-ClassPath: .
Automatic-Module-Name: org.adempiere.pipo
Bundle-Vendor: iDempiere Community
Bundle-ActivationPolicy: lazy

1
org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
View File

@ -110,6 +110,7 @@ public class PipoDictionaryService implements IDictionaryService {
Trx.get(trxName, false).commit(true);
if (logger.isLoggable(Level.INFO)) logger.info("commit " + trxName);
} catch (Exception e) {
Trx.get(trxName, false).rollback();
adPackageImp.setP_Msg(e.getLocalizedMessage());
packIn.getNotifier().addFailureLine(e.getLocalizedMessage());
packIn.setSuccess(false);

3
org.adempiere.plugin.utils/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Plugin Utils
Bundle-SymbolicName: org.adempiere.plugin.utils
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,
org.adempiere.util,
org.apache.xerces.dom;version="2.9.0",

4
org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AbstractActivator.java
View File

@ -159,6 +159,10 @@ public abstract class AbstractActivator implements BundleActivator, ServiceTrack
m_processInfo = processInfo;
}
public ProcessInfo getProcessInfo() {
return m_processInfo;
}
public void setProcessUI(IProcessUI processUI) {
m_processUI = processUI;
};

11
org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/PackInApplicationActivator.java
View File

@ -118,6 +118,7 @@ public class PackInApplicationActivator extends AbstractActivator {
t.schedule(new TimerTask() {
@Override
public void run() {
if (! "Y".equals(Env.getContext(Env.getCtx(), "org.adempiere.base.PackInFolderApplication"))) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(PackInApplicationActivator.class.getClassLoader());
@ -128,7 +129,8 @@ public class PackInApplicationActivator extends AbstractActivator {
service = null;
Thread.currentThread().setContextClassLoader(cl);
}
t.cancel();
}
t.cancel();
}
}, timeout);
} else {
@ -167,7 +169,12 @@ public class PackInApplicationActivator extends AbstractActivator {
currentFile = zipFile;
if (!packIn(zipFile)) {
// 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;
}
addLog(Level.INFO, "Successful application of " + zipFile);

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

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Replication Server
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
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",
org.adempiere.replication;bundle-version="0.0.0",
org.adempiere.base;bundle-version="0.0.0"

3
org.adempiere.replication/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Replication
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
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"
Export-Package: org.adempiere.process.rpl,
org.adempiere.process.rpl.exp,

3
org.adempiere.report.jasper.library/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: Library
Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
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"
Bundle-ClassPath: .,
lib/castor-core.jar,

3
org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: JasperReports Swing Client
Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true
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",
org.adempiere.ui.swing;bundle-version="0.0.0",
org.adempiere.report.jasper;bundle-version="0.0.0"

5
org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF
View File

@ -4,7 +4,8 @@ Bundle-Name: iDempiere JasperReport Web App
Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true
Bundle-Version: 6.2.0.qualifier
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
Import-Package: javax.servlet;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: .
Automatic-Module-Name: org.adempiere.report.jasper.webapp
Bundle-Vendor: iDempiere Community

3
org.adempiere.report.jasper/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere JasperReport integration
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
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,
org.apache.commons.codec,
org.apache.commons.codec.binary,

30
org.adempiere.server-feature/pom.xml
View File

@ -11,6 +11,36 @@
<packaging>eclipse-feature</packaging>
<build>
<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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>

2
org.adempiere.server-feature/server.product
View File

@ -24,7 +24,7 @@
</launcher>
<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>
<plugins>

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

@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.eclipse.equinox.app;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: /
Bundle-ClassPath: .,
WEB-INF/lib/jnlp-jardiff.jar,

23
org.adempiere.server/pom.xml
View File

@ -12,6 +12,29 @@
<build>
<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>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>

4
org.adempiere.server/src/main/server/org/compiere/server/AcctProcessor.java
View File

@ -157,7 +157,7 @@ public class AcctProcessor extends AdempiereServer
StringBuffer sql = new StringBuffer ("SELECT DISTINCT ProcessedOn FROM ").append(TableName)
.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;
ResultSet rs = null;
try
@ -211,7 +211,7 @@ public class AcctProcessor extends AdempiereServer
sql.append("=?");
else
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");
//
PreparedStatement pstmt = null;

3
org.adempiere.ui.swing/META-INF/MANIFEST.MF
View File

@ -75,7 +75,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.jfree.chart-osgi;bundle-version="1.0.19"
Eclipse-ExtensibleAPI: true
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",
groovy.cli;version="2.5.3",
groovy.grape;version="2.5.3",

3
org.adempiere.ui.zk/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Web Client
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
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",
javax.annotation,
javax.annotation.processing,

30
org.adempiere.ui.zk/pom.xml
View File

@ -11,6 +11,36 @@
<packaging>eclipse-plugin</packaging>
<build>
<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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>

3
org.adempiere.ui/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere UI base
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
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",
org.apache.xerces;bundle-version="0.0.0",
org.eclipse.equinox.app;bundle-version="0.0.0"

3
org.adempiere.webstore.resource/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.adempiere.webstore.resource
Bundle-Version: 6.2.0.qualifier
Bundle-Vendor: Adempiere.org
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
Jetty-WarPatchFragmentFolderPath: /
Bundle-ClassPath: .

3
org.adempiere.webstore.servlet/META-INF/MANIFEST.MF
View File

@ -4,7 +4,8 @@ Bundle-Name: iDempiere Web Store Servlets
Bundle-SymbolicName: org.adempiere.webstore.servlet
Bundle-Version: 6.2.0.qualifier
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
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Import-Package: javax.servlet,

8
org.adempiere.webstore/META-INF/MANIFEST.MF
View File

@ -6,7 +6,8 @@ Bundle-Version: 6.2.0.qualifier
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.adempiere.report.jasper.webapp;bundle-version="0.0.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
Import-Package: javax.servlet;version="3.0.0",
javax.servlet.http;version="3.0.0",
@ -84,8 +85,3 @@ Bundle-Activator: org.adempiere.webstore.Activator
Bundle-ClassPath: .
Automatic-Module-Name: org.adempiere.webstore
Bundle-Vendor: iDempiere Community

3
org.apache.ecs/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.apache.ecs
Bundle-Version: 6.2.0.qualifier
Bundle-Activator: org.apache.ecs.Activator
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"
Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
org.apache.ecs.filter;uses:="org.apache.ecs",

4
org.compiere.db.oracle.provider/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Oracle Provider
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
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",
org.adempiere.install;bundle-version="0.0.0"
Bundle-ClassPath: .,
@ -19,4 +20,3 @@ Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator
Service-Component: OSGI-INF/oracleprovider.xml
Automatic-Module-Name: org.compiere.db.oracle.provider
Bundle-Vendor: iDempiere Community

8
org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
View File

@ -1248,8 +1248,12 @@ public class DB_Oracle implements AdempiereDatabase
return m_convert;
}
public int getNextID(String Name) {
int m_sequence_id = DB.getSQLValueEx(null, "SELECT "+Name.toUpperCase()+".nextval FROM DUAL");
public int getNextID(String name) {
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;
}

3
org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: iDempiere Postgresql Provider
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
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: .,
lib/c3p0.jar,
lib/mchange-commons-java.jar,

5
org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java
View File

@ -966,8 +966,11 @@ public class DB_PostgreSQL implements AdempiereDatabase
}
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;
}

3
org.idempiere.felix.webconsole/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole
Bundle-Version: 6.2.0.qualifier
Bundle-Activator: org.idempiere.felix.webconsole.Activator
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",
javax.servlet.http;version="2.5.0",
javax.servlet.jsp;version="2.1.0",

3
org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.fitnesse.fixture
Bundle-Version: 6.2.0.qualifier
Bundle-Activator: org.idempiere.fitnesse.fixture.Activator
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,
fit.decorator,
fit.decorator.exceptions,

3
org.idempiere.fitnesse.server/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.fitnesse.server
Bundle-Version: 6.2.0.qualifier
Bundle-Activator: org.idempiere.fitnesse.server.Activator
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",
javax.servlet.http;version="3.0.0",
org.adempiere.base,

3
org.idempiere.fitrecorder/META-INF/MANIFEST.MF
View File

@ -8,7 +8,8 @@ Import-Package: org.adempiere.base,
org.adempiere.plugin.utils,
org.compiere.model,
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
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
Bundle-ActivationPolicy: lazy

3
org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF
View File

@ -4,7 +4,8 @@ Bundle-Name: iDempiere Hazelcast Service Configuration
Bundle-SymbolicName: org.idempiere.hazelcast.service.config
Bundle-Version: 6.2.0.qualifier
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: .
Automatic-Module-Name: org.idempiere.hazelcast.service.config
Bundle-Vendor: iDempiere Community

3
org.idempiere.hazelcast.service/META-INF/MANIFEST.MF
View File

@ -30,7 +30,8 @@ Bundle-ClassPath: .,
lib/hazelcast-aws.jar,
lib/hazelcast.jar
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
Automatic-Module-Name: org.idempiere.hazelcast.service
Bundle-Vendor: iDempiere Community

4
org.idempiere.p2.targetplatform/.settings/org.eclipse.jdt.core.prefs
View File

@ -1,12 +1,10 @@
eclipse.preferences.version=1
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.compliance=10
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=10

2
org.idempiere.p2/server.product
View File

@ -24,7 +24,7 @@
</launcher>
<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>
<plugins>

48
org.idempiere.parent/pom.xml
View File

@ -23,6 +23,7 @@
<!-- 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>
<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 -->
<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
<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>
<idempiere.product.id>org.adempiere.server.product</idempiere.product.id>
<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>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven-clean-plugin.version}</version>
</plugin>
<plugin>
<!-- https://www.eclipse.org/m2e/documentation/m2e-execution-not-covered.html -->
<groupId>org.eclipse.m2e</groupId>
@ -59,7 +62,21 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</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>
@ -371,6 +388,29 @@
</plugins>
</pluginManagement>
<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>
<!-- enable the Tycho build extension -->
<groupId>org.eclipse.tycho</groupId>

3
org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF
View File

@ -5,7 +5,8 @@ Bundle-SymbolicName: org.idempiere.ui.zk.selenium
Bundle-Version: 6.2.0.qualifier
Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator
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,
fit.decorator,
fit.decorator.exceptions,

3
org.idempiere.webservices/META-INF/MANIFEST.MF
View File

@ -4,7 +4,8 @@ Bundle-Name: iDempiere Webservices
Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
Bundle-Version: 6.2.0.qualifier
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
Import-Package: javax.activation,
javax.jws;version="1.1.0",

23
org.idempiere.webservices/pom.xml
View File

@ -12,6 +12,29 @@
<build>
<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>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>

3
org.idempiere.zk.extra/META-INF/MANIFEST.MF
View File

@ -3,7 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: extra zk library
Bundle-SymbolicName: org.idempiere.zk.extra
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: .,
lib/breeze.jar,
lib/calendar.jar,