svnno****@sourc*****
svnno****@sourc*****
2008年 8月 30日 (土) 04:06:21 JST
Revision: 1105
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1105
Author: sone
Date: 2008-08-30 04:06:20 +0900 (Sat, 30 Aug 2008)
Log Message:
-----------
logging system
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/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/NodeImplProxy.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/GroupCriterionResolver.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleCriterionResolver.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/SpringJNDIStarter.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryCacheObjectWrapper.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.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-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/resources/Messages.properties 2008-08-29 19:06:20 UTC (rev 1105)
@@ -257,10 +257,87 @@
# 12: components/portal
# 13: components/portal-site
# 14: components/portlet-factory
+1400001=E[1400001] Cannot create PreferencesValidator instance {0} for Portlet {1}
+1400002=E[1400002] exception in JetspeedPortletFactory.getPreferencesValidator()
+1400003=E[1400003] Cannot create Portlet instance {0} for Portlet Application {0}
+1400004=E[1400004] Failed to initialize Portlet {0} for Portlet Application {1}
+1400005=E[1400005] PortletFactory: Failed to load portlet {0}
# 15: components/prefs
+1500001=D[1500001] re-create node: {0}
+1500002=E[1500002] Failed to initialize prefs api.
+1500003=E[1500003] Could not retrieve node property: [key:{0}, value:{1}]
+1500004=D[1500004] Update existing property: {0}
# 16: components/profiler
+1600001=E[1600001] Invalid (null) Subject in request pipeline
+1600002=E[1600002] Could not find a principle for subject in request pipeline
+1600003=W[1600003] Could not find profiling rule for principal: {0}
+1600004=E[1600004] Couldn't find any profiling rules including default rule for principal {0}
+1600005=W[1600005] Could not find profiling rule for principal: {0}
+1600006=E[1600006] Couldn't find any profiling rules including default rule for principal {0}
+1600007=E[1600007] exception in getPrincipalRuleClass()
+1600008=E[1600008] Exception in setting locatorbeanName : {0}
+1600009=E[1600009] Exception in setting principalRulebeanName : {0}
+1600010=E[1600010] Exception in setting profilingRuleStandardbeanName : {0}
+1600011=E[1600011] Exception in setting profilingRuleFallback : {0}
+1600012=E[1600012] Failed to create locator for {0} error : {1}
+1600013=E[1600013] Failed to create principalRule for {0} error : {1}
+1600014=E[1600014] Failed to create principalRule for {0} error : {1}
+1600015=E[1600015] Invalid (null) Subject in request pipeline
+1600016=E[1600016] Invalid (null) Subject in request pipeline
+1600017=E[1600017] Invalid (null) Subject in request pipeline
+1600018=W[1600018] Invalid criterion provided - type null on rule {0}
+1600019=W[1600019] Invalid criterion provided - name or type null on rule {0}
+1600020=W[1600020] Invalid criterion provided - type null on rule {0}
+1600021=W[1600021] Invalid criterion provided - type null on rule {0}
+1600022=E[1600022] Invalid (null) Subject in request pipeline
# 17: components/rdbms
+1700001=I[1700001] Merging OJB respository {0} for DAO class {1}
+1700002=I[1700002] Setting up data source pooling for {0}
+1700003=I[1700003] Max active connnections set to: {0}
+1700004=I[1700004] Pool is set to "{0}" when all connections are exhausted.
+1700005=I[1700005] Attempting to start DBCPCDatasourceComponent.
+1700006=E[1700006] Unable to obtain a connection database via URI: {0}
+1700007=I[1700007] DBCPCDatasourceComponent successfuly started!
+1700008=E[1700008] Unable to start DBCPCDatasourceComponent: {0}
+1700009=I[1700009] Stopping DBCPCDatasourceComponent
+1700010=E[1700010] {0}
+1700011=D[1700011] Setting schema by executing sql '{0}' on connection {1}
+1700012=E[1700012] Error executing table schema setting sql: '{0}'.
+1700013=E[1700013] datasourceComponent stop failed with {0}
+1700014=E[1700014] SpringComponentManager stop failed with {0}
+1700015=E[1700015] JNDI unbindFromCurrentThread failed with {0}
+1700016=E[1700016] exception in SprintJNDIStarter.getProperty()
+1700017=I[1700017] JNDI successfully initiallized
+1700018=D[1700018] Binding {0} to name {1}
+1700019=D[1700019] Unbinding name {0}
+1700020=E[1700020] Can't instantiate class {0}
+1700021=E[1700021] Can't instantiate class {0}
+1700022=D[1700022] Request new connection from ConnectionFactory: {0}
+1700023=D[1700023] localBegin was called for con {0}
+1700024=D[1700024] Try to change autoCommit state to 'false'
+1700025=D[1700025] commit was called
+1700026=E[1700026] Commit on underlying connection failed, try to rollback connection
+1700027=I[1700027] Rollback was called, do rollback on current connection {0}
+1700028=E[1700028] Rollback on the underlying connection failed
+1700029=E[1700029] IsAlive check failed, running connection was invalid!!
+1700030=E[1700030] Release connection: connection is in local transaction, missing 'localCommit' or 'localRollback' call - try to rollback the connection
+1700031=W[1700031] Automatically derived RDBMS platform "{0}" differs from explicitly set platform "{1}"
+1700032=W[1700032] Cannot determine Oracle version, no "Release" in procuct version: "{0}"
+1700033=W[1700033] Cannot determine Oracle version, product version "{0}" not layed out as "... Release N.M....."
+1700034=D[1700034] Extracted Oracle major version {0} from product version "{1}"
+1700035=W[1700035] Automatically derived RDBMS platform "{0}" differs from explicitly set platform "{1}"
+1700036=D[1700036] ##### platform = {0}
+1700037=W[1700037] Cannot determine Oracle version, no "Release" in procuct version: "{0}"
+1700038=W[1700038] Cannot determine Oracle version, product version "{0}" not layed out as "... Release N.M....."
+1700039=D[1700039] Extracted Oracle major version {0} from product version "{0}"
# 18: components/registry
+1800001=W[1800001] Failed to retrieve Portlet Definition for {0}
+1800002=E[1800002] {0}
+1800003=D[1800003] CacheObject -UNKOWN OPRERATION ={0}
+1800004=E[1800004] Unable to instantiate Description implementor, {0}
+1800005=E[1800005] Failed to fully construct Portlet Definition
+1800006=E[1800006] Unable to instantiate Description implementor, {0}
+1800007=E[1800007] Unable to instantiate DisplayName implementor, {0}
# 19: components/rewriter
1900001=E[1900001] Unable to translate URL relative to base URL
1900002=E[1900002] Error creating rewriter class
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portlet-factory/src/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -29,8 +29,9 @@
import javax.portlet.UnavailableException;
import javax.servlet.ServletContext;
-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.container.JetspeedPortletConfig;
import org.apache.jetspeed.container.PortalAccessor;
import org.apache.jetspeed.om.common.portlet.PortletApplication;
@@ -217,11 +218,14 @@
}
catch (Exception e)
{
- String msg = "Cannot create PreferencesValidator instance "
- + className
- + " for Portlet "
- + pd.getName();
- log.error(msg, e);
+ //String msg = "Cannot create PreferencesValidator instance "
+ // + className
+ // + " for Portlet "
+ // + pd.getName();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {className, pd.getName()};
+ log.log("1400001", args, e); // REPLACED
}
}
}
@@ -229,7 +233,8 @@
}
catch (Exception e)
{
- log.error(e);
+ //log.error(e);
+ log.log("1400002", e); // REPLACED
}
return validator;
}
@@ -302,11 +307,15 @@
}
catch (Exception e)
{
- String msg = "Cannot create Portlet instance "
- + pd.getClassName() + " for Portlet Application "
- + pa.getName();
- log.error(msg, e);
- throw new UnavailableException(msg);
+ //String msg = "Cannot create Portlet instance "
+ // + pd.getClassName() + " for Portlet Application "
+ // + pa.getName();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {pd.getClassName(), pa.getName()};
+ log.log("1400003", args, e); // REPLACED
+ //throw new UnavailableException(msg);
+ throw new UnavailableException(log.getString("1400003"));
}
PortletContext portletContext = PortalAccessor
@@ -329,9 +338,12 @@
}
catch (PortletException e1)
{
- log.error("Failed to initialize Portlet "
- + pd.getClassName() + " for Portlet Application "
- + pa.getName(), e1);
+ //log.error("Failed to initialize Portlet "
+ // + pd.getClassName() + " for Portlet Application "
+ // + pa.getName(), e1);
+ Object[] args = new Object[]
+ {pd.getClassName(), pa.getName()};
+ log.log("1400004", args, e1); // REPLACED
throw e1;
}
portletCache.put(pdId, portlet);
@@ -343,8 +355,11 @@
}
catch (Throwable e)
{
- log.error("PortletFactory: Failed to load portlet "
- + pd.getClassName(), e);
+ //log.error("PortletFactory: Failed to load portlet "
+ // + pd.getClassName(), e);
+ Object[] args = new Object[]
+ {pd.getClassName()};
+ log.log("1400005", args, e); // REPLACED
throw new UnavailableException("Failed to load portlet "
+ pd.getClassName() + ": " + e.toString());
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/NodeImplProxy.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/NodeImplProxy.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/NodeImplProxy.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -20,8 +20,9 @@
import java.sql.Timestamp;
import java.util.Collection;
-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.prefs.om.Node;
public class NodeImplProxy implements Node
@@ -183,7 +184,10 @@
// e.printStackTrace();
if (log.isDebugEnabled())
{
- log.debug("re-create node: " + node.getFullPath(), e);
+ //log.debug("re-create node: " + node.getFullPath(), e);
+ Object[] args = new Object[]
+ {node.getFullPath()};
+ log.log("1500001", args, e); // REPLACED
}
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -19,6 +19,9 @@
import java.util.prefs.Preferences;
import java.util.prefs.PreferencesFactory;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.prefs.PreferencesException;
import org.apache.jetspeed.prefs.PreferencesProvider;
@@ -36,6 +39,9 @@
// TODO Findbugs
protected static PreferencesProvider prefsProvider;
+ protected static final Log log = LogFactory
+ .getLog(PreferencesFactoryImpl.class);
+
public PreferencesFactoryImpl()
{
super();
@@ -80,7 +86,8 @@
}
catch (Throwable e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1500002", e); // REPLACED
throw new PreferencesException("Failed to initialize prefs api. "
+ e.toString());
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -24,8 +24,9 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-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.prefs.FailedToCreateNodeException;
import org.apache.jetspeed.prefs.NodeAlreadyExistsException;
import org.apache.jetspeed.prefs.NodeDoesNotExistException;
@@ -248,8 +249,11 @@
Collection properties = node.getNodeProperties();
if (null == properties)
{
- log.error("Could not retrieve node property: [key: " + key
- + ", value:" + value + "]");
+ //log.error("Could not retrieve node property: [key: " + key
+ // + ", value:" + value + "]");
+ Object[] args = new Object[]
+ {key, value};
+ log.log("1500003", args); // REPLACED
return;
}
@@ -267,9 +271,12 @@
.currentTimeMillis()));
if (log.isDebugEnabled())
{
- log
- .debug("Update existing property: "
- + curProp.toString());
+ //log
+ // .debug("Update existing property: "
+ // + curProp.toString());
+ Object[] args = new Object[]
+ {curProp.toString()};
+ log.log("1500004", args); // REPLACED
}
// Property found, we break.
break;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfilerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -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.components.dao.InitablePersistenceBrokerDaoSupport;
import org.apache.jetspeed.profiler.ProfileLocator;
import org.apache.jetspeed.profiler.Profiler;
@@ -196,9 +197,11 @@
Subject subject = context.getSubject();
if (subject == null)
{
- String msg = "Invalid (null) Subject in request pipeline";
- log.error(msg);
- throw new ProfilerException(msg);
+ //String msg = "Invalid (null) Subject in request pipeline";
+ //log.error(msg);
+ log.log("1600001"); // REPLACED
+ //throw new ProfilerException(msg);
+ throw new ProfilerException(log.getString("1600001"));
}
// get the UserPrincipal, finding the first UserPrincipal, or
// find the first principal if no UserPrincipal isn't available
@@ -206,26 +209,35 @@
UserPrincipal.class);
if (principal == null)
{
- String msg = "Could not find a principle for subject in request pipeline";
- log.error(msg);
- throw new ProfilerException(msg);
+ //String msg = "Could not find a principle for subject in request pipeline";
+ //log.error(msg);
+ log.log("1600002"); // REPLACED
+ //throw new ProfilerException(msg);
+ throw new ProfilerException(log.getString("1600002"));
}
// find a profiling rule for this principal
ProfilingRule rule = getRuleForPrincipal(principal, locatorName);
if (null == rule)
{
- log.warn("Could not find profiling rule for principal: "
- + principal);
+ //log.warn("Could not find profiling rule for principal: "
+ // + principal);
+ Object[] args = new Object[]
+ {principal};
+ log.log("1600003", args); // REPLACED
rule = this.getDefaultRule();
}
if (null == rule)
{
- String msg = "Couldn't find any profiling rules including default rule for principal "
- + principal;
- log.error(msg);
- throw new ProfilerException(msg);
+ //String msg = "Couldn't find any profiling rules including default rule for principal "
+ // + principal;
+ //log.error(msg);
+ Object[] args = new Object[]
+ {principal};
+ log.log("1600004", args); // REPLACED
+ //throw new ProfilerException(msg);
+ throw new ProfilerException(log.getString("1600004"));
}
// create a profile locator for given rule
return rule.apply(context, this);
@@ -239,17 +251,24 @@
locatorName);
if (null == rule)
{
- log.warn("Could not find profiling rule for principal: "
- + DEFAULT_RULE_PRINCIPAL);
+ //log.warn("Could not find profiling rule for principal: "
+ // + DEFAULT_RULE_PRINCIPAL);
+ Object[] args = new Object[]
+ {DEFAULT_RULE_PRINCIPAL};
+ log.log("1600005", args); // REPLACED
rule = this.getDefaultRule();
}
if (null == rule)
{
- String msg = "Couldn't find any profiling rules including default rule for principal "
- + DEFAULT_RULE_PRINCIPAL;
- log.error(msg);
- throw new ProfilerException(msg);
+ //String msg = "Couldn't find any profiling rules including default rule for principal "
+ // + DEFAULT_RULE_PRINCIPAL;
+ //log.error(msg);
+ Object[] args = new Object[]
+ {DEFAULT_RULE_PRINCIPAL};
+ log.log("1600006", args); // REPLACED
+ //throw new ProfilerException(msg);
+ throw new ProfilerException(log.getString("1600006"));
}
// create a profile locator for given rule
return rule.apply(context, this);
@@ -324,7 +343,8 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1600007", e); // REPLACED
}
}
return this.prRuleClass;
@@ -609,9 +629,12 @@
}
catch (Exception e)
{
- String msg = "Exception in setting locatorbeanName : "
- + e.getLocalizedMessage();
- log.error(msg);
+ //String msg = "Exception in setting locatorbeanName : "
+ // + e.getLocalizedMessage();
+ //log.error(msg);
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1600008", args); // REPLACED
}
try
{
@@ -622,9 +645,12 @@
}
catch (Exception e)
{
- String msg = "Exception in setting principalRulebeanName : "
- + e.getLocalizedMessage();
- log.error(msg);
+ //String msg = "Exception in setting principalRulebeanName : "
+ // + e.getLocalizedMessage();
+ //log.error(msg);
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1600009", args); // REPLACED
}
try
{
@@ -635,9 +661,12 @@
}
catch (Exception e)
{
- String msg = "Exception in setting profilingRuleStandardbeanName : "
- + e.getLocalizedMessage();
- log.error(msg);
+ //String msg = "Exception in setting profilingRuleStandardbeanName : "
+ // + e.getLocalizedMessage();
+ //log.error(msg);
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1600010", args); // REPLACED
}
try
{
@@ -648,9 +677,12 @@
}
catch (Exception e)
{
- String msg = "Exception in setting profilingRuleFallback : "
- + e.getLocalizedMessage();
- log.error(msg);
+ //String msg = "Exception in setting profilingRuleFallback : "
+ // + e.getLocalizedMessage();
+ //log.error(msg);
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1600011", args); // REPLACED
}
}
@@ -697,8 +729,11 @@
}
catch (Exception e)
{
- log.error("Failed to create locator for " + this.locatorBean
- + " error : " + e.getLocalizedMessage());
+ //log.error("Failed to create locator for " + this.locatorBean
+ // + " error : " + e.getLocalizedMessage());
+ Object[] args = new Object[]
+ {this.locatorBean, e.getLocalizedMessage()};
+ log.log("1600012", args); // REPLACED
}
return null;
}
@@ -718,8 +753,11 @@
}
catch (Exception e)
{
- log.error("Failed to create principalRule for " + principalRuleBean
- + " error : " + e.getLocalizedMessage());
+ //log.error("Failed to create principalRule for " + principalRuleBean
+ // + " error : " + e.getLocalizedMessage());
+ Object[] args = new Object[]
+ {principalRuleBean, e.getLocalizedMessage()};
+ log.log("1600013", args); // REPLACED
throw new ClassNotFoundException("Spring failed to create the "
+ " principal rule bean.", e);
}
@@ -741,8 +779,11 @@
}
catch (Exception e)
{
- log.error("Failed to create principalRule for " + ruleCriterionBean
- + " error : " + e.getLocalizedMessage());
+ //log.error("Failed to create principalRule for " + ruleCriterionBean
+ // + " error : " + e.getLocalizedMessage());
+ Object[] args = new Object[]
+ {ruleCriterionBean, e.getLocalizedMessage()};
+ log.log("1600014", args); // REPLACED
throw new ClassNotFoundException("Spring failed to create the "
+ " rule criterion bean.", e);
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/GroupCriterionResolver.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/GroupCriterionResolver.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/GroupCriterionResolver.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -18,8 +18,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.profiler.rules.RuleCriterion;
import org.apache.jetspeed.profiler.rules.RuleCriterionResolver;
import org.apache.jetspeed.request.RequestContext;
@@ -55,8 +56,9 @@
Subject subject = context.getSubject();
if (subject == null)
{
- String msg = "Invalid (null) Subject in request pipeline";
- log.error(msg);
+ //String msg = "Invalid (null) Subject in request pipeline";
+ //log.error(msg);
+ log.log("1600015"); // REPLACED
return null;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleComboCriterionResolver.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -18,8 +18,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.profiler.rules.RuleCriterion;
import org.apache.jetspeed.profiler.rules.RuleCriterionResolver;
import org.apache.jetspeed.request.RequestContext;
@@ -53,8 +54,9 @@
Subject subject = context.getSubject();
if (subject == null)
{
- String msg = "Invalid (null) Subject in request pipeline";
- log.error(msg);
+ //String msg = "Invalid (null) Subject in request pipeline";
+ //log.error(msg);
+ log.log("1600016"); // REPLACED
return null;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleCriterionResolver.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleCriterionResolver.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleCriterionResolver.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -18,8 +18,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.profiler.rules.RuleCriterion;
import org.apache.jetspeed.profiler.rules.RuleCriterionResolver;
import org.apache.jetspeed.request.RequestContext;
@@ -55,8 +56,9 @@
Subject subject = context.getSubject();
if (subject == null)
{
- String msg = "Invalid (null) Subject in request pipeline";
- log.error(msg);
+ //String msg = "Invalid (null) Subject in request pipeline";
+ //log.error(msg);
+ log.log("1600017"); // REPLACED
return null;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -19,8 +19,9 @@
import java.util.Iterator;
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;
+
import org.apache.jetspeed.profiler.ProfileLocator;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.profiler.rules.ProfileResolvers;
@@ -74,8 +75,11 @@
RuleCriterion criterion = (RuleCriterion) criteria.next();
if (criterion.getType() == null)
{
- log.warn("Invalid criterion provided - type null on rule "
- + this);
+ //log.warn("Invalid criterion provided - type null on rule "
+ // + this);
+ Object[] args = new Object[]
+ {this};
+ log.log("1600018", args); // REPLACED
}
RuleCriterionResolver resolver = getResolver(criterion.getType());
if (resolver == null)
@@ -128,9 +132,12 @@
RuleCriterion criterion = (RuleCriterion) criteria.next();
if (criterion.getType() == null)
{
- log
- .warn("Invalid criterion provided - name or type null on rule "
- + this);
+ //log
+ // .warn("Invalid criterion provided - name or type null on rule "
+ // + this);
+ Object[] args = new Object[]
+ {this};
+ log.log("1600019", args); // REPLACED
}
RuleCriterionResolver resolver = getResolver(criterion.getType());
if (resolver != null)
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/StandardProfilingRule.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -18,8 +18,9 @@
import java.util.Iterator;
-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.profiler.ProfileLocator;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.profiler.rules.ProfileResolvers;
@@ -73,8 +74,11 @@
RuleCriterion criterion = (RuleCriterion) criteria.next();
if (criterion.getType() == null)
{
- log.warn("Invalid criterion provided - type null on rule "
- + this);
+ //log.warn("Invalid criterion provided - type null on rule "
+ // + this);
+ Object[] args = new Object[]
+ {this};
+ log.log("1600020", args); // REPLACED
}
RuleCriterionResolver resolver = getResolver(criterion.getType());
if (resolver == null)
@@ -108,8 +112,11 @@
RuleCriterion criterion = (RuleCriterion) criteria.next();
if (criterion.getType() == null)
{
- log.warn("Invalid criterion provided - type null on rule "
- + this);
+ //log.warn("Invalid criterion provided - type null on rule "
+ // + this);
+ Object[] args = new Object[]
+ {this};
+ log.log("1600021", args); // REPLACED
}
RuleCriterionResolver resolver = getResolver(criterion.getType());
if (resolver != null)
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/UserCriterionResolver.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -20,8 +20,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.profiler.rules.RuleCriterion;
import org.apache.jetspeed.profiler.rules.RuleCriterionResolver;
import org.apache.jetspeed.request.RequestContext;
@@ -58,8 +59,9 @@
Subject subject = context.getSubject();
if (subject == null)
{
- String msg = "Invalid (null) Subject in request pipeline";
- log.error(msg);
+ //String msg = "Invalid (null) Subject in request pipeline";
+ //log.error(msg);
+ log.log("1600022"); // REPLACED
return null;
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/dao/InitablePersistenceBrokerDaoSupport.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -18,6 +18,9 @@
import java.net.URL;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.ojb.broker.metadata.DescriptorRepository;
import org.apache.ojb.broker.metadata.MetadataManager;
import org.apache.ojb.broker.metadata.RepositoryPersistor;
@@ -42,6 +45,9 @@
protected String repositoryPath;
+ protected static final Log log = LogFactory
+ .getLog(InitablePersistenceBrokerDaoSupport.class);
+
/**
*
*/
@@ -70,8 +76,15 @@
URL descriptorUrl = getClass().getClassLoader().getResource(
repositoryPath);
- logger.info("Merging OJB respository " + descriptorUrl
- + " for DAO class " + getClass().getName());
+ //logger.info("Merging OJB respository " + descriptorUrl
+ // + " for DAO class " + getClass().getName());
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {descriptorUrl, getClass().getName()};
+ log.log("1700001", args); // REPLACED
+ }
+
DescriptorRepository repo = persistor
.readDescriptorRepository(descriptorUrl.openStream());
metaManager.mergeDescriptorRepository(repo);
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -17,7 +17,6 @@
package org.apache.jetspeed.components.datasource;
import java.io.CharArrayWriter;
-import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
@@ -25,12 +24,13 @@
import javax.sql.DataSource;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.dbcp.ConnectionFactory;
import org.apache.commons.dbcp.DriverManagerConnectionFactory;
import org.apache.commons.dbcp.PoolableConnectionFactory;
import org.apache.commons.dbcp.PoolingDataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.pool.ObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool;
@@ -111,12 +111,30 @@
{
- log.info("Setting up data source pooling for " + driverName);
+ //log.info("Setting up data source pooling for " + driverName);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {driverName};
+ log.log("1700002", args); // REPLACED
+ }
- log.info("Max active connnections set to: " + maxActive);
+ //log.info("Max active connnections set to: " + maxActive);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {maxActive};
+ log.log("1700003", args); // REPLACED
+ }
- log.info("Pool is set to \"" + whenExhausted
- + "\" when all connections are exhausted.");
+ //log.info("Pool is set to \"" + whenExhausted
+ // + "\" when all connections are exhausted.");
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {whenExhausted};
+ log.log("1700004", args); // REPLACED
+ }
this.user = user;
this.password = password;
@@ -149,7 +167,12 @@
try
{
- log.info("Attempting to start DBCPCDatasourceComponent.");
+ //log.info("Attempting to start DBCPCDatasourceComponent.");
+ if (log.isInfoEnabled())
+ {
+ log.log("1700005"); // REPLACED
+ }
+
Class.forName(driverName);
// Validate the connection before we go any further
@@ -161,8 +184,11 @@
}
catch (Exception e)
{
- log.error("Unable to obtain a connection database via URI: "
- + connectURI, e);
+ //log.error("Unable to obtain a connection database via URI: "
+ // + connectURI, e);
+ Object[] args = new Object[]
+ {connectURI};
+ log.log("1700006", args); // REPLACED
throw e;
}
@@ -177,15 +203,24 @@
dataSource = new PoolingDataSource(connectionPool);
- log.info("DBCPCDatasourceComponent successfuly started!");
+ //log.info("DBCPCDatasourceComponent successfuly started!");
+ if (log.isInfoEnabled())
+ {
+ log.log("1700007"); // REPLACED
+ }
+
}
catch (Throwable e)
{
CharArrayWriter caw = new CharArrayWriter();
- e.printStackTrace(new PrintWriter(caw));
- String msg = "Unable to start DBCPCDatasourceComponent: ";
- log.error(msg + e.toString(), e);
- throw new IllegalStateException(msg + caw.toString());
+ //e.printStackTrace(new PrintWriter(caw));
+ //String msg = "Unable to start DBCPCDatasourceComponent: ";
+ //log.error(msg + e.toString(), e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1700008", args, e); // REPLACED
+ throw new IllegalStateException(log.getString("1700008")
+ + caw.toString());
}
}
@@ -193,7 +228,11 @@
{
try
{
- log.info("Stopping DBCPCDatasourceComponent");
+ //log.info("Stopping DBCPCDatasourceComponent");
+ if (log.isInfoEnabled())
+ {
+ log.log("1700009"); // REPLACED
+ }
dsConnectionFactory.getPool().close();
// Support for using an embedded Derby database multiple times from
@@ -231,7 +270,10 @@
ise.initCause(e);
try
{
- log.error(ise);
+ //log.error(ise);
+ Object[] args = new Object[]
+ {ise};
+ log.log("1700010", args); // REPLACED
}
catch (Exception e1)
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -19,8 +19,9 @@
import java.sql.SQLException;
import java.sql.Statement;
-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.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
/**
@@ -56,8 +57,11 @@
{
if (log.isDebugEnabled())
{
- log.debug("Setting schema by executing sql '" + schemaSql
- + "' on connection " + con);
+ //log.debug("Setting schema by executing sql '" + schemaSql
+ // + "' on connection " + con);
+ Object[] args = new Object[]
+ {schemaSql, con};
+ log.log("1700011", args); // REPLACED
}
Statement stmt = con.createStatement();
@@ -69,8 +73,11 @@
}
catch (Exception e)
{
- log.error("Error executing table schema setting sql: '"
- + schemaSql + "'.", e);
+ //log.error("Error executing table schema setting sql: '"
+ // + schemaSql + "'.", e);
+ Object[] args = new Object[]
+ {schemaSql};
+ log.log("1700012", args, e); // REPLACED
}
finally
{
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/SpringJNDIStarter.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/SpringJNDIStarter.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/SpringJNDIStarter.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -29,6 +29,9 @@
import java.util.Map;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.jetspeed.components.SpringComponentManager;
import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent;
@@ -64,6 +67,8 @@
SpringComponentManager scm = null;
+ protected static final Log log = LogFactory.getLog(SpringJNDIStarter.class);
+
/**
*
* Create an instance with a given context and the usual SpringComponent
@@ -116,9 +121,12 @@
}
catch (Exception e)
{
- System.out.println("datasourceComponent stop failed with "
- + e.getLocalizedMessage());
- e.printStackTrace();
+ //System.out.println("datasourceComponent stop failed with "
+ // + e.getLocalizedMessage());
+ //e.printStackTrace();
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1700013", args); // REPLACED
}
try
{
@@ -126,9 +134,12 @@
}
catch (Exception e)
{
- System.out.println("SpringComponentManager stop failed with "
- + e.getLocalizedMessage());
- e.printStackTrace();
+ //System.out.println("SpringComponentManager stop failed with "
+ // + e.getLocalizedMessage());
+ //e.printStackTrace();
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1700014", args); // REPLACED
}
try
@@ -137,9 +148,12 @@
}
catch (Exception e)
{
- System.out.println("JNDI unbindFromCurrentThread failed with "
- + e.getLocalizedMessage());
- e.printStackTrace();
+ //System.out.println("JNDI unbindFromCurrentThread failed with "
+ //+ e.getLocalizedMessage());
+ //e.printStackTrace();
+ Object[] args = new Object[]
+ {e.getLocalizedMessage()};
+ log.log("1700015", args); // REPLACED
}
}
@@ -152,7 +166,8 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1700016", e); // REPLACED
}
if (s == null) s = System.getProperty(name);
return s;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/jndi/TyrexJNDIComponent.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -27,9 +27,8 @@
import javax.naming.Context;
import javax.naming.NamingException;
-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 tyrex.naming.MemoryContext;
import tyrex.tm.RuntimeContext;
@@ -73,7 +72,11 @@
// runtime context and associate the runtime context
// with the current thread
bindToCurrentThread();
- log.info("JNDI successfully initiallized");
+ //log.info("JNDI successfully initiallized");
+ if (log.isInfoEnabled())
+ {
+ log.log("1700017"); // REPLACED
+ }
}
@@ -110,7 +113,13 @@
public void bindObject(String bindToName, Object obj)
throws NamingException
{
- log.debug("Binding " + obj + " to name " + bindToName);
+ //log.debug("Binding " + obj + " to name " + bindToName);
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {obj, bindToName};
+ log.log("1700018", args); // REPLACED
+ }
Context ctx = getRootContext();
ctx.bind(bindToName, obj);
}
@@ -136,7 +145,13 @@
*/
public void unbindObject(String name) throws NamingException
{
- log.debug("Unbinding name " + name);
+ //log.debug("Unbinding name " + name);
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {name};
+ log.log("1700019", args); // REPLACED
+ }
Context ctx = getRootContext();
ctx.unbind(name);
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionManagerImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -23,6 +23,9 @@
import java.util.HashMap;
import java.util.Map;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.ojb.broker.OJBRuntimeException;
import org.apache.ojb.broker.PBKey;
import org.apache.ojb.broker.PersistenceBroker;
@@ -42,8 +45,6 @@
import org.apache.ojb.broker.platforms.PlatformFactory;
import org.apache.ojb.broker.util.ClassHelper;
import org.apache.ojb.broker.util.batch.BatchConnection;
-import org.apache.ojb.broker.util.logging.Logger;
-import org.apache.ojb.broker.util.logging.LoggerFactory;
/**
* Manages Connection ressources. This class is a replacement for the default
@@ -63,7 +64,9 @@
// We cannot derive from OBJ's ConnectionManagerIF because member
// variables are private
- private Logger log = LoggerFactory.getLogger(ConnectionManagerImpl.class);
+ //private Logger log = LoggerFactory.getLogger(ConnectionManagerImpl.class);
+ protected static final Log log = LogFactory
+ .getLog(ConnectionManagerImpl.class);
private PersistenceBroker broker = null;
@@ -136,19 +139,27 @@
}
catch (InstantiationException e)
{
- String err = "Can't instantiate class "
- + cpd.getConnectionFactory();
- log.error(err, e);
+ //String err = "Can't instantiate class "
+ // + cpd.getConnectionFactory();
+ //log.error(err, e);
+ Object[] args = new Object[]
+ {cpd.getConnectionFactory()};
+ log.log("1700020", args, e); // REPLACED
throw (IllegalStateException) (new IllegalStateException(
- err)).initCause(e);
+ //err)).initCause(e);
+ log.getString("1700020"))).initCause(e);
}
catch (IllegalAccessException e)
{
- String err = "Can't instantiate class "
- + cpd.getConnectionFactory();
- log.error(err, e);
+ //String err = "Can't instantiate class "
+ // + cpd.getConnectionFactory();
+ //log.error(err, e);
+ Object[] args = new Object[]
+ {cpd.getConnectionFactory()};
+ log.log("1700021", args); // REPLACED
throw (IllegalStateException) (new IllegalStateException(
- err)).initCause(e);
+ //err)).initCause(e);
+ log.getString("1700021"))).initCause(e);
}
}
}
@@ -250,8 +261,13 @@
}
}
if (log.isDebugEnabled())
- log.debug("Request new connection from ConnectionFactory: "
- + con);
+ {
+ //log.debug("Request new connection from ConnectionFactory: "
+ // + con);
+ Object[] args = new Object[]
+ {con};
+ log.log("1700022", args); // REPLACED
+ }
}
if (isBatchMode())
@@ -288,11 +304,19 @@
throw new PersistenceBrokerException("Can't lookup a connection", e);
}
if (log.isDebugEnabled())
- log.debug("localBegin was called for con " + connection);
+ {
+ //log.debug("localBegin was called for con " + connection);
+ Object[] args = new Object[]
+ {connection};
+ log.log("1700023", args); // REPLACED
+ }
if (jcd.getUseAutoCommit() == JdbcConnectionDescriptor.AUTO_COMMIT_SET_TRUE_AND_TEMPORARY_FALSE)
{
if (log.isDebugEnabled())
- log.debug("Try to change autoCommit state to 'false'");
+ {
+ //log.debug("Try to change autoCommit state to 'false'");
+ log.log("1700024"); // REPLACED
+ }
platform.changeAutoCommitState(jcd, connection, false);
}
this.isInLocalTransaction = true;
@@ -303,7 +327,8 @@
*/
public void localCommit()
{
- if (log.isDebugEnabled()) log.debug("commit was called");
+ if (log.isDebugEnabled()) //log.debug("commit was called");
+ log.log("1700025"); // REPLACED
if (!this.isInLocalTransaction) { throw new TransactionNotInProgressException(
"Not in transaction, call begin() before commit()"); }
try
@@ -319,10 +344,11 @@
}
catch (SQLException e)
{
- log
- .error(
- "Commit on underlying connection failed, try to rollback connection",
- e);
+ //log
+ // .error(
+ // "Commit on underlying connection failed, try to rollback connection",
+ // e);
+ log.log("1700026", e); // REPLACED
this.localRollback();
throw new TransactionAbortedException(
"Commit on connection failed", e);
@@ -340,8 +366,15 @@
*/
public void localRollback()
{
- log.info("Rollback was called, do rollback on current connection "
- + con);
+ //log.info("Rollback was called, do rollback on current connection "
+ // + con);
+ if (log.isInfoEnabled())
+ {
+ Object[] args = new Object[]
+ {con};
+ log.log("1700027", args); // REPLACED
+ }
+
if (!this.isInLocalTransaction) { throw new PersistenceBrokerException(
"Not in transaction, cannot abort"); }
try
@@ -359,7 +392,8 @@
}
catch (SQLException e)
{
- log.error("Rollback on the underlying connection failed", e);
+ //log.error("Rollback on the underlying connection failed", e);
+ log.log("1700028", e); // REPLACED
}
finally
{
@@ -409,8 +443,9 @@
}
catch (SQLException e)
{
- log.error("IsAlive check failed, running connection was invalid!!",
- e);
+ //log.error("IsAlive check failed, running connection was invalid!!",
+ // e);
+ log.log("1700029", e); // REPLACED
return false;
}
}
@@ -431,9 +466,10 @@
if (this.con == null) { return; }
if (isInLocalTransaction())
{
- log
- .error("Release connection: connection is in local transaction, missing 'localCommit' or"
- + " 'localRollback' call - try to rollback the connection");
+ //log
+ // .error("Release connection: connection is in local transaction, missing 'localCommit' or"
+ // + " 'localRollback' call - try to rollback the connection");
+ log.log("1700030"); // REPLACED
localRollback();
}
else
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -27,9 +27,10 @@
import javax.naming.InitialContext;
import javax.sql.DataSource;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.ojb.broker.PBKey;
import org.apache.ojb.broker.accesslayer.ConnectionFactoryDBCPImpl;
import org.apache.ojb.broker.accesslayer.ConnectionFactoryManagedImpl;
@@ -362,10 +363,13 @@
{
if (!platform.equals(jcd.getDbms()))
{
- log.warn("Automatically derived RDBMS platform \""
- + jcd.getDbms()
- + "\" differs from explicitly set platform \""
- + platform + "\"");
+ //log.warn("Automatically derived RDBMS platform \""
+ //+ jcd.getDbms()
+ //+ "\" differs from explicitly set platform \""
+ //+ platform + "\"");
+ Object[] args = new Object[]
+ {jcd.getDbms(), platform};
+ log.log("1700031", args); // REPLACED
}
jcd.setDbms(platform);
}
@@ -410,9 +414,12 @@
int startPos = dbVersion.indexOf(relKey);
if (startPos < 0)
{
- log
- .warn("Cannot determine Oracle version, no \"Release\" in procuct version: \""
- + dbVersion + "\"");
+ //log
+ // .warn("Cannot determine Oracle version, no \"Release\" in procuct version: \""
+ // + dbVersion + "\"");
+ Object[] args = new Object[]
+ {dbVersion};
+ log.log("1700032", args); // REPLACED
return;
}
startPos += relKey.length();
@@ -427,16 +434,22 @@
}
catch (NumberFormatException e)
{
- log
- .warn("Cannot determine Oracle version, product version \""
- + dbVersion
- + "\" not layed out as \"... Release N.M.....\"");
+ //log
+ // .warn("Cannot determine Oracle version, product version \""
+ // + dbVersion
+ // + "\" not layed out as \"... Release N.M.....\"");
+ Object[] args = new Object[]
+ {dbVersion};
+ log.log("1700033", args); // REPLACED
return;
}
if (log.isDebugEnabled())
{
- log.debug("Extracted Oracle major version " + rdbmsVersion
- + " from product version \"" + dbVersion + "\"");
+ //log.debug("Extracted Oracle major version " + rdbmsVersion
+ // + " from product version \"" + dbVersion + "\"");
+ Object[] args = new Object[]
+ {rdbmsVersion, dbVersion};
+ log.log("1700034", args); // REPLACED
}
}
if (rdbmsVersion >= 9)
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/DatabasePlatformConfigurator.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -22,8 +22,9 @@
import javax.sql.DataSource;
-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.ojb.broker.PBKey;
import org.apache.ojb.broker.accesslayer.LookupException;
import org.apache.ojb.broker.metadata.ConnectionRepository;
@@ -82,10 +83,13 @@
{
if (!platform.equals(jcd.getDbms()))
{
- log.warn("Automatically derived RDBMS platform \""
- + jcd.getDbms()
- + "\" differs from explicitly set platform \""
- + platform + "\"");
+ //log.warn("Automatically derived RDBMS platform \""
+ // + jcd.getDbms()
+ // + "\" differs from explicitly set platform \""
+ // + platform + "\"");
+ Object[] args = new Object[]
+ {jcd.getDbms(), platform};
+ log.log("1700035", args); // REPLACED
}
jcd.setDbms(platform);
}
@@ -93,7 +97,13 @@
{
platform = jcd.getDbms();
}
- System.out.println("##### platform = " + platform);
+ //System.out.println("##### platform = " + platform);
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {platform};
+ log.log("1700036", args); // REPLACED
+ }
}
/**
@@ -127,9 +137,12 @@
int startPos = dbVersion.indexOf(relKey);
if (startPos < 0)
{
- log
- .warn("Cannot determine Oracle version, no \"Release\" in procuct version: \""
- + dbVersion + "\"");
+ //log
+ // .warn("Cannot determine Oracle version, no \"Release\" in procuct version: \""
+ // + dbVersion + "\"");
+ Object[] args = new Object[]
+ {dbVersion};
+ log.log("1700037", args); // REPLACED
return platform;
}
startPos += relKey.length();
@@ -144,16 +157,22 @@
}
catch (NumberFormatException e)
{
- log
- .warn("Cannot determine Oracle version, product version \""
- + dbVersion
- + "\" not layed out as \"... Release N.M.....\"");
+ //log
+ // .warn("Cannot determine Oracle version, product version \""
+ // + dbVersion
+ // + "\" not layed out as \"... Release N.M.....\"");
+ Object[] args = new Object[]
+ {dbVersion};
+ log.log("1700038", args); // REPLACED
return platform;
}
if (log.isDebugEnabled())
{
- log.debug("Extracted Oracle major version " + rdbmsVersion
- + " from product version \"" + dbVersion + "\"");
+ //log.debug("Extracted Oracle major version " + rdbmsVersion
+ // + " from product version \"" + dbVersion + "\"");
+ Object[] args = new Object[]
+ {rdbmsVersion, dbVersion};
+ log.log("1700039", args); // REPLACED
}
}
if (rdbmsVersion >= 9)
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -22,6 +22,9 @@
import java.util.Iterator;
import java.util.prefs.BackingStoreException;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
@@ -75,6 +78,9 @@
// in your Spring configuration
boolean mergeSharedPreferences = false;
+ protected static final Log log = LogFactory
+ .getLog(PersistenceBrokerPortletEntityAccess.class);
+
/**
*
* @param registry
@@ -168,11 +174,14 @@
}
else
{
- String msg = "Failed to retrieve Portlet Definition for "
- + fragment.getName();
- logger.warn(msg);
+ //String msg = "Failed to retrieve Portlet Definition for "
+ // + fragment.getName();
+ //logger.warn(msg);
+ Object[] args = new Object[]
+ {fragment.getName()};
+ log.log("1800001", args); // REPLACED
portletEntity = new PortletEntityImpl(fragment);
- fragment.overrideRenderedContent(msg);
+ fragment.overrideRenderedContent(log.getString("1800001"));
}
portletEntity.setId(entityKey.toString());
@@ -337,7 +346,10 @@
if (content == null || !content.equals(msg))
{
fragment.overrideRenderedContent(msg);
- logger.error(msg);
+ //logger.error(msg);
+ Object[] args = new Object[]
+ {msg};
+ log.log("1800002", args); // REPLACED
}
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryCacheObjectWrapper.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryCacheObjectWrapper.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryCacheObjectWrapper.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -16,6 +16,9 @@
*/
package org.apache.jetspeed.components.portletregistry;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.DistributedCacheObject;
import org.apache.ojb.broker.Identity;
@@ -36,6 +39,9 @@
String key = null;;
+ protected static final Log log = LogFactory
+ .getLog(RegistryCacheObjectWrapper.class);
+
public RegistryCacheObjectWrapper(Identity id, String key)
{
// System.out.println(this.getClass().getName() + "-" + "NodeCache -
@@ -104,8 +110,14 @@
// System.out.println("CacheObjectExpired =" + this.getKey());
break;
default:
- System.out.println("CacheObject -UNKOWN OPRERATION ="
- + this.getKey());
+ //System.out.println("CacheObject -UNKOWN OPRERATION ="
+ // + this.getKey());
+ if (log.isDebugEnabled())
+ {
+ Object[] args = new Object[]
+ {this.getKey()};
+ log.log("1800003", args); // REPLACED
+ }
return;
}
return;
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -22,8 +22,9 @@
import java.util.Collection;
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.om.common.MutableDescription;
import org.apache.jetspeed.om.common.ParameterComposite;
import org.apache.jetspeed.util.HashCodeBuilder;
@@ -158,7 +159,10 @@
{
String msg = "Unable to instantiate Description implementor, "
+ e.toString();
- log.error(msg, e);
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1800004", args); // REPLACED
throw new IllegalStateException(msg);
}
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -30,6 +30,9 @@
import javax.portlet.PreferencesValidator;
+import jp.sf.pal.portal.logging.Log;
+import jp.sf.pal.portal.logging.LogFactory;
+
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.factory.PortletFactory;
@@ -162,6 +165,9 @@
private String jetspeedSecurityConstraint = null;
+ protected static final Log log = LogFactory
+ .getLog(PortletDefinitionImpl.class);
+
public PortletDefinitionImpl()
{
super();
@@ -178,7 +184,8 @@
{
// System.out.println("Failed to fully construct Portlet
// Definition");
- e.printStackTrace();
+ //e.printStackTrace();
+ log.log("1800005", e); // REPLACED
}
}
@@ -426,32 +433,32 @@
* public void addUserAttribute(UserAttribute userAttribute) {
* this.userAttributeSet.add(userAttribute); }
*//**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection)
- */
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection)
+ */
/*
* public void setUserAttributeSet(Collection userAttributeSet) {
* this.userAttributeSet = userAttributeSet; }
*//**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeSet()
- */
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeSet()
+ */
/*
* public Collection getUserAttributeSet() { return this.userAttributeSet; }
*//**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
- */
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef)
+ */
/*
* public void addUserAttributeRef(UserAttributeRef userAttributeRef) {
* System.out.println("_______IN addUserAttributeRef");
* this.userAttributeRefSet.add(userAttributeRef); }
*//**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection)
- */
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection)
+ */
/*
* public void setUserAttributeRefSet(Collection userAttributeRefSet) {
* this.userAttributeRefSet = userAttributeRefSet; }
*//**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeRefSet()
- */
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeRefSet()
+ */
/*
* public Collection getUserAttributeRefSet() { return
* this.userAttributeRefSet; }
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java 2008-08-27 07:00:23 UTC (rev 1104)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java 2008-08-29 19:06:20 UTC (rev 1105)
@@ -23,8 +23,9 @@
import javax.servlet.ServletContext;
-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.MutableDescription;
import org.apache.jetspeed.om.common.MutableDisplayName;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
@@ -195,10 +196,13 @@
}
catch (Exception e)
{
- String msg = "Unable to instantiate Description implementor, "
- + e.toString();
- log.error(msg, e);
- throw new IllegalStateException(msg);
+ //String msg = "Unable to instantiate Description implementor, "
+ // + e.toString();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1800006", args); // REPLACED
+ throw new IllegalStateException(log.getString("1800006"));
}
}
@@ -223,10 +227,13 @@
}
catch (Exception e)
{
- String msg = "Unable to instantiate DisplayName implementor, "
- + e.toString();
- log.error(msg, e);
- throw new IllegalStateException(msg);
+ //String msg = "Unable to instantiate DisplayName implementor, "
+ // + e.toString();
+ //log.error(msg, e);
+ Object[] args = new Object[]
+ {e.toString()};
+ log.log("1800007", args); // REPLACED
+ throw new IllegalStateException(log.getString("1800007"));
}
}