This is an implementation of the JetspeedDatabase interface.
@@ -79,6 +80,11 @@
public class ObjectBridgeDatabaseService extends TurbineBaseService
implements JetspeedDatabaseService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ObjectBridgeDatabaseService.class.getName());
+
PersistenceBroker pm = null;
/**
@@ -100,7 +106,7 @@
}
catch (Exception e)
{
- Log.error( "Failed to load ObjectBridge Manager: " + e.toString() );
+ logger.error("Failed to load ObjectBridge Manager: " + e.toString(), e);
throw new InitializationException(e.toString());
}
// initialization done
@@ -122,7 +128,7 @@
* fails to initialize
*/
public void init() throws InitializationException {
- Log.info( "Late init for ObjectBridgeDatabaseService called" );
+ logger.info( "Late init for ObjectBridgeDatabaseService called" );
}
/**
Index: org/apache/jetspeed/services/forward/ForwardTool.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/forward/ForwardTool.java,v
retrieving revision 1.2
diff -u -r1.2 ForwardTool.java
--- org/apache/jetspeed/services/forward/ForwardTool.java 14 Apr 2003 19:01:45 -0000 1.2
+++ org/apache/jetspeed/services/forward/ForwardTool.java 21 Jul 2003 00:20:57 -0000
@@ -55,10 +55,10 @@
// Turbine
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.services.pull.ApplicationTool;
+// Jetspeed
import org.apache.jetspeed.util.ServiceUtil;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
Index: org/apache/jetspeed/services/forward/JetspeedForwardService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/forward/JetspeedForwardService.java,v
retrieving revision 1.4
diff -u -r1.4 JetspeedForwardService.java
--- org/apache/jetspeed/services/forward/JetspeedForwardService.java 14 Apr 2003 19:01:46 -0000 1.4
+++ org/apache/jetspeed/services/forward/JetspeedForwardService.java 21 Jul 2003 00:20:58 -0000
@@ -68,7 +68,6 @@
// turbine, services
import org.apache.turbine.services.Service;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.services.resources.TurbineResources;
@@ -91,6 +90,8 @@
import org.xml.sax.InputSource;
// jetspeed
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
@@ -121,7 +122,11 @@
public class JetspeedForwardService extends TurbineBaseService
implements ForwardService
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedForwardService.class.getName());
+
// configuration keys
protected final static String CONFIG_MAPPING = "mapping";
protected final static String CONFIG_DIRECTORY = "directory";
@@ -180,8 +185,7 @@
}
catch (Exception e)
{
- Log.error("ForwardService: Failed to load : " + e);
- e.printStackTrace();
+ logger.error("ForwardService: Failed to load ", e);
}
// initialization done
@@ -342,7 +346,7 @@
{
// forward not found, log it and return to home page
// TODO: perhaps this could be configurable to go to a default error page
- Log.error("Forward not found, going to Home Page:" + forwardName);
+ logger.error("Forward not found, going to Home Page:" + forwardName);
duri = link.getHomePage();
}
@@ -364,8 +368,7 @@
}
catch (Throwable t)
{
- Log.error("Exception in Forward: " + t);
- t.printStackTrace();
+ logger.error("Exception in Forward",t);
}
return duri;
}
@@ -574,14 +577,14 @@
catch (Exception e)
{
String msg = "ForwardService: Error in castor mapping creation";
- Log.error(msg, e);
+ logger.error(msg, e);
throw new InitializationException(msg, e);
}
}
else
{
String msg = "ForwardService: Mapping not found or not a file or unreadable: " + this.mapping;
- Log.error(msg);
+ logger.error(msg);
throw new InitializationException(msg);
}
@@ -605,7 +608,7 @@
catch (Exception e)
{
String msg = "ForwardService: Fatal error loading Forward configurations";
- Log.error(msg, e);
+ logger.error(msg, e);
throw new InitializationException(msg, e);
}
@@ -643,7 +646,7 @@
Forward forward = (Forward)it.next();
if (this.forwards.containsKey(forward.getName()))
{
- Log.error("ForwardService: already contains Forward key: " + forward.getName());
+ logger.error("ForwardService: already contains Forward key: " + forward.getName());
}
else
{
@@ -661,7 +664,7 @@
String key = makePortletForwardKey(pf.getPortlet(), pf.getTarget());
if (this.portletForwards.containsKey(key))
{
- Log.error("ForwardService: already contains portletForward key: " + key);
+ logger.error("ForwardService: already contains portletForward key: " + key);
}
else
{
@@ -674,8 +677,7 @@
}
catch (Throwable t)
{
- t.printStackTrace();
- Log.error("ForwardService: Could not unmarshal: " + file, t);
+ logger.error("ForwardService: Could not unmarshal: " + file, t);
}
}
Index: org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java,v
retrieving revision 1.3
diff -u -r1.3 JetspeedIdGeneratorService.java
--- org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java 4 Mar 2003 17:02:14 -0000 1.3
+++ org/apache/jetspeed/services/idgenerator/JetspeedIdGeneratorService.java 21 Jul 2003 00:20:58 -0000
@@ -58,14 +58,14 @@
import javax.servlet.ServletConfig;
// Jetspeed
-import org.apache.jetspeed.services.idgenerator.IdGeneratorService;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
// Turbine
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.Log;
/**
* Simple implementation of the IdGeneratorService.
@@ -76,6 +76,11 @@
public class JetspeedIdGeneratorService extends TurbineBaseService
implements IdGeneratorService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedIdGeneratorService.class.getName());
+
// configuration keys
private final static String CONFIG_COUNTER_START = "counter.start";
private final static String CONFIG_PEID_PREFIX = "peid.prefix";
@@ -118,14 +123,14 @@
* fails to initialize
*/
public void init() throws InitializationException {
- Log.info( "Late init for JetspeedIdGeneratorService called" );
+ logger.info( "Late init for JetspeedIdGeneratorService called" );
while( !getInit() ) {
//Not yet...
try {
Thread.sleep( 100 );
- Log.info( "Waiting for init of JetspeedIdGeneratorService..." );
+ logger.info( "Waiting for init of JetspeedIdGeneratorService..." );
} catch (InterruptedException ie ) {
- Log.error( ie );
+ logger.error("Exception", ie);
}
}
}
@@ -136,7 +141,7 @@
*/
public void shutdown()
{
- Log.info( "Shutdown for JetspeedIdGeneratorService called. idCounter = "
+ logger.info( "Shutdown for JetspeedIdGeneratorService called. idCounter = "
+ idCounter + " (" + Long.toHexString(idCounter) + ")" );
}
Index: org/apache/jetspeed/services/jsp/tags/ContentURITag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/ContentURITag.java,v
retrieving revision 1.5
diff -u -r1.5 ContentURITag.java
--- org/apache/jetspeed/services/jsp/tags/ContentURITag.java 7 May 2003 15:16:51 -0000 1.5
+++ org/apache/jetspeed/services/jsp/tags/ContentURITag.java 21 Jul 2003 00:20:59 -0000
@@ -60,10 +60,13 @@
// Turbine Classes
import org.apache.turbine.util.ContentURI;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.jsp.JspService;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
/**
* Supporting class for the contentURI tag.
* Returns the URL for the given webapp relative URI
@@ -74,6 +77,11 @@
public class ContentURITag extends TagSupport
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(ContentURITag.class.getName());
+
+ /**
* type parameter defines type of URI that is requested
*/
private String href;
@@ -101,7 +109,7 @@
catch (Exception e)
{
String message = "Error processing contentUri-tag, parameter: "+ href;
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print( message );
Index: org/apache/jetspeed/services/jsp/tags/DynamicURITag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/DynamicURITag.java,v
retrieving revision 1.9
diff -u -r1.9 DynamicURITag.java
--- org/apache/jetspeed/services/jsp/tags/DynamicURITag.java 7 May 2003 15:16:51 -0000 1.9
+++ org/apache/jetspeed/services/jsp/tags/DynamicURITag.java 21 Jul 2003 00:20:59 -0000
@@ -59,11 +59,14 @@
import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.template.TemplateLink;
import org.apache.turbine.services.jsp.JspService;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
/**
* Supporting class for the DynamicURI tag.
* Basically routes the call to DynamicUri
@@ -74,6 +77,11 @@
public class DynamicURITag extends TagSupport
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DynamicURITag.class.getName());
+
+ /**
* screen parameter defines the screen to set
*/
private String screen;
@@ -130,7 +138,7 @@
catch (Exception e)
{
String message = "Error processing DynamicUriTag, parameter: screen='"+ screen + "', action='" +action +"'";
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print( message );
Index: org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java,v
retrieving revision 1.10
diff -u -r1.10 EcsScreenTag.java
--- org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java 7 May 2003 15:16:51 -0000 1.10
+++ org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java 21 Jul 2003 00:20:59 -0000
@@ -60,12 +60,14 @@
// Turbine Classes
import org.apache.turbine.modules.ScreenLoader;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.ecs.ConcreteElement;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
/**
* Supporting class for the ecsscreen tag.
@@ -77,7 +79,11 @@
*/
public class EcsScreenTag extends TagSupport
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(EcsScreenTag.class.getName());
+
/**
* Method called when the tag is encountered to send attributes to the
* output stream
@@ -117,7 +123,7 @@
catch (Exception e)
{
String message = "Error processing ecs screen '" + screenName + "'.";
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error processing ecs screen '" + screenName + "'. See log for more information.");
Index: org/apache/jetspeed/services/jsp/tags/InfoTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/InfoTag.java,v
retrieving revision 1.6
diff -u -r1.6 InfoTag.java
--- org/apache/jetspeed/services/jsp/tags/InfoTag.java 7 May 2003 15:16:51 -0000 1.6
+++ org/apache/jetspeed/services/jsp/tags/InfoTag.java 21 Jul 2003 00:20:59 -0000
@@ -62,10 +62,12 @@
import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.jsp.JspService;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
/**
* Supporting class for the info tag.
@@ -77,6 +79,11 @@
public class InfoTag extends TagSupport
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(InfoTag.class.getName());
+
+ /**
* requestedInfo parameter defines type of Info that is being requested
*/
private String requestedInfo;
@@ -127,7 +134,7 @@
catch (Exception e)
{
String message = "Error processing info-tag, parameter: "+ requestedInfo;
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error processing info-tag, parameter: "+ requestedInfo);
Index: org/apache/jetspeed/services/jsp/tags/JetspeedForwardTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedForwardTag.java,v
retrieving revision 1.1
diff -u -r1.1 JetspeedForwardTag.java
--- org/apache/jetspeed/services/jsp/tags/JetspeedForwardTag.java 25 Apr 2003 20:42:42 -0000 1.1
+++ org/apache/jetspeed/services/jsp/tags/JetspeedForwardTag.java 21 Jul 2003 00:20:59 -0000
@@ -60,7 +60,6 @@
import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.services.jsp.JspService;
@@ -69,6 +68,8 @@
import org.apache.ecs.StringElement;
// Jetspeed support
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.forward.ForwardService;
import org.apache.jetspeed.util.ServiceUtil;
@@ -86,6 +87,11 @@
*/
public class JetspeedForwardTag extends TagSupport
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedForwardTag.class.getName());
+
private String name = null;
private String target = null;
@@ -148,7 +154,7 @@
catch (Exception e)
{
String message = "Error processing name '" + name + "'.";
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error processing forward name '" + name + "'. See log for more information.");
Index: org/apache/jetspeed/services/jsp/tags/JetspeedL10NTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedL10NTag.java,v
retrieving revision 1.4
diff -u -r1.4 JetspeedL10NTag.java
--- org/apache/jetspeed/services/jsp/tags/JetspeedL10NTag.java 20 May 2003 19:11:47 -0000 1.4
+++ org/apache/jetspeed/services/jsp/tags/JetspeedL10NTag.java 21 Jul 2003 00:20:59 -0000
@@ -59,7 +59,6 @@
import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.jsp.JspService;
// ECS support
@@ -67,6 +66,8 @@
import org.apache.ecs.StringElement;
// Jetspeed support
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.customlocalization.CustomLocalizationTool;
import org.apache.jetspeed.services.customlocalization.CustomLocalization;
@@ -81,6 +82,11 @@
*/
public class JetspeedL10NTag extends TagSupport
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedL10NTag.class.getName());
+
private CustomLocalizationTool tool = null;
private String key = null;
@@ -136,7 +142,7 @@
catch (Exception oe)
{
result = new StringElement(def);
- Log.error(oe);
+ logger.error("Exception", oe);
}
// Output the result
@@ -149,7 +155,7 @@
catch (Exception e)
{
String message = "Error processing key '" + this.key + "'.";
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error translating key '" + this.key + "'. See log for more information.");
Index: org/apache/jetspeed/services/jsp/tags/JetspeedPaneTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPaneTag.java,v
retrieving revision 1.4
diff -u -r1.4 JetspeedPaneTag.java
--- org/apache/jetspeed/services/jsp/tags/JetspeedPaneTag.java 11 Nov 2002 22:35:18 -0000 1.4
+++ org/apache/jetspeed/services/jsp/tags/JetspeedPaneTag.java 21 Jul 2003 00:21:00 -0000
@@ -60,11 +60,13 @@
import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.jsp.JspService;
import org.apache.ecs.ConcreteElement;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.util.template.JetspeedTool;
@@ -80,6 +82,11 @@
*/
public class JetspeedPaneTag extends TagSupport
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedPaneTag.class.getName());
+
private String name = null;
public void setName(String name)
@@ -144,7 +151,7 @@
catch (Exception e)
{
String message = "Error processing name '" + name + "'.";
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error processing ecs screen '" + name + "'. See log for more information.");
Index: org/apache/jetspeed/services/jsp/tags/JetspeedParameterStyleTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedParameterStyleTag.java,v
retrieving revision 1.2
diff -u -r1.2 JetspeedParameterStyleTag.java
--- org/apache/jetspeed/services/jsp/tags/JetspeedParameterStyleTag.java 24 Jun 2003 18:49:05 -0000 1.2
+++ org/apache/jetspeed/services/jsp/tags/JetspeedParameterStyleTag.java 21 Jul 2003 00:21:00 -0000
@@ -65,11 +65,12 @@
// Turbine Classes
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.jsp.JspService;
// jetspeed
import org.apache.jetspeed.modules.ParameterLoader;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.security.PortalResource;
import org.apache.jetspeed.om.registry.Parameter;
import org.apache.jetspeed.om.registry.PortletEntry;
@@ -105,7 +106,11 @@
*/
public class JetspeedParameterStyleTag extends BodyTagSupport
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedParameterStyleTag.class.getName());
+
/**
* name parameter defines parameter name
*/
@@ -240,7 +245,7 @@
result = ".
*/
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.jsp.JspService;
import org.apache.ecs.ConcreteElement;
+// Jetspeed classes
import org.apache.jetspeed.services.PortletFactory;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.profile.ProfileLocator;
@@ -80,6 +83,11 @@
*/
public class JetspeedPortletTag extends TagSupport
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedPortletTag.class.getName());
+
private String name = null;
private String psml = null;
@@ -134,18 +142,18 @@
if (baseProfile != null)
{
entry = baseProfile.getDocument().getEntry(name);
- if ( Log.getLogger().isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
- Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from psml [" + this.psml);
+ logger.debug("JetspeedPortletTag: retrieved [" + entry + "] from psml [" + this.psml);
}
}
}
else
{
entry = data.getProfile().getDocument().getEntry(name);
- if ( Log.getLogger().isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
- Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from current psml");
+ logger.debug("JetspeedPortletTag: retrieved [" + entry + "] from current psml");
}
}
@@ -169,7 +177,7 @@
catch (Exception e)
{
String message = "Error processing name '" + name + "'.";
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error processing portlet '" + name + "'. See log for more information.");
Index: org/apache/jetspeed/services/jsp/tags/NavigationTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/NavigationTag.java,v
retrieving revision 1.5
diff -u -r1.5 NavigationTag.java
--- org/apache/jetspeed/services/jsp/tags/NavigationTag.java 7 May 2003 15:16:51 -0000 1.5
+++ org/apache/jetspeed/services/jsp/tags/NavigationTag.java 21 Jul 2003 00:21:01 -0000
@@ -64,12 +64,14 @@
// Turbine Classes
import org.apache.turbine.modules.NavigationLoader;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.jsp.JspService;
import org.apache.turbine.services.TurbineServices;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
/**
* Supporting class for the navigation tag.
@@ -82,6 +84,11 @@
public class NavigationTag extends TagSupport
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(NavigationTag.class.getName());
+
+ /**
* defaultTemplate parameter defines the template whose contents will replace
* this tag in the layout if none of the special states are detected.
*/
@@ -139,7 +146,7 @@
catch (Exception e)
{
String message = "Error processing navigation template:" + template + " using module: " + module;
- Log.error(message, e);
+ logger.error(message, e);
try
{
data.getOut().print("Error processing navigation template: " + template + " using module: " + module);
Index: org/apache/jetspeed/services/jsp/tags/TemplateLinkTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/TemplateLinkTag.java,v
retrieving revision 1.3
diff -u -r1.3 TemplateLinkTag.java
--- org/apache/jetspeed/services/jsp/tags/TemplateLinkTag.java 7 Mar 2001 06:48:40 -0000 1.3
+++ org/apache/jetspeed/services/jsp/tags/TemplateLinkTag.java 21 Jul 2003 00:21:01 -0000
@@ -54,16 +54,20 @@
*
This is an implementation of the RegistryService
* based on the Jetspeed Database Persistence Manager
This service subclasses TurbineResourceService and
* provides functionality for overriding properties in default resource
@@ -119,6 +123,11 @@
extends TurbineResourceService
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedResourceService.class.getName());
+
+ /**
* The purpose of this method is to get the configuration resource
* with the given name as a boolean value.
*
@@ -283,7 +292,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ logger.error("Exception", e);
}
return (ResourceService) res;
Index: org/apache/jetspeed/services/resources/VariableResourcesService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/VariableResourcesService.java,v
retrieving revision 1.13
diff -u -r1.13 VariableResourcesService.java
--- org/apache/jetspeed/services/resources/VariableResourcesService.java 7 May 2003 15:16:52 -0000 1.13
+++ org/apache/jetspeed/services/resources/VariableResourcesService.java 21 Jul 2003 00:21:12 -0000
@@ -57,7 +57,9 @@
// Java Core Classes
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
@@ -67,7 +69,10 @@
import org.apache.turbine.services.resources.TurbineResourceService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.util.Log;
+
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
/**
*
This implementation of the resourcesService relies
@@ -100,7 +105,11 @@
*/
public class VariableResourcesService extends TurbineResourceService
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(VariableResourcesService.class.getName());
+
public static final String WEBAPP_DIR="webapp.dir";
public static final String WEB_DIR="web.dir";
public static final String JVM_DIR="jvm.dir";
@@ -125,7 +134,7 @@
try {
Thread.sleep(500);
} catch (InterruptedException ie ) {
- Log.info("VariableResources service: Waiting for init()..." );
+ logger.info("VariableResources service: Waiting for init()..." );
}
}
}
@@ -185,7 +194,7 @@
//very unlikely that the JVM can't
//resolve its path
//But logging it anyway...
- Log.error( "Exception define JVM app dir", e );
+ logger.error( "Exception define JVM app dir", e );
}
// load servlet init parameters as variables, they may override
@@ -390,7 +399,7 @@
}
catch (Exception e)
{
- Log.error( "Unable to init resources for " + prefix, e );
+ logger.error( "Unable to init resources for " + prefix, e );
}
res.setVariables(this.variables);
return (ResourceService)res;
Index: org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java,v
retrieving revision 1.18
diff -u -r1.18 DefaultJetspeedRunData.java
--- org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java 10 Dec 2002 01:55:03 -0000 1.18
+++ org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java 21 Jul 2003 00:21:13 -0000
@@ -54,10 +54,13 @@
package org.apache.jetspeed.services.rundata;
-import org.apache.turbine.util.Log;
+// Java classes
+import java.util.Stack;
+// Jetspeed classes
import org.apache.jetspeed.om.security.JetspeedUser;
-
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.capability.CapabilityMap;
@@ -68,8 +71,6 @@
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.security.AccessControlList;
-import java.util.Stack;
-
/**
* This interface extends the RunData interface with methods
* specific to the needs of a Jetspeed like portal implementation.
@@ -85,7 +86,11 @@
public class DefaultJetspeedRunData extends DefaultTurbineRunData
implements JetspeedRunData
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DefaultJetspeedRunData.class.getName());
+
private Profile profile = null;
private CapabilityMap map = null;
private String peid = null;
@@ -402,7 +407,7 @@
}
else
{
- Log.warn("DefaultJetspeedRunData.getPageSessionId: no session");
+ logger.warn("DefaultJetspeedRunData.getPageSessionId: no session");
}
// profile
@@ -413,7 +418,7 @@
}
else
{
- Log.warn("DefaultJetspeedRunData.getPageSessionId: no profile");
+ logger.warn("DefaultJetspeedRunData.getPageSessionId: no profile");
}
return sessionId + profileId;
Index: org/apache/jetspeed/services/rundata/JetspeedRunDataService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/JetspeedRunDataService.java,v
retrieving revision 1.3
diff -u -r1.3 JetspeedRunDataService.java
--- org/apache/jetspeed/services/rundata/JetspeedRunDataService.java 4 Mar 2003 00:05:10 -0000 1.3
+++ org/apache/jetspeed/services/rundata/JetspeedRunDataService.java 21 Jul 2003 00:21:13 -0000
@@ -61,25 +61,27 @@
// package
package org.apache.jetspeed.services.rundata;
-// imports
+// Java classes
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+// Turbine classes
import org.apache.turbine.services.rundata.TurbineRunDataService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.TurbineServices;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.statemanager.StateManagerService;
-
/**
* The JetspeedRunDataService extends TurbineRunDataService,
* adding the ability to get the current runData object for the thread
@@ -95,6 +97,11 @@
public class JetspeedRunDataService
extends TurbineRunDataService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedRunDataService.class.getName());
+
/** The collection of active JetspeedRunData objects, keyed by Thread. */
private Map m_runDataStore = null;
@@ -152,8 +159,8 @@
stateManager.setCurrentContext(req.getSession(true));
}
- if (Log.getLogger().isDebugEnabled())
- Log.debug("JetspeedRunDataService: storing rundata " + r
+ if (logger.isDebugEnabled())
+ logger.debug("JetspeedRunDataService: storing rundata " + r
+ " for thread: " + Thread.currentThread());
return r;
@@ -179,8 +186,8 @@
// remove this thread's rundata
m_runDataStore.remove(Thread.currentThread());
- if (Log.getLogger().isDebugEnabled())
- Log.debug("JetspeedRunDataService: releasing rundata for thread: "
+ if (logger.isDebugEnabled())
+ logger.debug("JetspeedRunDataService: releasing rundata for thread: "
+ Thread.currentThread());
// let super do the work
@@ -194,8 +201,8 @@
*/
public JetspeedRunData getCurrentRunData()
{
- if (Log.getLogger().isDebugEnabled())
- Log.debug("JetspeedRunDataService: accessing rundata "
+ if (logger.isDebugEnabled())
+ logger.debug("JetspeedRunDataService: accessing rundata "
+ m_runDataStore.get(Thread.currentThread())
+ " for thread: " + Thread.currentThread());
Index: org/apache/jetspeed/services/search/handlers/PortletEntryToDocHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/search/handlers/PortletEntryToDocHandler.java,v
retrieving revision 1.1
diff -u -r1.1 PortletEntryToDocHandler.java
--- org/apache/jetspeed/services/search/handlers/PortletEntryToDocHandler.java 16 Jun 2003 19:05:00 -0000 1.1
+++ org/apache/jetspeed/services/search/handlers/PortletEntryToDocHandler.java 21 Jul 2003 00:21:13 -0000
@@ -61,12 +61,11 @@
// Jetspeed APIs
import org.apache.jetspeed.om.registry.PortletEntry;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.search.ParsedObject;
import org.apache.jetspeed.om.registry.Category;
-// Turbine APIs
-import org.apache.turbine.util.Log;
-
/**
* This object handler deals with portlet registry entries
*
@@ -76,6 +75,11 @@
public class PortletEntryToDocHandler extends RegistryEntryToDocHandler
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PortletEntryToDocHandler.class.getName());
+
+ /**
* Parses portlet entry object
*
* @param o
@@ -87,7 +91,7 @@
if ((o instanceof PortletEntry) == false)
{
- Log.error("PortletEntryToDocHandler: invalid object type: " + o);
+ logger.error("PortletEntryToDocHandler: invalid object type: " + o);
return null;
}
Index: org/apache/jetspeed/services/search/handlers/PortletToDocHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/search/handlers/PortletToDocHandler.java,v
retrieving revision 1.1
diff -u -r1.1 PortletToDocHandler.java
--- org/apache/jetspeed/services/search/handlers/PortletToDocHandler.java 16 Jun 2003 19:05:00 -0000 1.1
+++ org/apache/jetspeed/services/search/handlers/PortletToDocHandler.java 21 Jul 2003 00:21:13 -0000
@@ -55,12 +55,14 @@
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.search.BaseParsedObject;
import org.apache.jetspeed.services.search.ObjectHandler;
import org.apache.jetspeed.services.search.ParsedObject;
+
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.rundata.RunDataService;
-import org.apache.turbine.util.Log;
/**
* This object handler deals with portlets
@@ -70,7 +72,11 @@
*/
public class PortletToDocHandler implements ObjectHandler
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PortletToDocHandler.class.getName());
+
/* (non-Javadoc)
* @see org.apache.jetspeed.services.search.ObjectHandler#parseObject(java.lang.Object)
*/
@@ -80,7 +86,7 @@
if ((o instanceof Portlet) == false)
{
- Log.error("PortletToDocHandler: invalid object type: " + o);
+ logger.error("PortletToDocHandler: invalid object type: " + o);
return null;
}
Index: org/apache/jetspeed/services/search/handlers/RegistryEntryToDocHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/search/handlers/RegistryEntryToDocHandler.java,v
retrieving revision 1.1
diff -u -r1.1 RegistryEntryToDocHandler.java
--- org/apache/jetspeed/services/search/handlers/RegistryEntryToDocHandler.java 16 Jun 2003 19:05:00 -0000 1.1
+++ org/apache/jetspeed/services/search/handlers/RegistryEntryToDocHandler.java 21 Jul 2003 00:21:14 -0000
@@ -54,10 +54,12 @@
package org.apache.jetspeed.services.search.handlers;
import org.apache.jetspeed.om.registry.RegistryEntry;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.search.BaseParsedObject;
import org.apache.jetspeed.services.search.ObjectHandler;
import org.apache.jetspeed.services.search.ParsedObject;
-import org.apache.turbine.util.Log;
+
/**
* This object handler deals with registry entries
@@ -67,7 +69,11 @@
*/
public class RegistryEntryToDocHandler implements ObjectHandler
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RegistryEntryToDocHandler.class.getName());
+
/**
* @see org.apache.jetspeed.services.search.ObjectHandler#parseObject(java.lang.Object)
* @param o
@@ -79,7 +85,7 @@
if ((o instanceof RegistryEntry) == false)
{
- Log.error("RegistryEntryToDocHandler: invalid object type: " + o);
+ logger.error("RegistryEntryToDocHandler: invalid object type: " + o);
return null;
}
Index: org/apache/jetspeed/services/search/handlers/URLToDocHandler.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/search/handlers/URLToDocHandler.java,v
retrieving revision 1.1
diff -u -r1.1 URLToDocHandler.java
--- org/apache/jetspeed/services/search/handlers/URLToDocHandler.java 16 Jun 2003 19:05:01 -0000 1.1
+++ org/apache/jetspeed/services/search/handlers/URLToDocHandler.java 21 Jul 2003 00:21:14 -0000
@@ -56,18 +56,19 @@
// Java imports
import java.io.IOException;
import java.net.URL;
+
+// Commons HTTPClient
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
// Jetspeed imports
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.search.BaseParsedObject;
import org.apache.jetspeed.services.search.ObjectHandler;
import org.apache.jetspeed.services.search.ParsedObject;
-// Turbine APIs
-import org.apache.turbine.util.Log;
-
/**
* This object handler deals with URLs.
*
@@ -77,6 +78,11 @@
public class URLToDocHandler implements ObjectHandler
{
/**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(URLToDocHandler.class.getName());
+
+ /**
* Parses a specific object into a document suitable for index placement
*
* @param o
@@ -88,7 +94,7 @@
if ((o instanceof URL) == false)
{
- Log.error("URLToDocHandler: invalid object type: " + o);
+ logger.error("URLToDocHandler: invalid object type: " + o);
return null;
}
@@ -109,7 +115,10 @@
// execute the method.
client.executeMethod(method);
statusCode = method.getStatusCode();
- Log.debug("URL = " + pageToAdd.toString() + "Status code = " + statusCode);
+ if (logger.isDebugEnabled())
+ {
+ logger.debug("URL = " + pageToAdd.toString() + "Status code = " + statusCode);
+ }
}
catch (HttpException e)
{
@@ -130,7 +139,7 @@
}
catch (IOException ioe)
{
- Log.error("Getting content for " + pageToAdd.toString(), ioe);
+ logger.error("Getting content for " + pageToAdd.toString(), ioe);
}
if (content != null)
@@ -145,12 +154,12 @@
result.setDescription("");
result.setLanguage("");
result.setURL(pageToAdd);
- Log.info("Parsed '" + pageToAdd.toString() + "'");
+ logger.info("Parsed '" + pageToAdd.toString() + "'");
}
catch (Exception e)
{
e.printStackTrace();
- Log.error("Adding document to index", e);
+ logger.error("Adding document to index", e);
}
}
}
@@ -161,7 +170,7 @@
catch (IOException ioe)
{
ioe.printStackTrace();
- Log.error("Ending session to " + pageToAdd.toString(), ioe);
+ logger.error("Ending session to " + pageToAdd.toString(), ioe);
}
return result;
Index: org/apache/jetspeed/services/search/lucene/LuceneSearchService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/search/lucene/LuceneSearchService.java,v
retrieving revision 1.4
diff -u -r1.4 LuceneSearchService.java
--- org/apache/jetspeed/services/search/lucene/LuceneSearchService.java 16 Jul 2003 01:45:15 -0000 1.4
+++ org/apache/jetspeed/services/search/lucene/LuceneSearchService.java 21 Jul 2003 00:21:14 -0000
@@ -64,6 +64,8 @@
import java.util.Iterator;
// Jetspeed imports
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.search.HandlerFactory;
import org.apache.jetspeed.services.search.ObjectHandler;
import org.apache.jetspeed.services.search.ParsedObject;
@@ -77,7 +79,6 @@
import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.util.Log;
// Lucene imports
import org.apache.lucene.analysis.Analyzer;
@@ -103,6 +104,11 @@
*/
public class LuceneSearchService extends TurbineBaseService implements SearchService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(LuceneSearchService.class.getName());
+
private static final String CONFIG_DIRECTORY = "directory";
private File rootDir = null;
private String indexRoot = null;
@@ -139,18 +145,18 @@
*/
public void init() throws InitializationException
{
- Log.info("Late init for " + SearchService.SERVICE_NAME + " called");
+ logger.info("Late init for " + SearchService.SERVICE_NAME + " called");
while (!getInit())
{
//Not yet...
try
{
Thread.sleep(100);
- Log.info("Waiting for init of " + SearchService.SERVICE_NAME + "...");
+ logger.info("Waiting for init of " + SearchService.SERVICE_NAME + "...");
}
catch (InterruptedException ie)
{
- Log.error(ie);
+ logger.error("Exception", ie);
}
}
}
@@ -199,7 +205,7 @@
if (!rootDir.exists())
{
rootDir.mkdir();
- Log.info("Created index directory '" + rootDir.getPath() + "'");
+ logger.info("Created index directory '" + rootDir.getPath() + "'");
}
}
}
@@ -217,12 +223,11 @@
IndexWriter indexWriter = new IndexWriter(rootDir, new StandardAnalyzer(), true);
indexWriter.close();
indexWriter = null;
- Log.info("Created Lucene Index in " + rootDir.getPath());
+ logger.info("Created Lucene Index in " + rootDir.getPath());
}
catch (Exception e1)
{
- Log.error(this.getClass().getName() + ".initConfiguration - Getting or creating IndexSearcher");
- Log.error(e);
+ logger.error(this.getClass().getName() + ".initConfiguration - Getting or creating IndexSearcher", e);
throw new InitializationException("Getting or creating Index Searcher");
}
}
@@ -252,8 +257,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
- Log.error(e);
+ logger.error("Exception", e);
}
// Copy hits to the result list
@@ -280,7 +284,7 @@
}
catch (Exception ioe)
{
- Log.error(ioe);
+ logger.error("Exception", ioe);
}
result = null;
}
@@ -293,7 +297,7 @@
}
catch (IOException ioe)
{
- Log.error("Closing Searcher", ioe);
+ logger.error("Closing Searcher", ioe);
}
}
return results;
@@ -391,8 +395,8 @@
// Add the document to search index
indexWriter.addDocument(doc);
- Log.debug("Index Document Count = " + indexWriter.docCount());
- Log.info("Added '" + parsedObject.getTitle() + "' to index");
+ logger.debug("Index Document Count = " + indexWriter.docCount());
+ logger.info("Added '" + parsedObject.getTitle() + "' to index");
result = true;
}
@@ -402,7 +406,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ logger.error("Exception", e);
result = false;
}
@@ -455,7 +459,7 @@
term = new Term(ParsedObject.FIELDNAME_KEY, parsedObject.getKey());
// Remove the document from search index
int rc = indexReader.delete(term);
- Log.info("Attempted to delete '" + term.toString() + "' from index, documents deleted = " + rc);
+ logger.info("Attempted to delete '" + term.toString() + "' from index, documents deleted = " + rc);
//System.out.println("Attempted to delete '" + term.toString() + "' from index, documents deleted = " + rc);
result = rc > 0;
}
@@ -470,7 +474,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ logger.error("Exception", e);
result = false;
}
@@ -509,7 +513,7 @@
}
catch (Throwable e)
{
- Log.error(e);
+ logger.error("Exception", e);
}
try
@@ -520,7 +524,7 @@
}
catch (Throwable e)
{
- Log.error(e);
+ logger.error("Exception", e);
}
return false;
Index: org/apache/jetspeed/services/security/JetspeedDBSecurityService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/JetspeedDBSecurityService.java,v
retrieving revision 1.22
diff -u -r1.22 JetspeedDBSecurityService.java
--- org/apache/jetspeed/services/security/JetspeedDBSecurityService.java 4 Mar 2003 00:05:10 -0000 1.22
+++ org/apache/jetspeed/services/security/JetspeedDBSecurityService.java 21 Jul 2003 00:21:15 -0000
@@ -61,12 +61,13 @@
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.JetspeedUserFactory;
import org.apache.jetspeed.om.security.UserNamePrincipal;
-
import org.apache.jetspeed.portal.Portlet;
-
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.JetspeedUserManagement;
import org.apache.jetspeed.services.JetspeedPortalAccessController;
+import org.apache.jetspeed.services.rundata.JetspeedRunData;
// Turbine
import org.apache.turbine.services.TurbineServices;
@@ -74,10 +75,6 @@
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.ResourceService;
-import org.apache.turbine.util.Log;
-import org.apache.jetspeed.services.rundata.JetspeedRunData;
-
-
/**
*
This is an implementation of the JetspeedSecurityService interface.
*
@@ -90,7 +87,11 @@
public class JetspeedDBSecurityService extends TurbineBaseService
implements JetspeedSecurityService
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedDBSecurityService.class.getName());
+
private final static String CONFIG_CASEINSENSITIVE_USERNAME = "caseinsensitive.username";
private final static String CONFIG_CASEINSENSITIVE_PASSWORD = "caseinsensitive.password";
private final static String CONFIG_CASEINSENSITIVE_UPPER = "caseinsensitive.upper";
@@ -323,7 +324,7 @@
}
catch (Exception e)
{
- Log.error("Could not disable user: " + username + e);
+ logger.error("Could not disable user: " + username, e);
}
}
return disabled;
Index: org/apache/jetspeed/services/security/SecurityCacheImpl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/SecurityCacheImpl.java,v
retrieving revision 1.7
diff -u -r1.7 SecurityCacheImpl.java
--- org/apache/jetspeed/services/security/SecurityCacheImpl.java 7 Mar 2003 16:04:31 -0000 1.7
+++ org/apache/jetspeed/services/security/SecurityCacheImpl.java 21 Jul 2003 00:21:15 -0000
@@ -64,9 +64,10 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.ResourceService;
-import org.apache.turbine.util.Log;
import org.apache.jetspeed.services.JetspeedSecurity;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.om.security.Role;
import org.apache.jetspeed.om.security.Permission;
import org.apache.jetspeed.services.security.JetspeedSecurityException;
@@ -82,6 +83,11 @@
public class SecurityCacheImpl extends TurbineBaseService
implements SecurityCacheService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SecurityCacheImpl.class.getName());
+
protected Map acls = new HashMap();
protected Map perms = new HashMap();
@@ -282,7 +288,7 @@
}
catch (JetspeedSecurityException e)
{
- Log.error(e);
+ logger.error("Exception", e);
}
}
///////////////////////////////////////////////////////////////////////////
Index: org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java,v
retrieving revision 1.8
diff -u -r1.8 LDAPUserManagement.java
--- org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java 7 May 2003 15:16:52 -0000 1.8
+++ org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java 21 Jul 2003 00:21:16 -0000
@@ -64,6 +64,8 @@
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchResult;
import javax.servlet.ServletConfig;
+
+// Jetspeed classes
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.UserNamePrincipal;
@@ -73,6 +75,8 @@
import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.ldap.LDAPURL;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.rundata.JetspeedRunDataService;
import org.apache.jetspeed.services.security.CredentialsManagement;
@@ -82,12 +86,13 @@
import org.apache.jetspeed.services.security.UnknownUserException;
import org.apache.jetspeed.services.security.UserException;
import org.apache.jetspeed.services.security.UserManagement;
+
+// Turbine classes
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.resources.ResourceService;
import org.apache.turbine.services.rundata.RunDataService;
-import org.apache.turbine.util.Log;
/**
*
@@ -101,6 +106,11 @@
implements UserManagement,
CredentialsManagement
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(LDAPUserManagement.class.getName());
+
// Constants
private final static String CONFIG_SECURE_PASSWORDS_KEY = "secure.passwords";
private final static String CONFIG_SECURE_PASSWORDS_ALGORITHM = "secure.passwords.algorithm";
@@ -159,7 +169,7 @@
}
catch (Exception e)
{
- Log.error( "Failed to retrieve user '" + principal.getName() + "'", e );
+ logger.error( "Failed to retrieve user '" + principal.getName() + "'", e );
throw new UserException("Failed to retrieve user '" + principal.getName() + "'", e);
}
@@ -245,7 +255,7 @@
}
catch ( Exception e )
{
- Log.error( "Failed to retrieve user with filter:" + filter, e );
+ logger.error( "Failed to retrieve user with filter:" + filter, e );
throw new UserException( "Failed to retrieve user with filter:" + filter, e );
}
@@ -280,7 +290,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to save user object ", e);
+ logger.error( "Failed to save user object ", e);
throw new UserException("Failed to save user object ", e);
}
}
@@ -334,7 +344,7 @@
}
catch(Exception e)
{
- Log.error("Could not grant role: " + roles[ix] + " to user " + user.getUserName(), e);
+ logger.error("Could not grant role: " + roles[ix] + " to user " + user.getUserName(), e);
}
}
try
@@ -350,7 +360,7 @@
}
catch (Exception e)
{
- Log.error( "Failed to create profile for new user ", e );
+ logger.error( "Failed to create profile for new user ", e );
removeUser(new UserNamePrincipal(user.getUserName()));
throw new UserException("Failed to create profile for new user ", e);
}
@@ -381,7 +391,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to remove account '" + user.getUserName() + "'", e );
+ logger.error( "Failed to remove account '" + user.getUserName() + "'", e );
throw new UserException("Failed to remove account '" +
user.getUserName() + "'", e);
}
Index: org/apache/jetspeed/services/security/registry/RegistryAccessController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/registry/RegistryAccessController.java,v
retrieving revision 1.6
diff -u -r1.6 RegistryAccessController.java
--- org/apache/jetspeed/services/security/registry/RegistryAccessController.java 4 Mar 2003 00:05:12 -0000 1.6
+++ org/apache/jetspeed/services/security/registry/RegistryAccessController.java 21 Jul 2003 00:21:17 -0000
@@ -69,6 +69,8 @@
import org.apache.jetspeed.portal.PortletController;
import org.apache.jetspeed.portal.PortletSet;
import org.apache.jetspeed.services.Registry;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.security.JetspeedRoleManagement;
import org.apache.jetspeed.services.security.PortalAccessController;
import org.apache.jetspeed.services.security.PortalResource;
@@ -76,7 +78,6 @@
// Turbine imports
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.util.Log;
/**
* TurbineAccessController
@@ -86,6 +87,10 @@
*/
public class RegistryAccessController extends TurbineBaseService implements PortalAccessController
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(RegistryAccessController.class.getName());
/**
* Given a JetspeedUser, authorize that user to perform the secured action on
@@ -213,7 +218,7 @@
}
// We should never get here
- Log.error( "In " + this.getClass().getName() + ".checkPermission(user, resource, action) - Unkown resource = " + resource.getResourceType());
+ logger.error( "In " + this.getClass().getName() + ".checkPermission(user, resource, action) - Unkown resource = " + resource.getResourceType());
return false;
}
@@ -245,7 +250,7 @@
SecurityEntry securityEntry = (SecurityEntry) Registry.getEntry( Registry.SECURITY, securityRef.getParent());
if (securityEntry == null)
{
- Log.warn("Security id " + securityRef.getParent() + " does not exist. This was requested by the user " + user.getUserName());
+ logger.warn("Security id " + securityRef.getParent() + " does not exist. This was requested by the user " + user.getUserName());
return false;
}
@@ -265,7 +270,7 @@
}
catch (Exception e)
{
- Log.error(e);
+ logger.error("Exception", e);
return false;
}
return false;
Index: org/apache/jetspeed/services/security/turbine/TurbineAccessController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineAccessController.java,v
retrieving revision 1.5
diff -u -r1.5 TurbineAccessController.java
--- org/apache/jetspeed/services/security/turbine/TurbineAccessController.java 24 Jun 2003 19:09:37 -0000 1.5
+++ org/apache/jetspeed/services/security/turbine/TurbineAccessController.java 21 Jul 2003 00:21:17 -0000
@@ -70,13 +70,14 @@
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.services.Registry;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.security.PortalAccessController;
import org.apache.jetspeed.services.security.PortalResource;
// Turbine imports
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.util.Log;
/**
* TurbineAccessController
@@ -87,6 +88,11 @@
public class TurbineAccessController extends TurbineBaseService
implements PortalAccessController
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbineAccessController.class.getName());
+
private final static String CONFIG_DEFAULT_PERMISSION_LOGGEDIN = "services.JetspeedSecurity.permission.default.loggedin";
private final static String CONFIG_DEFAULT_PERMISSION_ANONYMOUS = "services.JetspeedSecurity.permission.default.anonymous";
@@ -242,7 +248,7 @@
} catch (Exception e)
{
- Log.error(e);
+ logger.error("Exception", e);
return false;
}
@@ -285,7 +291,7 @@
} catch (Exception e)
{
- Log.error(e);
+ logger.error("Exception", e);
return false;
}
@@ -307,7 +313,7 @@
}
catch (Exception e)
{
- Log.error( "Error checking permissions for " + user + " on " + action, e);
+ logger.error( "Error checking permissions for " + user + " on " + action, e);
}
for (int i = 0; i < defaultPermissions.length; i++)
{
Index: org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java,v
retrieving revision 1.7
diff -u -r1.7 TurbineAuthentication.java
--- org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java 23 Jun 2003 18:50:18 -0000 1.7
+++ org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java 21 Jul 2003 00:21:17 -0000
@@ -59,7 +59,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
@@ -67,11 +66,11 @@
import org.apache.jetspeed.services.security.PortalAuthentication;
import org.apache.jetspeed.services.security.LoginException;
-
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.JetspeedSecurity;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.om.security.UserNamePrincipal;
-
import org.apache.jetspeed.services.JetspeedUserManagement;
import org.apache.jetspeed.services.security.JetspeedSecurityService;
import org.apache.jetspeed.services.security.FailedLoginException;
@@ -99,6 +98,11 @@
public class TurbineAuthentication extends TurbineBaseService
implements PortalAuthentication
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbineAuthentication.class.getName());
+
/** The JetspeedRunData Service. */
private JetspeedRunDataService runDataService = null;
@@ -145,18 +149,18 @@
}
catch (UnknownUserException e)
{
- Log.warn("Unknown user attempted access: " + username, e);
+ logger.warn("Unknown user attempted access: " + username, e);
throw new FailedLoginException(e.toString());
}
catch (JetspeedSecurityException e)
{
- Log.warn("User denied authentication: " + username, e);
+ logger.warn("User denied authentication: " + username, e);
throw new LoginException(e.toString());
}
if(!user.getPassword().equals(password))
{
- Log.error("Invalid password for user: " + username);
+ logger.error("Invalid password for user: " + username);
throw new FailedLoginException("Credential authentication failure");
}
@@ -170,9 +174,9 @@
gcal.setTime(passwordLastChangedDate);
gcal.add(GregorianCalendar.DATE, this.expirationPeriod);
passwordExpireDate = gcal.getTime();
- if (Log.getLogger().isDebugEnabled())
+ if (logger.isDebugEnabled())
{
- Log.debug("TurbineAuthentication: password last changed = " + passwordLastChangedDate.toString() +
+ logger.debug("TurbineAuthentication: password last changed = " + passwordLastChangedDate.toString() +
", password expires = " + passwordExpireDate.toString());
}
}
@@ -198,7 +202,7 @@
}
catch (Exception e)
{
- Log.error( "Failed to update last login ", e);
+ logger.error( "Failed to update last login ", e);
putUserIntoContext(JetspeedSecurity.getAnonymousUser());
throw new LoginException("Failed to update last login ", e);
}
@@ -229,7 +233,7 @@
}
catch (JetspeedSecurityException e)
{
- Log.error( "Failed to get anonymous user: ", e );
+ logger.error( "Failed to get anonymous user: ", e );
throw new LoginException("Failed to get anonymous user: ", e);
}
return user;
@@ -257,7 +261,7 @@
}
catch (Exception e)
{
- Log.error( "Exception logging user out ", e );
+ logger.error( "Exception logging user out ", e );
throw new LoginException("Exception logging user out ", e );
}
}
Index: org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java,v
retrieving revision 1.8
diff -u -r1.8 TurbineGroupManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java 9 Jun 2003 22:06:57 -0000 1.8
+++ org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java 21 Jul 2003 00:21:18 -0000
@@ -78,6 +78,8 @@
import org.apache.jetspeed.services.security.JetspeedSecurityException;
import org.apache.jetspeed.services.PsmlManager;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
// Jetspeed Database OM
import org.apache.jetspeed.om.security.turbine.TurbineGroup;
@@ -101,7 +103,6 @@
import org.apache.turbine.services.rundata.RunDataService;
// Turbine
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
@@ -118,6 +119,11 @@
public class TurbineGroupManagement extends TurbineBaseService
implements GroupManagement
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbineGroupManagement.class.getName());
+
private JetspeedRunDataService runDataService = null;
private final static String CONFIG_DEFAULT_ROLE = "role.default";
@@ -153,7 +159,7 @@
}
catch(JetspeedSecurityException e)
{
- Log.error( "Failed to Retrieve User: " + username, e );
+ logger.error( "Failed to Retrieve User: " + username, e );
throw new GroupException("Failed to Retrieve User: ", e);
}
Criteria criteria = new Criteria();
@@ -180,7 +186,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve groups for user " + username, e );
+ logger.error( "Failed to retrieve groups for user " + username, e );
throw new GroupException("Failed to retrieve groups ", e);
}
return groups.values().iterator();
@@ -207,7 +213,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve groups ", e);
+ logger.error( "Failed to retrieve groups ", e);
throw new GroupException("Failed to retrieve groups ", e);
}
return groups.iterator();
@@ -246,7 +252,7 @@
catch(Exception e)
{
String message = "Failed to create group '" + group.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new GroupException( message, e );
}
@@ -263,7 +269,7 @@
catch (Exception e2)
{
}
- Log.error( "Failed to add default PSML for Group resource", e );
+ logger.error( "Failed to add default PSML for Group resource", e );
throw new GroupException("Failed to add default PSML for Group resource", e);
}
@@ -292,7 +298,7 @@
catch(Exception e2)
{
}
- Log.error( "Failed to create Group PSML", e );
+ logger.error( "Failed to create Group PSML", e );
throw new GroupException("Failed to create Group PSML", e);
}
}
@@ -332,7 +338,7 @@
catch(Exception e)
{
String message = "Failed to create group '" + group.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new GroupException( message, e );
}
@@ -388,10 +394,10 @@
}
catch (java.sql.SQLException sqle)
{
- Log.error(sqle);
+ logger.error("SQLException", sqle);
}
String message = "Failed to remove group '" + groupname + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new GroupException( message, e );
}
finally
@@ -402,7 +408,7 @@
}
catch (Throwable e)
{
- Log.error( "Error closing Torque connection", e );
+ logger.error( "Error closing Torque connection", e );
}
}
@@ -435,7 +441,7 @@
catch(Exception e)
{
String message = "Join group '" + groupname + "' to user '" + username + "' failed: ";
- Log.error( message, e);
+ logger.error( message, e);
throw new GroupException( message, e );
}
}
@@ -467,7 +473,7 @@
catch(Exception e)
{
String message = "Unjoin group '" + groupname + "' to user '" + username + "' failed: ";
- Log.error( message, e);
+ logger.error( message, e);
throw new GroupException( message, e );
}
@@ -501,7 +507,7 @@
catch(Exception e)
{
String message = "Failed to check group '" + groupname + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new GroupException( message, e );
}
return ( groups.size() > 0 );
@@ -532,7 +538,7 @@
catch(Exception e)
{
String message = "Failed to retrieve group '" + groupname + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new GroupException(message, e);
}
if ( groups.size() > 1 )
@@ -586,7 +592,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to check account's presence", e );
+ logger.error( "Failed to check account's presence", e );
throw new GroupException(
"Failed to check account's presence", e);
}
Index: org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java,v
retrieving revision 1.8
diff -u -r1.8 TurbinePermissionManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java 9 Jun 2003 22:06:57 -0000 1.8
+++ org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java 21 Jul 2003 00:21:19 -0000
@@ -83,6 +83,10 @@
import org.apache.jetspeed.om.security.turbine.TurbineRolePermission;
import org.apache.jetspeed.om.security.turbine.TurbineRolePermissionPeer;
+// Jetspeed logging
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
// Torque
import org.apache.torque.util.Criteria;
import org.apache.torque.om.NumberKey;
@@ -94,7 +98,6 @@
import org.apache.turbine.services.rundata.RunDataService;
// Turbine
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
@@ -111,6 +114,11 @@
public class TurbinePermissionManagement extends TurbineBaseService
implements PermissionManagement
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbinePermissionManagement.class.getName());
+
private JetspeedRunDataService runDataService = null;
private final static String CASCADE_DELETE = "programmatic.cascade.delete";
private final static boolean DEFAULT_CASCADE_DELETE = true;
@@ -153,7 +161,7 @@
}
catch(JetspeedSecurityException e)
{
- Log.error( "Failed to Retrieve Role: ", e );
+ logger.error( "Failed to Retrieve Role: ", e );
throw new PermissionException("Failed to Retrieve Role: ", e);
}
Criteria criteria = new Criteria();
@@ -180,7 +188,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve permissions ", e );
+ logger.error( "Failed to retrieve permissions ", e );
throw new PermissionException("Failed to retrieve permissions ", e);
}
return perms.values().iterator();
@@ -207,7 +215,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve permissions ", e);
+ logger.error( "Failed to retrieve permissions ", e);
throw new PermissionException("Failed to retrieve permissions ", e);
}
return permissions.iterator();
@@ -242,7 +250,7 @@
catch(Exception e)
{
String message = "Failed to create permission '" + permission.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new PermissionException(message, e);
}
}
@@ -281,7 +289,7 @@
catch(Exception e)
{
String message = "Failed to create permission '" + permission.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new PermissionException( message, e );
}
@@ -339,10 +347,10 @@
}
catch (java.sql.SQLException sqle)
{
- Log.error(sqle);
+ logger.error("SQLException", sqle);
}
String message = "Failed to remove permission '" + permissionName + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new PermissionException( message, e );
}
finally
@@ -353,7 +361,7 @@
}
catch (Throwable e)
{
- Log.error( "Error closing Torque connection", e );
+ logger.error( "Error closing Torque connection", e );
}
}
@@ -390,7 +398,7 @@
catch(Exception e)
{
String message = "Grant permission '" + permissionName + "' to role '" + roleName + "' failed: ";
- Log.error( message, e );
+ logger.error( message, e );
throw new PermissionException( message, e );
}
}
@@ -426,7 +434,7 @@
catch(Exception e)
{
String message = "Revoke permission '" + permissionName + "' to role '" + roleName + "' failed: ";
- Log.error( message, e );
+ logger.error( message, e );
throw new PermissionException( message, e);
}
@@ -467,7 +475,7 @@
catch(Exception e)
{
String message = "Failed to check permission '" + permissionName + "'";
- Log.error( message , e );
+ logger.error( message , e );
throw new PermissionException( message, e );
}
return ( permissions.size() > 0 );
@@ -499,7 +507,7 @@
catch(Exception e)
{
String message = "Failed to retrieve permission '" + permissionName + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new PermissionException( message, e );
}
if ( permissions.size() > 1 )
@@ -553,7 +561,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to check account's presence", e );
+ logger.error( "Failed to check account's presence", e );
throw new PermissionException(
"Failed to check account's presence", e);
}
Index: org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java,v
retrieving revision 1.10
diff -u -r1.10 TurbineRoleManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java 9 Jun 2003 22:06:57 -0000 1.10
+++ org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java 21 Jul 2003 00:21:19 -0000
@@ -94,6 +94,10 @@
import org.apache.jetspeed.services.Profiler;
import org.apache.jetspeed.om.profile.ProfileException;
+// Jetspeed logging
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
// Torque
import org.apache.torque.util.Criteria;
import org.apache.torque.om.NumberKey;
@@ -105,7 +109,6 @@
import org.apache.turbine.services.rundata.RunDataService;
// Turbine
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
@@ -122,6 +125,11 @@
public class TurbineRoleManagement extends TurbineBaseService
implements RoleManagement
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbineRoleManagement.class.getName());
+
private JetspeedRunDataService runDataService = null;
private final static String CASCADE_DELETE = "programmatic.cascade.delete";
private final static String CONFIG_SYSTEM_ROLES = "system.roles";
@@ -165,7 +173,7 @@
}
catch(JetspeedSecurityException e)
{
- Log.error( "Failed to Retrieve User: " + username, e );
+ logger.error( "Failed to Retrieve User: " + username, e );
throw new RoleException("Failed to Retrieve User: ", e);
}
Criteria criteria = new Criteria();
@@ -192,7 +200,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve roles ", e );
+ logger.error( "Failed to retrieve roles ", e );
throw new RoleException("Failed to retrieve roles ", e);
}
return roles.values().iterator();
@@ -219,7 +227,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve roles ", e );
+ logger.error( "Failed to retrieve roles ", e );
throw new RoleException("Failed to retrieve roles ", e);
}
return roles.iterator();
@@ -254,7 +262,7 @@
catch(Exception e)
{
String message = "Failed to create role '" + role.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e );
}
@@ -276,7 +284,7 @@
catch (Exception e2)
{
}
- Log.error( "Failed to add default PSML for Role resource", e );
+ logger.error( "Failed to add default PSML for Role resource", e );
throw new RoleException("Failed to add default PSML for Role resource", e);
}
@@ -305,7 +313,7 @@
catch(Exception e2)
{
}
- Log.error( "Failed to create Role PSML", e );
+ logger.error( "Failed to create Role PSML", e );
throw new RoleException("Failed to create Role PSML", e);
}
}
@@ -345,7 +353,7 @@
catch(Exception e)
{
String message = "Failed to create role '" + role.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e );
}
@@ -408,10 +416,10 @@
}
catch (java.sql.SQLException sqle)
{
- Log.error(sqle);
+ logger.error("SQLException", sqle);
}
String message = "Failed to remove role '" + rolename + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e );
}
finally
@@ -422,7 +430,7 @@
}
catch (Throwable t)
{
- Log.error( "Error closing Torque connection", t );
+ logger.error( "Error closing Torque connection", t );
}
}
@@ -459,7 +467,7 @@
catch(Exception e)
{
String message = "Grant role '" + rolename + "' to user '" + username + "' failed: ";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e );
}
}
@@ -496,7 +504,7 @@
catch(Exception e)
{
String message = "Revoke role '" + rolename + "' to user '" + username + "' failed: ";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e );
}
@@ -539,7 +547,7 @@
catch(Exception e)
{
String message = "Failed to check role '" + rolename + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e );
}
return ( roles.size() > 0 );
@@ -570,7 +578,7 @@
catch(Exception e)
{
String message = "Failed to retrieve role '" + rolename + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new RoleException( message, e);
}
if ( roles.size() > 1 )
@@ -624,7 +632,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to check account's presence", e );
+ logger.error( "Failed to check account's presence", e );
throw new RoleException(
"Failed to check account's presence", e);
}
Index: org/apache/jetspeed/services/security/turbine/TurbineUserManagement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/turbine/TurbineUserManagement.java,v
retrieving revision 1.10
diff -u -r1.10 TurbineUserManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbineUserManagement.java 9 Jun 2003 22:06:57 -0000 1.10
+++ org/apache/jetspeed/services/security/turbine/TurbineUserManagement.java 21 Jul 2003 00:21:20 -0000
@@ -66,7 +66,6 @@
import org.apache.torque.om.NumberKey;
// Turbine
-import org.apache.turbine.util.Log;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.InitializationException;
@@ -76,7 +75,8 @@
import org.apache.jetspeed.om.security.turbine.TurbineUser;
import org.apache.jetspeed.om.security.turbine.TurbineUserPeer;
-
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.om.profile.Profile;
// Jetspeed Security
@@ -121,6 +121,11 @@
implements UserManagement,
CredentialsManagement
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(TurbineUserManagement.class.getName());
+
private final static String CONFIG_SECURE_PASSWORDS_KEY = "secure.passwords";
private final static String CONFIG_SECURE_PASSWORDS_ALGORITHM = "secure.passwords.algorithm";
private final static String CONFIG_SYSTEM_USERS = "system.users";
@@ -184,7 +189,7 @@
catch(Exception e)
{
String message = "Failed to retrieve user '" + principal.getName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new UserException( message, e );
}
if ( users.size() > 1 )
@@ -220,7 +225,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve users ", e );
+ logger.error( "Failed to retrieve users ", e );
throw new UserException("Failed to retrieve users ", e);
}
return users.iterator();
@@ -249,7 +254,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to retrieve users ", e );
+ logger.error( "Failed to retrieve users ", e );
throw new UserException("Failed to retrieve users ", e);
}
return users.iterator();
@@ -279,7 +284,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to save user object ", e );
+ logger.error( "Failed to save user object ", e );
throw new UserException("Failed to save user object ", e);
}
@@ -321,7 +326,7 @@
catch(Exception e)
{
String message = "Failed to create account '" + user.getUserName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new UserException( message, e );
}
@@ -347,7 +352,7 @@
}
catch(Exception e)
{
- Log.error("Could not grant role: " + roles[ix] + " to user " + user.getUserName(), e);
+ logger.error("Could not grant role: " + roles[ix] + " to user " + user.getUserName(), e);
}
}
try
@@ -363,7 +368,7 @@
}
catch (Exception e)
{
- Log.error( "Failed to create profile for new user ", e );
+ logger.error( "Failed to create profile for new user ", e );
removeUser(new UserNamePrincipal(user.getUserName()));
throw new UserException("Failed to create profile for new user ", e);
}
@@ -412,7 +417,7 @@
catch(Exception e)
{
String message = "Failed to remove account '" + user.getUserName() + "'";
- Log.error( message, e );
+ logger.error( message, e );
throw new UserException( message, e );
}
@@ -529,9 +534,7 @@
}
catch (Exception e)
{
- Log.error("Unable to encrypt password."+e.getMessage());
- Log.error(e);
-
+ logger.error("Unable to encrypt password."+e.getMessage(), e);
return null;
}
}
@@ -618,7 +621,7 @@
}
catch(Exception e)
{
- Log.error( "Failed to check account's presence", e );
+ logger.error( "Failed to check account's presence", e );
throw new UserException(
"Failed to check account's presence", e);
}
Index: org/apache/jetspeed/services/statemanager/BaseStateManagerService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/statemanager/BaseStateManagerService.java,v
retrieving revision 1.3
diff -u -r1.3 BaseStateManagerService.java
--- org/apache/jetspeed/services/statemanager/BaseStateManagerService.java 4 Mar 2003 00:05:13 -0000 1.3
+++ org/apache/jetspeed/services/statemanager/BaseStateManagerService.java 21 Jul 2003 00:21:21 -0000
@@ -71,8 +71,9 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.statemanager.StateManagerService;
import org.apache.jetspeed.services.statemanager.SessionStateBindingListener;
@@ -92,6 +93,11 @@
extends TurbineBaseService
implements StateManagerService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(BaseStateManagerService.class.getName());
+
/** map of thread to http session for that thread. */
protected Map m_httpSessions = null;
@@ -177,7 +183,10 @@
((SessionStateBindingListener)attribute)
.valueUnbound(stateKey, attributeName);
}
- catch (Throwable e) {Log.warn("JetspeedStateManagerService.unBindAttributeValue: unbinding exception: ", e);}
+ catch (Throwable e)
+ {
+ logger.warn("JetspeedStateManagerService.unBindAttributeValue: unbinding exception: ", e);
+ }
}
} // unBindAttributeValue
@@ -198,7 +207,10 @@
((SessionStateBindingListener)attribute)
.valueBound(stateKey, attributeName);
}
- catch (Throwable e) {Log.warn("JetspeedStateManagerService.bindAttributeValue: unbinding exception: ", e);}
+ catch (Throwable e)
+ {
+ logger.warn("JetspeedStateManagerService.bindAttributeValue: unbinding exception: ", e);
+ }
}
} // bindAttributeValue
Index: org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java,v
retrieving revision 1.19
diff -u -r1.19 JetspeedTemplateLocatorService.java
--- org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java 17 Jul 2003 22:05:13 -0000 1.19
+++ org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java 21 Jul 2003 00:21:22 -0000
@@ -69,7 +69,6 @@
import javax.servlet.ServletConfig;
// turbine.util
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
// turbine.services
@@ -93,6 +92,8 @@
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.Profiler;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.customlocalization.CustomLocalizationService;
import org.apache.jetspeed.util.ServiceUtil;
/**
@@ -118,6 +119,11 @@
extends TurbineBaseService
implements TemplateLocatorService
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedTemplateLocatorService.class.getName());
+
private final static String CONFIG_TEMPLATE_ROOT = ".templateRoot";
private final static String CONFIG_PORTLET_GLOBAL_SEARCH = ".portlet.global.search";
private final static String CONFIG_HOT_DEPLOY = ".hot.deploy";
@@ -179,18 +185,18 @@
public void init() throws InitializationException
{
- Log.info("Late init for JetspeedTemplateLocatorService called");
+ logger.info("Late init for JetspeedTemplateLocatorService called");
while (!getInit())
{
//Not yet...
try
{
Thread.sleep(100);
- Log.info("Waiting for init of JetspeedTemplateLocatorService...");
+ logger.info("Waiting for init of JetspeedTemplateLocatorService...");
}
catch (InterruptedException ie)
{
- Log.error(ie);
+ logger.error("Exception", ie);
}
}
}
@@ -600,9 +606,9 @@
// the current template exists in cache, return the corresponding path
if (templateExists(realPath, true))
{
- if (Log.getLogger().isDebugEnabled())
+ if (logger.isDebugEnabled())
{
- Log.debug(
+ logger.debug(
"TemplateLocator: template exists in cache: "
+ realPath
+ " returning "
@@ -616,9 +622,9 @@
// Try to locate it directly on file system, perhaps it was recently added
if (templateExists(realPath, false))
{
- if (Log.getLogger().isDebugEnabled())
+ if (logger.isDebugEnabled())
{
- Log.debug(
+ logger.debug(
"TemplateLocator: template exists on the file system: "
+ realPath
+ " returning "
@@ -831,9 +837,9 @@
templateRoot = templateRoot + PATH_SEPARATOR;
}
- if (Log.getLogger().isDebugEnabled())
+ if (logger.isDebugEnabled())
{
- Log.debug("TemplateLocator: Adding templateRoot:" + templateRoot);
+ logger.debug("TemplateLocator: Adding templateRoot:" + templateRoot);
}
// traverse starting from the root template directory and add resources
Index: org/apache/jetspeed/services/template/JetspeedTemplateService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/JetspeedTemplateService.java,v
retrieving revision 1.9
diff -u -r1.9 JetspeedTemplateService.java
--- org/apache/jetspeed/services/template/JetspeedTemplateService.java 7 May 2003 15:16:53 -0000 1.9
+++ org/apache/jetspeed/services/template/JetspeedTemplateService.java 21 Jul 2003 00:21:22 -0000
@@ -66,7 +66,6 @@
import javax.servlet.ServletConfig;
// Turbine Utility Classes
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.ServletUtils;
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.InitializationException;
@@ -74,6 +73,10 @@
import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.modules.NavigationLoader;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
/**
*
This service extends the TurbineTemplateService to modify its behaviour:
* Not only layout and screen packages, but also the screen templates
@@ -103,6 +106,11 @@
// implements TemplateService
// removed dst: 2001/06/03, TDK 2.2 integration
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedTemplateService.class.getName());
+
/** The hashtable used to cache Screen names. */
private Hashtable screenCache = null;
@@ -148,11 +156,11 @@
{
initTemplate(config);
setInit(true);
- Log.info ("TemplateService init()....finished!");
+ logger.info ("TemplateService init()....finished!");
}
catch (Exception e)
{
- Log.error( "TurbineTemplateService failed to initialize", e );
+ logger.error( "TurbineTemplateService failed to initialize", e );
throw new InitializationException("TurbineTemplateService failed to initialize", e);
}
}
@@ -298,9 +306,9 @@
}
else
{
- if ( Log.getLogger().isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
- Log.debug("JetspeedTemplatePage.getLayoutTemplateName(" + key + ")");
+ logger.debug("JetspeedTemplatePage.getLayoutTemplateName(" + key + ")");
}
String[] names = parseScreenTemplate(key);
name = names[2];
@@ -428,9 +436,9 @@
template = template + "." + getDefaultExtension();
}
- if ( Log.getLogger().isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
- Log.debug("JetspeedTemplateService.parseScreen: template = " + template);
+ logger.debug("JetspeedTemplateService.parseScreen: template = " + template);
}
StringTokenizer st = new StringTokenizer(template, "/");
@@ -443,9 +451,9 @@
tokens.add(token);
}
}
- if ( Log.getLogger().isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
- Log.debug("JetspeedTemplateService.parseScreen: tokens1: " + tokens);
+ logger.debug("JetspeedTemplateService.parseScreen: tokens1: " + tokens);
}
String fileName = (String)tokens.get(tokens.size() - 1);
tokens.remove(tokens.size()-1);
@@ -462,9 +470,9 @@
String firstChar = String.valueOf(className.charAt(0));
firstChar = firstChar.toUpperCase();
className = firstChar + className.substring(1);
- if ( Log.getLogger().isDebugEnabled() )
+ if ( logger.isDebugEnabled() )
{
- Log.debug("JetspeedTemplateService.parseScreen: tokens2: " + tokens);
+ logger.debug("JetspeedTemplateService.parseScreen: tokens2: " + tokens);
}
// make sure the template exists and determine the correct
@@ -474,9 +482,9 @@
String pathSep = System.getProperty("path.separator");
for (int i=0; i This implementation of the URLManagerService is backed by a simple
@@ -78,15 +93,18 @@
* @author Santiago Gala
* @version $Id: JetspeedURLManagerService.java,v 1.14 2003/02/19 12:40:57 sgala Exp $
*/
-public class JetspeedURLManagerService
- extends TurbineBaseService
- implements URLManagerService {
-
+public class JetspeedURLManagerService extends TurbineBaseService implements URLManagerService
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(JetspeedURLManagerService.class.getName());
+
/**
Map used to store all URL Information.
*/
private Map urls = new HashMap();
-
+
/**
Path to the properties file used for persisting the data
*/
@@ -96,7 +114,7 @@
Hashtable to store proxy configuration in
*/
private Hashtable proxies = new Hashtable();
-
+
/**
* Late init. Don't return control until early init says we're done.
*/
@@ -106,14 +124,14 @@
try {
Thread.sleep(500);
} catch (InterruptedException ie ) {
- Log.info("URLManager service: Waiting for init()..." );
+ logger.info("URLManager service: Waiting for init()..." );
}
}
}
-
+
/**
* Called during Turbine.init()
*
@@ -126,7 +144,7 @@
try
{
- Log.info ( "JetspeedURLManagerService early init()....starting!");
+ logger.info ( "JetspeedURLManagerService early init()....starting!");
// Proxy Settings are stored as 'services.URLManager.proxy.
Handles fetching URLs and if for some reason anything happens add it to the
@@ -91,8 +92,12 @@
@author Santiago Gala
@version $Id: URLFetcher.java,v 1.12 2003/05/07 15:16:53 morciuch Exp $
*/
-public class URLFetcher {
-
+public class URLFetcher
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(URLFetcher.class.getName());
/**
URLs that Jetspeed is currently trying to fetch in real time.
@@ -133,7 +138,7 @@
//SGP
if( force == false && DiskCacheUtils.isCached( url ) == true)
{
- Log.info( "The url " +
+ logger.info( "The url " +
url +
" is fetched from the Cache" );
return JetspeedDiskCache.getInstance().getEntry( url ).getReader();
@@ -145,7 +150,7 @@
isRealtimeURL( url ) == false &&
force == false ) {
- Log.info( "The url " +
+ logger.info( "The url " +
url +
" is not in the cache and will be fetched now because you have configured -> " +
JetspeedResources.CACHE_REQUIRE_CACHED_KEY );
@@ -168,7 +173,7 @@
url.intern().wait();
} catch (InterruptedException e)
{
- Log.info("Wait Interrupted");
+ logger.info("Wait Interrupted");
} finally
{
removeRealtimeURL( url );
@@ -218,7 +223,7 @@
//it is not in the cache, add it to the bad URL list.
if ( DiskCacheUtils.isCached( url ) == false ) {
//Reported up there...
- //Log.error( t );
+ //logger.error( t );
URLManager.register( url, URLManagerService.STATUS_BAD, reason );
} else {
//it is in the cache, remove it (could be broken in cache).
@@ -317,7 +322,7 @@
( last == 0 ||
last > dce.getLastModified()) ) {
- Log.info( "URLFetcher: Found updated URL: " +
+ logger.info( "URLFetcher: Found updated URL: " +
url +
" Modified " + last + " Expires: " + expires +
" CLength: " + clength );
@@ -350,7 +355,7 @@
dce.setExpirationTime(expires);
- Log.info( "DiskCacheDaemon: URL still valid: " + url +
+ logger.info( "DiskCacheDaemon: URL still valid: " + url +
" Modified " + last + " Expires: " + expires +
" CLength: " + clength);
//removeRealtimeURL( url ); (done in finally)
@@ -358,7 +363,7 @@
}
} catch (Throwable e) {
//Add as a Bad URL
- Log.error( e );
+ logger.error("Throwable", e);
URLManager.register( url,
URLManagerService.STATUS_BAD,
e.toString() );
@@ -367,7 +372,7 @@
}
} else {
- Log.info( "URLFetcher: Cache miss during validation! Forcing url: " + url );
+ logger.info( "URLFetcher: Cache miss during validation! Forcing url: " + url );
removeRealtimeURL( url );
JetspeedDiskCache.getInstance().getEntry( url, true );
return true;
@@ -415,7 +420,7 @@
decl.indexOf( '"' , off + key.length()) );
}
}
- Log.info("URLFetcher: found URL with encoding -> " + enc );
+ logger.info("URLFetcher: found URL with encoding -> " + enc );
//Reset the bytes read
is.reset();
Reader rdr = new InputStreamReader( is,
Index: org/apache/jetspeed/services/urlmanager/URLFetcherDownloader.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/URLFetcherDownloader.java,v
retrieving revision 1.3
diff -u -r1.3 URLFetcherDownloader.java
--- org/apache/jetspeed/services/urlmanager/URLFetcherDownloader.java 17 Dec 2001 15:32:28 -0000 1.3
+++ org/apache/jetspeed/services/urlmanager/URLFetcherDownloader.java 21 Jul 2003 00:21:25 -0000
@@ -54,7 +54,8 @@
package org.apache.jetspeed.services.urlmanager;
-import org.apache.turbine.util.Log;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
/**
Used for fetching URLs and adding them to the disk cache when Jetspeed is
@@ -63,8 +64,13 @@
@author Kevin A. Burton
@version $Id: URLFetcherDownloader.java,v 1.3 2001/12/17 15:32:28 sgala Exp $
*/
-public class URLFetcherDownloader implements Runnable {
-
+public class URLFetcherDownloader implements Runnable
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(URLFetcherDownloader.class.getName());
+
private String url = null;
public URLFetcherDownloader( String url ) {
@@ -77,11 +83,11 @@
URLFetcher.addRealtimeURL( url );
try {
- Log.info( "URLFetcherDownloader -> now downloading URL: " + this.url );
+ logger.info( "URLFetcherDownloader -> now downloading URL: " + this.url );
URLFetcher.fetch( url, true ); //SGP I think it should be forced
// URLFetcher will put forced entries in the cache
} catch ( Throwable t ) {
- Log.error( "URLFetcherDownloader couldn't pull down url." + this.url, t );
+ logger.error( "URLFetcherDownloader couldn't pull down url." + this.url, t );
}
URLFetcher.removeRealtimeURL( url );
Index: org/apache/jetspeed/util/DirectoryUtils.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/DirectoryUtils.java,v
retrieving revision 1.3
diff -u -r1.3 DirectoryUtils.java
--- org/apache/jetspeed/util/DirectoryUtils.java 4 Mar 2003 00:05:15 -0000 1.3
+++ org/apache/jetspeed/util/DirectoryUtils.java 21 Jul 2003 00:21:25 -0000
@@ -54,8 +54,12 @@
package org.apache.jetspeed.util;
-import java.io.*;
-import org.apache.turbine.util.Log;
+import java.io.File;
+
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
/*
* File System Directory Utilities. Some utilities that java.io doesn't give us.
@@ -66,7 +70,11 @@
*/
public class DirectoryUtils
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DirectoryUtils.class.getName());
+
public static void main(String[] args)
{
DirectoryUtils.rmdir(args[0]);
@@ -98,7 +106,7 @@
}
catch (Exception e)
{
- Log.error("Error in rmdir utility:" , e);
+ logger.error("Error in rmdir utility:" , e);
return false;
}
}
@@ -123,7 +131,7 @@
}
catch (Exception e)
{
- Log.error("Failed to Delete file: " + path + " : " , e);
+ logger.error("Failed to Delete file: " + path + " : " , e);
file.deleteOnExit(); // try to get it later...
}
}
@@ -145,7 +153,7 @@
}
catch (Exception e)
{
- Log.error("Failed to Delete directory: " + path + " : " , e);
+ logger.error("Failed to Delete directory: " + path + " : " , e);
file.deleteOnExit(); // try to get it later...
}
Index: org/apache/jetspeed/util/HTMLRewriter.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/HTMLRewriter.java,v
retrieving revision 1.11
diff -u -r1.11 HTMLRewriter.java
--- org/apache/jetspeed/util/HTMLRewriter.java 7 May 2003 15:16:53 -0000 1.11
+++ org/apache/jetspeed/util/HTMLRewriter.java 21 Jul 2003 00:21:26 -0000
@@ -168,8 +168,6 @@
*/
package org.apache.jetspeed.util;
-import org.apache.turbine.util.Log;
-
import java.io.Reader;
import java.io.StringWriter;
import java.net.MalformedURLException;
@@ -179,6 +177,10 @@
import javax.swing.text.html.HTMLEditorKit;
import javax.swing.text.MutableAttributeSet;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
/**
*
* @author Ingo Rammer (rammer@sycom.at)
@@ -187,8 +189,13 @@
* @version 0.2
*/
-public class HTMLRewriter {
-
+public class HTMLRewriter
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(HTMLRewriter.class.getName());
+
private HTMLRewriter.Callback cb = new HTMLRewriter.Callback();
/** Sets the parameters for the HTMLRewriter
@@ -310,7 +317,7 @@
res = cb.getResult();
} catch (Exception e)
{
- Log.error( "Unable to convertURLS", e );
+ logger.error( "Unable to convertURLS", e );
throw new MalformedURLException(e.toString());
}
return res;
@@ -581,7 +588,7 @@
try {
baseUrl = new URL(attrs.getAttribute(HTML.Attribute.HREF).toString());
} catch (Throwable t) {
- Log.error( "HTMLRewriter: Setting BASE="
+ logger.error( "HTMLRewriter: Setting BASE="
+ attrs.getAttribute(HTML.Attribute.HREF).toString()
+ t.getMessage());
}
@@ -658,7 +665,7 @@
if (oldURL.toLowerCase().startsWith("javascript:")) {
return oldURL;
}
- Log.error( "HTMLRewriter: Setting BASE="
+ logger.error( "HTMLRewriter: Setting BASE="
+ baseUrl
+ " Old = "
+ oldURL
Index: org/apache/jetspeed/util/PortletSessionState.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/PortletSessionState.java,v
retrieving revision 1.7
diff -u -r1.7 PortletSessionState.java
--- org/apache/jetspeed/util/PortletSessionState.java 4 Mar 2003 00:05:15 -0000 1.7
+++ org/apache/jetspeed/util/PortletSessionState.java 21 Jul 2003 00:21:26 -0000
@@ -55,9 +55,11 @@
package org.apache.jetspeed.util;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
+
import org.apache.jetspeed.portal.portlets.VelocityPortlet;
import org.apache.jetspeed.portal.Portlet;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.persistence.PersistenceManager;
import org.apache.jetspeed.portal.PortletInstance;
@@ -70,6 +72,10 @@
*/
public class PortletSessionState
{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(PortletSessionState.class.getName());
/**
* Portlet attribute to save config state.
@@ -256,7 +262,7 @@
}
else
{
- Log.error("PortletSessionState: Passed null Velocity Portlet for name: " + name);
+ logger.error("PortletSessionState: Passed null Velocity Portlet for name: " + name);
return name;
}
}
Index: org/apache/jetspeed/util/SAXPIFilter.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/SAXPIFilter.java,v
retrieving revision 1.6
diff -u -r1.6 SAXPIFilter.java
--- org/apache/jetspeed/util/SAXPIFilter.java 7 May 2003 15:16:53 -0000 1.6
+++ org/apache/jetspeed/util/SAXPIFilter.java 21 Jul 2003 00:21:26 -0000
@@ -61,6 +61,7 @@
import java.io.UnsupportedEncodingException;
import java.util.Vector;
+// SAX classes
import org.xml.sax.AttributeList;
import org.xml.sax.HandlerBase;
import org.xml.sax.InputSource;
@@ -69,9 +70,9 @@
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.ParserFactory;
-//turbine stuff
-import org.apache.turbine.util.Log;
-
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
/**
This class is used to either strip and/or insert PIs in a XML document.
@@ -82,8 +83,13 @@
@author Raphaël Luta
@version $Id: SAXPIFilter.java,v 1.6 2003/05/07 15:16:53 morciuch Exp $
*/
-public class SAXPIFilter extends HandlerBase {
-
+public class SAXPIFilter extends HandlerBase
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SAXPIFilter.class.getName());
+
private static final String DEFAULT_PARSER_NAME = "org.apache.xerces.parsers.SAXParser";
protected PrintWriter out=new PrintWriter(System.out);
@@ -162,7 +168,7 @@
parser.parse(uri);
}
catch (Exception e) {
- Log.error( e );
+ logger.error("Exception", e);
}
}
@@ -183,7 +189,7 @@
parser.parse(new InputSource(in));
}
catch (Exception e) {
- Log.error( e );
+ logger.error("Exception", e);
}
}
@@ -204,7 +210,7 @@
parser.parse(new InputSource(in));
}
catch (Exception e) {
- Log.error( e );
+ logger.error("Exception", e);
}
}
Index: org/apache/jetspeed/util/SimpleTransform.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/SimpleTransform.java,v
retrieving revision 1.21
diff -u -r1.21 SimpleTransform.java
--- org/apache/jetspeed/util/SimpleTransform.java 7 May 2003 15:16:53 -0000 1.21
+++ org/apache/jetspeed/util/SimpleTransform.java 21 Jul 2003 00:21:27 -0000
@@ -90,11 +90,10 @@
//DOM Support
import org.w3c.dom.Document;
-//turbine support
-import org.apache.turbine.util.Log;
-
//Jetspeed stuff
import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.xml.JetspeedXMLEntityResolver;
@@ -113,7 +112,11 @@
*/
public class SimpleTransform
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(SimpleTransform.class.getName());
+
//FIXME: This code should go into the Turbine XSLTservice.
//Also, it is a temporary hack, as it should be configurable,
// and done later.
@@ -163,7 +166,7 @@
// and SAXResult
if (!tFactory.getFeature(SAXTransformerFactory.FEATURE) )
{
- Log.error( "SimpleTransform: nobody told you that we need a SAX Transformer?" );
+ logger.error( "SimpleTransform: nobody told you that we need a SAX Transformer?" );
throw new SAXException( "Invalid SAX Tranformer" );
}
try
@@ -233,13 +236,13 @@
catch (IOException e)
{
//should never really happen
- Log.error( e );
+ logger.error("Exception", e);
}
return pw.toString();
}
catch (Exception e)
{
- Log.error( "Invalid SAX Transformer: " , e );
+ logger.error( "Invalid SAX Transformer: " , e );
throw new SAXException( "problem in SAX transform: " + e.toString() );
}
}
@@ -278,15 +281,15 @@
}
catch (IOException e)
{
- Log.error( e );
+ logger.error("Exception", e);
//at this point we can just use the original url and stylesheet_url so this shouldn't be a problem
in = new InputSource( url );
style = new InputSource( stylesheet_url );
}
- if ( Log.getLogger().isInfoEnabled() )
+ if ( logger.isInfoEnabled() )
{
- Log.info( "SimpleTransform: transforming url: " +
+ logger.info( "SimpleTransform: transforming url: " +
url +
" with stylesheet: " +
stylesheet_url );
@@ -316,7 +319,7 @@
// and SAXResult
if (!tFactory.getFeature(SAXTransformerFactory.FEATURE) )
{
- Log.error( "SimpleTransform: nobody told you that we need a SAX Transformer?" );
+ logger.error( "SimpleTransform: nobody told you that we need a SAX Transformer?" );
throw new SAXException( "Invalid SAX Tranformer" );
}
try
@@ -381,13 +384,13 @@
catch (IOException e)
{
//should never really happen
- Log.error( e );
+ logger.error("Exception", e);
}
return pw.toString();
}
catch (Exception e)
{
- Log.error( "Invalid SAX Transformer: " , e);
+ logger.error( "Invalid SAX Transformer: " , e);
throw new SAXException( "problem in SAX transform: " + e.toString() );
}
}
@@ -414,7 +417,7 @@
// and SAXResult
if (!tFactory.getFeature(SAXTransformerFactory.FEATURE) )
{
- Log.error( "SimpleTransform: nobody told you that we need a SAX Transformer?" );
+ logger.error( "SimpleTransform: nobody told you that we need a SAX Transformer?" );
throw new IOException( "Invalid SAX Tranformer" );
}
try
@@ -493,18 +496,17 @@
// "foo.xml" to
// System.out, using the XSLT instructions
//found in "foo.xsl".
- Log.debug("Starting SAX thread...");
+ logger.debug("Starting SAX thread...");
try
{
processor.transform( xinput,
new StreamResult( pw ) );
pw.close();
- Log.debug("...ending SAX thread.");
+ logger.debug("...ending SAX thread.");
}
catch( Exception se)
{
- Log.debug("Error in SAXTransform");
- Log.debug( se.toString(), se );
+ logger.debug("Error in SAXTransform" + se.toString(), se );
}
}
} );
@@ -512,13 +514,13 @@
}
catch (java.io.UnsupportedEncodingException uee)
{
- Log.error("Need utf-8 encoding to SAXTransform", uee);
+ logger.error("Need utf-8 encoding to SAXTransform", uee);
}
return new InputStreamReader ( pis, "utf-8" );
}
catch (Exception e)
{
- Log.error( "Invalid SAX Transformer:" , e);
+ logger.error( "Invalid SAX Transformer:" , e);
throw new IOException( "problem in SAX transform: " + e.toString() );
}
}
Index: org/apache/jetspeed/util/URILookup.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java,v
retrieving revision 1.22
diff -u -r1.22 URILookup.java
--- org/apache/jetspeed/util/URILookup.java 7 May 2003 15:16:53 -0000 1.22
+++ org/apache/jetspeed/util/URILookup.java 21 Jul 2003 00:21:28 -0000
@@ -59,11 +59,12 @@
import org.apache.jetspeed.portal.PortletControl;
import org.apache.jetspeed.om.registry.PortletEntry;
import org.apache.jetspeed.services.Registry;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
//turbine
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.ParameterParser;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.template.TemplateLink;
@@ -121,8 +122,12 @@
* @version $Id: URILookup.java,v 1.22 2003/05/07 15:16:53 morciuch Exp $
*/
-public class URILookup {
-
+public class URILookup
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(URILookup.class.getName());
/**
* show Jetspeed Home page Request to which we refer.
* allowed Subtypes:
@@ -506,9 +511,9 @@
if (propertiesParameterValue!=null)
{
// found the parameter value, so replace the newURI with this one
- if ( Log.getLogger().isInfoEnabled() )
+ if ( logger.isInfoEnabled() )
{
- Log.info("URILookup: replaced uri "+newURI+" with "+propertiesParameterValue);
+ logger.info("URILookup: replaced uri "+newURI+" with "+propertiesParameterValue);
}
newURI = propertiesParameterValue;
}
@@ -665,7 +670,7 @@
ctxtPath = rundata.getRequest().getContextPath()+ctxtPath;
} catch (Exception e) {
// not servlet 2.2
- Log.error( "Servlet container probably not 2.2", e );
+ logger.error( "Servlet container probably not 2.2", e );
}
return rundata.getServerScheme()+"://"+
rundata.getServerName()+
Index: org/apache/jetspeed/util/parser/DefaultJetspeedParameterParser.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/parser/DefaultJetspeedParameterParser.java,v
retrieving revision 1.2
diff -u -r1.2 DefaultJetspeedParameterParser.java
--- org/apache/jetspeed/util/parser/DefaultJetspeedParameterParser.java 19 Feb 2003 07:58:54 -0000 1.2
+++ org/apache/jetspeed/util/parser/DefaultJetspeedParameterParser.java 21 Jul 2003 00:21:28 -0000
@@ -55,11 +55,12 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.parser.DefaultParameterParser;
import org.apache.jetspeed.om.registry.MediaTypeEntry;
import org.apache.jetspeed.services.Registry;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.capability.CapabilityMapFactory;
import org.apache.jetspeed.services.resources.JetspeedResources;
@@ -86,8 +87,13 @@
* @author Shinsuke SUGAYA
* @version $Id: DefaultJetspeedParameterParser.java,v 1.2 2003/02/19 07:58:54 taylor Exp $
*/
-public class DefaultJetspeedParameterParser extends DefaultParameterParser {
-
+public class DefaultJetspeedParameterParser extends DefaultParameterParser
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(DefaultJetspeedParameterParser.class.getName());
+
public DefaultJetspeedParameterParser()
{
super();
@@ -152,7 +158,7 @@
}
catch (Exception e)
{
- Log.warn("DefaultJetspeedParameterParser: Exception: " + e.toString());
+ logger.warn("DefaultJetspeedParameterParser: Exception: " + e.toString());
return str;
}
Index: org/apache/jetspeed/util/servlet/EcsServletElement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsServletElement.java,v
retrieving revision 1.7
diff -u -r1.7 EcsServletElement.java
--- org/apache/jetspeed/util/servlet/EcsServletElement.java 4 Mar 2003 00:05:16 -0000 1.7
+++ org/apache/jetspeed/util/servlet/EcsServletElement.java 21 Jul 2003 00:21:28 -0000
@@ -56,12 +56,15 @@
import java.io.OutputStream;
import java.io.PrintWriter;
-import javax.servlet.*;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
import org.apache.ecs.ConcreteElement;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
+
/**
* NOTE: The use of Ecs for aggregating portlet content is deprecated!
* This utility class will be removed once we don't have the ecs
@@ -76,7 +79,11 @@
*/
public class EcsServletElement extends ConcreteElement
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(EcsServletElement.class.getName());
+
/** RunData object to obtain HttpServletRequest/Response from. */
private RunData rundata;
@@ -128,7 +135,7 @@
{
String message = "EcsServletElement: Could not include the following URL: "
+ url + " : " + e.getMessage();
- Log.error( message, e );
+ logger.error( message, e );
out.print(message);
}
}
Index: org/apache/jetspeed/util/servlet/EcsStylesheetElement.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/servlet/EcsStylesheetElement.java,v
retrieving revision 1.5
diff -u -r1.5 EcsStylesheetElement.java
--- org/apache/jetspeed/util/servlet/EcsStylesheetElement.java 4 Mar 2003 00:05:16 -0000 1.5
+++ org/apache/jetspeed/util/servlet/EcsStylesheetElement.java 21 Jul 2003 00:21:28 -0000
@@ -54,16 +54,21 @@
package org.apache.jetspeed.util.servlet;
+// Java classes
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringReader;
-import org.apache.turbine.util.Log;
-import org.apache.ecs.ConcreteElement;
+import java.util.Map;
-import java.util.*;
+// SAX Classes
+import org.xml.sax.InputSource;
-import org.xml.sax.*;
+// ECS classes
+import org.apache.ecs.ConcreteElement;
+// Jetspeed classes
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.util.SimpleTransform;
/**
@@ -80,88 +85,93 @@
*
* @author Thomas Schaeck (schaeck@de.ibm.com)
*/
-public class EcsStylesheetElement extends ConcreteElement {
+public class EcsStylesheetElement extends ConcreteElement
+{
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(EcsStylesheetElement.class.getName());
+
+ /**
+ * Processes the referenced XML content using the referenced XSLT stylesheet and
+ * parameters.
+ *
+ * @param out The output stream to which the result shall be written.
+ */
+ public void output(OutputStream out)
+ {
+ output(new PrintWriter(out));
+ }
+
+ /**
+ * Processes the referenced XML content using the referenced XSLT stylesheet and
+ * parameters.
+ *
+ * @param out The print writer to be used for writing the result.
+ */
+ public void output(PrintWriter out)
+ {
+ try {
+
+ StringReader rdr = new StringReader (SimpleTransform.transform( content_, stylesheet_, params_ ) );
+ int count = 0;
+ char buff[] = new char[1024];
+ while( (count = rdr.read( buff, 0, buff.length ) ) > 0 ) {
+ out.write( buff, 0, count );
+ }
-/**
- * Processes the referenced XML content using the referenced XSLT stylesheet and
- * parameters.
- *
- * @param out The output stream to which the result shall be written.
- */
- public void output(OutputStream out)
- {
- output(new PrintWriter(out));
- }
+ /* // Get a new XSLT Processor
+ XSLTProcessor processor = XSLTProcessorFactory.getProcessor();
-/**
- * Processes the referenced XML content using the referenced XSLT stylesheet and
- * parameters.
- *
- * @param out The print writer to be used for writing the result.
- */
-public void output(PrintWriter out)
-{
- try {
-
- StringReader rdr = new StringReader (SimpleTransform.transform( content_, stylesheet_, params_ ) );
- int count = 0;
- char buff[] = new char[1024];
- while( (count = rdr.read( buff, 0, buff.length ) ) > 0 ) {
- out.write( buff, 0, count );
- }
-
- /* // Get a new XSLT Processor
- XSLTProcessor processor = XSLTProcessorFactory.getProcessor();
-
- // set the parameters for the stylesheet
- if (params_ != null)
- {
- Enumeration keys = params_.keys();
- while (keys.hasMoreElements())
+ // set the parameters for the stylesheet
+ if (params_ != null)
{
- String name = (String) keys.nextElement();
- processor.setStylesheetParam(name, (String) params_.get(name));
+ Enumeration keys = params_.keys();
+ while (keys.hasMoreElements())
+ {
+ String name = (String) keys.nextElement();
+ processor.setStylesheetParam(name, (String) params_.get(name));
+ }
}
- }
-
- // process the stylesheet
- processor.process( content_, stylesheet_, new XSLTResultTarget(out) ); */
- } catch (Exception e)
- {
- String message = "ECSStylesheetElement.output(PrintWriter): error processing stylesheet" + e.getMessage();
- Log.error(message, e);
- out.print(message);
- e.printStackTrace(out);
- }
-}
+ // process the stylesheet
+ processor.process( content_, stylesheet_, new XSLTResultTarget(out) ); */
+ } catch (Exception e)
+ {
+ String message = "ECSStylesheetElement.output(PrintWriter): error processing stylesheet" + e.getMessage();
+ logger.error(message, e);
+ out.print(message);
+ e.printStackTrace(out);
+ }
+ }
-/** XML content to be processed. */
-private InputSource content_;
-/** Parameters to be used by the stylesheet. */
-private Map params_;
+ /** XML content to be processed. */
+ private InputSource content_;
-/** XSLT stylesheet to be used for rendering the content. */
-private InputSource stylesheet_;
+ /** Parameters to be used by the stylesheet. */
+ private Map params_;
-/**
- * Construct an ECS element that will render a given XML dicument using a given
- * stylesheet and parameters when one of its output methods is invoked.
- *
- * @param content XML content to be processed
- * @param stylesheet XSLT stylesheet to be used for processing the content
- * @param params parameters for the stylesheet
- */
-public EcsStylesheetElement( InputSource content,
- InputSource stylesheet,
- Map params )
-{
- content_ = content;
- stylesheet_ = stylesheet;
- params_ = params;
+ /** XSLT stylesheet to be used for rendering the content. */
+ private InputSource stylesheet_;
+
+ /**
+ * Construct an ECS element that will render a given XML dicument using a given
+ * stylesheet and parameters when one of its output methods is invoked.
+ *
+ * @param content XML content to be processed
+ * @param stylesheet XSLT stylesheet to be used for processing the content
+ * @param params parameters for the stylesheet
+ */
+ public EcsStylesheetElement( InputSource content,
+ InputSource stylesheet,
+ Map params )
+ {
+ content_ = content;
+ stylesheet_ = stylesheet;
+ params_ = params;
-}
+ }
}
Index: org/apache/jetspeed/util/template/BaseJetspeedLink.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
retrieving revision 1.21
diff -u -r1.21 BaseJetspeedLink.java
--- org/apache/jetspeed/util/template/BaseJetspeedLink.java 23 Nov 2002 12:04:19 -0000 1.21
+++ org/apache/jetspeed/util/template/BaseJetspeedLink.java 21 Jul 2003 00:21:30 -0000
@@ -62,13 +62,14 @@
import org.apache.jetspeed.om.profile.ProfileLocator;
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.services.Profiler;
+import org.apache.jetspeed.services.logging.JetspeedLogFactoryService;
+import org.apache.jetspeed.services.logging.JetspeedLogger;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.util.template.JetspeedLink;
// Turbine
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.services.pull.ApplicationTool;
@@ -86,7 +87,11 @@
*/
public class BaseJetspeedLink implements ApplicationTool, JetspeedLink
{
-
+ /**
+ * Static initialization of the logger for this class
+ */
+ private static final JetspeedLogger logger = JetspeedLogFactoryService.getLogger(BaseJetspeedLink.class.getName());
+
/**
*