[ofbiz-plugins] branch trunk updated: [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug (OFBIZ-11762) (#24)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
     new dd1d408  [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug (OFBIZ-11762) (#24)
dd1d408 is described below

commit dd1d408bc8aeb77c1c17259b231754544735df92
Author: Priya Sharma <[hidden email]>
AuthorDate: Mon Jun 8 17:09:42 2020 +0530

    [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug (OFBIZ-11762) (#24)
   
    * [Improved]: Use GroovyBaseScript's logging utility methods instead of using Debug (OFBIZ-11762)
   
    * [Improved]: Updated all ocurances where we only needed to pass the throwable object, without a message
    - We have now added one more utility method to handle these cases. (OFBIZ-11762)
   
    Co-authored-by: Priya Sharma <[hidden email]>
---
 ...AcctgTransEntriesSearchResultsParameters.groovy |  4 +--
 .../accounting/BalanceSheetParameters.groovy       |  5 +--
 .../accounting/IncomeStatementParameters.groovy    |  5 +--
 .../InvoiceAcctgTransEntryParameters.groovy        |  4 +--
 .../PaymentAcctgTransEntryParameters.groovy        |  4 +--
 .../accounting/TrialBalanceParameters.groovy       |  4 +--
 .../order/NetBeforeOverheadReport.groovy           |  3 +-
 .../groovyScripts/order/ProductDemandReport.groovy |  3 +-
 birt/groovyScripts/order/SalesReport.groovy        |  3 +-
 ecommerce/groovyScripts/content/Mrv.groovy         |  2 +-
 ecommerce/groovyScripts/content/Search.groovy      | 16 ++++-----
 .../groovyScripts/forum/ContentAddPrep.groovy      |  8 ++---
 ecommerce/groovyScripts/forum/ContentPrep.groovy   | 22 ++++++------
 .../groovyScripts/forum/CurrentValPrep.groovy      | 20 +++++------
 ecommerce/groovyScripts/forum/EditAddPrep.groovy   | 10 +++---
 ecommerce/groovyScripts/forum/NodeTrailPrep.groovy |  8 ++---
 .../groovyScripts/forum/OwnerContentPrep.groovy    | 12 +++----
 ecommerce/groovyScripts/forum/PermPrep.groovy      | 42 +++++++++++-----------
 .../groovyScripts/forum/RespondPermAndPrep.groovy  | 16 ++++-----
 ecommerce/groovyScripts/forum/ResponsePrep.groovy  |  4 +--
 ecommerce/groovyScripts/forum/ViewPrep.groovy      | 12 +++----
 ecommerce/groovyScripts/includes/MruAdd.groovy     | 12 +++----
 ecommerce/groovyScripts/order/OrderStatus.groovy   |  2 +-
 scrum/groovyScripts/AddProductBacklogItem.groovy   |  6 ++--
 scrum/groovyScripts/ListCurrentProducts.groovy     |  3 +-
 scrum/groovyScripts/ListScrumResource.groovy       |  7 ++--
 scrum/groovyScripts/ListTimeSheets.groovy          |  6 ++--
 scrum/groovyScripts/ProductEmail.groovy            |  5 ++-
 scrum/groovyScripts/QuickAddBacklog.groovy         |  4 +--
 29 files changed, 112 insertions(+), 140 deletions(-)

diff --git a/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy b/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy
index 08e47a0..87fccae 100644
--- a/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy
+++ b/birt/groovyScripts/accounting/AcctgTransEntriesSearchResultsParameters.groovy
@@ -17,8 +17,6 @@
 * under the License.
 */
 
-def module = "AcctgTransEntriesSearchResultsParameters.groovy"
-
 try {
     def birtParameters = [:]
     birtParameters.organizationPartyId = parameters.organizationPartyId
@@ -43,6 +41,6 @@ try {
     birtParameters.userLoginId = userLogin.userLoginId
     request.setAttribute("birtParameters", birtParameters)
 } catch (e) {
-    Debug.logError(e, module)
+    logError(e)
 }
 return "success";
\ No newline at end of file
diff --git a/birt/groovyScripts/accounting/BalanceSheetParameters.groovy b/birt/groovyScripts/accounting/BalanceSheetParameters.groovy
index 6ff0ceb..553f417 100644
--- a/birt/groovyScripts/accounting/BalanceSheetParameters.groovy
+++ b/birt/groovyScripts/accounting/BalanceSheetParameters.groovy
@@ -18,9 +18,6 @@
  */
 
 import java.sql.Timestamp
-import org.apache.ofbiz.base.util.Debug
-
-def module = "BalanceSheetParameters.groovy"
 
 try {
     def birtParameters = [:]
@@ -36,6 +33,6 @@ try {
     birtParameters.locale = locale
     request.setAttribute("birtParameters", birtParameters)
 } catch (e) {
-    Debug.logError(e, module)
+    logError(e)
 }
 return "success";
\ No newline at end of file
diff --git a/birt/groovyScripts/accounting/IncomeStatementParameters.groovy b/birt/groovyScripts/accounting/IncomeStatementParameters.groovy
index ebf7836..72c7193 100644
--- a/birt/groovyScripts/accounting/IncomeStatementParameters.groovy
+++ b/birt/groovyScripts/accounting/IncomeStatementParameters.groovy
@@ -18,9 +18,6 @@
  */
 
 import java.sql.Timestamp
-import org.apache.ofbiz.base.util.Debug
-
-def module = "IncomeStatementParameters.groovy"
 
 try {
     def birtParameters = [:]
@@ -35,6 +32,6 @@ try {
     birtParameters.userLoginId = userLogin.userLoginId
     request.setAttribute("birtParameters", birtParameters)
 } catch (e) {
-    Debug.logError(e, module)
+    logError(e)
 }
 return "success";
\ No newline at end of file
diff --git a/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy b/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy
index efe2074..9887e0f 100644
--- a/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy
+++ b/birt/groovyScripts/accounting/InvoiceAcctgTransEntryParameters.groovy
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-def module = "InvoiceAcctgTransEntryParameters.groovy"
-
 try {
     birtParameters = [:]
     birtParameters.invoiceId = parameters.invoiceId
     birtParameters.userLoginId = userLogin.userLoginId
     request.setAttribute("birtParameters", birtParameters)
 } catch (e) {
-    Debug.logError(e, module)
+    logError(e)
 }
 return "success";
\ No newline at end of file
diff --git a/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy b/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy
index 244485a..cbdf7aa 100644
--- a/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy
+++ b/birt/groovyScripts/accounting/PaymentAcctgTransEntryParameters.groovy
@@ -17,14 +17,12 @@
  * under the License.
  */
 
-def module = "PaymentAcctgTransEntryParameters.groovy"
-
 try {
     birtParameters = [:]
     birtParameters.paymentId = parameters.paymentId
     birtParameters.userLoginId = userLogin.userLoginId
     request.setAttribute("birtParameters", birtParameters)
 } catch (e) {
-    Debug.logError(e, module)
+    logError(e)
 }
 return "success";
\ No newline at end of file
diff --git a/birt/groovyScripts/accounting/TrialBalanceParameters.groovy b/birt/groovyScripts/accounting/TrialBalanceParameters.groovy
index 0ab94e7..20ec212 100644
--- a/birt/groovyScripts/accounting/TrialBalanceParameters.groovy
+++ b/birt/groovyScripts/accounting/TrialBalanceParameters.groovy
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-def module = "TrialBalanceParameters.groovy"
-
 try {
     def birtParameters = [:]
     birtParameters.organizationPartyId = parameters.organizationPartyId
@@ -26,6 +24,6 @@ try {
     birtParameters.userLoginId = userLogin.userLoginId
     request.setAttribute("birtParameters", birtParameters)
 } catch (e) {
-    Debug.logError(e, module)
+    logError(e)
 }
 return "success";
\ No newline at end of file
diff --git a/birt/groovyScripts/order/NetBeforeOverheadReport.groovy b/birt/groovyScripts/order/NetBeforeOverheadReport.groovy
index e77c4ed..7b45b4f 100644
--- a/birt/groovyScripts/order/NetBeforeOverheadReport.groovy
+++ b/birt/groovyScripts/order/NetBeforeOverheadReport.groovy
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.base.util.UtilDatetime
 import java.sql.*
 
@@ -48,7 +47,7 @@ try {
     birtParameters.DateYear = DateYear
     birtParameters.NunberDate = NunberDate
 } catch (e) {
-    Debug.logError(e, "")
+    logError(e)
 }
 
 request.setAttribute("birtParameters", birtParameters)
diff --git a/birt/groovyScripts/order/ProductDemandReport.groovy b/birt/groovyScripts/order/ProductDemandReport.groovy
index aa27773..c4ae205 100644
--- a/birt/groovyScripts/order/ProductDemandReport.groovy
+++ b/birt/groovyScripts/order/ProductDemandReport.groovy
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.base.util.UtilDateTime
 import java.sql.*
 import com.ibm.icu.util.Calendar
@@ -33,7 +32,7 @@ try
     birtParameters.Week = Week
     birtParameters.Year = Year
 } catch (e) {
-    Debug.logError(e, "")
+    logError(e)
 }
 
 request.setAttribute("birtParameters", birtParameters)
diff --git a/birt/groovyScripts/order/SalesReport.groovy b/birt/groovyScripts/order/SalesReport.groovy
index 27bfe3c..dec8fa7 100644
--- a/birt/groovyScripts/order/SalesReport.groovy
+++ b/birt/groovyScripts/order/SalesReport.groovy
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import org.apache.ofbiz.base.util.Debug
 import java.sql.*
 
 fromDateStr = parameters.fromDate
@@ -36,7 +35,7 @@ try {
     birtParameters.thruMonth = month
     birtParameters.thisYear = year
 } catch (e) {
-    Debug.logError(e, "")
+    logError(e)
 }
 
 request.setAttribute("birtParameters", birtParameters)
diff --git a/ecommerce/groovyScripts/content/Mrv.groovy b/ecommerce/groovyScripts/content/Mrv.groovy
index ba25fd1..8627365 100644
--- a/ecommerce/groovyScripts/content/Mrv.groovy
+++ b/ecommerce/groovyScripts/content/Mrv.groovy
@@ -64,7 +64,7 @@ lifoSet.each { pk0 ->
     } else {
         // should handle errors in some other way; this does not provide any tracing; impossible to locat
         // where the error actually occurred
-        //Debug.logError("findOne on " + pk + " returned null")
+        //logError("findOne on " + pk + " returned null")
     }
 }
 context.put("mrvList", mrvList)
diff --git a/ecommerce/groovyScripts/content/Search.groovy b/ecommerce/groovyScripts/content/Search.groovy
index 3e90d12..c4ae3f6 100644
--- a/ecommerce/groovyScripts/content/Search.groovy
+++ b/ecommerce/groovyScripts/content/Search.groovy
@@ -34,12 +34,12 @@ import org.apache.ofbiz.base.util.UtilProperties
 
 paramMap = UtilHttp.getParameterMap(request)
 queryLine = paramMap.queryLine.toString()
-//Debug.logInfo("in search, queryLine:" + queryLine, "")
+//logInfo("in search, queryLine:" + queryLine)
 
 siteId = paramMap.siteId ?: "WebStoreCONTENT"
-//Debug.logInfo("in search, siteId:" + siteId, "")
+//logInfo("in search, siteId:" + siteId)
 featureIdByType = ParametricSearch.makeFeatureIdByTypeMap(paramMap)
-//Debug.logInfo("in search, featureIdByType:" + featureIdByType, "")
+//logInfo("in search, featureIdByType:" + featureIdByType)
 
 combQuery = new BooleanQuery.Builder()
 IndexSearcher searcher = null
@@ -57,9 +57,9 @@ try {
 
 termQuery = new TermQuery(new Term("site", siteId.toString()))
 combQuery.add(termQuery, BooleanClause.Occur.MUST)
-//Debug.logInfo("in search, termQuery:" + termQuery.toString(), "")
+//logInfo("in search, termQuery:" + termQuery.toString())
 
-//Debug.logInfo("in search, combQuery(1):" + combQuery, "")
+//logInfo("in search, combQuery(1):" + combQuery)
 if (queryLine && analyzer) {
     Query query = null
     QueryParser parser = new QueryParser("content", analyzer)
@@ -78,18 +78,18 @@ if (featureIdByType) {
         featureIdByType.each { key, value ->
             termQuery = new TermQuery(new Term("feature", value))
             featureQuery.add(termQuery, featuresRequired)
-            //Debug.logInfo("in search searchFeature3, termQuery:" + termQuery.toString(), "")
+            //logInfo("in search searchFeature3, termQuery:" + termQuery.toString())
         }
     }
     combQuery.add(featureQuery.build(), featuresRequired)
 }
 
 if (searcher) {
-    Debug.logInfo("in search searchFeature3, combQuery:" + combQuery.toString(), "")
+    logInfo("in search searchFeature3, combQuery:" + combQuery.toString())
     TopScoreDocCollector collector = TopScoreDocCollector.create(100) //defaulting to 100 results
     searcher.search(combQuery.build(), collector)
     ScoreDoc[] hits = collector.topDocs().scoreDocs
-    Debug.logInfo("in search, hits:" + collector.getTotalHits(), "")
+    logInfo("in search, hits:" + collector.getTotalHits())
 
     contentList = [] as ArrayList
     hitSet = [:] as HashSet
diff --git a/ecommerce/groovyScripts/forum/ContentAddPrep.groovy b/ecommerce/groovyScripts/forum/ContentAddPrep.groovy
index 0930a5e..0f18c8d 100644
--- a/ecommerce/groovyScripts/forum/ContentAddPrep.groovy
+++ b/ecommerce/groovyScripts/forum/ContentAddPrep.groovy
@@ -50,14 +50,14 @@ rootPubPt = parameters.webSiteId
 paramMap = UtilHttp.getParameterMap(request)
 contentIdTo = ContentManagementWorker.getFromSomewhere("forumId", paramMap, request, context)
 context.contentIdTo = contentIdTo
-//Debug.logInfo("in contentaddprep, contentIdTo:" + contentIdTo,"")
-//Debug.logInfo("in contentaddprep, paramMap:" + paramMap,"")
+//logInfo("in contentaddprep, contentIdTo:" + contentIdTo)
+//logInfo("in contentaddprep, paramMap:" + paramMap)
 attrList = from("ContentAttribute").where("contentId", contentIdTo, "attrName", "publishOperation").cache(true).queryList()
 publishOperation = null
 if (attrList) {
     contentAttribute = attrList.get(0)
     publishOperation = contentAttribute.attrValue
-    //Debug.logInfo("in contentaddprep, publishOperation:" + publishOperation,"")
+    //logInfo("in contentaddprep, publishOperation:" + publishOperation)
 }
 
 singleWrapper.putInContext("publishOperation", publishOperation)
@@ -90,4 +90,4 @@ singleWrapper.putInContext("statusId", statusId)
 siteAncestorList = []
 siteAncestorList.add(contentIdTo)
 context.siteAncestorList = siteAncestorList
-//Debug.logInfo("in viewprep, siteAncestorList:" + siteAncestorList,"")
+//logInfo("in viewprep, siteAncestorList:" + siteAncestorList)
diff --git a/ecommerce/groovyScripts/forum/ContentPrep.groovy b/ecommerce/groovyScripts/forum/ContentPrep.groovy
index ba3a608..34693a8 100644
--- a/ecommerce/groovyScripts/forum/ContentPrep.groovy
+++ b/ecommerce/groovyScripts/forum/ContentPrep.groovy
@@ -38,7 +38,7 @@ import javax.servlet.http.*
 // load edit or create Content form
 
 rootPubPt = parameters.webSiteId
-//Debug.logInfo("in contentprep, security:" + security, "")
+//logInfo("in contentprep, security:" + security)
 
 singleWrapper = context.singleWrapper
 
@@ -50,9 +50,9 @@ if (!contentId)
 if (!contentId)
     contentId = ContentManagementWorker.getFromSomewhere("contentId", paramMap, request, context)
 
-//Debug.logInfo("in contentprep, contentId(1):" + contentId, "")
+//logInfo("in contentprep, contentId(1):" + contentId)
 currentValue = parameters.currentValue
-//Debug.logInfo("in contentprep, currentValue(0):" + currentValue, "")
+//logInfo("in contentprep, currentValue(0):" + currentValue)
 
 if (!contentId && currentValue) {
     contentId = currentValue.contentId
@@ -60,8 +60,8 @@ if (!contentId && currentValue) {
 if (contentId && !currentValue) {
     currentValue = from("Content").where("contentId", contentId).cache(true).queryOne()
 }
-//Debug.logInfo("in contentprep, currentValue(1):" + currentValue, "")
-//Debug.logInfo("in contentprep, contentId(4):" + contentId, "")
+//logInfo("in contentprep, currentValue(1):" + currentValue)
+//logInfo("in contentprep, contentId(4):" + contentId)
 
 if (currentValue) {
     dataResourceId = currentValue.dataResourceId
@@ -93,10 +93,10 @@ if (currentValue) {
         context.txtContentId = subContentDataResourceView.contentId
         context.txtDataResourceId = subContentDataResourceView.dataResourceId
         context.textData = textData
-        //Debug.logInfo("textId:" + txtContentId, "")
-        //Debug.logInfo("textData:" + textData, "")
+        //logInfo("textId:" + txtContentId)
+        //logInfo("textData:" + textData)
         if (singleWrapper) {
-           //Debug.logInfo("textData:" + textData, "")
+           //logInfo("textData:" + textData)
            singleWrapper.putInContext("textData", textData)
         }
     }
@@ -109,10 +109,10 @@ if (currentValue) {
         context.sumContentId = subContentDataResourceView.contentId
         context.sumDataResourceId = subContentDataResourceView.dataResourceId
         context.summaryData = summaryData
-        //Debug.logInfo("sumId:" + sumContentId, "")
-        //Debug.logInfo("summaryData:" + summaryData, "")
+        //logInfo("sumId:" + sumContentId)
+        //logInfo("summaryData:" + summaryData)
         if (singleWrapper) {
-            //Debug.logInfo("summaryData:" + summaryData, "")
+            //logInfo("summaryData:" + summaryData)
             singleWrapper.putInContext("summaryData", summaryData)
         }
     }
diff --git a/ecommerce/groovyScripts/forum/CurrentValPrep.groovy b/ecommerce/groovyScripts/forum/CurrentValPrep.groovy
index bca27d6..e39ffb5 100644
--- a/ecommerce/groovyScripts/forum/CurrentValPrep.groovy
+++ b/ecommerce/groovyScripts/forum/CurrentValPrep.groovy
@@ -50,13 +50,13 @@ if (!currentEntityPropertyName) {
     currentEntityName = parameters[currentEntityPropertyName]
 }
 
-//Debug.logInfo("in currentvalprep, currentEntityName:" + currentEntityName,"")
+//logInfo("in currentvalprep, currentEntityName:" + currentEntityName)
 cachedPK = currentEntityMap[currentEntityName]
-//Debug.logInfo("in currentvalprep, cachedPK:" + cachedPK,"")
+//logInfo("in currentvalprep, cachedPK:" + cachedPK)
 
 // Build a key from param or attribute values.
 paramMap = UtilHttp.getParameterMap(request)
-//Debug.logInfo("paramMap:" + paramMap, null)
+//logInfo("paramMap:" + paramMap)
 v = delegator.makeValue(currentEntityName)
 passedPK = v.getPrimaryKey()
 keyColl = passedPK.getAllKeys()
@@ -64,14 +64,14 @@ keyIt = keyColl.iterator()
 while (keyIt.hasNext()) {
     attrName = keyIt.next()
     attrVal = parameters[attrName]
-    //Debug.logInfo("in currentvalprep, attrName:" + attrName,"")
-    //Debug.logInfo("in currentvalprep, attrVal:" + attrVal,"")
+    //logInfo("in currentvalprep, attrName:" + attrName)
+    //logInfo("in currentvalprep, attrVal:" + attrVal)
     if (attrVal) {
         passedPK[attrName] = attrVal
     }
 }
 
-//Debug.logInfo("in currentvalprep, passedPK:" + passedPK,"")
+//logInfo("in currentvalprep, passedPK:" + passedPK)
 // messed up code to determine whether or not the cached or passed keys have missing fields,
 // in which case, the valid one is used to retrieve the current value
 pksEqual = true
@@ -113,7 +113,7 @@ if (!pksEqual) {
     currentPK = cachedPK
    // all other condition result in currentPK = passedPK
 }
-//Debug.logInfo("in currentvalprep, currentPK:" + currentPK,"")
+//logInfo("in currentvalprep, currentPK:" + currentPK)
 
 currentEntityMap[currentEntityName] = currentPK
 request.setAttribute("currentPK", currentPK)
@@ -122,7 +122,7 @@ currentValue = from(currentPK.getPrimaryKey().getEntityName()).where(currentPK.g
 context.currentValue = currentValue
 request.setAttribute("currentValue", currentValue)
 
-// Debug.logInfo("===========in currentvalprep, currentValue:" + request.getAttribute("currentValue"),"")
+// logInfo("===========in currentvalprep, currentValue:" + request.getAttribute("currentValue"))
 if (currentValue) {
     if (currentEntityName.indexOf("DataResource") >= 0) {
         suffix = ""
@@ -134,7 +134,7 @@ if (currentValue) {
             if (s) suffix += "_" + s
         }
 
-        //Debug.logInfo("in currentvalprep, suffix:" + suffix,"")
+        //logInfo("in currentvalprep, suffix:" + suffix)
 //        if (suffix) {
 //            ContentManagementWorker.mruAdd(session, currentPK, suffix)
 //        } else {
@@ -144,4 +144,4 @@ if (currentValue) {
         ContentManagementWorker.mruAdd(session, currentPK)
     }
 }
-//Debug.logInfo("in currentvalprep, contentId:" + request.getAttribute("contentId"),"")
+//logInfo("in currentvalprep, contentId:" + request.getAttribute("contentId"))
diff --git a/ecommerce/groovyScripts/forum/EditAddPrep.groovy b/ecommerce/groovyScripts/forum/EditAddPrep.groovy
index 6797d9b..1962ed0 100644
--- a/ecommerce/groovyScripts/forum/EditAddPrep.groovy
+++ b/ecommerce/groovyScripts/forum/EditAddPrep.groovy
@@ -57,13 +57,13 @@ if ("SUMMARY".equals(mapKey)) {
 
 singleWrapper.putInContext("dataResourceTypeId", "ELECTRONIC_TEXT")
 singleWrapper.putInContext("contentAssocTypeId", "SUB_CONTENT")
-//Debug.logInfo("in editaddprep, contentIdTo:" + contentIdTo,"")
-//Debug.logInfo("in editaddprep, mapKey:" + mapKey,"")
+//logInfo("in editaddprep, contentIdTo:" + contentIdTo)
+//logInfo("in editaddprep, mapKey:" + mapKey)
 //currentValue = request.getAttribute("currentValue")
 //currentValue = request.getAttribute("currentValue")
 
 currentValue = ContentWorker.getSubContentCache(delegator, contentIdTo, mapKey, null, userLogin, null, null, false, null)
-//Debug.logInfo("in editaddprep, currentValue:" + currentValue,"")
+//logInfo("in editaddprep, currentValue:" + currentValue)
 
 if (!currentValue) {
     parentValue = from("Content").where("contentId", contentIdTo).cache(true).queryOne()
@@ -77,7 +77,7 @@ if (!currentValue) {
     singleWrapper.putInContext("contentTypeId", "DOCUMENT")
 } else {
     singleWrapper.putInContext("contentTypeId", null)
-    //Debug.logInfo("in editaddprep, currentValue:" + currentValue,"")
+    //logInfo("in editaddprep, currentValue:" + currentValue)
 }
 singleWrapper.putInContext("currentValue", currentValue)
 context.currentValue = currentValue
@@ -85,4 +85,4 @@ request.setAttribute("currentValue", currentValue)
 persistAction = parameters.persistAction ?: "persistContent"
 
 singleWrapper.putInContext("persistAction", persistAction)
-//Debug.logInfo("in editaddprep, currentValue:" + currentValue,"")
+//logInfo("in editaddprep, currentValue:" + currentValue)
diff --git a/ecommerce/groovyScripts/forum/NodeTrailPrep.groovy b/ecommerce/groovyScripts/forum/NodeTrailPrep.groovy
index 389cb49..b94ab36 100644
--- a/ecommerce/groovyScripts/forum/NodeTrailPrep.groovy
+++ b/ecommerce/groovyScripts/forum/NodeTrailPrep.groovy
@@ -67,14 +67,14 @@ if (nodeTrailCsv) {
            dummy = [:]
         }
         dummy.nodeTrailCsv = nodeTrailCsv
-        //Debug.logInfo("in nodetrailprep, dummy:" + dummy,"")
+        //logInfo("in nodetrailprep, dummy:" + dummy)
         singleWrapper.putInContext("dummy",dummy)
     }
     context.nodeTrailCsv = nodeTrailCsv
 
-    //Debug.logInfo("in nodetrailprep, nodeTrailCsv:" + nodeTrailCsv,"")
+    //logInfo("in nodetrailprep, nodeTrailCsv:" + nodeTrailCsv)
     trailContentList = ContentWorker.csvToContentList(nodeTrailCsv, delegator)
-    //Debug.logInfo("in nodetrailprep, trailContentList:" + trailContentList,"")
+    //logInfo("in nodetrailprep, trailContentList:" + trailContentList)
     context.ancestorList = trailContentList
-    //Debug.logInfo("in vewprep, siteAncestorList:" + siteAncestorList,"")
+    //logInfo("in vewprep, siteAncestorList:" + siteAncestorList)
 }
diff --git a/ecommerce/groovyScripts/forum/OwnerContentPrep.groovy b/ecommerce/groovyScripts/forum/OwnerContentPrep.groovy
index 81e2b4c..7e5f796 100644
--- a/ecommerce/groovyScripts/forum/OwnerContentPrep.groovy
+++ b/ecommerce/groovyScripts/forum/OwnerContentPrep.groovy
@@ -37,17 +37,17 @@ import javax.servlet.http.*
 
 // load edit or create Content form
 
-//Debug.logInfo("in ownerprep, security:" + security, "")
+//logInfo("in ownerprep, security:" + security)
 
 rootPubPt = parameters.webSiteId
-//Debug.logInfo("in ownerprep, rootPubPt:" + rootPubPt, "")
+//logInfo("in ownerprep, rootPubPt:" + rootPubPt)
 entityAction = page.entityOperation
 permittedOperations = page.permittedOperations
 
 allDepartmentContentList = ContentManagementWorker.getAllDepartmentContent(delegator, rootPubPt)
-//Debug.logInfo("in ownercontentprep, allDepartmentContentList:" + allDepartmentContentList, "")
+//logInfo("in ownercontentprep, allDepartmentContentList:" + allDepartmentContentList)
 departmentPointList = ContentManagementWorker.getPermittedDepartmentPoints( delegator, allDepartmentContentList, userLogin, security, entityAction, "CONTENT_CREATE", null )
-//Debug.logInfo("in ownercontentprep, departmentPointList:" + departmentPointList, "")
+//logInfo("in ownercontentprep, departmentPointList:" + departmentPointList)
 departmentPointMap = [:]
 departmentPointMapAll = [:]
 ownerContentList = []
@@ -69,10 +69,10 @@ departmentPointList.each { arr ->
         ownerContentList.add(lineMap2)
     }
 }
-//Debug.logInfo("in ownercontentprep, ownerContentList:" + ownerContentList, "")
+//logInfo("in ownercontentprep, ownerContentList:" + ownerContentList)
 
 pubPt = context.pubPt
-//Debug.logInfo("in ownercontentprep, pubPt:" + pubPt, "")
+//logInfo("in ownercontentprep, pubPt:" + pubPt)
 singleWrapper = context.singleWrapper
 singleWrapper.putInContext("ownerContentList", ownerContentList)
 singleWrapper.putInContext("pubPt", pubPt)
diff --git a/ecommerce/groovyScripts/forum/PermPrep.groovy b/ecommerce/groovyScripts/forum/PermPrep.groovy
index 5ffdb1a..6a22e27 100644
--- a/ecommerce/groovyScripts/forum/PermPrep.groovy
+++ b/ecommerce/groovyScripts/forum/PermPrep.groovy
@@ -39,7 +39,7 @@ import javax.servlet.*
 import javax.servlet.http.*
 
 paramMap = UtilHttp.getParameterMap(request)
-//Debug.logInfo("in permprep, userLogin(0):" + userLogin, null)
+//logInfo("in permprep, userLogin(0):" + userLogin)
 
 // Get permission from pagedef config file
 permission = context.permission
@@ -48,18 +48,18 @@ permissionType = context.permissionType ?: "simple"
 entityName = context.entityName
 entityOperation = context.entityOperation
 targetOperation = context.targetOperation
-//Debug.logInfo("in permprep, targetOperation(0):" + targetOperation, null)
+//logInfo("in permprep, targetOperation(0):" + targetOperation)
 
 mode = paramMap.mode
-//Debug.logInfo("in permprep, contentId(0):" + request.getAttribute("contentId"),"")
+//logInfo("in permprep, contentId(0):" + request.getAttribute("contentId"))
 currentValue = request.getAttribute("currentValue")
-//Debug.logInfo("in permprep, paramMap(1):" + paramMap, null)
-//Debug.logInfo("in permprep, currentValue(1):" + currentValue, null)
+//logInfo("in permprep, paramMap(1):" + paramMap)
+//logInfo("in permprep, currentValue(1):" + currentValue)
 
 if ("add".equals(mode)) {
     entityOperation = context.addEntityOperation ?: context.entityOperation ?: "_CREATE"
     targetOperation = context.addTargetOperation ?: context.get("targetOperation") ?: "CONTENT_CREATE"
-    //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, targetOperation:" + targetOperation, null)
+    //logInfo("in permprep, targetOperation:" + targetOperation)
 } else {
     if (!entityOperation) {
         entityOperation = "_UPDATE"
@@ -76,13 +76,13 @@ if ("complex".equals(permissionType)) {
     mapIn.targetOperationList = targetOperationList
     thisContentId = null
 
-    //Debug.logInfo("in permprep, userLogin(1):" + userLogin, null)
+    //logInfo("in permprep, userLogin(1):" + userLogin)
     //if (userLogin != null) {
-        //Debug.logInfo("in permprep, userLoginId(1):" + userLogin.get("userLoginId"), null)
+        //logInfo("in permprep, userLoginId(1):" + userLogin.get("userLoginId"))
     //}
     if (!currentValue || !"Content".equals(entityName)) {
         permissionIdName = context.permissionIdName
-        //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, permissionIdName(1):" + permissionIdName, null)
+        //logInfo("in permprep, permissionIdName(1):" + permissionIdName)
         if (!permissionIdName) {
             thisContentId = ContentManagementWorker.getFromSomewhere(permissionIdName, paramMap, request, context)
         } else if (!thisContentId) {
@@ -92,11 +92,11 @@ if ("complex".equals(permissionType)) {
         } else if (!thisContentId) {
             thisContentId = ContentManagementWorker.getFromSomewhere("contentId", paramMap, request, context)
         }
-        //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, thisContentId(2):" + thisContentId, null)
+        //logInfo("in permprep, thisContentId(2):" + thisContentId)
     } else {
         thisContentId = currentValue.contentId
     }
-    //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, thisContentId(3):" + thisContentId, null)
+    //logInfo("in permprep, thisContentId(3):" + thisContentId)
 
     if (!currentValue || !"Content".equals(entityName)) {
         if (thisContentId) {
@@ -114,7 +114,7 @@ if ("complex".equals(permissionType)) {
             entityOperation = editEntityOperation
         }
     }
-    //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, currentValue(2):" + currentValue, null)
+    //logInfo("in permprep, currentValue(2):" + currentValue)
     if ("Content".equals(currentValue?.getEntityName())) {
         mapIn.currentContent = currentValue
     }
@@ -125,10 +125,10 @@ if ("complex".equals(permissionType)) {
         mapIncontentPurposeList = StringUtil.split(contentPurposeTypeId, "|")
     }
 
-    //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, mapIn:" + mapIn, null)
+    //logInfo("in permprep, mapIn:" + mapIn)
     result = runService('checkContentPermission', mapIn)
     permissionStatus = result.permissionStatus
-    //org.apache.ofbiz.base.util.Debug.logInfo("in permprep, permissionStatus:" + permissionStatus, null)
+    //logInfo("in permprep, permissionStatus:" + permissionStatus)
     if ("granted".equals(permissionStatus)) {
         context.hasPermission = true
         request.setAttribute("hasPermission", true)
@@ -139,25 +139,25 @@ if ("complex".equals(permissionType)) {
         request.setAttribute("permissionStatus", "")
         errorMessage = "Permission to display:" + page.getPageName() + " is denied."
         recorder = result.permissionRecorder
-        //Debug.logInfo("recorder(0):" + recorder, "")
+        //logInfo("recorder(0):" + recorder)
         if (recorder) {
             permissionMessage = recorder.toHtml()
-            //Debug.logInfo("permissionMessage(0):" + permissionMessage, "")
+            //logInfo("permissionMessage(0):" + permissionMessage)
             errorMessage += " \n " + permissionMessage
         }
         request.setAttribute("errorMsgReq", errorMessage)
     }
-    //Debug.logInfo("in permprep, contentId(1):" + request.getAttribute("contentId"),"")
+    //logInfo("in permprep, contentId(1):" + request.getAttribute("contentId"))
 } else {
-    //org.apache.ofbiz.base.util.Debug.logInfo("permission:" + permission , null)
-    //org.apache.ofbiz.base.util.Debug.logInfo("entityOperation:" + entityOperation , null)
+    //logInfo("permission:" + permission )
+    //logInfo("entityOperation:" + entityOperation )
     if (security.hasEntityPermission(permission, entityOperation, session)) {
-        //org.apache.ofbiz.base.util.Debug.logInfo("hasEntityPermission is true:" , null)
+        //logInfo("hasEntityPermission is true:" )
         context.hasPermission = true
         request.setAttribute("hasPermission", true)
         request.setAttribute("permissionStatus", "granted")
     } else {
-        //org.apache.ofbiz.base.util.Debug.logInfo("hasEntityPermission is false:" , null)
+        //logInfo("hasEntityPermission is false:" )
         context.hasPermission = false
         request.setAttribute("hasPermission", false)
         request.setAttribute("permissionStatus", "")
diff --git a/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy b/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy
index ad58bc4..d9c222b 100644
--- a/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy
+++ b/ecommerce/groovyScripts/forum/RespondPermAndPrep.groovy
@@ -76,18 +76,18 @@ if (currentValue) {
 mapIn.entityOperation = "_CREATE"
 mapIn.contentPurposeList = ["RESPONSE"]
 
-//org.apache.ofbiz.base.util.Debug.logInfo("in permprep, mapIn:" + mapIn, null)
+//logInfo("in permprep, mapIn:" + mapIn)
 result = runService('checkContentPermission', mapIn)
 permissionStatus = result.permissionStatus
-//org.apache.ofbiz.base.util.Debug.logInfo("permissionStatus:" + permissionStatus, null)
+//logInfo("permissionStatus:" + permissionStatus)
 if (!"granted".equals(permissionStatus)) {
     request.setAttribute("errorMsgReq", "Permission to add response is denied (1)")
     errorMessage = "Permission to add response is denied (2)"
     recorder = result.permissionRecorder
-    //Debug.logInfo("recorder(0):" + recorder, "")
+    //logInfo("recorder(0):" + recorder)
     if (recorder) {
         permissionMessage = recorder.toHtml()
-        //Debug.logInfo("permissionMessage(0):" + permissionMessage, "")
+        //logInfo("permissionMessage(0):" + permissionMessage)
         errorMessage += " \n " + permissionMessage
     }
     request.setAttribute("permissionErrorMsg", errorMessage)
@@ -108,19 +108,19 @@ if (pubContentValue) {
     mapIn.currentContent = pubContentValue
     mapIn.statusId = "CTNT_PUBLISHED"
 }
-//org.apache.ofbiz.base.util.Debug.logInfo("in permprep(2), mapIn:" + mapIn, null)
+//logInfo("in permprep(2), mapIn:" + mapIn)
 result = dispatcher.runSync("checkContentPermission", mapIn)
 permissionStatus = result.permissionStatus
-//org.apache.ofbiz.base.util.Debug.logInfo("permissionStatus(2):" + permissionStatus, null)
+//logInfo("permissionStatus(2):" + permissionStatus)
 if (!"granted".equals(permissionStatus)) {
 
     request.setAttribute("errorMsgReq", "Permission to add response is denied (2)")
     errorMessage = "Permission to add response is denied (2)"
     recorder = result.permissionRecorder
-        //Debug.logInfo("recorder(0):" + recorder, "")
+        //logInfo("recorder(0):" + recorder)
     if (recorder) {
         permissionMessage = recorder.toHtml()
-        //Debug.logInfo("permissionMessage(0):" + permissionMessage, "")
+        //logInfo("permissionMessage(0):" + permissionMessage)
         errorMessage += " \n " + permissionMessage
     }
     request.setAttribute("permissionErrorMsg", errorMessage)
diff --git a/ecommerce/groovyScripts/forum/ResponsePrep.groovy b/ecommerce/groovyScripts/forum/ResponsePrep.groovy
index 945dee3..d1c12b4 100644
--- a/ecommerce/groovyScripts/forum/ResponsePrep.groovy
+++ b/ecommerce/groovyScripts/forum/ResponsePrep.groovy
@@ -44,7 +44,7 @@ paramMap = UtilHttp.getParameterMap(request)
 
 contentIdTo = paramMap.contentIdTo
 nodeTrailCsv = paramMap.nodeTrailCsv
-//Debug.logInfo("in viewprep, nodeTrailCsv:" + nodeTrailCsv,"")
+//logInfo("in viewprep, nodeTrailCsv:" + nodeTrailCsv)
 context.nodeTrailCsv = nodeTrailCsv
 contentId = paramMap.contentIdTo
 context.subContentId = contentId
@@ -65,7 +65,7 @@ idList.each { id ->
     siteAncestorList.add(webSitePublishPoint)
 }
 context.siteAncestorList = siteAncestorList
-//Debug.logInfo("in viewprep, siteAncestorList:" + siteAncestorList,"")
+//logInfo("in viewprep, siteAncestorList:" + siteAncestorList)
 
 singleWrapper = context.singleWrapper
 // singleWrapper.putInContext("pageName", page.getPageName())
diff --git a/ecommerce/groovyScripts/forum/ViewPrep.groovy b/ecommerce/groovyScripts/forum/ViewPrep.groovy
index e5ee12f..9f85a20 100644
--- a/ecommerce/groovyScripts/forum/ViewPrep.groovy
+++ b/ecommerce/groovyScripts/forum/ViewPrep.groovy
@@ -46,24 +46,24 @@ paramMap = UtilHttp.getParameterMap(request)
 //since we are adding them again.
 temp = request.getQueryString()
 queryString = UtilHttp.stripViewParamsFromQueryString(temp)
-//Debug.logInfo("in viewprep, queryString(1):" + queryString,"")
+//logInfo("in viewprep, queryString(1):" + queryString)
 context.queryString = queryString
-//Debug.logInfo("in viewprep, queryString(2):" + queryString,"")
+//logInfo("in viewprep, queryString(2):" + queryString)
 
 requestURL = request.getRequestURL()
-//Debug.logInfo("in viewprep, requestURL(3):" + requestURL,"")
+//logInfo("in viewprep, requestURL(3):" + requestURL)
 context.requestURL = requestURL
 viewSize = paramMap.VIEW_SIZE
 context.viewSize = viewSize
-//Debug.logInfo("in viewprep, viewSize(3):" + viewSize,"")
+//logInfo("in viewprep, viewSize(3):" + viewSize)
 viewIndex = paramMap.VIEW_INDEX
 context.viewIndex = viewIndex
-//Debug.logInfo("in viewprep, viewIndex(3):" + viewIndex,"")
+//logInfo("in viewprep, viewIndex(3):" + viewIndex)
 
 nodeTrailCsv = ContentManagementWorker.getFromSomewhere("nodeTrailCsv", paramMap, request, context)
 context.nodeTrailCsv = nodeTrailCsv
 contentId = ContentManagementWorker.getFromSomewhere("contentId", paramMap, request, context)
-//Debug.logInfo("in viewprep, contentId(3):" + contentId,"")
+//logInfo("in viewprep, contentId(3):" + contentId)
 context.subContentId = contentId
 context.contentIdTo = contentId
 forumId = ContentManagementWorker.getFromSomewhere("forumId", paramMap, request, context)
diff --git a/ecommerce/groovyScripts/includes/MruAdd.groovy b/ecommerce/groovyScripts/includes/MruAdd.groovy
index e887ac0..b65ad55 100644
--- a/ecommerce/groovyScripts/includes/MruAdd.groovy
+++ b/ecommerce/groovyScripts/includes/MruAdd.groovy
@@ -40,8 +40,8 @@ import javax.servlet.*
 import javax.servlet.http.*
 
 lookupCaches = session.getAttribute("lookupCaches")
-//org.apache.ofbiz.base.util.Debug.logInfo("entityName:" + entityName, "")
-//org.apache.ofbiz.base.util.Debug.logInfo("in MruAdd.groovy, lookupCaches:" + lookupCaches, "")
+//logInfo("entityName:" + entityName)
+//logInfo("in MruAdd.groovy, lookupCaches:" + lookupCaches)
 
 if (!lookupCaches) {
     lookupCaches = [:]
@@ -49,9 +49,9 @@ if (!lookupCaches) {
 }
 
 cacheEntityName = entityName
-//Debug.logInfo("cacheEntityName:" + cacheEntityName, "")
+//logInfo("cacheEntityName:" + cacheEntityName)
 lifoSet = lookupCaches[cacheEntityName]
-//org.apache.ofbiz.base.util.Debug.logInfo("lifoSet:" + lifoSet, "")
+//logInfo("lifoSet:" + lifoSet)
 if (!lifoSet) {
     lifoSet = new LifoSet(10)
     lookupCaches[cacheEntityName] = lifoSet
@@ -60,11 +60,11 @@ if (!lifoSet) {
 paramMap = UtilHttp.getParameterMap(request)
 contentId = paramMap.contentId
 contentAssocDataResourceViewFrom = ContentWorker.getSubContentCache(delegator, null, null, contentId, null, null, null, null, null)
-//Debug.logInfo("in mruadd, contentAssocDataResourceViewFrom :" + contentAssocDataResourceViewFrom , "")
+//logInfo("in mruadd, contentAssocDataResourceViewFrom :" + contentAssocDataResourceViewFrom )
 if (contentAssocDataResourceViewFrom) {
     lookupCaches = session.getAttribute("lookupCaches")
     viewPK = contentAssocDataResourceViewFrom.getPrimaryKey()
-    //Debug.logInfo("in mruadd, viewPK :" + viewPK , "")
+    //logInfo("in mruadd, viewPK :" + viewPK )
     if (viewPK) {
         ContentManagementWorker.mruAdd(session, viewPK)
     }
diff --git a/ecommerce/groovyScripts/order/OrderStatus.groovy b/ecommerce/groovyScripts/order/OrderStatus.groovy
index 1eebea5..746a178 100644
--- a/ecommerce/groovyScripts/order/OrderStatus.groovy
+++ b/ecommerce/groovyScripts/order/OrderStatus.groovy
@@ -105,7 +105,7 @@ if (orderId) {
         if (!userLogin || !orderRole) {
             context.remove("orderHeader")
             orderHeader = null
-            Debug.logWarning("Warning: in OrderStatus.groovy before getting order detail info: role not found or user not logged in; partyId=[" + partyId + "], userLoginId=[" + (userLogin == null ? "null" : userLogin.get("userLoginId")) + "]", "orderstatus")
+            logWarning("Warning: in OrderStatus.groovy before getting order detail info: role not found or user not logged in; partyId=[" + partyId + "], userLoginId=[" + (userLogin == null ? "null" : userLogin.get("userLoginId")) + "]")
         }
     }
 }
diff --git a/scrum/groovyScripts/AddProductBacklogItem.groovy b/scrum/groovyScripts/AddProductBacklogItem.groovy
index 1d76a88..bef08b8 100644
--- a/scrum/groovyScripts/AddProductBacklogItem.groovy
+++ b/scrum/groovyScripts/AddProductBacklogItem.groovy
@@ -22,8 +22,6 @@ import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
 import org.apache.ofbiz.entity.GenericEntityException
 
-def module = "AddProductBacklogItem.groovy"
-
 // find cust request and items
 def inputFields = [:]
 def custRequestAndItems = []
@@ -39,13 +37,13 @@ def performFindResults = runService('performFind', ["entityName": "CustRequestAn
 try {
     custRequestAndItems = performFindResults.listIt.getCompleteList()
 } catch (GenericEntityException e) {
-    Debug.logError(e, "Failure in " + module)
+    logError(e, "Failure in " + module)
 } finally {
     if (performFindResults.listIt != null) {
         try {
             performFindResults.listIt.close()
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                logError(e)
             }
     }
 }
diff --git a/scrum/groovyScripts/ListCurrentProducts.groovy b/scrum/groovyScripts/ListCurrentProducts.groovy
index b8599b2..5a95686 100644
--- a/scrum/groovyScripts/ListCurrentProducts.groovy
+++ b/scrum/groovyScripts/ListCurrentProducts.groovy
@@ -19,7 +19,6 @@
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityJoinOperator
 import org.apache.ofbiz.entity.condition.EntityOperator
-import org.apache.ofbiz.base.util.Debug;
 import org.apache.ofbiz.base.util.UtilValidate
 
 roleTypeId = null
@@ -198,7 +197,7 @@ if (userLogin) {
                 products.add(product)
     }
 } else {
-    Debug.logError("Party ID missing =========>>> : null ", "")
+    logError("Party ID missing =========>>> : null ")
 }
 
 if (products){
diff --git a/scrum/groovyScripts/ListScrumResource.groovy b/scrum/groovyScripts/ListScrumResource.groovy
index 33d3c1b..ae0aeef 100644
--- a/scrum/groovyScripts/ListScrumResource.groovy
+++ b/scrum/groovyScripts/ListScrumResource.groovy
@@ -18,9 +18,6 @@
  */
 
 import org.apache.ofbiz.entity.GenericEntityException
-import org.apache.ofbiz.base.util.Debug
-
-def module = "ListScrumResource.groovy"
 
 performFindInMap = [:]
 performFindInMap.entityName = "ScrumMemberUserLoginAndSecurityGroup"
@@ -38,13 +35,13 @@ performFindResults = runService('performFind', performFindInMap)
 try {
     resultList = performFindResults.listIt.getCompleteList()
 } catch (GenericEntityException e) {
-    Debug.logError(e, "Failure in " + module)
+    logError(e)
 } finally {
     if (performFindResults.listIt != null) {
         try {
             performFindResults.listIt.close()
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                logError(e)
             }
     }
 }
diff --git a/scrum/groovyScripts/ListTimeSheets.groovy b/scrum/groovyScripts/ListTimeSheets.groovy
index ae6e841..0f3a039 100644
--- a/scrum/groovyScripts/ListTimeSheets.groovy
+++ b/scrum/groovyScripts/ListTimeSheets.groovy
@@ -21,11 +21,9 @@ import org.apache.ofbiz.entity.GenericEntityException
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.util.EntityFindOptions
 import org.apache.ofbiz.entity.condition.EntityOperator
-import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.base.util.UtilDateTime
 
 // get all timesheets of all user, including the planned hours
-module ="ListTimeSheets.groovy"
 timesheets = []
 inputFields = [:]
 
@@ -38,13 +36,13 @@ if (performFindResults.listSize > 0) {
     try {
         timesheetsDb = performFindResults.listIt.getCompleteList()
     } catch (GenericEntityException e) {
-        Debug.logError(e, "Failure in " + module)
+        logError(e, "Failure in " + module)
     } finally {
         if (performFindResults.listIt != null) {
             try {
                 performFindResults.listIt.close()
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    logError(e)
                 }
         }
     }
diff --git a/scrum/groovyScripts/ProductEmail.groovy b/scrum/groovyScripts/ProductEmail.groovy
index fc70b03..2831554 100644
--- a/scrum/groovyScripts/ProductEmail.groovy
+++ b/scrum/groovyScripts/ProductEmail.groovy
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.base.util.UtilDateTime
 import org.apache.ofbiz.base.util.UtilValidate
 import org.apache.ofbiz.entity.GenericEntityException
@@ -93,7 +92,7 @@ try{
        }
     }
 } catch (exeption) {
-    Debug.logInfo("catch exeption ================" + exeption,"")
+    logInfo("catch exeption ================" + exeption)
 } catch (GenericEntityException e) {
-    Debug.logInfo("catch GenericEntityException ================" + e.getMessage(),"")
+    logInfo("catch GenericEntityException ================" + e.getMessage())
 }
diff --git a/scrum/groovyScripts/QuickAddBacklog.groovy b/scrum/groovyScripts/QuickAddBacklog.groovy
index 76c2156..34526d9 100644
--- a/scrum/groovyScripts/QuickAddBacklog.groovy
+++ b/scrum/groovyScripts/QuickAddBacklog.groovy
@@ -17,8 +17,6 @@
 * under the License.
 */
 
-import org.apache.ofbiz.base.util.Debug
-
 try{
     // for sprint dropdown
     workEffortList = []
@@ -79,7 +77,7 @@ try{
         context.categoryList = categoryList
     }
 }catch(e){
-    Debug.logInfo("catch e ================" + e,"")
+    logInfo("catch e ================" + e)
 }
 
 //subString function