svnno****@sourc*****
svnno****@sourc*****
2008年 8月 16日 (土) 04:48:04 JST
Revision: 1095
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1095
Author: sone
Date: 2008-08-16 04:48:04 +0900 (Sat, 16 Aug 2008)
Log Message:
-----------
logging system(/components/page-manager and /components/locator)
Modified Paths:
--------------
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java
-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-08-15 19:48:04 UTC (rev 1095)
@@ -164,7 +164,96 @@
0900051=E[0900051] Could not update a value "{2}" of "{1}" key for {0}.
0900052=E[0900052] Could not delete "{1}" key for {0}.
# 10: components/locator
+1000001=I[1000001] Locator application root {0}
+1000002=D[1000002] TemplateLocator: template exists: {0} returning {1}
+1000003=E[1000003] Failed to create template
# 11: components/page-manager
+1100001=I[1100001] getAllNodes() Skipping unsupported document: {0}
+1100002=W[1100002] getAllNodes() failed to create Node: {0}:{1}
+1100003=E[1100003] getAllNodes() unexpected missing folder: {0}
+1100004=D[1100004] Waiting on content for Fragment {0}
+1100005=D[1100005] Been notified that Faragment {0} is complete
+1100006=W[1100006] getPhysicalPermissionPath(): no permission path available for {0} element.
+1100007=E[1100007] dereferenceSecurityConstraintsRefs(): Unable to dereference "{0}" security constraints definition.
+1100008=E[1100008] dereferenceSecurityConstraintsRefs(): Missing page security, unable to dereference security constraints definitions.
+1100009=E[1100009] Failed to create page object for {0}
+1100010=E[1100010] Failed to create link object for {0}
+1100011=E[1100011] Failed to create link object for {0}
+1100012=E[1100012] Failed to create page security object for {0}
+1100013=E[1100013] Failed to create page object for {0}
+1100014=E[1100014] Failed to create page object for {0}
+1100015=E[1100015] Failed to create menu definition object for {0}
+1100016=E[1100016] Failed to create menu exclude definition object for {0}
+1100017=E[1100017] Failed to create menu include definition object for {0}
+1100018=E[1100018] Failed to create menu options definition object for {0}
+1100019=E[1100019] Failed to create menu separator definition object for {0}
+1100020=E[1100020] Failed to create menu definition object for {0}
+1100021=E[1100021] Failed to create menu exclude definition object for {0}
+1100022=E[1100022] Failed to create menu include definition object for {0}
+1100023=E[1100023] Failed to create menu options definition object for {0}
+1100024=E[1100024] Failed to create menu separator definition object for {0}
+1100025=E[1100025] Failed to create security constraints definition object for {0}
+1100026=E[1100026] Failed to create security constraint definition object for {0}
+1100027=E[1100027] Failed to create security constraint definition object for {0}
+1100028=E[1100028] Failed to create security constraint definition object for {0}
+1100029=E[1100029] Failed to create security constraint definition object for {0}
+1100030=E[1100030] Failed to create security constraint definition object for {0}
+1100031=E[1100031] Failed to create security constraints definition object for {0}
+1100032=E[1100032] Failed to create security constraints definition object for {0}
+1100033=E[1100033] Factory failed to create object: {0}
+1100034=E[1100034] Failed to notify page manager event listener
+1100035=E[1100035] Failed to notify page manager event listener
+1100036=E[1100036] Failed to notify page manager event listener
+1100037=E[1100037] Failed to import:
+1100038=D[1100038] overwriting folder {0}
+1100039=D[1100039] skipping folder {0}
+1100040=D[1100040] importing new folder {0}
+1100041=D[1100041] overwriting page {0}
+1100042=D[1100042] skipping page {0}
+1100043=D[1100043] importing new page {0}
+1100044=D[1100044] overwriting page {0}
+1100045=D[1100045] skipping page {0}
+1100046=D[1100046] importing new page {0}
+1100047=E[1100047] Could not create user home for null principal
+1100048=E[1100048] createUserHomePagesFromRoles failed: {0}
+1100049=W[1100049] Recieved null Document to update
+1100050=W[1100050] Recieved Document with null path/id to update
+1100051=E[1100051] Could not marshal the file {0}
+1100052=E[1100052] "Document {0} is not valid
+1100053=E[1100053] Could not save the file {0}
+1100054=E[1100054] Error while saving {0}
+1100055=D[1100055] Loading psml mapping file {0}
+1100056=E[1100056] Could not load the file {0}
+1100057=E[1100057] Could not unmarshal the file {0}
+1100058=E[1100058] Document {0} is not valid
+1100059=W[1100059] Recieved null Document to remove
+1100060=W[1100060] Recieved Document with null path/id to remove
+1100061=E[1100061] Error putting document:
+1100062=D[1100062] Entry is refreshing: {0}
+1100063=W[1100063] Recieved null Folder to update
+1100064=W[1100064] Recieved Folder with null path/id to update
+1100065=W[1100065] Recieved null Folder to remove
+1100066=W[1100066] Recieved Folder with null path/id to remove
+1100067=E[1100067] Error storing Document in the FileCache: {0}
+1100068=E[1100068] Exception : {0}
+1100069=D[1100069] Adding first page
+1100070=D[1100070] Adding second page
+1100071=D[1100071] About to throw ex
+1100072=E[1100072] Page paths and ids must match!
+1100073=E[1100073] Page paths and ids must be set!
+1100074=E[1100074] Link paths and ids must match!
+1100075=E[1100075] Link paths and ids must be set!
+1100076=E[1100076] {0}
+1100077=E[1100077] PageSecurity path must be: {0}{1}
+1100078=E[1100078] PageSecurity paths and ids must match!
+1100079=E[1100079] PageSecurity paths and ids must be set!
+1100080=E[1100080] Folder paths and ids must match!
+1100081=E[1100081] Folder paths and ids must be set!
+1100082=D[1100082] Invocation for method [{0}] failed. Will attempt to replay method invocation [{1}] times with an interval of [{2}] milliseconds
+1100083=D[1100083] Sleeping for [{0}] milliseconds before replaying invocation for method [{1}].
+1100084=D[1100084] Attempt invocation [{0}] for method [{1}].
+1100085=D[1100085] Attempt [{0}] to replay invocation for method [{1}] failed. [{2}] attempts left.
+1100086=D[1100086] [{0}] attempts to replay invocation for method [{1}] failed. Throwing exception [{2}]
# 12: components/portal
# 13: components/portal-site
# 14: components/portlet-factory
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -25,14 +25,15 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
/**
* Jetspeed's default implementation of a template locator.
*
* @author <a href="mailto:taylo****@apach*****">David Sean Taylor</a>
- * @version $Id: JetspeedTemplateLocator.java 587334 2007-10-23 00:30:49Z taylor $
+ * @version $Id: JetspeedTemplateLocator.java 587334 2007-10-23 00:30:49Z taylor
+ * $
*/
public class JetspeedTemplateLocator implements TemplateLocator
{
@@ -81,8 +82,15 @@
throws FileNotFoundException
{
this.appRoot = appRoot;
- log.info("Locator application root "
- + new File(appRoot).getAbsolutePath());
+ //log.info("Locator application root "
+ //+ new File(appRoot).getAbsolutePath());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {new File(appRoot).getAbsolutePath()};
+ log.log("1000001", args); // REPLACED
+ }
+
this.roots = roots;
Iterator itr = roots.iterator();
while (itr.hasNext())
@@ -207,8 +215,11 @@
{
if (log.isDebugEnabled())
{
- log.debug("TemplateLocator: template exists: " + realPath
- + " returning " + workingPath);
+ //log.debug("TemplateLocator: template exists: " + realPath
+ // + " returning " + workingPath);
+ Object[] args = new Object[]
+ {realPath, workingPath};
+ log.log("1000002", args); // REPLACED
}
int appRootLength = appRoot.length();
// remove the application root path from the reall path to
@@ -360,7 +371,8 @@
}
catch (Exception e)
{
- log.error("Failed to create template", e);
+ //log.error("Failed to create template", e);
+ log.log("1000003", e); // REPLACED
template = new JetspeedTemplateDescriptor();
}
return template;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -21,8 +21,9 @@
import java.util.List;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.SecurityConstraints;
@@ -619,14 +620,23 @@
catch (UnsupportedDocumentTypeException e)
{
// Skip unsupported documents
- log
- .info("getAllNodes() Skipping unsupported document: "
- + nodeNames[i]);
+ //log
+ // .info("getAllNodes() Skipping unsupported document: "
+ // + nodeNames[i]);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {nodeNames[i]};
+ log.log("1100001", args); // REPLACED
+ }
}
catch (Exception e)
{
- log.warn("getAllNodes() failed to create Node: "
- + nodeNames[i] + ":" + e.toString(), e);
+ //log.warn("getAllNodes() failed to create Node: "
+ // + nodeNames[i] + ":" + e.toString(), e);
+ Object[] args = new Object[]
+ {nodeNames[i], e.toString()};
+ log.log("1100002", args, e); // REPLACED
}
}
}
@@ -635,8 +645,11 @@
{
if (folderExistenceRequired)
{
- log.error("getAllNodes() unexpected missing folder: "
- + getPath(), fnfe);
+ //log.error("getAllNodes() unexpected missing folder: "
+ // + getPath(), fnfe);
+ Object[] args = new Object[]
+ {getPath()};
+ log.log("1100003", args, fnfe); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -23,8 +23,9 @@
import java.util.ListIterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.decoration.Decoration;
import org.apache.jetspeed.om.common.SecurityConstraint;
@@ -121,8 +122,14 @@
{
try
{
- log.debug("Waiting on content for Fragment " + getId());
+ //log.debug("Waiting on content for Fragment " + getId());
// TODO Findbugs
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {getId()};
+ log.log("1100004", args); // REPLACED
+ }
portletContent.wait();
return portletContent.getContent();
}
@@ -132,8 +139,14 @@
}
finally
{
- log.debug("Been notified that Faragment " + getId()
- + " is complete");
+ //log.debug("Been notified that Faragment " + getId()
+ // + " is complete");
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {getId()};
+ log.log("1100005", args); // REPLACED
+ }
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -26,8 +26,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.om.common.SecuredResource;
import org.apache.jetspeed.om.common.SecurityConstraint;
@@ -489,9 +490,12 @@
public String getPhysicalPermissionPath()
{
// no permissions path available by default
- log
- .warn("getPhysicalPermissionPath(): no permission path available for "
- + this + " element.");
+ //log
+ // .warn("getPhysicalPermissionPath(): no permission path available for "
+ // + this + " element.");
+ Object[] args = new Object[]
+ {this};
+ log.log("1100006", args); // REPLACED
return null;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -21,8 +21,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
@@ -333,17 +334,21 @@
}
else
{
- log
- .error("dereferenceSecurityConstraintsRefs(): Unable to dereference \""
- + constraintsRef
- + "\" security constraints definition.");
+ //log
+ // .error("dereferenceSecurityConstraintsRefs(): Unable to dereference \""
+ // + constraintsRef
+ // + "\" security constraints definition.");
+ Object[] args = new Object[]
+ {constraintsRef};
+ log.log("1100007", args); // REPLACED
}
}
}
else
{
- log
- .error("dereferenceSecurityConstraintsRefs(): Missing page security, unable to dereference security constraints definitions.");
+ //log
+ // .error("dereferenceSecurityConstraintsRefs(): Missing page security, unable to dereference security constraints definitions.");
+ log.log("1100008"); // REPLACED
}
return constraints;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -24,8 +24,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.common.SecurityConstraint;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.folder.Folder;
@@ -227,9 +228,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create page object for "
- + this.pageClass;
- log.error(message, e);
+ //String message = "Failed to create page object for "
+ // + this.pageClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageClass};
+ log.log("1100009", args, e); // REPLACED
}
return page;
}
@@ -254,9 +258,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create link object for "
- + this.linkClass;
- log.error(message, e);
+ //String message = "Failed to create link object for "
+ // + this.linkClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.linkClass};
+ log.log("1100010", args, e); // REPLACED
}
return folder;
}
@@ -285,9 +292,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create link object for "
- + this.linkClass;
- log.error(message, e);
+ //String message = "Failed to create link object for "
+ // + this.linkClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.linkClass};
+ log.log("1100011", args, e); // REPLACED
}
return link;
}
@@ -309,9 +319,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create page security object for "
- + this.pageClass;
- log.error(message, e);
+ //String message = "Failed to create page security object for "
+ //+ this.pageClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageClass};
+ log.log("1100012", args, e); // REPLACED
}
return pageSecurity;
}
@@ -331,10 +344,13 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create page object for "
- + this.pageClass;
- log.error(message, e);
- // throw new NodeException(message, e);
+ //String message = "Failed to create page object for "
+ // + this.pageClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageClass};
+ log.log("1100013", args, e); // REPLACED
+ // throw new NodeException(message, e);
}
return fragment;
}
@@ -354,9 +370,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create page object for "
- + this.pageClass;
- log.error(message, e);
+ //String message = "Failed to create page object for "
+ //+ this.pageClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageClass};
+ log.log("1100014", args, e); // REPLACED
// throw new NodeException(message, e);
}
return fragment;
@@ -375,9 +394,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu definition object for "
- + this.folderMenuDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu definition object for "
+ // + this.folderMenuDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.folderMenuDefinitionClass};
+ log.log("1100015", args, e); // REPLACED
}
return null;
}
@@ -396,9 +418,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu exclude definition object for "
- + this.folderMenuExcludeDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu exclude definition object for "
+ //+ this.folderMenuExcludeDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.folderMenuExcludeDefinitionClass};
+ log.log("1100016", args, e); // REPLACED
}
return null;
}
@@ -417,9 +442,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu include definition object for "
- + this.folderMenuIncludeDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu include definition object for "
+ // + this.folderMenuIncludeDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.folderMenuIncludeDefinitionClass};
+ log.log("1100017", args, e); // REPLACED
}
return null;
}
@@ -438,9 +466,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu options definition object for "
- + this.folderMenuOptionsDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu options definition object for "
+ //+ this.folderMenuOptionsDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.folderMenuOptionsDefinitionClass};
+ log.log("1100018", args, e); // REPLACED
}
return null;
}
@@ -459,9 +490,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu separator definition object for "
- + this.folderMenuSeparatorDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu separator definition object for "
+ // + this.folderMenuSeparatorDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.folderMenuSeparatorDefinitionClass};
+ log.log("1100019", args, e); // REPLACED
}
return null;
}
@@ -479,9 +513,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu definition object for "
- + this.pageMenuDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu definition object for "
+ //+ this.pageMenuDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageMenuDefinitionClass};
+ log.log("1100020", args, e); // REPLACED
}
return null;
}
@@ -500,9 +537,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu exclude definition object for "
- + this.pageMenuExcludeDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu exclude definition object for "
+ // + this.pageMenuExcludeDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageMenuExcludeDefinitionClass};
+ log.log("1100021", args, e); // REPLACED
}
return null;
}
@@ -521,9 +561,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu include definition object for "
- + this.pageMenuIncludeDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu include definition object for "
+ //+ this.pageMenuIncludeDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageMenuIncludeDefinitionClass};
+ log.log("1100022", args, e); // REPLACED
}
return null;
}
@@ -542,9 +585,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu options definition object for "
- + this.pageMenuOptionsDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu options definition object for "
+ //+ this.pageMenuOptionsDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageMenuOptionsDefinitionClass};
+ log.log("1100023", args, e); // REPLACED
}
return null;
}
@@ -563,9 +609,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create menu separator definition object for "
- + this.pageMenuSeparatorDefinitionClass;
- log.error(message, e);
+ //String message = "Failed to create menu separator definition object for "
+ // + this.pageMenuSeparatorDefinitionClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageMenuSeparatorDefinitionClass};
+ log.log("1100024", args, e); // REPLACED
}
return null;
}
@@ -584,9 +633,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraints definition object for "
- + this.securityConstraintsClass;
- log.error(message, e);
+ //String message = "Failed to create security constraints definition object for "
+ // + this.securityConstraintsClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.securityConstraintsClass};
+ log.log("1100025", args, e); // REPLACED
}
return null;
}
@@ -605,9 +657,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraint definition object for "
- + this.folderSecurityConstraintClass;
- log.error(message, e);
+ //String message = "Failed to create security constraint definition object for "
+ // + this.folderSecurityConstraintClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.folderSecurityConstraintClass};
+ log.log("1100026", args, e); // REPLACED
}
return null;
}
@@ -625,9 +680,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraint definition object for "
- + this.pageSecurityConstraintClass;
- log.error(message, e);
+ //String message = "Failed to create security constraint definition object for "
+ // + this.pageSecurityConstraintClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageSecurityConstraintClass};
+ log.log("1100027", args, e); // REPLACED
}
return null;
}
@@ -646,9 +704,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraint definition object for "
- + this.fragmentSecurityConstraintClass;
- log.error(message, e);
+ //String message = "Failed to create security constraint definition object for "
+ // + this.fragmentSecurityConstraintClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.fragmentSecurityConstraintClass};
+ log.log("1100028", args, e); // REPLACED
}
return null;
}
@@ -666,9 +727,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraint definition object for "
- + this.linkSecurityConstraintClass;
- log.error(message, e);
+ //String message = "Failed to create security constraint definition object for "
+ //+ this.linkSecurityConstraintClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.linkSecurityConstraintClass};
+ log.log("1100029", args, e); // REPLACED
}
return null;
}
@@ -687,9 +751,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraint definition object for "
- + this.pageSecuritySecurityConstraintClass;
- log.error(message, e);
+ //String message = "Failed to create security constraint definition object for "
+ // + this.pageSecuritySecurityConstraintClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.pageSecuritySecurityConstraintClass};
+ log.log("1100030", args, e); // REPLACED
}
return null;
}
@@ -707,9 +774,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraints definition object for "
- + this.securityConstraintsDefClass;
- log.error(message, e);
+ //String message = "Failed to create security constraints definition object for "
+ // + this.securityConstraintsDefClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.securityConstraintsDefClass};
+ log.log("1100031", args, e); // REPLACED
}
return null;
}
@@ -727,9 +797,12 @@
}
catch (ClassCastException e)
{
- String message = "Failed to create security constraints definition object for "
- + this.fragmentPreferenceClass;
- log.error(message, e);
+ //String message = "Failed to create security constraints definition object for "
+ // + this.fragmentPreferenceClass;
+ //log.error(message, e);
+ Object[] args = new Object[]
+ {this.fragmentPreferenceClass};
+ log.log("1100032", args, e); // REPLACED
}
return null;
}
@@ -750,9 +823,12 @@
}
catch (Exception e)
{
- log
- .error("Factory failed to create object: "
- + classe.getName(), e);
+ //log
+ // .error("Factory failed to create object: "
+ // + classe.getName(), e);
+ Object[] args = new Object[]
+ {classe.getName()};
+ log.log("1100033", args, e); // REPLACED
}
return object;
}
@@ -823,7 +899,8 @@
}
catch (Exception e)
{
- log.error("Failed to notify page manager event listener", e);
+ //log.error("Failed to notify page manager event listener", e);
+ log.log("1100034", e); // REPLACED
}
}
}
@@ -855,7 +932,8 @@
}
catch (Exception e)
{
- log.error("Failed to notify page manager event listener", e);
+ //log.error("Failed to notify page manager event listener", e);
+ log.log("1100035", e); // REPLACED
}
}
}
@@ -887,7 +965,8 @@
}
catch (Exception e)
{
- log.error("Failed to notify page manager event listener", e);
+ //log.error("Failed to notify page manager event listener", e);
+ log.log("1100036", e); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -18,6 +18,9 @@
import java.util.Iterator;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.folder.Folder;
@@ -62,6 +65,8 @@
/* count of total links imported */
private int linkCount = 0;
+ protected static final Log log = LogFactory.getLog(PageImporter.class);
+
public static void main(String args[])
{
String fileName = System.getProperty(
@@ -115,8 +120,9 @@
}
catch (Exception e)
{
- System.err.println("Failed to import: " + e);
- e.printStackTrace();
+ //System.err.println("Failed to import: " + e);
+ //e.printStackTrace();
+ log.log("1100037", e); // REPLACED
}
}
@@ -168,7 +174,13 @@
{
if (isOverwriteFolders())
{
- System.out.println("overwriting folder " + srcFolder.getPath());
+ //System.out.println("overwriting folder " + srcFolder.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcFolder.getPath()};
+ log.log("1100038", args); // REPLACED
+ }
destManager.removeFolder(dstFolder);
dstFolder = destManager.copyFolder(srcFolder, srcFolder
.getPath());
@@ -177,11 +189,23 @@
}
else
- System.out.println("skipping folder " + srcFolder.getPath());
+ //System.out.println("skipping folder " + srcFolder.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcFolder.getPath()};
+ log.log("1100039", args); // REPLACED
+ }
}
else
{
- System.out.println("importing new folder " + srcFolder.getPath());
+ //System.out.println("importing new folder " + srcFolder.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcFolder.getPath()};
+ log.log("1100040", args); // REPLACED
+ }
dstFolder = destManager.copyFolder(srcFolder, srcFolder.getPath());
destManager.updateFolder(dstFolder);
folderCount++;
@@ -195,18 +219,36 @@
{
if (isOverwritePages())
{
- System.out.println("overwriting page " + srcPage.getPath());
+ //System.out.println("overwriting page " + srcPage.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcPage.getPath()};
+ log.log("1100041", args); // REPLACED
+ }
destManager.removePage(dstPage);
dstPage = destManager.copyPage(srcPage, srcPage.getPath());
destManager.updatePage(dstPage);
pageCount++;
}
else
- System.out.println("skipping page " + srcPage.getPath());
+ //System.out.println("skipping page " + srcPage.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcPage.getPath()};
+ log.log("1100042", args); // REPLACED
+ }
}
else
{
- System.out.println("importing new page " + srcPage.getPath());
+ //System.out.println("importing new page " + srcPage.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcPage.getPath()};
+ log.log("1100043", args); // REPLACED
+ }
dstPage = destManager.copyPage(srcPage, srcPage.getPath());
destManager.updatePage(dstPage);
pageCount++;
@@ -222,18 +264,36 @@
{
if (isOverwritePages())
{
- System.out.println("overwriting link " + srcLink.getPath());
+ //System.out.println("overwriting link " + srcLink.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcLink.getPath()};
+ log.log("1100044", args); // REPLACED
+ }
destManager.removeLink(dstLink);
dstLink = destManager.copyLink(srcLink, srcLink.getPath());
destManager.updateLink(dstLink);
linkCount++;
}
else
- System.out.println("skipping link " + srcLink.getPath());
+ //System.out.println("skipping link " + srcLink.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcLink.getPath()};
+ log.log("1100045", args); // REPLACED
+ }
}
else
{
- System.out.println("importing new link " + srcLink.getPath());
+ //System.out.println("importing new link " + srcLink.getPath());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {srcLink.getPath()};
+ log.log("1100046", args); // REPLACED
+ }
dstLink = destManager.copyLink(srcLink, srcLink.getPath());
destManager.updateLink(dstLink);
linkCount++;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -21,8 +21,9 @@
import javax.security.auth.Subject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
@@ -61,9 +62,10 @@
UserPrincipal.class);
if (principal == null)
{
- String errorMessage = "Could not create user home for null principal";
- log.error(errorMessage);
- throw new NodeException(errorMessage);
+ //String errorMessage = "Could not create user home for null principal";
+ //log.error(errorMessage);
+ log.log("1100047"); // REPLACED
+ throw new NodeException(log.getString("1100047"));
}
try
{
@@ -105,10 +107,13 @@
}
catch (Exception e)
{
- String errorMessage = "createUserHomePagesFromRoles failed: "
- + e.getMessage();
- log.error(errorMessage, e);
- throw new NodeException(errorMessage, e);
+ //String errorMessage = "createUserHomePagesFromRoles failed: "
+ //+ e.getMessage();
+ //log.error(errorMessage, e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1100048", args, e); // REPLACED
+ throw new NodeException(log.getString("1100048"), e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -30,8 +30,9 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
import org.apache.jetspeed.cache.file.FileCacheEventListener;
@@ -199,7 +200,8 @@
// sanity checks
if (document == null)
{
- log.warn("Recieved null Document to update");
+ //log.warn("Recieved null Document to update");
+ log.log("1100049"); // REPLACED
return;
}
String path = document.getPath();
@@ -208,7 +210,8 @@
path = document.getId();
if (path == null)
{
- log.warn("Recieved Document with null path/id to update");
+ //log.warn("Recieved Document with null path/id to update");
+ log.log("1100050"); // REPLACED
return;
}
document.setPath(path);
@@ -343,22 +346,34 @@
}
catch (MarshalException e)
{
- log.error("Could not marshal the file " + f.getAbsolutePath(), e);
+ //log.error("Could not marshal the file " + f.getAbsolutePath(), e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100051", args, e); // REPLACED
throw new FailedToUpdateDocumentException(e);
}
catch (ValidationException e)
{
- log.error("Document " + f.getAbsolutePath() + " is not valid", e);
+ //log.error("Document " + f.getAbsolutePath() + " is not valid", e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100052", args, e); // REPLACED
throw new FailedToUpdateDocumentException(e);
}
catch (IOException e)
{
- log.error("Could not save the file " + f.getAbsolutePath(), e);
+ //log.error("Could not save the file " + f.getAbsolutePath(), e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100053", args, e); // REPLACED
throw new FailedToUpdateDocumentException(e);
}
catch (Exception e)
{
- log.error("Error while saving " + f.getAbsolutePath(), e);
+ //log.error("Error while saving " + f.getAbsolutePath(), e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100054", args, e); // REPLACED
throw new FailedToUpdateDocumentException(e);
}
finally
@@ -393,7 +408,10 @@
if (log.isDebugEnabled())
{
- log.debug("Loading psml mapping file " + mappingFile);
+ //log.debug("Loading psml mapping file " + mappingFile);
+ Object[] args = new Object[]
+ {mappingFile};
+ log.log("1100055", args); // REPLACED
}
mapping = new Mapping();
@@ -644,21 +662,33 @@
}
catch (IOException e)
{
- log.error("Could not load the file " + f.getAbsolutePath(), e);
- throw new PageNotFoundException("Could not load the file "
- + f.getAbsolutePath(), e);
+ //log.error("Could not load the file " + f.getAbsolutePath(), e);
+ //throw new PageNotFoundException("Could not load the file "
+ //+ f.getAbsolutePath(), e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100056", args, e); // REPLACED
+ throw new PageNotFoundException(log.getString("1100056"), e);
}
catch (MarshalException e)
{
- log.error("Could not unmarshal the file " + f.getAbsolutePath(), e);
- throw new PageNotFoundException("Could not unmarshal the file "
- + f.getAbsolutePath(), e);
+ //log.error("Could not unmarshal the file " + f.getAbsolutePath(), e);
+ //throw new PageNotFoundException("Could not unmarshal the file "
+ // + f.getAbsolutePath(), e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100057", args, e); // REPLACED
+ throw new PageNotFoundException(log.getString("1100057"), e);
}
catch (ValidationException e)
{
- log.error("Document " + f.getAbsolutePath() + " is not valid", e);
- throw new DocumentNotFoundException("Document "
- + f.getAbsolutePath() + " is not valid", e);
+ //log.error("Document " + f.getAbsolutePath() + " is not valid", e);
+ //throw new DocumentNotFoundException("Document "
+ // + f.getAbsolutePath() + " is not valid", e);
+ Object[] args = new Object[]
+ {f.getAbsolutePath()};
+ log.log("1100058", args, e); // REPLACED
+ throw new DocumentNotFoundException(log.getString("1100058"), e);
}
if (document == null)
@@ -699,7 +729,8 @@
// sanity checks
if (document == null)
{
- log.warn("Recieved null Document to remove");
+ //log.warn("Recieved null Document to remove");
+ log.log("1100059"); // REPLACED
return;
}
String path = document.getPath();
@@ -708,7 +739,8 @@
path = document.getId();
if (path == null)
{
- log.warn("Recieved Document with null path/id to remove");
+ //log.warn("Recieved Document with null path/id to remove");
+ log.log("1100060"); // REPLACED
return;
}
}
@@ -790,7 +822,8 @@
}
catch (java.io.IOException e)
{
- log.error("Error putting document: " + e);
+ //log.error("Error putting document: " + e);
+ log.log("1100061"); // REPLACED
IllegalStateException ise = new IllegalStateException(
"Error storing Document in the FileCache: "
+ e.toString());
@@ -810,8 +843,13 @@
*/
public void refresh(FileCacheEntry entry) throws Exception
{
- log.debug("Entry is refreshing: " + entry.getFile().getName());
-
+ //log.debug("Entry is refreshing: " + entry.getFile().getName());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {entry.getFile().getName()};
+ log.log("1100062", args); // REPLACED
+ }
if (entry.getDocument() instanceof Document
&& ((Document) entry.getDocument()).getPath().endsWith(
documentType))
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -23,8 +23,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
import org.apache.jetspeed.cache.file.FileCacheEventListener;
@@ -248,7 +249,8 @@
// sanity checks
if (folder == null)
{
- log.warn("Recieved null Folder to update");
+ //log.warn("Recieved null Folder to update");
+ log.log("1100063"); // REPLACED
return;
}
String path = folder.getPath();
@@ -257,7 +259,8 @@
path = folder.getId();
if (path == null)
{
- log.warn("Recieved Folder with null path/id to update");
+ //log.warn("Recieved Folder with null path/id to update");
+ log.log("1100064"); // REPLACED
return;
}
folder.setPath(path);
@@ -314,7 +317,8 @@
// sanity checks
if (folder == null)
{
- log.warn("Recieved null Folder to remove");
+ //log.warn("Recieved null Folder to remove");
+ log.log("1100065"); // REPLACED
return;
}
String path = folder.getPath();
@@ -323,7 +327,8 @@
path = folder.getId();
if (path == null)
{
- log.warn("Recieved Folder with null path/id to remove");
+ //log.warn("Recieved Folder with null path/id to remove");
+ log.log("1100066"); // REPLACED
return;
}
folder.setPath(path);
@@ -718,10 +723,14 @@
catch (java.io.IOException e)
{
- String msg = "Error storing Document in the FileCache: "
- + e.toString();
- log.error(msg);
- IllegalStateException ise = new IllegalStateException(msg);
+ //String msg = "Error storing Document in the FileCache: "
+ //+ e.toString();
+ //log.error(msg);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1100067", args); // REPLACED
+ IllegalStateException ise = new IllegalStateException(log
+ .getString("1100067"));
ise.initCause(e);
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -24,6 +24,9 @@
import javax.security.auth.Subject;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.components.dao.InitablePersistenceBrokerDaoSupport;
import org.apache.jetspeed.om.common.SecurityConstraint;
@@ -162,6 +165,9 @@
private PageManager pageManagerProxy;
+ protected static final Log log = LogFactory
+ .getLog(DatabasePageManager.class);
+
public DatabasePageManager(String repositoryPath, int cacheSize,
int cacheExpiresSeconds, boolean isPermissionsSecurity,
boolean isConstraintsSecurity)
@@ -676,7 +682,10 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1100068", args); // REPLACED
}
return false;
}
@@ -2202,11 +2211,23 @@
if (pages.length > 0 && pages[0].getPath().equals("/tx__test1.psml"))
{
// for tx testing
- System.out.println("Adding first page");
+ //System.out.println("Adding first page");
+ if (log.isDebugEnabled())
+ {
+ log.log("1100069"); // REPLACED
+ }
this.updatePage(pages[0]);
- System.out.println("Adding second page");
+ //System.out.println("Adding second page");
+ if (log.isDebugEnabled())
+ {
+ log.log("1100070"); // REPLACED
+ }
this.updatePage(pages[1]);
- System.out.println("About to throw ex");
+ //System.out.println("About to throw ex");
+ if (log.isDebugEnabled())
+ {
+ log.log("1100071"); // REPLACED
+ }
throw new NodeException("Its gonna blow captain!");
}
for (int ix = 0; ix < pages.length; ix++)
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -19,8 +19,9 @@
import java.util.Collection;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.util.collections.RemovalAwareCollection;
import org.apache.jetspeed.util.collections.RemovalAwareList;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -22,8 +22,9 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.cache.file.FileCache;
import org.apache.jetspeed.cache.file.FileCacheEntry;
@@ -224,13 +225,15 @@
{
if (!page.getPath().equals(page.getId()))
{
- log.error("Page paths and ids must match!");
+ //log.error("Page paths and ids must match!");
+ log.log("1100072"); // REPLACED
return;
}
}
else
{
- log.error("Page paths and ids must be set!");
+ //log.error("Page paths and ids must be set!");
+ log.log("1100073"); // REPLACED
return;
}
@@ -377,13 +380,15 @@
{
if (!link.getPath().equals(link.getId()))
{
- log.error("Link paths and ids must match!");
+ //log.error("Link paths and ids must match!");
+ log.log("1100074"); // REPLACED
return;
}
}
else
{
- log.error("Link paths and ids must be set!");
+ //log.error("Link paths and ids must be set!");
+ log.log("1100075"); // REPLACED
return;
}
@@ -495,7 +500,10 @@
}
catch (Exception e)
{
- log.error(e.getMessage(), e);
+ //log.error(e.getMessage(), e);
+ Object[] args = new Object[]
+ {e.getMessage()};
+ log.log("1100076", args, e); // REPLACED
}
return false;
}
@@ -529,7 +537,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#updatePageSecurity(org.apache.jetspeed.om.page.PageSecurity)
+ * @see
+ * org.apache.jetspeed.page.PageManager#updatePageSecurity(org.apache.jetspeed
+ * .om.page.PageSecurity)
*/
public void updatePageSecurity(PageSecurity pageSecurity)
throws NodeException, FailedToUpdateDocumentException
@@ -541,19 +551,24 @@
if (!pageSecurity.getPath().equals(
Folder.PATH_SEPARATOR + PageSecurity.DOCUMENT_TYPE))
{
- log.error("PageSecurity path must be: " + Folder.PATH_SEPARATOR
- + PageSecurity.DOCUMENT_TYPE);
+ //log.error("PageSecurity path must be: " + Folder.PATH_SEPARATOR
+ // + PageSecurity.DOCUMENT_TYPE);
+ Object[] args = new Object[]
+ {Folder.PATH_SEPARATOR, PageSecurity.DOCUMENT_TYPE};
+ log.log("1100077", args); // REPLACED
return;
}
if (!pageSecurity.getPath().equals(pageSecurity.getId()))
{
- log.error("PageSecurity paths and ids must match!");
+ //log.error("PageSecurity paths and ids must match!");
+ log.log("1100078"); // REPLACED
return;
}
}
else
{
- log.error("PageSecurity paths and ids must be set!");
+ //log.error("PageSecurity paths and ids must be set!");
+ log.log("1100079"); // REPLACED
return;
}
@@ -620,7 +635,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#removePageSecurity(org.apache.jetspeed.om.page.PageSecurity)
+ * @see
+ * org.apache.jetspeed.page.PageManager#removePageSecurity(org.apache.jetspeed
+ * .om.page.PageSecurity)
*/
public void removePageSecurity(PageSecurity pageSecurity)
throws NodeException, FailedToDeleteDocumentException
@@ -676,7 +693,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getFolders(org.apache.jetspeed.om.folder.Folder)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getFolders(org.apache.jetspeed.om
+ * .folder.Folder)
*/
public NodeSet getFolders(Folder folder) throws DocumentException
{
@@ -687,7 +706,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getFolder(org.apache.jetspeed.om.folder.Folder,java.lang.String)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getFolder(org.apache.jetspeed.om
+ * .folder.Folder,java.lang.String)
*/
public Folder getFolder(Folder folder, String name)
throws FolderNotFoundException, DocumentException
@@ -699,7 +720,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getPages(org.apache.jetspeed.om.folder.Folder)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getPages(org.apache.jetspeed.om.
+ * folder.Folder)
*/
public NodeSet getPages(Folder folder) throws NodeException
{
@@ -710,7 +733,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getPage(org.apache.jetspeed.om.folder.Folder,java.lang.String)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getPage(org.apache.jetspeed.om.folder
+ * .Folder,java.lang.String)
*/
public Page getPage(Folder folder, String name)
throws PageNotFoundException, NodeException
@@ -722,7 +747,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getLinks(org.apache.jetspeed.om.folder.Folder)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getLinks(org.apache.jetspeed.om.
+ * folder.Folder)
*/
public NodeSet getLinks(Folder folder) throws NodeException
{
@@ -733,7 +760,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getLink(org.apache.jetspeed.om.folder.Folder,java.lang.String)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getLink(org.apache.jetspeed.om.folder
+ * .Folder,java.lang.String)
*/
public Link getLink(Folder folder, String name)
throws DocumentNotFoundException, NodeException
@@ -745,7 +774,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getPageSecurity(org.apache.jetspeed.om.folder.Folder)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getPageSecurity(org.apache.jetspeed
+ * .om.folder.Folder)
*/
public PageSecurity getPageSecurity(Folder folder)
throws DocumentNotFoundException, NodeException
@@ -757,7 +788,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getAll(org.apache.jetspeed.om.folder.Folder)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getAll(org.apache.jetspeed.om.folder
+ * .Folder)
*/
public NodeSet getAll(Folder folder) throws DocumentException
{
@@ -782,7 +815,9 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#updateFolder(org.apache.jetspeed.om.folder.Folder,boolean)
+ * @see
+ * org.apache.jetspeed.page.PageManager#updateFolder(org.apache.jetspeed
+ * .om.folder.Folder,boolean)
*/
public void updateFolder(Folder folder, boolean deep) throws NodeException,
FolderNotUpdatedException
@@ -792,13 +827,15 @@
{
if (!folder.getPath().equals(folder.getId()))
{
- log.error("Folder paths and ids must match!");
+ //log.error("Folder paths and ids must match!");
+ log.log("1100080"); // REPLACED
return;
}
}
else
{
- log.error("Folder paths and ids must be set!");
+ //log.error("Folder paths and ids must be set!");
+ log.log("1100081"); // REPLACED
return;
}
@@ -883,8 +920,7 @@
*
* @param folderImpl
* folder whose nodes are to be updated
- * @param throws
- * FolderNotUpdatedException
+ * @param throws FolderNotUpdatedException
*/
private void updateFolderNodes(FolderImpl folderImpl)
throws FolderNotUpdatedException
@@ -1074,7 +1110,8 @@
/*
* (non-Javadoc)
*
- * @see org.apache.jetspeed.page.PageManager#getContentPage(java.lang.String)
+ * @see
+ * org.apache.jetspeed.page.PageManager#getContentPage(java.lang.String)
*/
public ContentPage getContentPage(String path)
throws PageNotFoundException, NodeException
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java 2008-08-13 14:42:48 UTC (rev 1094)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/MethodReplayInterceptor.java 2008-08-15 19:48:04 UTC (rev 1095)
@@ -16,10 +16,11 @@
*/
package org.apache.jetspeed.util.interceptors;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Generic aspect that will attempt to replay a method invocation if one of a
@@ -71,12 +72,15 @@
// TODO should this be at level WARN/ERROR?
if (log.isDebugEnabled())
{
- log
- .debug("Invocation for method ["
- + invocation.getMethod().toString()
- + "] failed. Will attempt to replay method invocation ["
- + retryCount + "] times with an interval of ["
- + retryInterval + "] milliseconds");
+ //log
+ // .debug("Invocation for method ["
+ // + invocation.getMethod().toString()
+ // + "] failed. Will attempt to replay method invocation ["
+ // + retryCount + "] times with an interval of ["
+ // + retryInterval + "] milliseconds");
+ Object[] args = new Object[]
+ {invocation.getMethod().toString(), retryCount, retryInterval};
+ log.log("1100082", args); // REPLACED
}
int retryCounter = 1;
@@ -89,20 +93,26 @@
{
if (log.isDebugEnabled())
{
- log
- .debug("Sleeping for ["
- + retryInterval
- + "] milliseconds before replaying invocation for method ["
- + invocation.getMethod().toString()
- + "].");
+ //log
+ // .debug("Sleeping for ["
+ // + retryInterval
+ // + "] milliseconds before replaying invocation for method ["
+ // + invocation.getMethod().toString()
+ // + "].");
+ Object[] args = new Object[]
+ {retryInterval, invocation.getMethod().toString()};
+ log.log("1100083", args); // REPLACED
}
Thread.sleep(this.retryInterval);
if (log.isDebugEnabled())
{
- log.debug("Attempt invocation [" + retryCounter
- + "] for method ["
- + invocation.getMethod().toString() + "].");
+ //log.debug("Attempt invocation [" + retryCounter
+ // + "] for method ["
+ // + invocation.getMethod().toString() + "].");
+ Object[] args = new Object[]
+ {retryCounter, invocation.getMethod().toString()};
+ log.log("1100084", args); // REPLACED
}
// returning from a finally block will discard the
// exception
@@ -116,11 +126,15 @@
if (log.isDebugEnabled())
{
- log.debug("Attempt [" + retryCounter
- + "] to replay invocation for method ["
- + invocation.getMethod().toString()
- + "] failed. [" + (retryCount - retryCounter)
- + "] attempts left.");
+ //log.debug("Attempt [" + retryCounter
+ // + "] to replay invocation for method ["
+ // + invocation.getMethod().toString()
+ // + "] failed. [" + (retryCount - retryCounter)
+ //+ "] attempts left.");
+ Object[] args = new Object[]
+ {retryCounter, invocation.getMethod().toString(),
+ (retryCount - retryCounter)};
+ log.log("1100085", args); // REPLACED
}
lastExp = exp2;
@@ -129,11 +143,15 @@
}
if (log.isDebugEnabled())
{
- log.debug("[" + retryCounter
- + "] attempts to replay invocation for method ["
- + invocation.getMethod().toString()
- + "] failed. Throwing exception ["
- + lastExp.getClass().getName() + "]");
+ //log.debug("[" + retryCounter
+ // + "] attempts to replay invocation for method ["
+ // + invocation.getMethod().toString()
+ // + "] failed. Throwing exception ["
+ //+ lastExp.getClass().getName() + "]");
+ Object[] args = new Object[]
+ {retryCounter, invocation.getMethod().toString(),
+ lastExp.getClass().getName()};
+ log.log("1100086", args); // REPLACED
}
throw lastExp;
}