Author: jacopoc
Date: Mon Sep 1 15:03:25 2014
New Revision: 1621820
URL: http://svn.apache.org/r1621820
Log:
Removed some trivial padding for info messages at startup that required the
usage of an external (freemarker) util class.
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java
Modified:
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java?rev=1621820&r1=1621819&r2=1621820&view=diff
==============================================================================
---
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
(original)
+++
ofbiz/trunk/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaUtil.java
Mon Sep 1 15:03:25 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
-import freemarker.template.utility.StringUtil;
import javolution.util.FastList;
import javolution.util.FastMap;
@@ -135,7 +134,7 @@ public class EntityEcaUtil {
rules.add(new EntityEcaRule(e));
}
try {
- Debug.logInfo("Loaded [" +
StringUtil.leftPad(Integer.toString(rules.size()), 3) + "] Entity ECA
definitions from " + handler.getFullLocation() + " in loader " +
handler.getLoaderName(), module);
+ Debug.logInfo("Loaded [" + rules.size() + "] Entity ECA
definitions from " + handler.getFullLocation() + " in loader " +
handler.getLoaderName(), module);
} catch (GenericConfigException e) {
Debug.logError(e, module);
}
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java?rev=1621820&r1=1621819&r2=1621820&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
(original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
Mon Sep 1 15:03:25 2014
@@ -51,8 +51,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import freemarker.template.utility.StringUtil;
-
/**
* Generic Service - Service Definition Reader
*/
@@ -182,11 +180,11 @@ public class ModelServiceReader implemen
}
if (this.isFromURL) {
utilTimer.timerString("Finished file " + readerURL + " - Total
Services: " + i + " FINISHED");
- Debug.logInfo("Loaded [" + StringUtil.leftPad(Integer.toString(i),
3) + "] Services from " + readerURL, module);
+ Debug.logInfo("Loaded [" + i + "] Services from " + readerURL,
module);
} else {
utilTimer.timerString("Finished document in " + handler + " -
Total Services: " + i + " FINISHED");
if (Debug.infoOn()) {
- Debug.logInfo("Loaded [" +
StringUtil.leftPad(Integer.toString(i), 3) + "] Services from " +
resourceLocation, module);
+ Debug.logInfo("Loaded [" + i + "] Services from " +
resourceLocation, module);
}
}
return modelServices;
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java?rev=1621820&r1=1621819&r2=1621820&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
(original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaUtil.java
Mon Sep 1 15:03:25 2014
@@ -43,8 +43,6 @@ import org.ofbiz.service.config.ServiceC
import org.ofbiz.service.config.model.ServiceEcas;
import org.w3c.dom.Element;
-import freemarker.template.utility.StringUtil;
-
/**
* ServiceEcaUtil
*/
@@ -123,7 +121,7 @@ public class ServiceEcaUtil {
handlerRules.add(new ServiceEcaRule(e, resourceLocation));
}
if (Debug.infoOn()) {
- Debug.logInfo("Loaded [" +
StringUtil.leftPad(Integer.toString(handlerRules.size()), 3) + "] Service ECA
Rules from " + resourceLocation, module);
+ Debug.logInfo("Loaded [" + handlerRules.size() + "] Service ECA
Rules from " + resourceLocation, module);
}
return handlerRules;
}
Modified:
ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java?rev=1621820&r1=1621819&r2=1621820&view=diff
==============================================================================
---
ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java
(original)
+++
ofbiz/trunk/framework/service/src/org/ofbiz/service/group/ServiceGroupReader.java
Mon Sep 1 15:03:25 2014
@@ -33,8 +33,6 @@ import org.ofbiz.service.config.ServiceC
import org.ofbiz.service.config.model.ServiceGroups;
import org.w3c.dom.Element;
-import freemarker.template.utility.StringUtil;
-
/**
* ServiceGroupReader.java
*/
@@ -88,7 +86,7 @@ public class ServiceGroupReader {
} catch (GenericConfigException e) {
Debug.logError(e, "Could not get resource URL", module);
}
- Debug.logInfo("Loaded [" +
StringUtil.leftPad(Integer.toString(numDefs), 3) + "] Group definitions from "
+ resourceLocation, module);
+ Debug.logInfo("Loaded [" + numDefs + "] Group definitions from " +
resourceLocation, module);
}
}