You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/12/13 12:43:07 UTC
svn commit: r1818005 [3/3] - in /ofbiz:
ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/
ofbiz-framework/trunk/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/
ofbiz-framework/tr...
Modified: ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/job/PersistedServiceJob.java Wed Dec 13 12:43:05 2017
@@ -114,7 +114,7 @@ public class PersistedServiceJob extends
throw new InvalidJobException("Unable to set the startDateTime and statusId on the current job [" + getJobId() + "]; not running!", e);
}
if (Debug.verboseOn()) {
- Debug.logVerbose("Placing job [" + getJobId() + "] in queue", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Placing job [" + getJobId() + "] in queue", module);
}
}
@@ -141,7 +141,7 @@ public class PersistedServiceJob extends
throw new InvalidJobException("Unable to set the startDateTime and statusId on the current job [" + getJobId() + "]; not running!", e);
}
if (Debug.verboseOn()) {
- Debug.logVerbose("Job [" + getJobId() + "] running", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Job [" + getJobId() + "] running", module);
}
// configure any additional recurrences
long maxRecurrenceCount = -1;
@@ -365,7 +365,7 @@ public class PersistedServiceJob extends
throw new InvalidJobException("Unable to dequeue job [" + getJobId() + "]", e);
}
if (Debug.verboseOn()) {
- Debug.logVerbose("Job [" + getJobId() + "] not queued, rescheduling", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Job [" + getJobId() + "] not queued, rescheduling", module);
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java Wed Dec 13 12:43:05 2017
@@ -165,7 +165,7 @@ public class ConfigXMLReader {
rootElement = UtilXml.firstChildElement(rootElement, "site-conf");
}
if (Debug.verboseOn())
- Debug.logVerbose("Loaded XML Config - " + location, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Loaded XML Config - " + location, module);
return rootElement;
} catch (Exception e) {
Debug.logError(e, module);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlServlet.java Wed Dec 13 12:43:05 2017
@@ -141,7 +141,7 @@ public class ControlServlet extends Http
}
request.setAttribute("_CONTROL_PATH_", contextPath + request.getServletPath());
if (Debug.verboseOn())
- Debug.logVerbose("Control Path: " + request.getAttribute("_CONTROL_PATH_"), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Control Path: " + request.getAttribute("_CONTROL_PATH_"), module);
// for convenience, and necessity with event handlers, make security and delegator available in the request:
// try to get it from the session first so that we can have a delegator/dispatcher/security for a certain user if desired
@@ -332,49 +332,49 @@ public class ControlServlet extends Http
ServletContext servletContext = this.getServletContext();
HttpSession session = request.getSession();
- Debug.logVerbose("--- Start Request Headers: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- Start Request Headers: ---", module);
Enumeration<String> headerNames = UtilGenerics.cast(request.getHeaderNames());
while (headerNames.hasMoreElements()) {
String headerName = headerNames.nextElement();
Debug.logVerbose(headerName + ":" + request.getHeader(headerName), module);
}
- Debug.logVerbose("--- End Request Headers: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- End Request Headers: ---", module);
- Debug.logVerbose("--- Start Request Parameters: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- Start Request Parameters: ---", module);
Enumeration<String> paramNames = UtilGenerics.cast(request.getParameterNames());
while (paramNames.hasMoreElements()) {
String paramName = paramNames.nextElement();
Debug.logVerbose(paramName + ":" + request.getParameter(paramName), module);
}
- Debug.logVerbose("--- End Request Parameters: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- End Request Parameters: ---", module);
- Debug.logVerbose("--- Start Request Attributes: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- Start Request Attributes: ---", module);
Enumeration<String> reqNames = UtilGenerics.cast(request.getAttributeNames());
while (reqNames != null && reqNames.hasMoreElements()) {
String attName = reqNames.nextElement();
Debug.logVerbose(attName + ":" + request.getAttribute(attName), module);
}
- Debug.logVerbose("--- End Request Attributes ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- End Request Attributes ---", module);
- Debug.logVerbose("--- Start Session Attributes: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- Start Session Attributes: ---", module);
Enumeration<String> sesNames = null;
try {
sesNames = UtilGenerics.cast(session.getAttributeNames());
} catch (IllegalStateException e) {
- Debug.logVerbose("Cannot get session attributes : " + e.getMessage(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Cannot get session attributes : " + e.getMessage(), module);
}
while (sesNames != null && sesNames.hasMoreElements()) {
String attName = sesNames.nextElement();
Debug.logVerbose(attName + ":" + session.getAttribute(attName), module);
}
- Debug.logVerbose("--- End Session Attributes ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- End Session Attributes ---", module);
Enumeration<String> appNames = UtilGenerics.cast(servletContext.getAttributeNames());
- Debug.logVerbose("--- Start ServletContext Attributes: ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- Start ServletContext Attributes: ---", module);
while (appNames != null && appNames.hasMoreElements()) {
String attName = appNames.nextElement();
Debug.logVerbose(attName + ":" + servletContext.getAttribute(attName), module);
}
- Debug.logVerbose("--- End ServletContext Attributes ---", module);
+ if (Debug.verboseOn()) Debug.logVerbose("--- End ServletContext Attributes ---", module);
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/JavaEventHandler.java Wed Dec 13 12:43:05 2017
@@ -74,7 +74,7 @@ public class JavaEventHandler implements
Class<?>[] paramTypes = new Class<?>[] {HttpServletRequest.class, HttpServletResponse.class};
- Debug.logVerbose("*[[Event invocation]]*", module);
+ if (Debug.verboseOn()) Debug.logVerbose("*[[Event invocation]]*", module);
Object[] params = new Object[] {request, response};
return invoke(event.path, event.invoke, eventClass, paramTypes, params, event.transactionTimeout);
@@ -89,7 +89,7 @@ public class JavaEventHandler implements
throw new EventHandlerException("Invalid event method or path; call initialize()");
}
- Debug.logVerbose("[Processing]: JAVA Event", module);
+ if (Debug.verboseOn()) Debug.logVerbose("[Processing]: JAVA Event", module);
try {
if (transactionTimeout > 0) {
beganTransaction = TransactionUtil.begin(transactionTimeout);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SOAPEventHandler.java Wed Dec 13 12:43:05 2017
@@ -168,7 +168,7 @@ public class SOAPEventHandler implements
throw new EventHandlerException("Cannot get the envelope", e);
}
- Debug.logVerbose("[Processing]: SOAP Event", module);
+ if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SOAP Event", module);
String serviceName = null;
try {
@@ -194,7 +194,7 @@ public class SOAPEventHandler implements
}
Map<String, Object> serviceResults = dispatcher.runSync(serviceName, parameters);
- Debug.logVerbose("[EventHandler] : Service invoked", module);
+ if (Debug.verboseOn()) Debug.logVerbose("[EventHandler] : Service invoked", module);
createAndSendSOAPResponse(serviceResults, serviceName, response);
@@ -236,7 +236,7 @@ public class SOAPEventHandler implements
private void createAndSendSOAPResponse(Map<String, Object> serviceResults, String serviceName, HttpServletResponse response) throws EventHandlerException {
try {
// setup the response
- Debug.logVerbose("[EventHandler] : Setting up response message", module);
+ if (Debug.verboseOn()) Debug.logVerbose("[EventHandler] : Setting up response message", module);
String xmlResults = SoapSerializer.serialize(serviceResults);
//Debug.logInfo("xmlResults ==================" + xmlResults, module);
XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xmlResults));
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java Wed Dec 13 12:43:05 2017
@@ -127,8 +127,8 @@ public class ServiceEventHandler impleme
}
if (Debug.verboseOn()) {
- Debug.logVerbose("[Processing]: SERVICE Event", module);
- Debug.logVerbose("[Using delegator]: " + dispatcher.getDelegator().getDelegatorName(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SERVICE Event", module);
+ if (Debug.verboseOn()) Debug.logVerbose("[Using delegator]: " + dispatcher.getDelegator().getDelegatorName(), module);
}
boolean isMultiPart = ServletFileUpload.isMultipartContent(request);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/SimpleEventHandler.java Wed Dec 13 12:43:05 2017
@@ -69,7 +69,7 @@ public class SimpleEventHandler implemen
throw new EventHandlerException("Event Name (eventMethod) cannot be null");
}
- Debug.logVerbose("[Processing]: SIMPLE Event", module);
+ if (Debug.verboseOn()) Debug.logVerbose("[Processing]: SIMPLE Event", module);
try {
beganTransaction = TransactionUtil.begin();
String eventReturn = SimpleMethod.runSimpleEvent(xmlResource, eventName, request, response);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java Wed Dec 13 12:43:05 2017
@@ -75,7 +75,7 @@ public class OfbizUrlTransform implement
String result = "";
if (o != null) {
if (Debug.verboseOn())
- Debug.logVerbose("Arg Object : " + o.getClass().getName(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Arg Object : " + o.getClass().getName(), module);
if (o instanceof TemplateScalarModel) {
TemplateScalarModel s = (TemplateScalarModel) o;
try {
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/webdav/WebDavUtil.java Wed Dec 13 12:43:05 2017
@@ -85,7 +85,7 @@ public final class WebDavUtil {
String credentials = request.getHeader("Authorization");
if (credentials != null && credentials.startsWith("Basic ")) {
credentials = Base64.base64Decode(credentials.replace("Basic ", ""));
- Debug.logVerbose("Found HTTP Basic credentials", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Found HTTP Basic credentials", module);
String[] parts = credentials.split(":");
if (parts.length < 2) {
return null;
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/WidgetFactory.java Wed Dec 13 12:43:05 2017
@@ -129,7 +129,7 @@ public class WidgetFactory {
Assert.notNull("tagName", tagName, "widgetClass", widgetClass);
screenWidgets.put(tagName, widgetClass.getConstructor(ModelScreen.class, Element.class));
if (Debug.verboseOn()) {
- Debug.logVerbose("Registered " + widgetClass.getName() + " with tag name " + tagName, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Registered " + widgetClass.getName() + " with tag name " + tagName, module);
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/AbstractModelAction.java Wed Dec 13 12:43:05 2017
@@ -136,7 +136,7 @@ public abstract class AbstractModelActio
return;
for (ModelAction action : actions) {
if (Debug.verboseOn())
- Debug.logVerbose("Running action " + action.getClass().getName(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Running action " + action.getClass().getName(), module);
try {
action.runAction(context);
} catch (GeneralException e) {
@@ -155,7 +155,7 @@ public abstract class AbstractModelActio
protected AbstractModelAction(ModelWidget modelWidget, Element actionElement) {
this.modelWidget = modelWidget;
if (Debug.verboseOn())
- Debug.logVerbose("Reading widget action with name: " + actionElement.getNodeName(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Reading widget action with name: " + actionElement.getNodeName(), module);
}
/**
@@ -317,7 +317,7 @@ public abstract class AbstractModelActio
public void runAction(Map<String, Object> context) {
Object valueObject = valueNameAcsr.get(context);
if (valueObject == null) {
- Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", module);
return;
}
if (!(valueObject instanceof GenericValue)) {
@@ -398,7 +398,7 @@ public abstract class AbstractModelActio
public void runAction(Map<String, Object> context) {
Object valueObject = valueNameAcsr.get(context);
if (valueObject == null) {
- Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Value not found with name: " + valueNameAcsr + ", not getting related...", module);
return;
}
if (!(valueObject instanceof GenericValue)) {
@@ -804,7 +804,7 @@ public abstract class AbstractModelActio
HttpSession session = (HttpSession) context.get("session");
newValue = getInMemoryPersistedFromField(session, context);
if (Debug.verboseOn())
- Debug.logVerbose("In user getting value for field from [" + this.fromField.getOriginalName() + "]: "
+ if (Debug.verboseOn()) Debug.logVerbose("In user getting value for field from [" + this.fromField.getOriginalName() + "]: "
+ newValue, module);
} else if (!this.valueExdr.isEmpty()) {
newValue = this.valueExdr.expand(context);
@@ -814,7 +814,7 @@ public abstract class AbstractModelActio
ServletContext servletContext = (ServletContext) context.get("application");
newValue = getInMemoryPersistedFromField(servletContext, context);
if (Debug.verboseOn())
- Debug.logVerbose("In application getting value for field from [" + this.fromField.getOriginalName()
+ if (Debug.verboseOn()) Debug.logVerbose("In application getting value for field from [" + this.fromField.getOriginalName()
+ "]: " + newValue, module);
} else if (!this.valueExdr.isEmpty()) {
newValue = this.valueExdr.expandString(context);
@@ -823,7 +823,7 @@ public abstract class AbstractModelActio
if (!this.fromField.isEmpty()) {
newValue = this.fromField.get(context);
if (Debug.verboseOn())
- Debug.logVerbose("Getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue,
+ if (Debug.verboseOn()) Debug.logVerbose("Getting value for field from [" + this.fromField.getOriginalName() + "]: " + newValue,
module);
} else if (!this.valueExdr.isEmpty()) {
newValue = this.valueExdr.expand(context);
@@ -874,7 +874,7 @@ public abstract class AbstractModelActio
HttpSession session = (HttpSession) context.get("session");
session.setAttribute(newKey, newValue);
if (Debug.verboseOn())
- Debug.logVerbose("In user setting value for field from [" + this.field.getOriginalName() + "]: " + newValue,
+ if (Debug.verboseOn()) Debug.logVerbose("In user setting value for field from [" + this.field.getOriginalName() + "]: " + newValue,
module);
} else if (this.toScope != null && "application".equals(this.toScope)) {
String originalName = this.field.getOriginalName();
@@ -890,13 +890,13 @@ public abstract class AbstractModelActio
ServletContext servletContext = (ServletContext) context.get("application");
servletContext.setAttribute(newKey, newValue);
if (Debug.verboseOn())
- Debug.logVerbose("In application setting value for field from [" + this.field.getOriginalName() + "]: "
+ if (Debug.verboseOn()) Debug.logVerbose("In application setting value for field from [" + this.field.getOriginalName() + "]: "
+ newValue, module);
} else {
// only do this if it is not global, if global ONLY put it in the global context
if (!global) {
if (Debug.verboseOn())
- Debug.logVerbose("Setting field [" + this.field.getOriginalName() + "] to value: " + newValue, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Setting field [" + this.field.getOriginalName() + "] to value: " + newValue, module);
this.field.put(context, newValue);
}
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java Wed Dec 13 12:43:05 2017
@@ -3180,7 +3180,7 @@ public class ModelFormField {
// Output format might not support menus, so make menu rendering optional.
MenuStringRenderer menuStringRenderer = (MenuStringRenderer) context.get("menuStringRenderer");
if (menuStringRenderer == null) {
- Debug.logVerbose("MenuStringRenderer instance not found in rendering context, menu not rendered.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("MenuStringRenderer instance not found in rendering context, menu not rendered.", module);
return;
}
ModelMenu modelMenu = getModelMenu(context);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java Wed Dec 13 12:43:05 2017
@@ -1036,7 +1036,7 @@ public abstract class ModelScreenWidget
// Output format might not support forms, so make form rendering optional.
FormStringRenderer formStringRenderer = (FormStringRenderer) context.get("formStringRenderer");
if (formStringRenderer == null) {
- Debug.logVerbose("FormStringRenderer instance not found in rendering context, form not rendered.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("FormStringRenderer instance not found in rendering context, form not rendered.", module);
return;
}
boolean protectScope = !shareScope(context);
@@ -1122,7 +1122,7 @@ public abstract class ModelScreenWidget
// Output format might not support forms, so make form rendering optional.
FormStringRenderer formStringRenderer = (FormStringRenderer) context.get("formStringRenderer");
if (formStringRenderer == null) {
- Debug.logVerbose("FormStringRenderer instance not found in rendering context, form not rendered.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("FormStringRenderer instance not found in rendering context, form not rendered.", module);
return;
}
boolean protectScope = !shareScope(context);
@@ -1216,7 +1216,7 @@ public abstract class ModelScreenWidget
// Output format might not support trees, so make tree rendering optional.
TreeStringRenderer treeStringRenderer = (TreeStringRenderer) context.get("treeStringRenderer");
if (treeStringRenderer == null) {
- Debug.logVerbose("TreeStringRenderer instance not found in rendering context, tree not rendered.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("TreeStringRenderer instance not found in rendering context, tree not rendered.", module);
return;
}
boolean protectScope = !shareScope(context);
@@ -1579,7 +1579,7 @@ public abstract class ModelScreenWidget
// Output format might not support menus, so make menu rendering optional.
MenuStringRenderer menuStringRenderer = (MenuStringRenderer) context.get("menuStringRenderer");
if (menuStringRenderer == null) {
- Debug.logVerbose("MenuStringRenderer instance not found in rendering context, menu not rendered.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("MenuStringRenderer instance not found in rendering context, menu not rendered.", module);
return;
}
ModelMenu modelMenu = getModelMenu(context);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelTreeAction.java Wed Dec 13 12:43:05 2017
@@ -109,14 +109,14 @@ public abstract class ModelTreeAction ex
protected ModelTreeAction(ModelNode modelNode, Element actionElement) {
if (Debug.verboseOn())
- Debug.logVerbose("Reading Tree action with name: " + actionElement.getNodeName(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Reading Tree action with name: " + actionElement.getNodeName(), module);
this.modelTree = modelNode.getModelTree();
this.modelSubNode = null;
}
protected ModelTreeAction(ModelNode.ModelSubNode modelSubNode, Element actionElement) {
if (Debug.verboseOn())
- Debug.logVerbose("Reading Tree action with name: " + actionElement.getNodeName(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Reading Tree action with name: " + actionElement.getNodeName(), module);
this.modelSubNode = modelSubNode;
this.modelTree = modelSubNode.getNode().getModelTree();
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java Wed Dec 13 12:43:05 2017
@@ -689,7 +689,7 @@ public class FormRenderer {
Object obj = context.get(lookupName);
if (obj == null) {
if (Debug.verboseOn())
- Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not rendering rows.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not rendering rows.", module);
return;
}
// if list is empty, do not render rows
@@ -765,7 +765,7 @@ public class FormRenderer {
}
if (Debug.verboseOn())
- Debug.logVerbose("In form got another row, context is: " + localContext, module);
+ if (Debug.verboseOn()) Debug.logVerbose("In form got another row, context is: " + localContext, module);
// Check to see if there is a field, same name and same use-when (could come from extended form)
List<ModelFormField> tempFieldList = new LinkedList<ModelFormField>();
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/Paginator.java Wed Dec 13 12:43:05 2017
@@ -184,7 +184,7 @@ public final class Paginator {
Object obj = context.get(lookupName);
if (obj == null) {
if (Debug.verboseOn())
- Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not running pagination.",
+ if (Debug.verboseOn()) Debug.logVerbose("No object for list or iterator name [" + lookupName + "] found, so not running pagination.",
module);
return;
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/UtilHelpText.java Wed Dec 13 12:43:05 2017
@@ -74,12 +74,12 @@ public final class UtilHelpText {
if (fieldDescription.equals(messageId)) {
messageId = "FieldDescription." + fieldName;
if (Debug.verboseOn()) {
- Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: " + messageId, module);
+ if (Debug.verboseOn()) Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "], Trying with: " + messageId, module);
}
fieldDescription = UtilProperties.getMessage(entityResourceName, messageId, locale);
if (fieldDescription.equals(messageId)) {
if (Debug.verboseOn()) {
- Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module);
+ if (Debug.verboseOn()) Debug.logVerbose("No help text found in [" + entityResourceName + "] with key [" + messageId + "]", module);
}
return "";
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java Wed Dec 13 12:43:05 2017
@@ -130,7 +130,7 @@ public class MacroMenuRenderer implement
}
sb.append(" />");
if (Debug.verboseOn()) {
- Debug.logVerbose("Executing macro: " + sb, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Executing macro: " + sb, module);
}
executeMacro(writer, sb.toString());
}
Modified: ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/EbayHelper.java Wed Dec 13 12:43:05 2017
@@ -105,7 +105,7 @@ public class EbayHelper {
public static Map<String, Object> postItem(String postItemsUrl, StringBuffer generatedXmlData, String devID, String appID, String certID,
String callName, String compatibilityLevel, String siteID) throws IOException {
if (Debug.verboseOn()) {
- Debug.logVerbose("Request of " + callName + " To eBay:\n" + generatedXmlData.toString(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Request of " + callName + " To eBay:\n" + generatedXmlData.toString(), module);
}
HttpURLConnection connection = (HttpURLConnection) (new URL(postItemsUrl)).openConnection();
connection.setDoInput(true);
@@ -137,7 +137,7 @@ public class EbayHelper {
result = ServiceUtil.returnFailure(EbayHelper.toString(inputStream));
}
if (Debug.verboseOn()) {
- Debug.logVerbose("Response of " + callName + " From eBay:\n" + response, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Response of " + callName + " From eBay:\n" + response, module);
}
return result;
}
@@ -298,7 +298,7 @@ public class EbayHelper {
try {
if (UtilValidate.isNotEmpty(name) && userLogin != null) {
- Debug.logVerbose("Creating Customer Party: " + name, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Creating Customer Party: " + name, module);
// Try to split the lastname from the firstname
String firstName = "";
@@ -316,7 +316,7 @@ public class EbayHelper {
name, "firstName", firstName, "lastName", lastName, "userLogin", userLogin, "comments",
"Created via eBay"));
partyId = (String) summaryResult.get("partyId");
- Debug.logVerbose("Created Customer Party: " + partyId, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Created Customer Party: " + partyId, module);
}
} catch (GenericServiceException e) {
Debug.logError(e, "Failed to createPerson", module);
Modified: ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ebay/src/main/java/org/apache/ofbiz/ebay/ProductsExportToEbay.java Wed Dec 13 12:43:05 2017
@@ -133,7 +133,7 @@ public class ProductsExportToEbay {
private static Map<String, Object> postItem(String postItemsUrl, StringBuffer dataItems, String devID, String appID, String certID,
String callName, String compatibilityLevel, String siteID) throws IOException {
if (Debug.verboseOn()) {
- Debug.logVerbose("Request of " + callName + " To eBay:\n" + dataItems.toString(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Request of " + callName + " To eBay:\n" + dataItems.toString(), module);
}
HttpURLConnection connection = (HttpURLConnection)(new URL(postItemsUrl)).openConnection();
connection.setDoInput(true);
@@ -167,7 +167,7 @@ public class ProductsExportToEbay {
}
if (Debug.verboseOn()) {
- Debug.logVerbose("Response of " + callName + " From eBay:\n" + response, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Response of " + callName + " From eBay:\n" + response, module);
}
return result;
Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/ofbiz-plugins/trunk/ebaystore/src/main/java/org/apache/ofbiz/ebaystore/EbayStore.java Wed Dec 13 12:43:05 2017
@@ -165,7 +165,7 @@ public class EbayStore {
private static Map<String, Object> postItem(String postItemsUrl, StringBuffer dataItems, String devID, String appID, String certID,
String callName, String compatibilityLevel, String siteID) throws IOException {
if (Debug.verboseOn()) {
- Debug.logVerbose("Request of " + callName + " To eBay:\n" + dataItems.toString(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Request of " + callName + " To eBay:\n" + dataItems.toString(), module);
}
HttpURLConnection connection = (HttpURLConnection)(new URL(postItemsUrl)).openConnection();
connection.setDoInput(true);
@@ -199,7 +199,7 @@ public class EbayStore {
}
if (Debug.verboseOn()) {
- Debug.logVerbose("Response of " + callName + " From eBay:\n" + response, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Response of " + callName + " From eBay:\n" + response, module);
}
return result;
Modified: ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/GitHubAuthenticator.java Wed Dec 13 12:43:05 2017
@@ -195,7 +195,7 @@ public class GitHubAuthenticator impleme
if (parentTx != null) {
try {
TransactionUtil.resume(parentTx);
- Debug.logVerbose("Resumed the parent transaction.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Resumed the parent transaction.", module);
} catch (GenericTransactionException e) {
Debug.logError(e, "Could not resume parent nested transaction: " + e.getMessage(), module);
}
Modified: ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java (original)
+++ ofbiz/ofbiz-plugins/trunk/passport/src/main/java/org/apache/ofbiz/passport/user/LinkedInAuthenticator.java Wed Dec 13 12:43:05 2017
@@ -202,7 +202,7 @@ public class LinkedInAuthenticator imple
if (parentTx != null) {
try {
TransactionUtil.resume(parentTx);
- Debug.logVerbose("Resumed the parent transaction.", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Resumed the parent transaction.", module);
} catch (GenericTransactionException e) {
Debug.logError(e, "Could not resume parent nested transaction: " + e.getMessage(), module);
}
Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/ProductUtil.java Wed Dec 13 12:43:05 2017
@@ -56,7 +56,7 @@ public final class ProductUtil {
Locale locale = new Locale("de_DE");
if (Debug.verboseOn()) {
- Debug.logVerbose("Solr: Getting product content for productId '" + productId + "'", module);
+ if (Debug.verboseOn()) Debug.logVerbose("Solr: Getting product content for productId '" + productId + "'", module);
}
try {
Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrProductSearch.java Wed Dec 13 12:43:05 2017
@@ -111,7 +111,7 @@ public abstract class SolrProductSearch
}
} else {
final String statusMsg = "Solr ECA indexing disabled; skipping indexing for productId '" + productId + "'";
- Debug.logVerbose("Solr: addToSolr: " + statusMsg, module);
+ if (Debug.verboseOn()) Debug.logVerbose("Solr: addToSolr: " + statusMsg, module);
result = ServiceUtil.returnSuccess();
}
return result;
@@ -139,7 +139,7 @@ public abstract class SolrProductSearch
Collection<SolrInputDocument> docs = new ArrayList<SolrInputDocument>();
if (Debug.verboseOn()) {
- Debug.logVerbose("Solr: Indexing document: " + doc1.toString(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Solr: Indexing document: " + doc1.toString(), module);
}
docs.add(doc1);
@@ -215,7 +215,7 @@ public abstract class SolrProductSearch
for (Iterator<Map<String, Object>> fieldListIterator = fieldList.iterator(); fieldListIterator.hasNext();) {
SolrInputDocument doc1 = SolrUtil.generateSolrDocument(fieldListIterator.next());
if (Debug.verboseOn()) {
- Debug.logVerbose("Solr: Indexing document: " + doc1.toString(), module);
+ if (Debug.verboseOn()) Debug.logVerbose("Solr: Indexing document: " + doc1.toString(), module);
}
docs.add(doc1);
}
Modified: ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java?rev=1818005&r1=1818004&r2=1818005&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java (original)
+++ ofbiz/ofbiz-plugins/trunk/solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java Wed Dec 13 12:43:05 2017
@@ -279,7 +279,7 @@ public final class SolrUtil {
solrQuery.setFacet(true);
solrQuery.addFacetField("cat");
solrQuery.setFacetLimit(-1);
- Debug.logVerbose("solr: solrQuery: " + solrQuery, module);
+ if (Debug.verboseOn()) Debug.logVerbose("solr: solrQuery: " + solrQuery, module);
returnMap = client.query(solrQuery, METHOD.POST);
result.put("rows", returnMap);
result.put("numFound", returnMap.getResults().getNumFound());