svn commit: r1335932 - in /ofbiz/branches/release11.04/f
Locked
svn commit: r1335932 - in /ofbiz/branches/release11.04/f
 
|
Author: ashish
Date: Wed May 9 05:38:43 2012 New Revision: 1335932 URL: http://svn.apache.org/viewvc?rev=1335932&view=rev Log: Applied similar fix as we did on trunk r1300463. On production systems you can't suppress Debug.log( message by the use of debug.properties file. It is always good to use Debug.* statements that are having log level setup in debug.properties file. The real problem comes with Debug.log( statement when you are printing any list or map object that contains so many records(or data) in it. Here I am changing all the occurrence of Debug.log( with Debug.logInfo(, Debug.logError( or Debug.logWarning( so that we can have better control of Debug.* statements on production system. :-) Bad use of Debug statement. On production system you will get false alarm that you are having error in code base although the resultant statement is only giving additional information instead of error message. Modified: ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateGeronimoDeployment.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/ContainerLoader.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/JunitContainer.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/HttpClient.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilProperties.java ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilURL.java ofbiz/branches/release11.04/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/CommonServices.java ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/FtpServices.java ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/geo/GeoWorker.java ofbiz/branches/release11.04/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelReader.java ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaSetField.java ofbiz/branches/release11.04/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/JobManager.java ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Modified: ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original) +++ ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java Wed May 9 05:38:43 2012 @@ -227,7 +227,7 @@ public class GenerateContainer implement // } // } - //Debug.log("Using Data : " + dataMap, module); + //Debug.logInfo("Using Data : " + dataMap, module); for (int i = 0; i < files.length; i++) { if (!(files[i].isDirectory() || files[i].isHidden() || files[i].getName().equalsIgnoreCase("geronimo-web.xml"))) { parseTemplate(files[i], dataMap); @@ -362,7 +362,7 @@ public class GenerateContainer implement } } } else { - //Debug.log("Using Data : " + dataMap, module); + //Debug.logInfo("Using Data : " + dataMap, module); for (int i = 0; i < files.length; i++) { if (!files[i].isDirectory() && !files[i].isHidden()) { parseTemplate(files[i], dataMap); @@ -452,7 +452,7 @@ public class GenerateContainer implement } private void parseTemplate(File templateFile, Map<String, Object> dataMap) throws ContainerException { - Debug.log("Parsing template : " + templateFile.getAbsolutePath(), module); + Debug.logInfo("Parsing template : " + templateFile.getAbsolutePath(), module); Reader reader = null; try { reader = new InputStreamReader(new FileInputStream(templateFile)); Modified: ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateGeronimoDeployment.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateGeronimoDeployment.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateGeronimoDeployment.java (original) +++ ofbiz/branches/release11.04/framework/appserver/src/org/ofbiz/appservers/GenerateGeronimoDeployment.java Wed May 9 05:38:43 2012 @@ -119,7 +119,7 @@ public class GenerateGeronimoDeployment // Copy file contents from source to destination dstChannel.transferFrom(srcChannel, 0, srcChannel.size()); - Debug.log("Created jar file : " + newJarName + " in WASCE or Geronimo repository", module); + Debug.logInfo("Created jar file : " + newJarName + " in WASCE or Geronimo repository", module); // Close the channels srcChannel.close(); @@ -142,7 +142,7 @@ public class GenerateGeronimoDeployment } private void parseTemplate(File templateFile, ComponentConfig.WebappInfo webApp) { - Debug.log("Parsing template : " + templateFile.getAbsolutePath() + " for web app " + webApp.getName(), module); + Debug.logInfo("Parsing template : " + templateFile.getAbsolutePath() + " for web app " + webApp.getName(), module); Map<String, Object> dataMap= new HashMap<String, Object>(); dataMap.put("webApp", webApp); Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/ContainerLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/ContainerLoader.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/ContainerLoader.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/ContainerLoader.java Wed May 9 05:38:43 2012 @@ -211,7 +211,7 @@ public class ContainerLoader implements } } } - Debug.log(writer.toString(), module); + Debug.logInfo(writer.toString(), module); } /** Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/JunitContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/JunitContainer.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/JunitContainer.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/container/JunitContainer.java Wed May 9 05:38:43 2012 @@ -46,7 +46,7 @@ public class JunitContainer implements C // get the tests to run Iterator<ContainerConfig.Container.Property> ti = jc.properties.values().iterator(); if (ti == null) { - Debug.log("No tests to load", module); + Debug.logInfo("No tests to load", module); return true; } @@ -70,29 +70,29 @@ public class JunitContainer implements C suite.run(results); // dispay the results - Debug.log("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " + + Debug.logInfo("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " + results.failureCount() + " # Errors: " + results.errorCount(), module); if (Debug.infoOn()) { - Debug.log("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module); + Debug.logInfo("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module); Enumeration<?> err = results.errors(); if (!err.hasMoreElements()) { - Debug.log("None"); + Debug.logInfo("None", module); } else { while (err.hasMoreElements()) { - Debug.log("--> " + err.nextElement(), module); + Debug.logInfo("--> " + err.nextElement(), module); } } - Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); - Debug.log("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module); + Debug.logInfo("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); + Debug.logInfo("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module); Enumeration<?> fail = results.failures(); if (!fail.hasMoreElements()) { - Debug.log("None"); + Debug.logInfo("None", module); } else { while (fail.hasMoreElements()) { - Debug.log("--> " + fail.nextElement(), module); + Debug.logInfo("--> " + fail.nextElement(), module); } } - Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); + Debug.logInfo("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); } return true; Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/HttpClient.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/HttpClient.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/HttpClient.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/HttpClient.java Wed May 9 05:38:43 2012 @@ -333,7 +333,7 @@ public class HttpClient { try { if (Debug.verboseOn() || debug) { try { - Debug.log("ContentEncoding: " + con.getContentEncoding() + "; ContentType: " + + Debug.logInfo("ContentEncoding: " + con.getContentEncoding() + "; ContentType: " + con.getContentType() + " or: " + URLConnection.guessContentTypeFromStream(in), module); } catch (IOException ioe) { Debug.logWarning(ioe, "Caught exception printing content debugging information", module); @@ -350,7 +350,7 @@ public class HttpClient { } } - if (Debug.verboseOn() || debug) Debug.log("Content-Type: " + contentType, module); + if (Debug.verboseOn() || debug) Debug.logInfo("Content-Type: " + contentType, module); if (contentType != null) { contentType = contentType.toUpperCase(); @@ -363,15 +363,15 @@ public class HttpClient { } if (charset != null) charset = charset.trim(); - if (Debug.verboseOn() || debug) Debug.log("Getting text from HttpClient with charset: " + charset, module); + if (Debug.verboseOn() || debug) Debug.logInfo("Getting text from HttpClient with charset: " + charset, module); } BufferedReader post = new BufferedReader(charset == null ? new InputStreamReader(in) : new InputStreamReader(in, charset)); String line = ""; - if (Debug.verboseOn() || debug) Debug.log("---- HttpClient Response Content ----", module); + if (Debug.verboseOn() || debug) Debug.logInfo("---- HttpClient Response Content ----", module); while ((line = post.readLine()) != null) { - if (Debug.verboseOn() || debug) Debug.log("[HttpClient] : " + line, module); + if (Debug.verboseOn() || debug) Debug.logInfo("[HttpClient] : " + line, module); buf.append(line); if (lineFeed) { buf.append("\n"); @@ -421,11 +421,11 @@ public class HttpClient { } else { con = URLConnector.openConnection(requestUrl, timeout, clientCertAlias, hostVerification); } - if (Debug.verboseOn() || debug) Debug.log("Connection opened to : " + requestUrl.toExternalForm(), module); + if (Debug.verboseOn() || debug) Debug.logInfo("Connection opened to : " + requestUrl.toExternalForm(), module); if ((con instanceof HttpURLConnection)) { ((HttpURLConnection) con).setInstanceFollowRedirects(followRedirects); - if (Debug.verboseOn() || debug) Debug.log("Connection is of type HttpURLConnection, more specifically: " + con.getClass().getName(), module); + if (Debug.verboseOn() || debug) Debug.logInfo("Connection is of type HttpURLConnection, more specifically: " + con.getClass().getName(), module); } // set the content type @@ -451,7 +451,7 @@ public class HttpClient { if (basicAuthUsername != null) { String basicAuthString = "Basic " + Base64.base64Encode(basicAuthUsername + ":" + (basicAuthPassword == null ? "" : basicAuthPassword)); con.setRequestProperty("Authorization", basicAuthString); - if (Debug.verboseOn() || debug) Debug.log("Header - Authorization: " + basicAuthString, module); + if (Debug.verboseOn() || debug) Debug.logInfo("Header - Authorization: " + basicAuthString, module); } if (UtilValidate.isNotEmpty(headers)) { @@ -459,27 +459,27 @@ public class HttpClient { String headerName = entry.getKey(); String headerValue = entry.getValue(); con.setRequestProperty(headerName, headerValue); - if (Debug.verboseOn() || debug) Debug.log("Header - " + headerName + ": " + headerValue, module); + if (Debug.verboseOn() || debug) Debug.logInfo("Header - " + headerName + ": " + headerValue, module); } } if (method.equalsIgnoreCase("post")) { DataOutputStream out = new DataOutputStream(con.getOutputStream()); - if (Debug.verboseOn() || debug) Debug.log("Opened output stream", module); + if (Debug.verboseOn() || debug) Debug.logInfo("Opened output stream", module); if (arguments != null) { out.writeBytes(arguments); - if (Debug.verboseOn() || debug) Debug.log("Wrote arguements (parameters) : " + arguments, module); + if (Debug.verboseOn() || debug) Debug.logInfo("Wrote arguements (parameters) : " + arguments, module); } out.flush(); out.close(); - if (Debug.verboseOn() || debug) Debug.log("Flushed and closed buffer", module); + if (Debug.verboseOn() || debug) Debug.logInfo("Flushed and closed buffer", module); } if (Debug.verboseOn() || debug) { Map<String, List<String>> headerFields = con.getHeaderFields(); - Debug.log("Header Fields : " + headerFields, module); + Debug.logInfo("Header Fields : " + headerFields, module); } in = con.getInputStream(); Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/KeyStoreUtil.java Wed May 9 05:38:43 2012 @@ -170,12 +170,12 @@ public class KeyStoreUtil { Collection<? extends Certificate> certCol = cf.generateCertificates(bais); Certificate[] certs = new Certificate[certCol.toArray().length]; if (certCol.size() == 1) { - Debug.log("Single certificate; no chain", module); + Debug.logInfo("Single certificate; no chain", module); bais = new ByteArrayInputStream(certChain); Certificate cert = cf.generateCertificate(bais); certs[0] = cert; } else { - Debug.log("Certificate chain length : " + certCol.size(), module); + Debug.logInfo("Certificate chain length : " + certCol.size(), module); certs = (Certificate[]) certCol.toArray(); } Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java Wed May 9 05:38:43 2012 @@ -83,7 +83,7 @@ public class MultiTrustManager implement for (Certificate cert: chain) { if (cert instanceof X509Certificate) { if (Debug.verboseOn()) - Debug.log("Read certificate (chain) : " + ((X509Certificate) cert).getSubjectX500Principal().getName(), module); + Debug.logInfo("Read certificate (chain) : " + ((X509Certificate) cert).getSubjectX500Principal().getName(), module); issuers.add((X509Certificate) cert); } } @@ -91,7 +91,7 @@ public class MultiTrustManager implement Certificate cert = store.getCertificate(alias); if (cert != null && cert instanceof X509Certificate) { if (Debug.verboseOn()) - Debug.log("Read certificate : " + ((X509Certificate) cert).getSubjectX500Principal().getName(), module); + Debug.logInfo("Read certificate : " + ((X509Certificate) cert).getSubjectX500Principal().getName(), module); issuers.add((X509Certificate) cert); } } @@ -111,10 +111,10 @@ public class MultiTrustManager implement for (X509Certificate issuer: issuers) { for (X509Certificate c: cert) { if (Debug.verboseOn()) - Debug.log("--- Checking cert: " + issuer.getSubjectX500Principal() + " vs " + c.getSubjectX500Principal(), module); + Debug.logInfo("--- Checking cert: " + issuer.getSubjectX500Principal() + " vs " + c.getSubjectX500Principal(), module); if (issuer.equals(c)) { if (Debug.verboseOn()) - Debug.log("--- Found trusted cert: " + issuer.getSerialNumber().toString(16) + " : " + issuer.getSubjectX500Principal(), module); + Debug.logInfo("--- Found trusted cert: " + issuer.getSerialNumber().toString(16) + " : " + issuer.getSubjectX500Principal(), module); return true; } } Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilProperties.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilProperties.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilProperties.java Wed May 9 05:38:43 2012 @@ -281,7 +281,7 @@ public class UtilProperties implements S try { value = properties.getProperty(name); } catch (Exception e) { - Debug.log(e, module); + Debug.logInfo(e, module); } return value == null ? "" : value.trim(); } @@ -305,11 +305,11 @@ public class UtilProperties implements S properties = getProperties(url); resourceCache.put(cacheKey, properties); } catch (MissingResourceException e) { - Debug.log(e, module); + Debug.logInfo(e, module); } } if (properties == null) { - Debug.log("[UtilProperties.getProperties] could not find resource: " + resource, module); + Debug.logInfo("[UtilProperties.getProperties] could not find resource: " + resource, module); return null; } return properties; @@ -330,11 +330,11 @@ public class UtilProperties implements S properties.load(url.openStream()); urlCache.put(url.toString(), properties); } catch (Exception e) { - Debug.log(e, module); + Debug.logInfo(e, module); } } if (properties == null) { - Debug.log("[UtilProperties.getProperties] could not find resource: " + url, module); + Debug.logInfo("[UtilProperties.getProperties] could not find resource: " + url, module); return null; } return properties; @@ -421,7 +421,7 @@ public class UtilProperties implements S try { value = properties.getProperty(name); } catch (Exception e) { - Debug.log(e, module); + Debug.logInfo(e, module); } return value == null ? "" : value.trim(); } @@ -458,7 +458,7 @@ public class UtilProperties implements S curIdx++; } } catch (Exception e) { - Debug.log(e, module); + Debug.logInfo(e, module); } return value == null ? "" : value.trim(); } @@ -534,7 +534,7 @@ public class UtilProperties implements S propFile.close(); } catch (FileNotFoundException e) { - Debug.log(e, "Unable to located the resource file.", module); + Debug.logInfo(e, "Unable to located the resource file.", module); } catch (IOException e) { Debug.logError(e, module); } @@ -576,7 +576,7 @@ public class UtilProperties implements S try { value = bundle.getString(name); } catch (Exception e) { - //Debug.log(e, module); + //Debug.logInfo(e, module); } return value == null ? name : value.trim(); } @@ -672,7 +672,7 @@ public class UtilProperties implements S String resourceCacheKey = createResourceName(resource, locale, false); if (!resourceNotFoundMessagesShown.contains(resourceCacheKey)) { resourceNotFoundMessagesShown.add(resourceCacheKey); - Debug.log("[UtilProperties.getPropertyValue] could not find resource: " + resource + " for locale " + locale, module); + Debug.logInfo("[UtilProperties.getPropertyValue] could not find resource: " + resource + " for locale " + locale, module); } throw new IllegalArgumentException("Could not find resource bundle [" + resource + "] in the locale [" + locale + "]"); } @@ -724,9 +724,9 @@ public class UtilProperties implements S properties = new ExtendedProperties(url, locale); } catch (Exception e) { if (UtilValidate.isNotEmpty(e.getMessage())) { - Debug.log(e.getMessage(), module); + Debug.logInfo(e.getMessage(), module); } else { - Debug.log("Exception thrown: " + e.getClass().getName(), module); + Debug.logInfo("Exception thrown: " + e.getClass().getName(), module); } properties = null; } Modified: ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilURL.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilURL.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilURL.java (original) +++ ofbiz/branches/release11.04/framework/base/src/org/ofbiz/base/util/UtilURL.java Wed May 9 05:38:43 2012 @@ -80,7 +80,7 @@ public class UtilURL { if (url == null) url = fromOfbizHomePath(resourceName); if (url == null) url = fromUrlString(resourceName); - //Debug.log("[fromResource] got URL " + (url == null ? "[NotFound]" : url.toExternalForm()) + " from resourceName " + resourceName); + //Debug.logInfo("[fromResource] got URL " + (url == null ? "[NotFound]" : url.toExternalForm()) + " from resourceName " + resourceName); return url; } Modified: ofbiz/branches/release11.04/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java (original) +++ ofbiz/branches/release11.04/framework/catalina/src/org/ofbiz/catalina/container/SSLImpl.java Wed May 9 05:38:43 2012 @@ -44,7 +44,7 @@ public class SSLImpl extends JSSEImpleme super(); this.ssFactory = (new JSSEFactory()).getSocketFactory(); this.allow = new TrustManager[] { new AllowTrustManager() }; - Debug.log("SSLImpl loaded; using custom ServerSocketFactory", module); + Debug.logInfo("SSLImpl loaded; using custom ServerSocketFactory", module); } @Override Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/CommonServices.java (original) +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/CommonServices.java Wed May 9 05:38:43 2012 @@ -324,7 +324,7 @@ public class CommonServices { set.add(delegator.getModelEntity("RoleType")); for (ModelEntity modelEntity: set) { - Debug.log(modelEntity.getEntityName(), module); + Debug.logInfo(modelEntity.getEntityName(), module); } return ServiceUtil.returnSuccess(); } @@ -366,10 +366,10 @@ public class CommonServices { if (UtilValidate.isNotEmpty(TransactionUtil.debugResMap)) { TransactionUtil.logRunningTx(); } else { - Debug.log("No running transaction to display.", module); + Debug.logInfo("No running transaction to display.", module); } } else { - Debug.log("Debug resources is disabled.", module); + Debug.logInfo("Debug resources is disabled.", module); } return ServiceUtil.returnSuccess(); @@ -458,7 +458,7 @@ public class CommonServices { for (String str: listOfStrings) { String v = mapOfStrings.get(str); - Debug.log("SimpleMapListTest: " + str + " -> " + v, module); + Debug.logInfo("SimpleMapListTest: " + str + " -> " + v, module); } return ServiceUtil.returnSuccess(); @@ -469,17 +469,17 @@ public class CommonServices { MimeMessage message = wrapper.getMessage(); try { if (message.getAllRecipients() != null) { - Debug.log("To: " + UtilMisc.toListArray(message.getAllRecipients()), module); + Debug.logInfo("To: " + UtilMisc.toListArray(message.getAllRecipients()), module); } if (message.getFrom() != null) { - Debug.log("From: " + UtilMisc.toListArray(message.getFrom()), module); + Debug.logInfo("From: " + UtilMisc.toListArray(message.getFrom()), module); } - Debug.log("Subject: " + message.getSubject(), module); + Debug.logInfo("Subject: " + message.getSubject(), module); if (message.getSentDate() != null) { - Debug.log("Sent: " + message.getSentDate().toString(), module); + Debug.logInfo("Sent: " + message.getSentDate().toString(), module); } if (message.getReceivedDate() != null) { - Debug.log("Received: " + message.getReceivedDate().toString(), module); + Debug.logInfo("Received: " + message.getReceivedDate().toString(), module); } } catch (Exception e) { Debug.logError(e, module); @@ -497,7 +497,7 @@ public class CommonServices { try { while ((line = reader.readLine()) != null) { - Debug.log("Read line: " + line, module); + Debug.logInfo("Read line: " + line, module); writer.write(line); } } catch (IOException e) { Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/FtpServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/FtpServices.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/FtpServices.java (original) +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/FtpServices.java Wed May 9 05:38:43 2012 @@ -105,7 +105,7 @@ public class FtpServices { ftp.logout(); } } catch (IOException ioe) { - Debug.log(ioe, "[putFile] caught exception: " + ioe.getMessage(), module); + Debug.logInfo(ioe, "[putFile] caught exception: " + ioe.getMessage(), module); errorList.add(UtilProperties.getMessage(resource, "CommonFtpProblemWithTransfer", UtilMisc.toMap("errorString", ioe.getMessage()), locale)); } finally { if (ftp.isConnected()) { Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/geo/GeoWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/geo/GeoWorker.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/geo/GeoWorker.java (original) +++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/geo/GeoWorker.java Wed May 9 05:38:43 2012 @@ -57,7 +57,7 @@ public class GeoWorker { return UtilMisc.toList(geo); } - //Debug.log("Expanding geo : " + geo, module); + //Debug.logInfo("Expanding geo : " + geo, module); List<GenericValue> geoList = FastList.newInstance(); List<GenericValue> thisGeoAssoc = null; @@ -77,10 +77,10 @@ public class GeoWorker { geoList.addAll(expandGeoGroup(nextGeo)); } } else { - //Debug.log("No associated geos with this group", module); + //Debug.logInfo("No associated geos with this group", module); } - //Debug.log("Expanded to : " + geoList, module); + //Debug.logInfo("Expanded to : " + geoList, module); return geoList; } @@ -119,7 +119,7 @@ public class GeoWorker { if (geoList == null || geo == null) { return false; } - //Debug.log("Contains Geo : " + geoList.contains(geo)); + //Debug.logInfo("Contains Geo : " + geoList.contains(geo)); return geoList.contains(geo); } Modified: ofbiz/branches/release11.04/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java (original) +++ ofbiz/branches/release11.04/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java Wed May 9 05:38:43 2012 @@ -118,7 +118,7 @@ public class DataFile2EntityXml { dataFile = DataFile.readFile(dataFileUrl, definitionUrl, definitionName); } catch (Exception e) { //messages.add(e.toString()); - //Debug.log(e); + //Debug.logInfo(e); } } Modified: ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original) +++ ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Wed May 9 05:38:43 2012 @@ -358,7 +358,7 @@ public class ModelEntity extends ModelIn // override the default resource file String defResourceName = StringUtil.internString(extendEntityElement.getAttribute("default-resource-name")); - //Debug.log("Extended entity - " + extendEntityElement.getAttribute("entity-name") + " new resource name : " + defResourceName, module); + //Debug.logInfo("Extended entity - " + extendEntityElement.getAttribute("entity-name") + " new resource name : " + defResourceName, module); if (UtilValidate.isNotEmpty(defResourceName)) { this.setDefaultResourceName(defResourceName); } Modified: ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java (original) +++ ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java Wed May 9 05:38:43 2012 @@ -210,7 +210,7 @@ public class ModelEntityChecker { try { relatedEntity = reader.getModelEntity(relation.getRelEntityName()); } catch (GenericEntityException e) { - Debug.log("Entity referred to in relation is not defined: " + relation.getRelEntityName()); + Debug.logInfo("Entity referred to in relation is not defined: " + relation.getRelEntityName(), module); } if (relatedEntity != null) { //if relation is of type one, make sure keyMaps @@ -505,7 +505,7 @@ public class ModelEntityChecker { public static void initReservedWords(TreeSet<String> reservedWords) { //create extensive list of reserved words int asize = rwArray.length; - Debug.log("[initReservedWords] array length=" + asize); + Debug.logInfo("[initReservedWords] array length=" + asize, module); for (int i = 0; i < asize; i++) { reservedWords.add(rwArray[i]); } Modified: ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelReader.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelReader.java (original) +++ ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/model/ModelReader.java Wed May 9 05:38:43 2012 @@ -386,7 +386,7 @@ public class ModelReader implements Seri Debug.logInfo(message, module); } - Debug.log("FINISHED LOADING ENTITIES - ALL FILES; #Entities=" + numEntities + " #ViewEntities=" + + Debug.logInfo("FINISHED LOADING ENTITIES - ALL FILES; #Entities=" + numEntities + " #ViewEntities=" + numViewEntities + " #Fields=" + numFields + " #Relationships=" + numRelations + " #AutoRelationships=" + numAutoRelations, module); } } Modified: ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java (original) +++ ofbiz/branches/release11.04/framework/entity/src/org/ofbiz/entity/transaction/DebugXaResource.java Wed May 9 05:38:43 2012 @@ -55,7 +55,7 @@ public class DebugXaResource extends Gen } public void log() { - Debug.log("Xid : " + xid, module); - Debug.log(ex, module); + Debug.logInfo("Xid : " + xid, module); + Debug.logInfo(ex, module); } } Modified: ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java (original) +++ ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityGroupUtil.java Wed May 9 05:38:43 2012 @@ -103,7 +103,7 @@ public class EntityGroupUtil { if (matchesAlways || (matchesInclude && !matchesExclude)) { // make sure this log message is not checked in uncommented: - //Debug.log("In runEntitySync adding [" + modelEntity.getEntityName() + "] to list of Entities to sync", module); + //Debug.logInfo("In runEntitySync adding [" + modelEntity.getEntityName() + "] to list of Entities to sync", module); entityModelToUseList.add(modelEntity); } } Modified: ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java (original) +++ ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java Wed May 9 05:38:43 2012 @@ -72,13 +72,13 @@ public class EntityWatchServices { if (changed) { String errMsg = "Watching entity [" + currentValue.getEntityName() + "] field [" + fieldName + "] value changed from [" + currentFieldValue + "] to [" + newFieldValue + "] for pk [" + newValue.getPrimaryKey() + "]"; - Debug.log(new Exception(errMsg), errMsg, module); + Debug.logInfo(new Exception(errMsg), errMsg, module); } } else { // watch the whole entity if (!currentValue.equals(newValue)) { String errMsg = "Watching entity [" + currentValue.getEntityName() + "] values changed from [" + currentValue + "] to [" + newValue + "] for pk [" + newValue.getPrimaryKey() + "]"; - Debug.log(new Exception(errMsg), errMsg, module); + Debug.logInfo(new Exception(errMsg), errMsg, module); } } } else { @@ -86,11 +86,11 @@ public class EntityWatchServices { // just watch the field Object newFieldValue = newValue.get(fieldName); String errMsg = "Watching entity [" + newValue.getEntityName() + "] field [" + fieldName + "] value changed from [null] to [" + newFieldValue + "] for pk [" + newValue.getPrimaryKey() + "]"; - Debug.log(new Exception(errMsg), errMsg, module); + Debug.logInfo(new Exception(errMsg), errMsg, module); } else { // watch the whole entity String errMsg = "Watching entity [" + newValue.getEntityName() + "] values changed from [null] to [" + newValue + "] for pk [" + newValue.getPrimaryKey() + "]"; - Debug.log(new Exception(errMsg), errMsg, module); + Debug.logInfo(new Exception(errMsg), errMsg, module); } } Modified: ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java (original) +++ ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataLoadContainer.java Wed May 9 05:38:43 2012 @@ -117,7 +117,7 @@ public class EntityDataLoadContainer imp argumentName = argument; argumentVal = ""; } - Debug.log("Install Argument - " + argumentName + " = " + argumentVal, module); + Debug.logInfo("Install Argument - " + argumentName + " = " + argumentVal, module); if ("readers".equalsIgnoreCase(argumentName)) { this.readers = argumentVal; @@ -164,21 +164,21 @@ public class EntityDataLoadContainer imp createConstraints = true; } } else if ("help".equalsIgnoreCase(argumentName)) { - Debug.log("--------------------------------------", module); - Debug.log("java -jar ofbiz.jar -install [options]", module); - Debug.log("-component=[name] .... only load from a specific component"); - Debug.log("-delegator=[name] .... use the defined delegator (default-no-eca", module); - Debug.log("-group=[name] ........ override the entity group (org.ofbiz)", module); - Debug.log("-file=[path] ......... load a single file from location, several files separated by commas.", module); - Debug.log("-createfks ........... create dummy (placeholder) FKs", module); - Debug.log("-maintainTxs ......... maintain timestamps in data file", module); - Debug.log("-inserts ............. use mostly inserts option", module); - Debug.log("-repair-columns ........... repair column sizes", module); - Debug.log("-drop-pks ............ drop primary keys", module); - Debug.log("-create-pks .......... create primary keys", module); - Debug.log("-drop-constraints..... drop indexes and foreign keys before loading", module); - Debug.log("-create-constraints... create indexes and foreign keys after loading (default is true w/ drop-constraints)", module); - Debug.log("-help ................ display this information", module); + Debug.logInfo("--------------------------------------", module); + Debug.logInfo("java -jar ofbiz.jar -install [options]", module); + Debug.logInfo("-component=[name] .... only load from a specific component", module); + Debug.logInfo("-delegator=[name] .... use the defined delegator (default-no-eca", module); + Debug.logInfo("-group=[name] ........ override the entity group (org.ofbiz)", module); + Debug.logInfo("-file=[path] ......... load a single file from location, several files separated by commas.", module); + Debug.logInfo("-createfks ........... create dummy (placeholder) FKs", module); + Debug.logInfo("-maintainTxs ......... maintain timestamps in data file", module); + Debug.logInfo("-inserts ............. use mostly inserts option", module); + Debug.logInfo("-repair-columns ........... repair column sizes", module); + Debug.logInfo("-drop-pks ............ drop primary keys", module); + Debug.logInfo("-create-pks .......... create primary keys", module); + Debug.logInfo("-drop-constraints..... drop indexes and foreign keys before loading", module); + Debug.logInfo("-create-constraints... create indexes and foreign keys after loading (default is true w/ drop-constraints)", module); + Debug.logInfo("-help ................ display this information", module); System.exit(1); } Modified: ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java (original) +++ ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/data/EntityDataServices.java Wed May 9 05:38:43 2012 @@ -246,27 +246,27 @@ public class EntityDataServices { BufferedReader reader = new BufferedReader(new FileReader(file)); String[] header = readEntityHeader(file, delimiter, reader); - //Debug.log("Opened data file [" + file.getName() + "] now running...", module); + //Debug.logInfo("Opened data file [" + file.getName() + "] now running...", module); GeneralException exception = null; String line = null; int lineNumber = 1; while ((line = reader.readLine()) != null) { // process the record String fields[] = line.split(delimiter); - //Debug.log("Split record", module); + //Debug.logInfo("Split record", module); if (fields.length < 1) { exception = new GeneralException("Illegal number of fields [" + file.getName() + " / " + lineNumber); break; } GenericValue newValue = makeGenericValue(delegator, entityName, header, fields); - //Debug.log("Made value object", module); + //Debug.logInfo("Made value object", module); newValue = delegator.createOrStore(newValue); - //Debug.log("Stored record", module); + //Debug.logInfo("Stored record", module); if (lineNumber % 500 == 0 || lineNumber == 1) { - Debug.log("Records Stored [" + file.getName() + "]: " + lineNumber, module); - //Debug.log("Last record : " + newValue, module); + Debug.logInfo("Records Stored [" + file.getName() + "]: " + lineNumber, module); + //Debug.logInfo("Last record : " + newValue, module); } lineNumber++; Modified: ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaSetField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaSetField.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaSetField.java (original) +++ ofbiz/branches/release11.04/framework/entityext/src/org/ofbiz/entityext/eca/EntityEcaSetField.java Wed May 9 05:38:43 2012 @@ -56,7 +56,7 @@ public class EntityEcaSetField { if (UtilValidate.isNotEmpty(s)) { value = s; } - Debug.log("Expanded String: " + s, module); + Debug.logInfo("Expanded String: " + s, module); } } Modified: ofbiz/branches/release11.04/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java (original) +++ ofbiz/branches/release11.04/framework/security/src/org/ofbiz/security/authz/da/GroovyDaHandler.java Wed May 9 05:38:43 2012 @@ -44,7 +44,7 @@ public class GroovyDaHandler implements bindings.put("userId", userId); bindings.put("permissionContext", context); - Debug.log("Attempting to call groovy script : " + accessString, module); + Debug.logInfo("Attempting to call groovy script : " + accessString, module); Object result = null; if (accessString.startsWith("component://")) { Modified: ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java (original) +++ ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java Wed May 9 05:38:43 2012 @@ -63,7 +63,7 @@ public class ServiceEcaSetField { if (UtilValidate.isNotEmpty(s)) { value = s; } - Debug.log("Expanded String: " + s, module); + Debug.logInfo("Expanded String: " + s, module); } } // TODO: rewrite using the ContextAccessor.java see hack below to be able to use maps for email notifications Modified: ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/JobManager.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/JobManager.java (original) +++ ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/JobManager.java Wed May 9 05:38:43 2012 @@ -224,7 +224,7 @@ public class JobManager { int rescheduled = 0; for (GenericValue job: crashed) { Timestamp now = UtilDateTime.nowTimestamp(); - Debug.log("Scheduling Job : " + job, module); + Debug.logInfo("Scheduling Job : " + job, module); String pJobId = job.getString("parentJobId"); if (pJobId == null) { Modified: ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java (original) +++ ofbiz/branches/release11.04/framework/service/src/org/ofbiz/service/job/PersistedServiceJob.java Wed May 9 05:38:43 2012 @@ -244,7 +244,7 @@ public class PersistedServiceJob extends } catch (GenericEntityException gee) { Debug.logError(gee, "ERROR: Unable to re-schedule job [" + getJobId() + "] to re-run : " + job, module); } - Debug.log("Persisted Job [" + getJobId() + "] Failed Re-Scheduling : " + next, module); + Debug.logInfo("Persisted Job [" + getJobId() + "] Failed Re-Scheduling : " + next, module); } else { Debug.logWarning("Persisted Job [" + getJobId() + "] Failed - Max Retry Hit; not re-scheduling", module); } Modified: ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original) +++ ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Wed May 9 05:38:43 2012 @@ -154,38 +154,38 @@ public class TestRunContainer implements } // display the results - Debug.log("[JUNIT] Results for test suite: " + suite.getName()); - Debug.log("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " + + Debug.logInfo("[JUNIT] Results for test suite: " + suite.getName(), module); + Debug.logInfo("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " + results.failureCount() + " # Errors: " + results.errorCount(), module); if (Debug.importantOn()) { - Debug.log("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module); + Debug.logInfo("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module); Enumeration<?> err = results.errors(); if (!err.hasMoreElements()) { - Debug.log("None"); + Debug.logInfo("None", module); } else { while (err.hasMoreElements()) { Object error = err.nextElement(); - Debug.log("--> " + error, module); + Debug.logInfo("--> " + error, module); if (error instanceof TestFailure) { - Debug.log(((TestFailure) error).trace()); + Debug.logInfo(((TestFailure) error).trace(), module); } } } - Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); - Debug.log("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module); + Debug.logInfo("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); + Debug.logInfo("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module); Enumeration<?> fail = results.failures(); if (!fail.hasMoreElements()) { - Debug.log("None"); + Debug.logInfo("None", module); } else { while (fail.hasMoreElements()) { Object failure = fail.nextElement(); - Debug.log("--> " + failure, module); + Debug.logInfo("--> " + failure, module); if (failure instanceof TestFailure) { - Debug.log(((TestFailure) failure).trace()); + Debug.logInfo(((TestFailure) failure).trace(), module); } } } - Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); + Debug.logInfo("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module); } } Modified: ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java (original) +++ ofbiz/branches/release11.04/framework/testtools/src/org/ofbiz/testtools/VerifySeleniumSetups.java Wed May 9 05:38:43 2012 @@ -92,7 +92,7 @@ public class VerifySeleniumSetups { if (contentLength == -1) { request.setAttribute("_ERROR_MESSAGE_", "can not conect to the internet"); } - Debug.log("file size. "+contentLength,module); + Debug.logInfo("file size. "+contentLength,module); if (file.exists()) { if (contentLength == file.length()) { lib = true; @@ -145,12 +145,12 @@ public class VerifySeleniumSetups { URLConnection connection = url.openConnection(); contentLength = connection.getContentLength(); InputStream stream = connection.getInputStream(); - Debug.log("getContentLength is :"+contentLength); + Debug.logInfo("getContentLength is :"+contentLength, module); in = new BufferedInputStream(stream); long totalBytes = in.available(); - Debug.log("totalBytes is : "+totalBytes); + Debug.logInfo("totalBytes is : "+totalBytes, module); byte[] b = new byte[1024]; @@ -158,12 +158,12 @@ public class VerifySeleniumSetups { out = new BufferedOutputStream(file); int r; - Debug.log("currentValue is : "+currentValue+" bytes"); + Debug.logInfo("currentValue is : "+currentValue+" bytes", module); while ((r = in.read(b,0,b.length)) != -1) { out.write(b,0,r); bytesRead += r; currentValue = (int)(bytesRead * 100 / contentLength); - // Debug.log("loading.. :"+bytesRead); + // Debug.logInfo("loading.. :"+bytesRead); } out.flush(); } catch (IOException ex) { Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java Wed May 9 05:38:43 2012 @@ -208,7 +208,7 @@ public class ContextFilter implements Fi allowList.add("/"); // No path is allowed. allowList.add(""); // No path is allowed. - if (debug) Debug.log("[Request]: " + httpRequest.getRequestURI(), module); + if (debug) Debug.logInfo("[Request]: " + httpRequest.getRequestURI(), module); requestPath = httpRequest.getServletPath(); if (requestPath == null) requestPath = ""; Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlEventListener.java Wed May 9 05:38:43 2012 @@ -122,45 +122,45 @@ public class ControlEventListener implem public void logStats(HttpSession session, GenericValue visit) { if (Debug.verboseOn() || session.getAttribute("org.ofbiz.log.session.stats") != null) { - Debug.log("<===================================================================>", module); - Debug.log("Session ID : " + session.getId(), module); - Debug.log("Created Time : " + session.getCreationTime(), module); - Debug.log("Last Access : " + session.getLastAccessedTime(), module); - Debug.log("Max Inactive : " + session.getMaxInactiveInterval(), module); - Debug.log("--------------------------------------------------------------------", module); - Debug.log("Total Sessions : " + ControlEventListener.getTotalActiveSessions(), module); - Debug.log("Total Active : " + ControlEventListener.getTotalActiveSessions(), module); - Debug.log("Total Passive : " + ControlEventListener.getTotalPassiveSessions(), module); - Debug.log("** note : this session has been counted as destroyed.", module); - Debug.log("--------------------------------------------------------------------", module); + Debug.logInfo("<===================================================================>", module); + Debug.logInfo("Session ID : " + session.getId(), module); + Debug.logInfo("Created Time : " + session.getCreationTime(), module); + Debug.logInfo("Last Access : " + session.getLastAccessedTime(), module); + Debug.logInfo("Max Inactive : " + session.getMaxInactiveInterval(), module); + Debug.logInfo("--------------------------------------------------------------------", module); + Debug.logInfo("Total Sessions : " + ControlEventListener.getTotalActiveSessions(), module); + Debug.logInfo("Total Active : " + ControlEventListener.getTotalActiveSessions(), module); + Debug.logInfo("Total Passive : " + ControlEventListener.getTotalPassiveSessions(), module); + Debug.logInfo("** note : this session has been counted as destroyed.", module); + Debug.logInfo("--------------------------------------------------------------------", module); if (visit != null) { - Debug.log("Visit ID : " + visit.getString("visitId"), module); - Debug.log("Party ID : " + visit.getString("partyId"), module); - Debug.log("Client IP : " + visit.getString("clientIpAddress"), module); - Debug.log("Client Host : " + visit.getString("clientHostName"), module); - Debug.log("Client User : " + visit.getString("clientUser"), module); - Debug.log("WebApp : " + visit.getString("webappName"), module); - Debug.log("Locale : " + visit.getString("initialLocale"), module); - Debug.log("UserAgent : " + visit.getString("initialUserAgent"), module); - Debug.log("Referrer : " + visit.getString("initialReferrer"), module); - Debug.log("Initial Req : " + visit.getString("initialRequest"), module); - Debug.log("Visit From : " + visit.getString("fromDate"), module); - Debug.log("Visit Thru : " + visit.getString("thruDate"), module); + Debug.logInfo("Visit ID : " + visit.getString("visitId"), module); + Debug.logInfo("Party ID : " + visit.getString("partyId"), module); + Debug.logInfo("Client IP : " + visit.getString("clientIpAddress"), module); + Debug.logInfo("Client Host : " + visit.getString("clientHostName"), module); + Debug.logInfo("Client User : " + visit.getString("clientUser"), module); + Debug.logInfo("WebApp : " + visit.getString("webappName"), module); + Debug.logInfo("Locale : " + visit.getString("initialLocale"), module); + Debug.logInfo("UserAgent : " + visit.getString("initialUserAgent"), module); + Debug.logInfo("Referrer : " + visit.getString("initialReferrer"), module); + Debug.logInfo("Initial Req : " + visit.getString("initialRequest"), module); + Debug.logInfo("Visit From : " + visit.getString("fromDate"), module); + Debug.logInfo("Visit Thru : " + visit.getString("thruDate"), module); } - Debug.log("--------------------------------------------------------------------", module); - Debug.log("--- Start Session Attributes: ---", module); + Debug.logInfo("--------------------------------------------------------------------", module); + Debug.logInfo("--- Start Session Attributes: ---", module); Enumeration<String> sesNames = null; try { sesNames = UtilGenerics.cast(session.getAttributeNames()); } catch (IllegalStateException e) { - Debug.log("Cannot get session attributes : " + e.getMessage(), module); + Debug.logInfo("Cannot get session attributes : " + e.getMessage(), module); } while (sesNames != null && sesNames.hasMoreElements()) { String attName = sesNames.nextElement(); - Debug.log(attName + ":" + session.getAttribute(attName), module); + Debug.logInfo(attName + ":" + session.getAttribute(attName), module); } - Debug.log("--- End Session Attributes ---", module); - Debug.log("<===================================================================>", module); + Debug.logInfo("--- End Session Attributes ---", module); + Debug.logInfo("<===================================================================>", module); } } Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/ControlServlet.java Wed May 9 05:38:43 2012 @@ -116,7 +116,7 @@ public class ControlServlet extends Http } GenericValue userLogin = (GenericValue) session.getAttribute("userLogin"); - //Debug.log("Cert Chain: " + request.getAttribute("javax.servlet.request.X509Certificate"), module); + //Debug.logInfo("Cert Chain: " + request.getAttribute("javax.servlet.request.X509Certificate"), module); // set the Entity Engine user info if we have a userLogin if (userLogin != null) { Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Wed May 9 05:38:43 2012 @@ -871,7 +871,7 @@ public class LoginWorker { String cnPattern = UtilProperties.getPropertyValue("security.properties", "security.login.cert.pattern", "(.*)"); Pattern pattern = Pattern.compile(cnPattern); - //Debug.log("CN Pattern: " + cnPattern, module); + //Debug.logInfo("CN Pattern: " + cnPattern, module); if (currentUserLogin == null) { X509Certificate[] clientCerts = (X509Certificate[]) request.getAttribute("javax.servlet.request.X509Certificate"); // 2.2 spec @@ -884,7 +884,7 @@ public class LoginWorker { for (int i = 0; i < clientCerts.length; i++) { //X500Principal x500 = clientCerts[i].getSubjectX500Principal(); - //Debug.log("Checking client certification for authentication: " + x500.getName(), module); + //Debug.logInfo("Checking client certification for authentication: " + x500.getName(), module); Map<String, String> x500Map = KeyStoreUtil.getCertX500Map(clientCerts[i]); if (i == 0) { @@ -894,14 +894,14 @@ public class LoginWorker { if (m.matches()) { userLoginId = m.group(1); } else { - Debug.log("Client certificate CN does not match pattern: [" + cnPattern + "]", module); + Debug.logInfo("Client certificate CN does not match pattern: [" + cnPattern + "]", module); } } try { // check for a valid issuer (or generated cert data) if (LoginWorker.checkValidIssuer(delegator, x500Map, clientCerts[i].getSerialNumber())) { - //Debug.log("Looking up userLogin from CN: " + userLoginId, module); + //Debug.logInfo("Looking up userLogin from CN: " + userLoginId, module); // CN should match the userLoginId GenericValue userLogin = delegator.findOne("UserLogin", false, "userLoginId", userLoginId); Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Wed May 9 05:38:43 2012 @@ -516,7 +516,7 @@ public class RequestHandler { // if the request has the save-last-view attribute set, save it now before the view can be rendered or other chain done so that the _LAST* session attributes will represent the previous request if (nextRequestResponse.saveLastView) { - // Debug.log("======save last view: " + session.getAttribute("_LAST_VIEW_NAME_")); + // Debug.logInfo("======save last view: " + session.getAttribute("_LAST_VIEW_NAME_")); String lastViewName = (String) session.getAttribute("_LAST_VIEW_NAME_"); // Do not save the view if the last view is the same as the current view and saveCurrentView is false if (!(!nextRequestResponse.saveCurrentView && "view".equals(nextRequestResponse.type) && nextRequestResponse.value.equals(lastViewName))) { @@ -771,13 +771,13 @@ public class RequestHandler { req.getSession().setAttribute("_LAST_VIEW_PARAMS_", paramMap); if ("SAVED".equals(saveName)) { - //Debug.log("======save current view: " + view); + //Debug.logInfo("======save current view: " + view); req.getSession().setAttribute("_SAVED_VIEW_NAME_", view); req.getSession().setAttribute("_SAVED_VIEW_PARAMS_", paramMap); } if ("HOME".equals(saveName)) { - //Debug.log("======save home view: " + view); + //Debug.logInfo("======save home view: " + view); req.getSession().setAttribute("_HOME_VIEW_NAME_", view); req.getSession().setAttribute("_HOME_VIEW_PARAMS_", paramMap); // clear other saved views Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java Wed May 9 05:38:43 2012 @@ -258,7 +258,7 @@ public class SOAPEventHandler implements // log the response message if (Debug.verboseOn()) { try { - Debug.log("Response Message:\n" + resEnv + "\n", module); + Debug.logInfo("Response Message:\n" + resEnv + "\n", module); } catch (Throwable t) { } } @@ -300,7 +300,7 @@ public class SOAPEventHandler implements // log the response message if (Debug.verboseOn()) { try { - Debug.log("Response Message:\n" + resEnv + "\n", module); + Debug.logInfo("Response Message:\n" + resEnv + "\n", module); } catch (Throwable t) { } } Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceEventHandler.java Wed May 9 05:38:43 2012 @@ -174,7 +174,7 @@ public class ServiceEventHandler impleme String fieldName = item.getFieldName(); //byte[] itemBytes = item.get(); /* - Debug.log("Item Info [" + fieldName + "] : " + item.getName() + " / " + item.getSize() + " / " + + Debug.logInfo("Item Info [" + fieldName + "] : " + item.getName() + " / " + item.getSize() + " / " + item.getContentType() + " FF: " + item.isFormField(), module); */ if (item.isFormField() || item.getName() == null) { @@ -245,7 +245,7 @@ public class ServiceEventHandler impleme if (UtilValidate.isNotEmpty(modelParam.stringMapPrefix)) { Map<String, Object> paramMap = UtilHttp.makeParamMapWithPrefix(request, multiPartMap, modelParam.stringMapPrefix, null); value = paramMap; - if (Debug.verboseOn()) Debug.log("Set [" + modelParam.name + "]: " + paramMap, module); + if (Debug.verboseOn()) Debug.logInfo("Set [" + modelParam.name + "]: " + paramMap, module); } else if (UtilValidate.isNotEmpty(modelParam.stringListSuffix)) { List<Object> paramList = UtilHttp.makeParamListWithSuffix(request, multiPartMap, modelParam.stringListSuffix, null); value = paramList; Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/ServiceStreamHandler.java Wed May 9 05:38:43 2012 @@ -83,7 +83,7 @@ public class ServiceStreamHandler implem outputError(out, e, "Exception thrown in runSync()"); throw new EventHandlerException(e.getMessage(), e); } - Debug.log("Received respone: " + resp, module); + Debug.logInfo("Received respone: " + resp, module); if (ServiceUtil.isError(resp)) { outputError(out, null, ServiceUtil.getErrorMessage(resp)); throw new EventHandlerException(ServiceUtil.getErrorMessage(resp)); Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/event/TestEvent.java Wed May 9 05:38:43 2012 @@ -33,7 +33,7 @@ public class TestEvent { public static String test(HttpServletRequest request, HttpServletResponse response) { request.setAttribute("MESSAGE", "Test Event Ran Fine."); - Debug.log("Test Event Ran Fine.", module); + Debug.logInfo("Test Event Ran Fine.", module); return "success"; } @@ -44,9 +44,9 @@ public class TestEvent { http.setHeader("Cookie", "name=value,value=name"); http.setHeader("User-Agent", "Mozilla/4.0"); http.setParameter("testId", "testing"); - Debug.log(http.post(), module); + Debug.logInfo(http.post(), module); } catch (Exception e) { - Debug.log(e, "HttpClientException Caught.", module); + Debug.logInfo(e, "HttpClientException Caught.", module); } return "success"; } Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/ftl/JpCacheIncludeTransform.java Wed May 9 05:38:43 2012 @@ -62,12 +62,12 @@ public class JpCacheIncludeTransform imp } public void close() throws IOException { - Debug.log("Checking for cached content (" + contextName + "." + include + ")", module); + Debug.logInfo("Checking for cached content (" + contextName + "." + include + ")", module); String content = (String) pageCache.get(contextName + "." + include); if (content == null) { content = wrapper.get(include); pageCache.put(contextName + "." + include, content, expireTime); - Debug.log("No content found; cached result for - " + expireTime, module); + Debug.logInfo("No content found; cached result for - " + expireTime, module); } if (content != null) { writer.write(content); @@ -78,13 +78,13 @@ public class JpCacheIncludeTransform imp public long getExpireTime(Map args) { Object o = args.get("expireTime"); - Debug.log("ExpireTime Object - " + o, module); + Debug.logInfo("ExpireTime Object - " + o, module); long expireTime = 0; if (o != null) { if (o instanceof SimpleScalar) { SimpleScalar s = (SimpleScalar) o; String ets = s.getAsString(); - Debug.log("ExpireTime String - " + ets, module); + Debug.logInfo("ExpireTime String - " + ets, module); try { expireTime = Long.parseLong(ets); } catch (Exception e) { @@ -97,13 +97,13 @@ public class JpCacheIncludeTransform imp public String getInclude(Map args) { Object o = args.get("include"); - Debug.log("Include Object - " + o, module); + Debug.logInfo("Include Object - " + o, module); String include = null; if (o != null) { if (o instanceof SimpleScalar) { SimpleScalar s = (SimpleScalar) o; include = s.getAsString(); - Debug.log("Include String - " + include, module); + Debug.logInfo("Include String - " + include, module); } } return include; Modified: ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java (original) +++ ofbiz/branches/release11.04/framework/webapp/src/org/ofbiz/webapp/view/JspViewHandler.java Wed May 9 05:38:43 2012 @@ -54,8 +54,8 @@ public class JspViewHandler extends Abst throw new ViewHandlerException("Null or empty source"); } - //Debug.log("Requested Page : " + page, module); - //Debug.log("Physical Path : " + context.getRealPath(page)); + //Debug.logInfo("Requested Page : " + page, module); + //Debug.logInfo("Physical Path : " + context.getRealPath(page)); // tell the ContextFilter we are forwarding request.setAttribute(ContextFilter.FORWARDED_FROM_SERVLET, Boolean.TRUE); Modified: ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=1335932&r1=1335931&r2=1335932&view=diff ============================================================================== --- ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Wed May 9 05:38:43 2012 @@ -282,11 +282,11 @@ public class WebToolsServices { } // pause in between files if (pauseLong > 0) { - Debug.log("Pausing for [" + pauseLong + "] seconds - " + UtilDateTime.nowTimestamp()); + Debug.logInfo("Pausing for [" + pauseLong + "] seconds - " + UtilDateTime.nowTimestamp(), module); try { Thread.sleep((pauseLong * 1000)); } catch (InterruptedException ie) { - Debug.log("Pause finished - " + UtilDateTime.nowTimestamp()); + Debug.logInfo("Pause finished - " + UtilDateTime.nowTimestamp(), module); } } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |