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

hg merge release-2.1 (merge release2.1 into development)

This commit is contained in:
Carlos Ruiz 2015-08-20 14:46:09 -05:00
parent a353c9cad0 536a21a514
commit b90dbf35ba
16 changed files with 312 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/i2.1/oracle/201508192155_IDEMPIERE-2771.sql Normal file
View File

@ -0,0 +1,11 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2771 Improve 2pack tracing for errors
-- Aug 19, 2015 9:55:02 PM COT
INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200067,0,0,TO_DATE('2015-08-19 21:55:02','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2015-08-19 21:55:02','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','EMAIL_NOTIFY_2PACK',' ','EMail to get 2Pack Notifications','D','C','12ab33a5-4129-4d5b-9066-dbdbc20df816')
;
SELECT register_migration_script('201508192155_IDEMPIERE-2771.sql') FROM dual
;

14
migration/i2.1/oracle/201508201340_IDEMPIERE-2778.sql Normal file
View File

@ -0,0 +1,14 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-2778 2pack: column size for SQL statement shall be extended
-- Aug 20, 2015 3:37:36 PM CEST
UPDATE AD_Column SET FieldLength=4000,Updated=TO_DATE('2015-08-20 15:37:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=50122
;
-- Aug 20, 2015 3:37:48 PM CEST
ALTER TABLE AD_Package_Exp_Detail MODIFY SQLStatement VARCHAR2(4000) DEFAULT NULL
;
SELECT register_migration_script('201508201340_IDEMPIERE-2778.sql') FROM dual
;

8
migration/i2.1/postgresql/201508192155_IDEMPIERE-2771.sql Normal file
View File

@ -0,0 +1,8 @@
-- IDEMPIERE-2771 Improve 2pack tracing for errors
-- Aug 19, 2015 9:55:02 PM COT
INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200067,0,0,TO_TIMESTAMP('2015-08-19 21:55:02','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2015-08-19 21:55:02','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','EMAIL_NOTIFY_2PACK',' ','EMail to get 2Pack Notifications','D','C','12ab33a5-4129-4d5b-9066-dbdbc20df816')
;
SELECT register_migration_script('201508192155_IDEMPIERE-2771.sql') FROM dual
;

11
migration/i2.1/postgresql/201508201340_IDEMPIERE-2778.sql Normal file
View File

@ -0,0 +1,11 @@
-- IDEMPIERE-2778 2pack: column size for SQL statement shall be extended
-- Aug 20, 2015 3:37:36 PM CEST
UPDATE AD_Column SET FieldLength=4000,Updated=TO_TIMESTAMP('2015-08-20 15:37:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=50122
;
-- Aug 20, 2015 3:37:48 PM CEST
INSERT INTO t_alter_column values('ad_package_exp_detail','SQLStatement','VARCHAR(4000)',null,'NULL')
;
SELECT register_migration_script('201508201340_IDEMPIERE-2778.sql') FROM dual
;

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

@ -835,7 +835,7 @@ public class MColumn extends X_AD_Column
@Override
public I_AD_Table getAD_Table() throws RuntimeException {
MTable table = MTable.get(getCtx(), getAD_Table_ID());
MTable table = MTable.get(getCtx(), getAD_Table_ID(), get_TrxName());
return table;
}

3
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -42,7 +42,7 @@ public class MSysConfig extends X_AD_SysConfig
/**
*
*/
private static final long serialVersionUID = -8766810721578833704L;
private static final long serialVersionUID = 2300170888492939423L;
public static final String ADDRESS_VALIDATION = "ADDRESS_VALIDATION";
public static final String ALERT_SEND_ATTACHMENT_AS_XLS = "ALERT_SEND_ATTACHMENT_AS_XLS";
@ -80,6 +80,7 @@ public class MSysConfig extends X_AD_SysConfig
public static final String DOCACTIONBUTTON_SHOWACTIONNAME = "DOCACTIONBUTTON_SHOWACTIONNAME";
public static final String DPVIEWS_SHOWINFOACCOUNT = "DPViews_ShowInfoAccount";
public static final String DPVIEWS_SHOWINFOSCHEDULE = "DPViews_ShowInfoSchedule";
public static final String EMAIL_NOTIFY_2PACK = "EMAIL_NOTIFY_2PACK";
public static final String ENABLE_PAYMENTBOX_BUTTON = "ENABLE_PAYMENTBOX_BUTTON";
public static final String GRIDTABLE_LOAD_TIMEOUT_IN_SECONDS = "GRIDTABLE_LOAD_TIMEOUT_IN_SECONDS";
public static final String HTML_REPORT_THEME = "HTML_REPORT_THEME";

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

@ -55,7 +55,7 @@ public class MTable extends X_AD_Table
/**
*
*/
private static final long serialVersionUID = -1776819186412187384L;
private static final long serialVersionUID = -8757836873040013402L;
public final static int MAX_OFFICIAL_ID = 999999;
@ -66,13 +66,27 @@ public class MTable extends X_AD_Table
* @return MTable
*/
public static MTable get (Properties ctx, int AD_Table_ID)
{
return get(ctx, AD_Table_ID, null);
} // get
/**
* Get Table from Cache
* @param ctx context
* @param AD_Table_ID id
* @param trxName transaction
* @return MTable
*/
public static MTable get (Properties ctx, int AD_Table_ID, String trxName)
{
Integer key = Integer.valueOf(AD_Table_ID);
MTable retValue = s_cache.get (key);
if (retValue != null && retValue.getCtx() == ctx) {
if (trxName != null)
retValue.set_TrxName(trxName);
return retValue;
}
retValue = new MTable (ctx, AD_Table_ID, null);
retValue = new MTable (ctx, AD_Table_ID, trxName);
if (retValue.get_ID () != 0) {
s_cache.put (key, retValue);
}

11
org.adempiere.base/src/org/compiere/util/EMail.java
View File

@ -72,7 +72,7 @@ public final class EMail implements Serializable
/**
*
*/
private static final long serialVersionUID = 955264336741872361L;
private static final long serialVersionUID = -2489441683920482601L;
//use in server bean
public final static String HTML_MAIL_MARKER = "ContentType=text/html;";
@ -224,6 +224,7 @@ public final class EMail implements Serializable
/** Send result Message */
private String m_sentMsg = null;
private List<ValueNamePair> additionalHeaders = new ArrayList<ValueNamePair>();
/** Mail Sent OK Status */
public static final String SENT_OK = "OK";
@ -349,6 +350,11 @@ public final class EMail implements Serializable
// Bounce only header
m_msg.setReturnOption (SMTPMessage.RETURN_HDRS);
// m_msg.setHeader("X-Mailer", "msgsend");
if (additionalHeaders.size() > 0) {
for (ValueNamePair vnp : additionalHeaders) {
m_msg.setHeader(vnp.getName(), vnp.getValue());
}
}
//
setContent();
m_msg.saveChanges();
@ -1211,5 +1217,8 @@ public final class EMail implements Serializable
EMail email = new EMail(System.getProperties(), args[0], args[1], args[2], args[3], args[4]);
email.send();
} // main
public void setHeader(String name, String value) {
additionalHeaders.add(new ValueNamePair(value, name));
}
} // EMail

6
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java
View File

@ -46,6 +46,7 @@ import org.compiere.model.MColumn;
import org.compiere.model.MRole;
import org.compiere.model.MTable;
import org.compiere.model.PO;
import org.compiere.model.X_AD_Package_Imp_Detail;
import org.compiere.util.DB;
import org.compiere.util.Env;
import org.xml.sax.SAXException;
@ -95,8 +96,13 @@ public class GenericPOElementHandler extends AbstractElementHandler {
element.unresolved = notfounds.toString();
return;
}
String action = po.is_new() ? "New" : "Update";
po.saveEx();
element.recordId = po.get_ID();
X_AD_Package_Imp_Detail impDetail = createImportDetail(ctx, element.qName, po.get_TableName(), po.get_Table_ID());
logImportDetail(ctx, impDetail, 1, po.toString(), element.recordId, action);
if ( I_AD_Window.Table_Name.equals(tableName)
|| I_AD_Process.Table_Name.equals(tableName)
|| I_AD_Role.Table_Name.equals(tableName)

9
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/SQLStatementElementHandler.java
View File

@ -51,6 +51,7 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
Savepoint savepoint = null;
PreparedStatement pstmt = null;
X_AD_Package_Imp_Detail impDetail = null;
impDetail = createImportDetail(ctx, element.qName, "", 0);
try {
// NOTE Postgres needs to commit DDL statements
// add a SQL command just with COMMIT if you want to simulate the Oracle behavior (commit on DDL)
@ -86,6 +87,8 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
stmt = null;
}
}
logImportDetail (ctx, impDetail, 1, "SQLStatement",1,"Execute");
ctx.packIn.getNotifier().addSuccessLine("-> " + sql);
} catch (Exception e) {
// rollback immediately on exception to avoid a wrong SQL stop the whole process
if (savepoint != null)
@ -101,6 +104,9 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
}
savepoint = null;
}
ctx.packIn.getNotifier().addFailureLine("SQL statement failed but ignored, error (" + e.getLocalizedMessage() + "): " + sql);
logImportDetail (ctx, impDetail, 0, "SQLStatement",1,"Execute");
ctx.packIn.getNotifier().addFailureLine("-> " + sql);
log.log(Level.SEVERE,"SQLSatement", e);
} finally {
DB.close(pstmt);
@ -118,9 +124,6 @@ public class SQLStatementElementHandler extends AbstractElementHandler {
}
}
}
impDetail = createImportDetail(ctx, element.qName, "",
0);
logImportDetail (ctx, impDetail, 1, "SQLStatement",1,"Execute");
}
public void endElement(PIPOContext ctx, Element element) throws SAXException {

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

@ -78,6 +78,8 @@ public class PipoDictionaryService implements IDictionaryService {
packIn.setPackageVersion(packageVersion);
packIn.setUpdateDictionary(false);
packIn.getNotifier().setFileName(packageFile.getName());
packIn.getNotifier().setPluginName(context.getBundle().getSymbolicName() + " v" + packageVersion);
adPackageImp = new X_AD_Package_Imp_Proc(Env.getCtx(), 0, null);
if (logger.isLoggable(Level.INFO)) logger.info("zipFilepath->" + packageFile);
@ -104,6 +106,7 @@ public class PipoDictionaryService implements IDictionaryService {
if (logger.isLoggable(Level.INFO)) logger.info("commit " + trxName);
} catch (Exception e) {
adPackageImp.setP_Msg(e.getLocalizedMessage());
packIn.getNotifier().addStatusLine(e.getLocalizedMessage());
logger.log(Level.SEVERE, "importXML:", e);
throw e;
} finally {
@ -122,6 +125,7 @@ public class PipoDictionaryService implements IDictionaryService {
attachment.save(); // ignoring exceptions
}
}
packIn.getNotifier().notifyRecipient();
}
}

8
org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
View File

@ -100,6 +100,14 @@ public abstract class AbstractElementHandler implements ElementHandler {
detail.setSuccess(result);
detail.setRecord_ID(objectID);
ctx.packIn.addImportDetail(detail);
StringBuilder msg = new StringBuilder(action).append(" ");
if (detail.getTableName() != null)
msg.append(detail.getTableName());
msg.append("=").append(objectName).append("[").append(objectID).append("]");
if (success == 1)
ctx.packIn.getNotifier().addSuccessLine(msg.toString());
else
ctx.packIn.getNotifier().addFailureLine(msg.toString());
}
/**

9
org.adempiere.pipo/src/org/adempiere/pipo2/PackIn.java
View File

@ -61,6 +61,7 @@ public class PackIn {
private Map<String,Integer> columnCache = new HashMap<String,Integer>();
private String packageName = null;
private String packageVersion = null;
private PackInNotifier notifier = new PackInNotifier(this);
private X_AD_Package_Imp_Proc packinProc;
private List<X_AD_Package_Imp_Detail> importDetails;
@ -176,7 +177,9 @@ public class PackIn {
log.info(msg);
if (handler.getUnresolvedCount() > 0)
handler.dumpUnresolvedElements();
return "Processed="+handler.getElementsProcessed()+" Un-Resolved="+handler.getUnresolvedCount();
msg = "Processed="+handler.getElementsProcessed()+" Un-Resolved="+handler.getUnresolvedCount();
getNotifier().addStatusLine(msg);
return msg;
} catch (Exception e) {
log.log(Level.SEVERE, "importXML:", e);
throw new RuntimeException(e.getLocalizedMessage(), e);
@ -288,6 +291,10 @@ public class PackIn {
this.packageVersion = packageVersion;
}
public PackInNotifier getNotifier() {
return notifier;
}
public X_AD_Package_Imp_Proc getAD_Package_Imp_Proc() {
if (packinProc.getAD_Package_Imp_Proc_ID() == 0)
packinProc.saveEx(); // we need the ID to set

26
org.adempiere.pipo/src/org/adempiere/pipo2/PackInHandler.java
View File

@ -306,14 +306,13 @@ public class PackInHandler extends DefaultHandler {
updateRoleAccess();
if (!packageStatus.equals("Completed with errors")) {
if (getUnresolvedCount() > 0) {
packageStatus = "Completed - unresolved";
} else {
packageStatus = "Completed successfully";
packIn.setSuccess(true);
}
if (getUnresolvedCount() > 0) {
packageStatus = "Completed - unresolved";
} else {
packageStatus = "Completed successfully";
packIn.setSuccess(true);
}
packIn.getNotifier().addStatusLine(packageStatus);
//Update package history log with package status
packageImp.setPK_Status(packageStatus);
@ -334,12 +333,14 @@ public class PackInHandler extends DefaultHandler {
processElement(e);
} catch (RuntimeException re) {
packageStatus = "Import Failed";
packIn.getNotifier().addStatusLine(packageStatus);
//Update package history log with package status
packageImp.setPK_Status(packageStatus);
packageImp.saveEx();
throw re;
} catch (SAXException se) {
packageStatus = "Import Failed";
packIn.getNotifier().addStatusLine(packageStatus);
//Update package history log with package status
packageImp.setPK_Status(packageStatus);
packageImp.saveEx();
@ -409,7 +410,15 @@ public class PackInHandler extends DefaultHandler {
DatabaseMetaData md = conn.getMetaData();
String catalog = DB.getDatabase().getCatalog();
String schema = DB.getDatabase().getSchema();
MTable table = MTable.get(m_ctx.ctx, column.getAD_Table_ID());
MTable table = MTable.get(m_ctx.ctx, column.getAD_Table_ID(), m_ctx.trx.getTrxName());
if (table.get_ID() != column.getAD_Table_ID()) {
// table not found
log.warning("Table " + column.getAD_Table_ID() + " not found");
continue;
}
if (table.isView()) {
continue;
}
String tableName = table.getTableName();
String fkConstraintSql = MColumn.getForeignKeyConstraintSql(md, catalog, schema, tableName, table, column, false);
@ -487,6 +496,7 @@ public class PackInHandler extends DefaultHandler {
if (e.unresolved != null && e.unresolved.length() > 0)
s.append(" unresolved ").append(e.unresolved);
log.warning(s.toString());
packIn.getNotifier().addFailureLine(s.toString());
}
}
}

172
org.adempiere.pipo/src/org/adempiere/pipo2/PackInNotifier.java Normal file
View File

@ -0,0 +1,172 @@
/**********************************************************************
* This file is part of iDempiere ERP Open Source *
* http://www.idempiere.org *
* *
* Copyright (C) Trek Global *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2 *
* of the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
* MA 02110-1301, USA. *
* *
* Developer: *
* - Carlos Ruiz - globalqss *
**********************************************************************/
package org.adempiere.pipo2;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import org.compiere.model.MClient;
import org.compiere.model.MSysConfig;
import org.compiere.util.EMail;
import org.compiere.util.Env;
import org.compiere.util.KeyNamePair;
/**
* PackIn Notifier
*
* @author Carlos Ruiz - globalqss - sponsored by Trek Global
*/
public class PackInNotifier {
private String fileName;
private String pluginName;
private List<KeyNamePair> knpLines = new ArrayList<KeyNamePair>();
private PackIn packIn;
public PackInNotifier(PackIn packIn) {
this.packIn = packIn;
}
private static final int LEVEL_STATUS = 0;
private static final int LEVEL_FAILURE = 1;
private static final int LEVEL_SUCCESS = 2;
public void addStatusLine(String msg) {
addLine(LEVEL_STATUS, msg);
}
public void addFailureLine(String msg) {
addLine(LEVEL_FAILURE, msg);
}
public void addSuccessLine(String msg) {
addLine(LEVEL_SUCCESS, msg);
}
public void addLine(int level, String msg) {
knpLines.add(new KeyNamePair(level, msg));
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getPluginName() {
return pluginName;
}
public void setPluginName(String pluginName) {
this.pluginName = pluginName;
}
public void notifyRecipient() {
// get list from current tenant
String emailList = MSysConfig.getValue(MSysConfig.EMAIL_NOTIFY_2PACK, "", Env.getAD_Client_ID(Env.getCtx())).trim();
String emailSys = MSysConfig.getValue(MSysConfig.EMAIL_NOTIFY_2PACK, "", 0).trim();
if (emailSys.length() > 0 && !emailList.equals(emailSys))
emailList += "," + emailSys;
if (emailList.length() == 0)
return;
// Compose Subject
StringBuilder subject = new StringBuilder("*");
String status;
if (packIn.isSuccess()) {
status = "Success";
} else {
status = "Failure";
}
subject.append(status).append("* Result for PackIn ").append(getFileName());
if (getPluginName() != null) {
subject.append(" from ").append(getPluginName());
}
// Body
StringBuilder message = new StringBuilder();
message.append("===========================\n");
message.append("Packin File: ").append(getFileName()).append("\n");
if (getPluginName() != null)
message.append("Plugin: ").append(getPluginName()).append("\n");
MClient client = MClient.get(Env.getCtx());
message.append("Executed on: ").append(client.getName()).append("\n");
message.append("Status: ").append(status).append("\n");
for (String line : getLines(LEVEL_STATUS)) {
message.append(line).append("\n");
}
message.append("===========================\n");
// --> if failed:
List<String> fLines = getLines(LEVEL_FAILURE);
if (fLines.size() > 0) {
message.append("Failed Objects:").append("\n");
for (String line : fLines) {
message.append(line).append("\n");
}
message.append("===========================\n");
}
List<String> sLines = getLines(LEVEL_SUCCESS);
if (sLines.size() > 0) {
message.append("Successful Objects:").append("\n");
for (String line : sLines) {
message.append(line).append("\n");
}
message.append("===========================\n");
}
StringTokenizer st = new StringTokenizer(emailList, " ,;", false);
String to = st.nextToken();
EMail email = client.createEMail(null, to, subject.toString(), message.toString());
if (email != null)
{
if (!packIn.isSuccess()) {
email.setHeader("X-Priority", "1");
email.setHeader("Priority","Urgent");
email.setHeader("Importance","high");
}
while (st.hasMoreTokens())
email.addTo(st.nextToken());
status = email.send();
}
}
private List<String> getLines(int levelStatus) {
List<String> lines = new ArrayList<String>();
for (KeyNamePair knp : knpLines) {
if (knp.getKey() == levelStatus) {
lines.add(knp.getName());
}
}
return lines;
}
}

24
org.adempiere.pipo/src/org/adempiere/pipo2/PackInProcess.java
View File

@ -75,8 +75,7 @@ public class PackInProcess extends SvrProcess {
*/
protected String doIt() throws Exception {
X_AD_Package_Imp_Proc adPackageImp = new X_AD_Package_Imp_Proc(getCtx(),
p_PackIn_ID, get_TrxName());
X_AD_Package_Imp_Proc adPackageImp = new X_AD_Package_Imp_Proc(getCtx(), p_PackIn_ID, null); // out of trx
// Create Target directory if required
String packageDirectory = adPackageImp.getAD_Package_Dir();
@ -134,14 +133,25 @@ public class PackInProcess extends SvrProcess {
packIn.setPackageName(packageName);
packIn.setPackageVersion(packageVersion);
packIn.setUpdateDictionary(m_UpdateDictionary);
packIn.getNotifier().setFileName(zipFilepath.getName());
packIn.setAD_Package_Imp_Proc(adPackageImp);
// call XML Handler
String msg = packIn.importXML(dict_file, getCtx(), get_TrxName());
adPackageImp.setDateProcessed(new Timestamp(System.currentTimeMillis()));
adPackageImp.setP_Msg(msg);
adPackageImp.saveEx();
String msg;
try {
msg = packIn.importXML(dict_file, getCtx(), get_TrxName());
adPackageImp.setDateProcessed(new Timestamp(System.currentTimeMillis()));
adPackageImp.setP_Msg(msg);
adPackageImp.saveEx();
} catch (Exception e) {
adPackageImp.setP_Msg(e.getLocalizedMessage());
packIn.getNotifier().addStatusLine(e.getLocalizedMessage());
log.log(Level.SEVERE, "importXML:", e);
throw e;
} finally {
adPackageImp.save(); // ignoring exceptions
packIn.getNotifier().notifyRecipient();
}
return msg;
} // doIt
} // PackInProcess