Index: org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java,v
retrieving revision 1.6
diff -u -r1.6 ThreadGroupJoin.java
--- org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java 17 Dec 2001 15:32:24 -0000 1.6
+++ org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java 4 May 2003 21:42:45 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
package org.apache.jetspeed.daemon.impl.util;
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
/**
Util class for joining a ThreadGroup and joining all of its Threads and waiting
@@ -113,8 +113,11 @@
long seconds = ( System.currentTimeMillis() - begin ) / 1000;
begin = System.currentTimeMillis();
-
- Log.info( source + ": has completed " + i + " threads in " + seconds + " second(s)" );
+
+ if ( Log.getLogger().isInfoEnabled() )
+ {
+ Log.info( source + ": has completed " + i + " threads in " + seconds + " second(s)" );
+ }
}
Index: org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java,v
retrieving revision 1.13
diff -u -r1.13 URLRefresher.java
--- org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java 4 Mar 2003 00:04:52 -0000 1.13
+++ org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java 4 May 2003 21:42:45 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,10 +60,10 @@
import org.apache.jetspeed.services.urlmanager.URLFetcher;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
//Java stuff
-import java.util.*;
+import java.util.Enumeration;
/**
Index: org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java,v
retrieving revision 1.13
diff -u -r1.13 EntryInstantiator.java
--- org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java 4 Mar 2003 00:04:52 -0000 1.13
+++ org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java 4 May 2003 21:42:45 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@
import org.apache.jetspeed.om.registry.PortletEntry;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
/**
Handles taking all known Portlets and then instantiatles them all so that
@@ -83,10 +83,13 @@
public void process() {
- Log.info( "BEGIN: EntryInstantiator: Instantiating " +
+ if ( Log.getLogger().isInfoEnabled() )
+ {
+ Log.info( "BEGIN: EntryInstantiator: Instantiating " +
Registry.get(Registry.PORTLET).getEntryCount() +
" Portlet(s) found in the PortletRegistry" );
-
+ }
+
for( int i = 0; i < entries.length; ++i ) {
Instantiator inst = new Instantiator( i, entries[i] );
Index: org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java,v
retrieving revision 1.23
diff -u -r1.23 Instantiator.java
--- org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java 4 Mar 2003 00:04:52 -0000 1.23
+++ org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java 4 May 2003 21:42:45 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,8 @@
package org.apache.jetspeed.daemon.impl.util.feeddaemon;
//jetspeed stuff
-import org.apache.jetspeed.cache.disk.*;
+import org.apache.jetspeed.cache.disk.DiskCacheUtils;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
import org.apache.jetspeed.om.registry.PortletEntry;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.services.PortletFactory;
@@ -65,10 +66,10 @@
import org.apache.jetspeed.services.resources.JetspeedResources;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
//Java stuff
-import java.io.*;
+import java.io.IOException;
/**
@@ -192,7 +193,7 @@
return;
} catch ( Throwable t) {
//t.printStackTrace();
- Log.error( "Instantiator: Throwable" + t);
+ Log.error( "Instantiator: Throwable", t);
}
org.apache.jetspeed.om.registry.Registry registry =
Index: org/apache/jetspeed/modules/ParameterLoader.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/ParameterLoader.java,v
retrieving revision 1.2
diff -u -r1.2 ParameterLoader.java
--- org/apache/jetspeed/modules/ParameterLoader.java 27 Nov 2002 17:56:38 -0000 1.2
+++ org/apache/jetspeed/modules/ParameterLoader.java 4 May 2003 21:42:46 -0000
@@ -87,11 +87,6 @@
private static ParameterLoader instance = new ParameterLoader(JetspeedResources.getInt("parameter.cache.size", 50));
/**
- * Logging verbosity level for debug statements (the higher the more output)
- */
- private static int verbosity = JetspeedResources.getInt("parameter.verbosity", 1);
-
- /**
* These ctor's are private to force clients to use getInstance()
* to access this class.
*/
@@ -183,8 +178,8 @@
if (cache() && this.containsKey(provider)) {
prm = (ParameterPresentationStyle) this.get(provider);
- if (verbosity > 0 && Log.getLogger().isDebugEnabled()) {
- Log.debug("ParameterLoader: Serving parameter: "+provider+", prm="+prm+" from cache");
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("ParameterLoader: Serving parameter: " + provider + ", prm=" + prm + " from cache");
}
} else {
@@ -198,17 +193,18 @@
// Attempt to load the presentation style
prm = (ParameterPresentationStyle)ab.getAssembler("parameter", provider);
if (prm == null) {
- if (verbosity > 0 && Log.getLogger().isDebugEnabled()) {
+ if ( Log.getLogger().isDebugEnabled() ) {
Log.debug("ParameterLoader: Registering the factory");
}
ab.registerFactory("parameter", new ParameterPresentationStyleFactory());
prm = (ParameterPresentationStyle)ab.getAssembler("parameter", provider);
}
- if (verbosity > 0 && Log.getLogger().isDebugEnabled()) {
+ if ( Log.getLogger().isDebugEnabled() ) {
Log.debug("ParameterLoader: Loaded parameter: "+provider+", prm="+prm);
}
} catch (ClassCastException cce) {
prm = null;
+ Log.error( "Error loading presentation style", cce );
}
if (prm == null) {
@@ -260,7 +256,7 @@
if (parmkey.startsWith(key)) {
try {
String stylekey = parmkey.substring(parmkey.lastIndexOf(".")+1);
- if (verbosity > 1 && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
Log.debug("ParameterLoader: parm name [" + parmName + "] - storing option [" + stylekey +
"] with value [" + parms.get(parmkey) + "]");
Index: org/apache/jetspeed/modules/actions/JetspeedAccessController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedAccessController.java,v
retrieving revision 1.6
diff -u -r1.6 JetspeedAccessController.java
--- org/apache/jetspeed/modules/actions/JetspeedAccessController.java 4 Mar 2003 00:04:52 -0000 1.6
+++ org/apache/jetspeed/modules/actions/JetspeedAccessController.java 4 May 2003 21:42:46 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@
catch (ClassCastException e)
{
Log.error("The RunData object does not implement the expected interface, "
- +"please verify the RunData factory settings");
+ + "please verify the RunData factory settings", e);
return;
}
Index: org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java,v
retrieving revision 1.22
diff -u -r1.22 JetspeedSessionValidator.java
--- org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java 8 Apr 2003 21:35:30 -0000 1.22
+++ org/apache/jetspeed/modules/actions/JetspeedSessionValidator.java 4 May 2003 21:42:46 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,7 @@
import org.apache.jetspeed.util.ServiceUtil;
import org.apache.jetspeed.services.customlocalization.CustomLocalizationService;
+
/**
Just like org.apache.turbine.modules.actions.sessionvalidator.TemplateSessionValidator except:
@@ -142,7 +143,7 @@
catch (ClassCastException e)
{
Log.error("The RunData object does not implement the expected interface, "
- +"please verify the RunData factory settings");
+ + "please verify the RunData factory settings", e);
return;
}
String language = (String) data.getRequest().getParameter("js_language");
@@ -156,6 +157,7 @@
CustomLocalizationService locService = (CustomLocalizationService) ServiceUtil.getServiceByName(
LocalizationService.SERVICE_NAME);
Locale locale = locService.getLocale(data);
+
if (locale == null) {
locale = new Locale(
TurbineResources.getString("locale.default.language", "en"),
Index: org/apache/jetspeed/modules/actions/MarkRefPage.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/MarkRefPage.java,v
retrieving revision 1.4
diff -u -r1.4 MarkRefPage.java
--- org/apache/jetspeed/modules/actions/MarkRefPage.java 4 Mar 2003 00:04:52 -0000 1.4
+++ org/apache/jetspeed/modules/actions/MarkRefPage.java 4 May 2003 21:42:46 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,14 +55,14 @@
package org.apache.jetspeed.modules.actions;
// Java Core Classes
-import java.util.*;
+import java.util.Enumeration;
// Jetspeed Modules
import org.apache.jetspeed.util.URILookup;
// Turbine Modules
-import org.apache.turbine.modules.*;
-import org.apache.turbine.util.*;
+import org.apache.turbine.modules.Action;
+import org.apache.turbine.util.RunData;
/**
* Marks the referer page to enable buttons as "back"
Index: org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java,v
retrieving revision 1.25
diff -u -r1.25 MultiColumnControllerAction.java
--- org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java 17 Nov 2002 03:06:27 -0000 1.25
+++ org/apache/jetspeed/modules/actions/controllers/MultiColumnControllerAction.java 4 May 2003 21:42:47 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -172,7 +172,9 @@
rowNum = row;
}
- Log.debug("Controller calculated setSize " + set.size() + " row " + row + " colNum: " + colNum + " rowNum: " + rowNum);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("Controller calculated setSize " + set.size() + " row " + row + " colNum: " + colNum + " rowNum: " + rowNum);
+ }
// initialize the result position table and the work list
List[] table = new List[colNum];
List filler = Collections.nCopies(rowNum + 1, null);
@@ -293,7 +295,9 @@
.getDocument()
.getPortletsById(customizedSet.getID());
- Log.debug("MultiCol: columns " + columns + " set " + set);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("MultiCol: columns " + columns + " set " + set);
+ }
if ((columns != null) && (columns.length == colNum))
{
@@ -303,17 +307,23 @@
eCount += columns[i].size();
}
- Log.debug("MultiCol: eCount " + eCount + " setCount" + set.getEntryCount() + set.getPortletsCount());
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("MultiCol: eCount " + eCount + " setCount" + set.getEntryCount() + set.getPortletsCount());
+ }
if (eCount != set.getEntryCount() + set.getPortletsCount())
{
- Log.debug("MultiCol: rebuilding columns ");
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("MultiCol: rebuilding columns ");
+ }
columns = buildColumns(set, colNum);
}
}
else
{
- Log.debug("MultiCol: rebuilding columns ");
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("MultiCol: rebuilding columns ");
+ }
columns = buildColumns(set, colNum);
}
@@ -482,6 +492,7 @@
catch (Exception e)
{
// probably got wrong coordinates
+ Log.error("MultiColumnControllerAction: Probably got wrong coordinates", e);
}
}
}
@@ -727,7 +738,9 @@
rowNum = row;
}
- Log.debug("Controller customize colNum: " + colNum + " rowNum: " + rowNum);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("Controller customize colNum: " + colNum + " rowNum: " + rowNum);
+ }
// initialize the result position table and the work list
List[] table = new List[colNum];
List filler = Collections.nCopies(rowNum + 1, null);
@@ -760,7 +773,9 @@
{
if (table[col].get(row) == null)
{
- Log.debug("Set portlet at col " + col + " row " + row);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("Set portlet at col " + col + " row " + row);
+ }
table[col].set(row, i.next());
}
}
@@ -769,12 +784,16 @@
// now cleanup any remaining null elements
for (int j = 0; j < table.length; j++)
{
- Log.debug("Column " + j);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("Column " + j);
+ }
i = table[j].iterator();
while (i.hasNext())
{
Object obj = i.next();
- Log.debug("Element " + obj);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("Element " + obj);
+ }
if (obj == null)
{
i.remove();
@@ -864,7 +883,9 @@
}
}
- Log.debug("Constraints col " + col + " row " + row);
+ if ( Log.getLogger().isDebugEnabled() ) {
+ Log.debug("Constraints col " + col + " row " + row);
+ }
if ((row >= 0) && (col >= 0) && (col < columnCount))
{
table[col].set(row, element);
Index: org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java,v
retrieving revision 1.12
diff -u -r1.12 PsmlUpdateAction.java
--- org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java 12 Feb 2003 21:33:04 -0000 1.12
+++ org/apache/jetspeed/modules/actions/portlets/PsmlUpdateAction.java 4 May 2003 21:42:49 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -878,7 +878,10 @@
if (mapFile != null)
{
File map = new File(mapFile);
- Log.debug("Loading psml mapping file "+mapFile);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug( "Loading psml mapping file " + mapFile );
+ }
if (map.exists() && map.isFile() && map.canRead())
{
try
Index: org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java,v
retrieving revision 1.18
diff -u -r1.18 JetspeedJspLayout.java
--- org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java 11 Jul 2002 04:22:56 -0000 1.18
+++ org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java 4 May 2003 21:42:51 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -95,7 +95,10 @@
// set the content type (including charset)
data.getResponse().setContentType(data.getContentType());
- Log.info("JetspeedJspLayout: set response content type to " + data.getContentType());
+ if (Log.getLogger().isInfoEnabled() )
+ {
+ Log.info("JetspeedJspLayout: set response content type to " + data.getContentType());
+ }
// tell turbine that the response is handled by the JSP system.
data.declareDirectResponse();
@@ -105,13 +108,19 @@
if (path != null)
screenPath = jsp.getRelativeTemplateName("/screens" + path);
data.getRequest().setAttribute("screenJsp", screenPath);
- Log.info("JetspeedJspLayout: set 'screenJSP' to: " + screenPath );
+ if (Log.getLogger().isInfoEnabled() )
+ {
+ Log.info("JetspeedJspLayout: set 'screenJSP' to: " + screenPath );
+ }
// Grab the layout template set in the JetspeedTemplatePage.
String templateName = data.getLayoutTemplate();
// Finally, generate the layout template and output to the response
- Log.info("JetspeedJspLayout: forward request to: " + "/layouts" + templateName);
+ if (Log.getLogger().isInfoEnabled() )
+ {
+ Log.info("JetspeedJspLayout: forward request to: " + "/layouts" + templateName);
+ }
jsp.handleRequest(data, "/layouts" + templateName, false);
}
Index: org/apache/jetspeed/modules/layouts/JetspeedLayout.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/layouts/JetspeedLayout.java,v
retrieving revision 1.10
diff -u -r1.10 JetspeedLayout.java
--- org/apache/jetspeed/modules/layouts/JetspeedLayout.java 4 Mar 2003 00:04:56 -0000 1.10
+++ org/apache/jetspeed/modules/layouts/JetspeedLayout.java 4 May 2003 21:42:51 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,10 @@
data.setContentType( mt.getContentType() );
data.setCharSet( mt.getCharSet() );
- Log.debug( "Layout: Setting type to: " + mt );
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug( "Layout: Setting type to: " + mt );
+ }
if ( mt.equals( MimeType.WML ) ) {
// we should output WML code, use raw output
Index: org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java,v
retrieving revision 1.21
diff -u -r1.21 JetspeedTemplatePage.java
--- org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java 4 Mar 2003 00:04:58 -0000 1.21
+++ org/apache/jetspeed/modules/pages/JetspeedTemplatePage.java 4 May 2003 21:42:52 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -213,8 +213,10 @@
{
template=template+"."+ext;
}
-
- Log.debug("JetspeedTemplatePage: requested template = " + template);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplatePage: requested template = " + template);
+ }
// get real path now - this is a fix to get us thru 1.3a2
// when the TurbineTemplateService can locate resources by NLS and mediatype,
@@ -222,11 +224,17 @@
String locatedScreen = TemplateLocator.locateScreenTemplate(data, template);
data.setScreenTemplate( locatedScreen );
- Log.debug("JetspeedTemplatePage: calculated template = " + locatedScreen);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplatePage: calculated template = " + locatedScreen);
+ }
String layout = TemplateLocator.locateLayoutTemplate(data, template);
data.setLayoutTemplate(layout);
- Log.debug("JetspeedTemplatePage: layoutTemplate is finally " + layout);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplatePage: layoutTemplate is finally " + layout);
+ }
String screen = TurbineTemplate.getScreenName(template);
if (screen == null)
Index: org/apache/jetspeed/om/profile/BaseProfileLocator.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java,v
retrieving revision 1.16
diff -u -r1.16 BaseProfileLocator.java
--- org/apache/jetspeed/om/profile/BaseProfileLocator.java 4 Mar 2003 00:04:58 -0000 1.16
+++ org/apache/jetspeed/om/profile/BaseProfileLocator.java 4 May 2003 21:42:53 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -241,7 +241,7 @@
}
catch (Exception e)
{
- Log.error("ProfileLocator: Failed to set User: " + e);
+ Log.error("ProfileLocator: Failed to set User: ", e);
}
}
else if (name.equals(Profiler.PARAM_GROUP) && tok.hasMoreTokens())
@@ -252,7 +252,7 @@
}
catch (Exception e)
{
- Log.error("ProfileLocator: Failed to set Group: " + e);
+ Log.error("ProfileLocator: Failed to set Group: ", e);
}
}
else if (name.equals(Profiler.PARAM_ROLE) && tok.hasMoreTokens())
@@ -263,7 +263,7 @@
}
catch (Exception e)
{
- Log.error("ProfileLocator: Failed to set Role: " + e);
+ Log.error("ProfileLocator: Failed to set Role: ", e);
}
}
else if (name.equals(Profiler.PARAM_PAGE) && tok.hasMoreTokens())
@@ -341,7 +341,7 @@
}
catch (Exception e)
{
- Log.error("Could not get Anonymous user");
+ Log.error("Could not get Anonymous user", e);
}
finally
{
@@ -487,6 +487,7 @@
}
catch (Exception e)
{
+ Log.error("ProfileLocator: Failed to set Role " + roleName, e);
}
}
@@ -530,7 +531,7 @@
}
catch (Exception e)
{
- System.out.println("Group error" + e);
+ Log.error("ProfileLocator: Failed to set Group: " + e);
}
}
Index: org/apache/jetspeed/om/registry/base/BaseClientRegistry.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseClientRegistry.java,v
retrieving revision 1.2
diff -u -r1.2 BaseClientRegistry.java
--- org/apache/jetspeed/om/registry/base/BaseClientRegistry.java 7 Nov 2002 20:17:54 -0000 1.2
+++ org/apache/jetspeed/om/registry/base/BaseClientRegistry.java 4 May 2003 21:42:53 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,8 +84,6 @@
*/
public class BaseClientRegistry extends BaseOrderedRegistry implements ClientRegistry
{
- static final boolean DEBUG = false;
-
/**
@see Registry#setEntry
*/
@@ -159,9 +157,9 @@
ClientEntry clientEntry = null;
Enumeration clients = getEntries();
- if (DEBUG && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
- Log.debug("ClientRegistry: Looking for client with useragent :" + useragent);
+ Log.debug( "ClientRegistry: Looking for client with useragent :" + useragent );
}
if (clients != null)
@@ -179,18 +177,18 @@
if (r.match(useragent))
{
- if (DEBUG && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
- Log.debug("ClientRegistry: "+useragent+" matches "+client.getUseragentpattern());
+ Log.debug( "ClientRegistry: " + useragent + " matches " + client.getUseragentpattern() );
}
return client;
}
else
{
- if (DEBUG && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
- Log.debug("ClientRegistry: "+useragent+" does not match "+client.getUseragentpattern());
+ Log.debug( "ClientRegistry: " + useragent + " does not match " + client.getUseragentpattern() );
}
}
}
Index: org/apache/jetspeed/om/registry/base/BaseMediaTypeRegistry.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseMediaTypeRegistry.java,v
retrieving revision 1.4
diff -u -r1.4 BaseMediaTypeRegistry.java
--- org/apache/jetspeed/om/registry/base/BaseMediaTypeRegistry.java 7 Nov 2002 20:17:54 -0000 1.4
+++ org/apache/jetspeed/om/registry/base/BaseMediaTypeRegistry.java 4 May 2003 21:42:53 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -96,7 +96,7 @@
String type = cm.getPreferredType().getContentType();
List result = new ArrayList();
- if (DEBUG && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
Log.debug("MediaTypeRegistry: looking for type " + type );
}
@@ -113,7 +113,7 @@
{
MediaTypeEntry mte = (MediaTypeEntry)en.nextElement();
- if (DEBUG && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
Log.debug("MediaTypeRegistry: found MediaTypeEntry for type " + mte.getMimeType() );
}
@@ -128,7 +128,7 @@
Log.error(e);
}
- if (DEBUG && Log.getLogger().isDebugEnabled())
+ if ( Log.getLogger().isDebugEnabled() )
{
Log.debug("MediaTypeRegistry: found " + result.size() + " entries." );
}
Index: org/apache/jetspeed/om/registry/base/BaseOrderedRegistry.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/BaseOrderedRegistry.java,v
retrieving revision 1.1
diff -u -r1.1 BaseOrderedRegistry.java
--- org/apache/jetspeed/om/registry/base/BaseOrderedRegistry.java 7 Nov 2002 20:20:32 -0000 1.1
+++ org/apache/jetspeed/om/registry/base/BaseOrderedRegistry.java 4 May 2003 21:42:54 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,9 @@
import org.apache.jetspeed.om.registry.RegistryEntry;
import org.apache.jetspeed.om.registry.InvalidEntryException;
+
+import org.apache.turbine.util.Log;
+
import java.util.Map;
import java.util.TreeMap;
import java.util.List;
@@ -72,8 +75,6 @@
*/
public class BaseOrderedRegistry implements LocalRegistry
{
- protected static final boolean DEBUG = false;
-
protected List entries = new Vector();
protected Map idx = null;
@@ -124,6 +125,7 @@
buildIdx();
}
+ Log.error("getEntry: index and vector are not in synch.", e);
throw new InvalidEntryException( InvalidEntryException.ENTRY_DOES_NOT_EXIST+" "+name );
}
Index: org/apache/jetspeed/om/security/BaseJetspeedUser.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/BaseJetspeedUser.java,v
retrieving revision 1.6
diff -u -r1.6 BaseJetspeedUser.java
--- org/apache/jetspeed/om/security/BaseJetspeedUser.java 13 Sep 2002 18:44:06 -0000 1.6
+++ org/apache/jetspeed/om/security/BaseJetspeedUser.java 4 May 2003 21:42:54 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -131,6 +131,7 @@
}
catch (Exception e)
{
+ Log.error("getUserId(): " + e.getMessage(), e);
}
return tmp;
}
@@ -156,6 +157,7 @@
}
catch (Exception e)
{
+ Log.error("getAccessCounterForSession(): " + e.getMessage(), e);
return 0;
}
}
@@ -173,6 +175,7 @@
}
catch (Exception e)
{
+ Log.error("getAccessCounter(): " + e.getMessage(), e);
return 0;
}
}
@@ -251,6 +254,7 @@
}
catch (Exception e)
{
+ Log.error("getPerm(" + name + "): " + e.getMessage(), e);
return def;
}
}
@@ -302,6 +306,7 @@
}
catch (Exception e)
{
+ Log.error("getTemp(" + name + "): " + e.getMessage(), e);
val = def;
}
return val;
@@ -326,6 +331,7 @@
}
catch (Exception e)
{
+ Log.error("getUserName(): " + e.getMessage(), e);
}
return tmp;
}
@@ -349,6 +355,7 @@
}
catch (Exception e)
{
+ Log.error("getFirstName(): " + e.getMessage(), e);
}
return tmp;
}
@@ -370,6 +377,7 @@
}
catch (Exception e)
{
+ Log.error("getLastName(): " + e.getMessage(), e);
}
return tmp;
}
@@ -747,6 +755,7 @@
}
catch (Exception e)
{
+ Log.error("getDisabled(): " + e.getMessage(), e);
}
return disabled;
}
Index: org/apache/jetspeed/om/security/ldap/BaseLDAPObject.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/ldap/BaseLDAPObject.java,v
retrieving revision 1.5
diff -u -r1.5 BaseLDAPObject.java
--- org/apache/jetspeed/om/security/ldap/BaseLDAPObject.java 4 Mar 2003 00:05:03 -0000 1.5
+++ org/apache/jetspeed/om/security/ldap/BaseLDAPObject.java 4 May 2003 21:42:56 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -362,6 +362,7 @@
}
catch (NamingException e)
{
+ Log.warn( "getUtil(): " + e.getMessage(), e );
return new String("");
}
}
@@ -390,21 +391,22 @@
}
if (!(attrs.get(field) == null))
- {
+ {
try
- {
+ {
for(NamingEnumeration enum = attrs.get(field).getAll(); enum.hasMore(); )
{
temp = (String)enum.nextElement();
if (null != temp)
- {
+ {
values.add(temp);
}
}
}
- catch (NamingException e)
- {
+ catch (NamingException e)
+ {
+ Log.warn( "getUtil(): " + e.getMessage(), e );
}
}
Index: org/apache/jetspeed/om/security/ldap/LDAPUser.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/security/ldap/LDAPUser.java,v
retrieving revision 1.4
diff -u -r1.4 LDAPUser.java
--- org/apache/jetspeed/om/security/ldap/LDAPUser.java 28 Jan 2003 04:49:43 -0000 1.4
+++ org/apache/jetspeed/om/security/ldap/LDAPUser.java 4 May 2003 21:42:56 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -185,11 +185,11 @@
public LDAPUser(Attributes attributes)
{
- fillObject(attributes);
- }
-
- private void fillObject(Attributes attributes)
- {
+ fillObject(attributes);
+ }
+
+ private void fillObject(Attributes attributes)
+ {
tempStorage = new Hashtable(20);
permStorage = new Hashtable(50);
setHasLoggedIn(Boolean.FALSE);
@@ -202,15 +202,16 @@
}
catch (Exception e)
{
+ Log.error("fillobject()" , e);
}
- setUserName(getutil(ATTR_UID, attributes));
- setUserId(getutil(ATTR_UID_NUMBER, attributes));
- setEmail(getutil(ATTR_MAIL, attributes));
- setFirstName(getutil(ATTR_GIVEN_NAME, attributes));
- setLastName(getutil(ATTR_SN, attributes));
- // setName(getutil(ATTR_NAME, attributes));
- setConfirmed(getutil(ATTR_CONFIRMED, attributes));
+ setUserName(getutil(ATTR_UID, attributes));
+ setUserId(getutil(ATTR_UID_NUMBER, attributes));
+ setEmail(getutil(ATTR_MAIL, attributes));
+ setFirstName(getutil(ATTR_GIVEN_NAME, attributes));
+ setLastName(getutil(ATTR_SN, attributes));
+ // setName(getutil(ATTR_NAME, attributes));
+ setConfirmed(getutil(ATTR_CONFIRMED, attributes));
setLastLogin(parseDate(getutil(ATTR_LAST_LOGIN_DATE, attributes)));
lastAccessDate = parseDate(getutil(ATTR_LAST_MODIFIED_DATE, attributes));
@@ -225,11 +226,12 @@
}
catch (Exception e)
{
+ Log.error("fillobject() could not set password" , e);
}
-
+
this.groupRoles = getutil( ATTR_USER_GROUP_ROLE, attributes, true );
ldapurl = JetspeedLDAP.buildURL(ATTR_UID + "=" + getUserName() + "," + ORGANIZATIONAL_UNIT);
- }
+ }
// --------------------- Persistence operations ----------------------
@@ -254,12 +256,12 @@
try
{
- setutil(ATTR_OBJECT_DATA, serializePerm(permStorage));
- }
- catch (Exception e)
- {
- Log.warn("Could not serialize object data!" , e);
- }
+ setutil(ATTR_OBJECT_DATA, serializePerm(permStorage));
+ }
+ catch (Exception e)
+ {
+ Log.warn("Could not serialize object data!" , e);
+ }
if (create)
{
@@ -330,6 +332,7 @@
}
catch (Exception e)
{
+ Log.error("getUserId():" , e);
}
return tmp;
}
@@ -355,6 +358,7 @@
}
catch (Exception e)
{
+ Log.error("getAccessCounterForSession():" , e);
return 0;
}
}
@@ -372,6 +376,7 @@
}
catch (Exception e)
{
+ Log.error("getAccessCounter():" , e);
return 0;
}
@@ -453,6 +458,7 @@
}
catch (Exception e)
{
+ Log.error("getPerm():" , e);
return def;
}
}
@@ -504,6 +510,7 @@
}
catch (Exception e)
{
+ Log.error("getTemp():" , e);
val = def;
}
return val;
@@ -529,6 +536,7 @@
}
catch (Exception e)
{
+ Log.error("getUserName():" , e);
}
return tmp;
@@ -554,6 +562,7 @@
}
catch (Exception e)
{
+ Log.error("getFirstName():" , e);
}
return tmp;
}
@@ -575,6 +584,7 @@
}
catch (Exception e)
{
+ Log.error("getLastName():" , e);
}
return tmp;
@@ -748,7 +758,8 @@
* returns this value as a boolean. This is private because you
* should use hasLoggedIn() instead.
*
- * @return True if someone has logged in.
+ * @return True if someone has logged in.
+
*/
private Boolean getHasLoggedIn()
{
@@ -953,6 +964,7 @@
}
catch (Exception e)
{
+ Log.error("getDisabled():" , e);
}
return disabled;
Index: org/apache/jetspeed/portal/BasePortletSet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
retrieving revision 1.29
diff -u -r1.29 BasePortletSet.java
--- org/apache/jetspeed/portal/BasePortletSet.java 10 Sep 2002 15:12:08 -0000 1.29
+++ org/apache/jetspeed/portal/BasePortletSet.java 4 May 2003 21:42:57 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -352,7 +352,10 @@
if (!JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
portalResource, JetspeedSecurity.PERMISSION_VIEW))
{
- Log.debug("Unauthorized access by user \"" + rundata.getUser().getUserName() + "\"");
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("Unauthorized access by user \"" + rundata.getUser().getUserName() + "\"");
+ }
// Clear any portlets that exist in this set
if (this.portlets != null)
{
@@ -362,7 +365,10 @@
}
else
{
- Log.debug("User \"" + rundata.getUser().getUserName() + "\" is authorized to portlet set " + getID());
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("User \"" + rundata.getUser().getUserName() + "\" is authorized to portlet set " + getID());
+ }
}
if (controller == null)
Index: org/apache/jetspeed/portal/PortletURIManager.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletURIManager.java,v
retrieving revision 1.38
diff -u -r1.38 PortletURIManager.java
--- org/apache/jetspeed/portal/PortletURIManager.java 4 Mar 2003 00:05:03 -0000 1.38
+++ org/apache/jetspeed/portal/PortletURIManager.java 4 May 2003 21:42:58 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,9 @@
import org.apache.jetspeed.services.Registry;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.RunData;
/**
Index: org/apache/jetspeed/portal/controllers/AbstractPortletController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/AbstractPortletController.java,v
retrieving revision 1.23
diff -u -r1.23 AbstractPortletController.java
--- org/apache/jetspeed/portal/controllers/AbstractPortletController.java 4 Mar 2003 00:05:03 -0000 1.23
+++ org/apache/jetspeed/portal/controllers/AbstractPortletController.java 4 May 2003 21:42:58 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,12 @@
package org.apache.jetspeed.portal.controllers;
//jetspeed support
-import org.apache.jetspeed.portal.*;
+import org.apache.jetspeed.portal.BasePortletSetConstraints;
+import org.apache.jetspeed.portal.PortletConfig;
+import org.apache.jetspeed.portal.PortletController;
+import org.apache.jetspeed.portal.PortletControllerConfig;
+import org.apache.jetspeed.portal.PortletSet;
+
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.services.Registry;
@@ -64,10 +69,12 @@
import org.apache.jetspeed.util.MimeType;
//turbine support
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
//ecs stuff
-import org.apache.ecs.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.ElementContainer;
import java.util.Map;
import java.util.Iterator;
@@ -143,6 +150,7 @@
PortletConfig conf = getPortlets().getPortletConfig();
padding = Integer.parseInt( conf.getSkin( "padding" , String.valueOf( DEFAULT_PADDING ) ) );
} catch ( RuntimeException e ) {
+ Log.error("Exception getting padding value", e);
padding = DEFAULT_PADDING;
}
@@ -157,6 +165,7 @@
PortletConfig conf = getPortlets().getPortletConfig();
conf.setSkin( "padding" , String.valueOf( padding ) );
} catch ( RuntimeException e ) {
+ Log.error("Exception setting padding value", e);
// FIXME: What should we do if there's no portlets, config or skin defined ?
}
@@ -170,6 +179,7 @@
PortletConfig conf = getPortlets().getPortletConfig();
conf.setSkin( "padding" , padding );
} catch ( RuntimeException e ) {
+ Log.error("Exception setting padding value", e);
// FIXME: What should we do if there's no portlets, config or skin defined ?
}
}
Index: org/apache/jetspeed/portal/controllers/GridPortletController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/GridPortletController.java,v
retrieving revision 1.14
diff -u -r1.14 GridPortletController.java
--- org/apache/jetspeed/portal/controllers/GridPortletController.java 4 Mar 2003 00:05:03 -0000 1.14
+++ org/apache/jetspeed/portal/controllers/GridPortletController.java 4 May 2003 21:42:58 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -64,6 +64,9 @@
//jetspeed stuff
import org.apache.jetspeed.portal.*;
+// Turbine stuff
+import org.apache.turbine.util.Log;
+
//standard Java stuff
import java.util.Vector;
import java.util.StringTokenizer;
@@ -230,7 +233,7 @@
}
catch (Exception e)
{
- org.apache.turbine.util.Log.error(e);
+ Log.error("getContent():", e);
}
return base;
Index: org/apache/jetspeed/portal/controllers/VelocityPortletController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPortletController.java,v
retrieving revision 1.9
diff -u -r1.9 VelocityPortletController.java
--- org/apache/jetspeed/portal/controllers/VelocityPortletController.java 4 Mar 2003 00:05:03 -0000 1.9
+++ org/apache/jetspeed/portal/controllers/VelocityPortletController.java 4 May 2003 21:42:58 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -137,6 +137,7 @@
}
catch( Exception e)
{
+ Log.error( "Error generating content: ", e );
s= e.toString();
}
Index: org/apache/jetspeed/portal/controls/TitleControl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/TitleControl.java,v
retrieving revision 1.11
diff -u -r1.11 TitleControl.java
--- org/apache/jetspeed/portal/controls/TitleControl.java 4 Mar 2003 00:05:04 -0000 1.11
+++ org/apache/jetspeed/portal/controls/TitleControl.java 4 May 2003 21:42:59 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,20 +56,30 @@
//ECS stuff
-import org.apache.ecs.html.*;
-import org.apache.ecs.*;
+import org.apache.ecs.html.IMG;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.Table;
+import org.apache.ecs.html.TD;
+import org.apache.ecs.html.TR;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.ElementContainer;
//jetspeed support
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.capability.*;
+import org.apache.jetspeed.util.JetspeedException;
+import org.apache.jetspeed.util.MimeType;
+import org.apache.jetspeed.util.URILookup;
+import org.apache.jetspeed.capability.CapabilityMap;
+import org.apache.jetspeed.capability.CapabilityMapFactory;
import org.apache.jetspeed.services.resources.JetspeedResources;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.ContentURI;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
//java imports
-import java.util.*;
+import java.util.Vector;
/**
Index: org/apache/jetspeed/portal/controls/VelocityPortletControl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
retrieving revision 1.23
diff -u -r1.23 VelocityPortletControl.java
--- org/apache/jetspeed/portal/controls/VelocityPortletControl.java 4 Mar 2003 00:05:04 -0000 1.23
+++ org/apache/jetspeed/portal/controls/VelocityPortletControl.java 4 May 2003 21:42:59 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -171,6 +171,7 @@
}
catch( Exception e )
{
+ Log.error( "Exception while creating content ", e );
s = e.toString();
}
@@ -304,7 +305,7 @@
}
catch( Exception e)
{
- Log.error( e );
+ Log.error( "Exception in buildActionList", e );
}
// action.setLink( jsLink.setPortletById(portlet.getID())
// .addQueryData("action", getAction( action.getName()))
Index: org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java,v
retrieving revision 1.12
diff -u -r1.12 VelocityPortletSetControl.java
--- org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java 18 Nov 2002 17:08:07 -0000 1.12
+++ org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java 4 May 2003 21:42:59 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -299,6 +299,7 @@
}
catch (ClassCastException e)
{
+ Log.error( "Exception in compare", e );
return 0;
}
}
Index: org/apache/jetspeed/portal/expire/ExpireFactory.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/ExpireFactory.java,v
retrieving revision 1.3
diff -u -r1.3 ExpireFactory.java
--- org/apache/jetspeed/portal/expire/ExpireFactory.java 7 Mar 2001 06:46:17 -0000 1.3
+++ org/apache/jetspeed/portal/expire/ExpireFactory.java 4 May 2003 21:43:00 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,11 +55,11 @@
package org.apache.jetspeed.portal.expire;
//jetspeed stuff
-import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
+import org.apache.jetspeed.portal.Portlet;
+import org.apache.jetspeed.util.JetspeedException;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
/**
Handles content expiration
Index: org/apache/jetspeed/portal/expire/FileWatchExpire.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatchExpire.java,v
retrieving revision 1.7
diff -u -r1.7 FileWatchExpire.java
--- org/apache/jetspeed/portal/expire/FileWatchExpire.java 4 Mar 2003 00:05:04 -0000 1.7
+++ org/apache/jetspeed/portal/expire/FileWatchExpire.java 4 May 2003 21:43:00 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,10 +55,10 @@
package org.apache.jetspeed.portal.expire;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
//java stuff
-import java.io.*;
+import java.io.IOException;
/**
Handles expiration mechanisms that expire when the file changes.
Index: org/apache/jetspeed/portal/expire/FileWatcher.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/expire/FileWatcher.java,v
retrieving revision 1.13
diff -u -r1.13 FileWatcher.java
--- org/apache/jetspeed/portal/expire/FileWatcher.java 4 Mar 2003 00:05:04 -0000 1.13
+++ org/apache/jetspeed/portal/expire/FileWatcher.java 4 May 2003 21:43:00 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,13 +55,16 @@
package org.apache.jetspeed.portal.expire;
//jetspeed stuff
-import org.apache.jetspeed.cache.disk.*;
+import org.apache.jetspeed.cache.disk.DiskCacheEntry;
+import org.apache.jetspeed.cache.disk.DiskCacheUtils;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
//java stuff
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
/**
@@ -133,7 +136,10 @@
try {
this.lastModified = JetspeedDiskCache.getInstance().getEntry( url ).
getLastModified();
- } catch (Throwable e) {}
+ } catch (Throwable e)
+ {
+ Log.error( "Unable to set last modified on url " + url, e );
+ }
this.url = url;
this.parent = parent;
@@ -167,17 +173,20 @@
// 0 means always modified
if ( recent == 0 ||
- this.lastModified < recent ) {
+ this.lastModified < recent ) {
+
+ if ( Log.getLogger().isInfoEnabled() )
+ {
+ String message = "";
+
+ if ( this.parent != null ) {
+ message = this.parent + ": ";
+ }
- String message = "";
-
- if ( this.parent != null ) {
- message = this.parent + ": ";
+ message += "REFRESH: Expiring Portlet because it's URL has been modified on disk -> " + url;
+
+ Log.info( message );
}
-
- message += "REFRESH: Expiring Portlet because it's URL has been modified on disk -> " + url;
-
- Log.info( message );
return true;
}
Index: org/apache/jetspeed/portal/portlets/AbstractPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/AbstractPortlet.java,v
retrieving revision 1.61
diff -u -r1.61 AbstractPortlet.java
--- org/apache/jetspeed/portal/portlets/AbstractPortlet.java 4 Mar 2003 00:05:04 -0000 1.61
+++ org/apache/jetspeed/portal/portlets/AbstractPortlet.java 4 May 2003 21:43:01 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -448,6 +448,9 @@
}
} catch (Exception e) {
element = new JetspeedClearElement("Error when retrieving Portlet contents");
+ if( Log.getLogger().isDebugEnabled() ) {
+ Log.debug( "Error when retrieving Portlet contents", e );
+ }
}
} else {
if( element == null ) {
Index: org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java,v
retrieving revision 1.36
diff -u -r1.36 ApplicationsPortlet.java
--- org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java 4 Mar 2003 00:05:04 -0000 1.36
+++ org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java 4 May 2003 21:43:01 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,18 +55,24 @@
package org.apache.jetspeed.portal.portlets;
//Element Construction Set
-import org.apache.ecs.html.*;
+import org.apache.ecs.html.A;
+import org.apache.ecs.html.Table;
+import org.apache.ecs.html.TD;
+import org.apache.ecs.html.TR;
import org.apache.ecs.ConcreteElement;
//Jetspeed stuff
-import org.apache.jetspeed.portal.*;
-
+import org.apache.jetspeed.portal.Portlet;
+import org.apache.jetspeed.portal.PortletConfig;
+import org.apache.jetspeed.portal.PortletException;
+import org.apache.jetspeed.portal.PortletURIManager;
import org.apache.jetspeed.services.PortletFactory;
import org.apache.jetspeed.services.Registry;
import org.apache.jetspeed.om.registry.PortletEntry;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
//standard java stuff
import java.util.*;
Index: org/apache/jetspeed/portal/portlets/FileWatchPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/FileWatchPortlet.java,v
retrieving revision 1.6
diff -u -r1.6 FileWatchPortlet.java
--- org/apache/jetspeed/portal/portlets/FileWatchPortlet.java 4 Mar 2003 00:05:04 -0000 1.6
+++ org/apache/jetspeed/portal/portlets/FileWatchPortlet.java 4 May 2003 21:43:01 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,11 +55,13 @@
package org.apache.jetspeed.portal.portlets;
//jetspeed
-import org.apache.jetspeed.portal.expire.*;
-import org.apache.jetspeed.util.*;
+import org.apache.jetspeed.portal.expire.Expire;
+import org.apache.jetspeed.portal.expire.ExpireFactory;
+import org.apache.jetspeed.portal.expire.FileWatchExpire;
+import org.apache.jetspeed.util.JetspeedException;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
/**
Just like AbstractPortlet except that when its URL is modified on disk it
Index: org/apache/jetspeed/portal/portlets/IFramePortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/IFramePortlet.java,v
retrieving revision 1.3
diff -u -r1.3 IFramePortlet.java
--- org/apache/jetspeed/portal/portlets/IFramePortlet.java 24 Oct 2002 14:59:25 -0000 1.3
+++ org/apache/jetspeed/portal/portlets/IFramePortlet.java 4 May 2003 21:43:02 -0000
@@ -2,7 +2,7 @@
* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -588,6 +588,7 @@
}
catch (Exception e)
{
+ Log.error("Exception in init()", e);
throw new PortletException(e.getMessage());
}
}
Index: org/apache/jetspeed/portal/portlets/JetspeedContent.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/JetspeedContent.java,v
retrieving revision 1.23
diff -u -r1.23 JetspeedContent.java
--- org/apache/jetspeed/portal/portlets/JetspeedContent.java 4 Mar 2003 00:05:04 -0000 1.23
+++ org/apache/jetspeed/portal/portlets/JetspeedContent.java 4 May 2003 21:43:02 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,20 +58,22 @@
import org.apache.ecs.ConcreteElement;
//Jetspeed stuff
-import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.cache.disk.*;
-
+import org.apache.jetspeed.portal.PortletConfig;
+import org.apache.jetspeed.portal.PortletException;
+import org.apache.jetspeed.util.JetspeedClearElement;
+import org.apache.jetspeed.util.SimpleTransform;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
+import org.apache.jetspeed.services.resources.JetspeedResources;
//turbine
-import org.apache.turbine.util.*;
-import org.apache.jetspeed.services.resources.JetspeedResources;
+import org.apache.turbine.util.Log;
+
//XML stuff
import org.xml.sax.SAXException;
//java stuff
-import java.io.*;
+import java.io.IOException;
/**
@@ -172,7 +174,7 @@
this.stylesheet = JetspeedDiskCache.getInstance()
.getEntry( this.stylesheet ).getURL();
} catch (IOException e) {
- Log.error(e);
+ Log.error( "Couldn't transform content.", e );
throw new PortletException( "Couldn't transform content. Please see error log" );
}
@@ -182,7 +184,7 @@
return new JetspeedClearElement( SimpleTransform.transform( url, stylesheet ) );
} catch (SAXException e) {
- Log.error( e );
+ Log.error( "Couldn't transform content.", e );
throw new PortletException( "Couldn't transform content. Please see error log" );
}
Index: org/apache/jetspeed/portal/portlets/NewRSSPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/NewRSSPortlet.java,v
retrieving revision 1.17
diff -u -r1.17 NewRSSPortlet.java
--- org/apache/jetspeed/portal/portlets/NewRSSPortlet.java 7 Nov 2002 20:22:45 -0000 1.17
+++ org/apache/jetspeed/portal/portlets/NewRSSPortlet.java 4 May 2003 21:43:02 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,32 +55,41 @@
package org.apache.jetspeed.portal.portlets;
//standard java stuff
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
//Element Construction Set
import org.apache.jetspeed.util.JetspeedClearElement;
import org.apache.ecs.ConcreteElement;
//standard Jetspeed stuff
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.cache.disk.*;
-import org.apache.jetspeed.portal.*;
+import org.apache.jetspeed.util.MimeType;
+import org.apache.jetspeed.util.SimpleTransform;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
+import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.xml.JetspeedXMLEntityResolver;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.capability.CapabilityMapFactory;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
//JAXP support
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
//XML stuff
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
Portlet which renders RDF Site Summary.
Index: org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java,v
retrieving revision 1.43
diff -u -r1.43 PortletInfoPortlet.java
--- org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java 4 Mar 2003 00:05:04 -0000 1.43
+++ org/apache/jetspeed/portal/portlets/PortletInfoPortlet.java 4 May 2003 21:43:03 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -56,26 +56,33 @@
//standard java stuff
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.Iterator;
import java.text.DateFormat;
//Element Construction Set
-import org.apache.ecs.html.*;
+import org.apache.ecs.html.A;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.Table;
+import org.apache.ecs.html.TD;
+import org.apache.ecs.html.TR;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.StringElement;
//Jetspeed stuff
-import org.apache.jetspeed.portal.*;
+import org.apache.jetspeed.portal.Portlet;
+import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.services.PortletFactory;
-import org.apache.jetspeed.cache.disk.*;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.util.template.JetspeedLink;
import org.apache.jetspeed.util.template.JetspeedLinkFactory;
//Turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
/**
Index: org/apache/jetspeed/portal/portlets/RSSPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/RSSPortlet.java,v
retrieving revision 1.49
diff -u -r1.49 RSSPortlet.java
--- org/apache/jetspeed/portal/portlets/RSSPortlet.java 4 Mar 2003 00:05:04 -0000 1.49
+++ org/apache/jetspeed/portal/portlets/RSSPortlet.java 4 May 2003 21:43:03 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,29 +55,34 @@
package org.apache.jetspeed.portal.portlets;
//standard java stuff
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Vector;
//Element Construction Set
import org.apache.jetspeed.util.JetspeedClearElement;
//standard Jetspeed stuff
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.cache.disk.*;
-import org.apache.jetspeed.portal.*;
+import org.apache.jetspeed.util.SimpleTransform;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
+import org.apache.jetspeed.portal.PortletException;
import org.apache.jetspeed.xml.JetspeedXMLEntityResolver;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
//JAXP support
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
//XML stuff
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
/**
Portlet to change RDF Site Summary into a portlet format for HTML presentation.
Index: org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java,v
retrieving revision 1.2
diff -u -r1.2 ServletInvokerPortlet.java
--- org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java 4 Mar 2003 00:05:04 -0000 1.2
+++ org/apache/jetspeed/portal/portlets/ServletInvokerPortlet.java 4 May 2003 21:43:03 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,9 +58,10 @@
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.StringElement;
-import org.apache.jetspeed.portal.*;
+import org.apache.jetspeed.portal.PortletConfig;
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
import org.apache.jetspeed.portal.portlets.AbstractPortlet;
import org.apache.jetspeed.util.servlet.EcsServletElement;
Index: org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java,v
retrieving revision 1.10
diff -u -r1.10 TurbineScreenPortlet.java
--- org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java 4 Mar 2003 00:05:04 -0000 1.10
+++ org/apache/jetspeed/portal/portlets/TurbineScreenPortlet.java 4 May 2003 21:43:03 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,19 +55,23 @@
package org.apache.jetspeed.portal.portlets;
//standard java stuff
-import java.util.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
//Element Construction Set
-import org.apache.ecs.html.*;
+import org.apache.ecs.html.Comment;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.ElementContainer;
//standard Jetspeed stuff
-import org.apache.jetspeed.portal.*;
+import org.apache.jetspeed.portal.PortletConfig;
+import org.apache.jetspeed.portal.PortletException;
//turbine stuff
-import org.apache.turbine.util.*;
-import org.apache.turbine.modules.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.modules.ScreenLoader;
/**
This portlet will attempt to render the Turbine Screen within a portlet.
Index: org/apache/jetspeed/portal/portlets/WMLFilePortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WMLFilePortlet.java,v
retrieving revision 1.8
diff -u -r1.8 WMLFilePortlet.java
--- org/apache/jetspeed/portal/portlets/WMLFilePortlet.java 4 Mar 2003 00:05:05 -0000 1.8
+++ org/apache/jetspeed/portal/portlets/WMLFilePortlet.java 4 May 2003 21:43:04 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,21 +55,33 @@
package org.apache.jetspeed.portal.portlets;
//Element Construction Set
-import org.apache.ecs.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.StringElement;
//Jetspeed stuff
-import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.cache.disk.*;
+import org.apache.jetspeed.portal.PortletConfig;
+import org.apache.jetspeed.portal.PortletException;
+import org.apache.jetspeed.util.JetspeedClearElement;
+import org.apache.jetspeed.util.MimeType;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
//standard java stuff
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
-import org.xml.sax.*;
+
+import org.xml.sax.AttributeList;
+import org.xml.sax.HandlerBase;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.ParserFactory;
/**
Index: org/apache/jetspeed/portal/portlets/WebPagePortlet2.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java,v
retrieving revision 1.1
diff -u -r1.1 WebPagePortlet2.java
--- org/apache/jetspeed/portal/portlets/WebPagePortlet2.java 29 Oct 2002 18:38:05 -0000 1.1
+++ org/apache/jetspeed/portal/portlets/WebPagePortlet2.java 4 May 2003 21:43:04 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -189,13 +189,16 @@
if (pageExpiration > System.currentTimeMillis() && (cacheContent == true))
{
contentStale = false;
- Log.debug( "WebPagePortlet caching URL: " +
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug( "WebPagePortlet caching URL: " +
url +
" Expiration: " +
pageExpiration +
", " +
(pageExpiration - System.currentTimeMillis() ) +
" milliseconds into the future" );
+ }
setExpirationMillis(pageExpiration);
} else {
contentStale = true;
Index: org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java,v
retrieving revision 1.11
diff -u -r1.11 BadURLManagerPortlet.java
--- org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java 4 Mar 2003 00:05:06 -0000 1.11
+++ org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java 4 May 2003 21:43:04 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,11 +54,18 @@
package org.apache.jetspeed.portal.portlets.admin;
//ecs stuff
-import org.apache.ecs.*;
-import org.apache.ecs.html.*;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.ElementContainer;
+import org.apache.ecs.html.A;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.BR;
+import org.apache.ecs.html.LI;
+import org.apache.ecs.html.UL;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.DynamicURI;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.RunData;
//jetspeed stuff
Index: org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java,v
retrieving revision 1.25
diff -u -r1.25 DaemonAdminPortlet.java
--- org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java 4 Mar 2003 00:05:06 -0000 1.25
+++ org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java 4 May 2003 21:43:05 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,21 +55,34 @@
package org.apache.jetspeed.portal.portlets.admin;
//Element Construction Set
-import org.apache.ecs.html.*;
-import org.apache.ecs.*;
+import org.apache.ecs.html.B;
+import org.apache.ecs.html.Form;
+import org.apache.ecs.html.Input;
+import org.apache.ecs.html.P;
+import org.apache.ecs.html.Table;
+import org.apache.ecs.html.TD;
+import org.apache.ecs.html.TH;
+import org.apache.ecs.html.TR;
+import org.apache.ecs.ConcreteElement;
+import org.apache.ecs.ElementContainer;
+import org.apache.ecs.StringElement;
//Jetspeed stuff
-import org.apache.jetspeed.portal.portlets.*;
-import org.apache.jetspeed.portal.*;
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.daemon.*;
-import org.apache.jetspeed.daemon.impl.*;
+import org.apache.jetspeed.portal.portlets.AbstractPortlet;
+import org.apache.jetspeed.portal.PortletException;
+import org.apache.jetspeed.util.JetspeedClearElement;
+import org.apache.jetspeed.daemon.Daemon;
+import org.apache.jetspeed.daemon.DaemonEntry;
+import org.apache.jetspeed.daemon.DaemonNotFoundException;
+import org.apache.jetspeed.daemon.impl.FeedDaemon;
import org.apache.jetspeed.om.security.JetspeedUser;
import org.apache.jetspeed.services.daemonfactory.DaemonFactory;
import org.apache.jetspeed.services.JetspeedSecurity;
//turbine
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.ParameterParser;
+import org.apache.turbine.util.RunData;
//standard java stuff
import java.util.*;
@@ -120,8 +133,7 @@
DaemonFactory.process( entry );
} catch (DaemonNotFoundException e) {
- Log.info( "Could not process daemon..." );
- Log.error( e );
+ Log.error( "Could not process daemon...", e );
}
}
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.4
diff -u -r1.4 ContentURITag.java
--- org/apache/jetspeed/services/jsp/tags/ContentURITag.java 7 Mar 2001 06:48:33 -0000 1.4
+++ org/apache/jetspeed/services/jsp/tags/ContentURITag.java 4 May 2003 21:43:08 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,11 +54,14 @@
* .
*/
-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.*;
+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;
/**
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.8
diff -u -r1.8 DynamicURITag.java
--- org/apache/jetspeed/services/jsp/tags/DynamicURITag.java 7 Jun 2001 22:00:31 -0000 1.8
+++ org/apache/jetspeed/services/jsp/tags/DynamicURITag.java 4 May 2003 21:43:08 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,11 +54,13 @@
* .
*/
-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.*;
+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;
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.9
diff -u -r1.9 EcsScreenTag.java
--- org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java 4 Mar 2003 00:05:08 -0000 1.9
+++ org/apache/jetspeed/services/jsp/tags/EcsScreenTag.java 4 May 2003 21:43:08 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,12 +54,14 @@
* .
*/
-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.modules.ScreenLoader;
-import org.apache.turbine.util.*;
+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;
@@ -112,7 +114,7 @@
}
}
- catch (Exception e)
+ catch (Exception e)
{
String message = "Error processing ecs screen '" + screenName + "'.";
Log.error(message, e);
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.5
diff -u -r1.5 InfoTag.java
--- org/apache/jetspeed/services/jsp/tags/InfoTag.java 23 Oct 2001 01:21:43 -0000 1.5
+++ org/apache/jetspeed/services/jsp/tags/InfoTag.java 4 May 2003 21:43:09 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,14 +54,16 @@
* .
*/
-import java.util.*;
-import java.text.*;
+import java.util.Date;
+import java.text.DateFormat;
-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.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
import org.apache.turbine.services.jsp.JspService;
Index: org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java,v
retrieving revision 1.7
diff -u -r1.7 JetspeedPortletTag.java
--- org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java 4 Mar 2003 00:05:08 -0000 1.7
+++ org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java 4 May 2003 21:43:09 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -128,19 +128,25 @@
if (this.psml != null)
{
- ProfileLocator baseLocator = Profiler.createLocator();
- baseLocator.createFromPath(this.psml);
- Profile baseProfile = Profiler.getProfile(baseLocator);
- if (baseProfile != null)
- {
- entry = baseProfile.getDocument().getEntry(name);
- Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from psml [" + this.psml);
- }
+ ProfileLocator baseLocator = Profiler.createLocator();
+ baseLocator.createFromPath(this.psml);
+ Profile baseProfile = Profiler.getProfile(baseLocator);
+ if (baseProfile != null)
+ {
+ entry = baseProfile.getDocument().getEntry(name);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from psml [" + this.psml);
+ }
+ }
}
else
{
- entry = data.getProfile().getDocument().getEntry(name);
- Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from current psml");
+ entry = data.getProfile().getDocument().getEntry(name);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from current psml");
+ }
}
if (entry != null)
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.4
diff -u -r1.4 NavigationTag.java
--- org/apache/jetspeed/services/jsp/tags/NavigationTag.java 4 Mar 2003 00:05:08 -0000 1.4
+++ org/apache/jetspeed/services/jsp/tags/NavigationTag.java 4 May 2003 21:43:09 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,15 +54,18 @@
* .
*/
-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;
+
// JetSpeed Classes
import org.apache.jetspeed.services.TemplateLocator;
// Turbine Classes
import org.apache.turbine.modules.NavigationLoader;
-import org.apache.turbine.util.*;
+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;
Index: org/apache/jetspeed/services/jsp/tags/URILookupTag.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/URILookupTag.java,v
retrieving revision 1.10
diff -u -r1.10 URILookupTag.java
--- org/apache/jetspeed/services/jsp/tags/URILookupTag.java 4 Mar 2003 00:05:08 -0000 1.10
+++ org/apache/jetspeed/services/jsp/tags/URILookupTag.java 4 May 2003 21:43:09 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,11 +54,13 @@
* .
*/
-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.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.RunData;
import org.apache.turbine.services.jsp.JspService;
// Jetsped Classes
Index: org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java,v
retrieving revision 1.16
diff -u -r1.16 JetspeedPortletFactoryService.java
--- org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java 11 Apr 2003 13:20:51 -0000 1.16
+++ org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java 4 May 2003 21:43:10 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -248,7 +248,10 @@
{
Log.info( "The portlet (" + handle + ") is expired" );
PortletCache.removeCacheable(handle);
- Log.debug( "After removal of object(" + handle + ")." );
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug( "After removal of object(" + handle + ")." );
+ }
portlet = null;
}
}
@@ -577,4 +580,3 @@
}
}
-
Index: org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.48
diff -u -r1.48 JetspeedProfilerService.java
--- org/apache/jetspeed/services/profiler/JetspeedProfilerService.java 17 Apr 2003 15:28:56 -0000 1.48
+++ org/apache/jetspeed/services/profiler/JetspeedProfilerService.java 4 May 2003 21:43:11 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -255,7 +255,7 @@
}
catch (Exception e)
{
- Log.error("Profiler: Failed to load Service: " + e);
+ Log.error("Profiler: Failed to load Service ", e);
e.printStackTrace();
}
@@ -318,6 +318,7 @@
}
catch (Exception e)
{
+ Log.error( "Error getting profile", e );
throw new ProfileException(e.toString());
}
}
@@ -531,6 +532,7 @@
}
catch (Exception e)
{
+ Log.error( "Exception in fallbackProfile", e );
throw new ProfileException(e.toString());
}
return null;
@@ -870,7 +872,9 @@
mediaTypes = serviceConf.getStringArray(CONFIG_NEWUSER_MEDIA);
}
catch (Exception e)
- {}
+ {
+ Log.error( "Error getting media types", e );
+ }
if (null == mediaTypes || mediaTypes.length == 0)
{
@@ -1050,6 +1054,7 @@
}
catch (Exception e)
{
+ Log.error( "Error creating profile", e );
throw new ProfileException(e.toString());
}
}
@@ -1117,3 +1122,4 @@
return this.useRoleFallback && this.useRoleMerge;
}
}
+
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.12
diff -u -r1.12 VariableResourcesService.java
--- org/apache/jetspeed/services/resources/VariableResourcesService.java 4 Mar 2003 00:05:10 -0000 1.12
+++ org/apache/jetspeed/services/resources/VariableResourcesService.java 4 May 2003 21:43:12 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -184,6 +184,8 @@
} catch (IOException e) {
//very unlikely that the JVM can't
//resolve its path
+ //But logging it anyway...
+ Log.error( "Exception define JVM app dir", e );
}
// load servlet init parameters as variables, they may override
@@ -382,7 +384,14 @@
}
VariableResourcesService res = new VariableResourcesService();
- try { res.init(config); } catch (Exception e) {}
+ try
+ {
+ res.init(config);
+ }
+ catch (Exception e)
+ {
+ Log.error( "Unable to init resources for " + prefix, e );
+ }
res.setVariables(this.variables);
return (ResourceService)res;
}
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.7
diff -u -r1.7 LDAPUserManagement.java
--- org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java 4 Mar 2003 00:05:11 -0000 1.7
+++ org/apache/jetspeed/services/security/ldap/LDAPUserManagement.java 4 May 2003 21:43:13 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -159,6 +159,7 @@
}
catch (Exception e)
{
+ Log.error( "Failed to retrieve user '" + principal.getName() + "'", e );
throw new UserException("Failed to retrieve user '" + principal.getName() + "'", e);
}
@@ -244,6 +245,7 @@
}
catch ( Exception e )
{
+ Log.error( "Failed to retrieve user with filter:" + filter, e );
throw new UserException( "Failed to retrieve user with filter:" + filter, e );
}
@@ -278,6 +280,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to save user object ", e);
throw new UserException("Failed to save user object ", e);
}
}
@@ -347,6 +350,7 @@
}
catch (Exception e)
{
+ Log.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);
}
@@ -377,6 +381,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to remove account '" + user.getUserName() + "'", e );
throw new UserException("Failed to remove account '" +
user.getUserName() + "'", e);
}
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.3
diff -u -r1.3 TurbineAccessController.java
--- org/apache/jetspeed/services/security/turbine/TurbineAccessController.java 25 Aug 2002 19:45:07 -0000 1.3
+++ org/apache/jetspeed/services/security/turbine/TurbineAccessController.java 4 May 2003 21:43:13 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -300,9 +300,10 @@
{
defaultPermissions = JetspeedResources.getStringArray(CONFIG_DEFAULT_PERMISSION_LOGGEDIN);
}
- } catch (Exception e)
+ }
+ catch (Exception e)
{
- e.printStackTrace();
+ Log.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.5
diff -u -r1.5 TurbineAuthentication.java
--- org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java 4 Mar 2003 00:05:12 -0000 1.5
+++ org/apache/jetspeed/services/security/turbine/TurbineAuthentication.java 4 May 2003 21:43:14 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -139,15 +139,18 @@
}
catch (UnknownUserException e)
{
+ Log.warn("Unknown user attempted access: " + username, e);
throw new FailedLoginException(e.toString());
}
catch (JetspeedSecurityException e)
{
+ Log.warn("User denied authentication: " + username, e);
throw new LoginException(e.toString());
}
if(!user.getPassword().equals(password))
{
+ Log.error("Invalid password for user: " + username);
throw new FailedLoginException("Credential authentication failure");
}
@@ -189,6 +192,7 @@
}
catch (Exception e)
{
+ Log.error( "Failed to update last login ", e);
putUserIntoContext(JetspeedSecurity.getAnonymousUser());
throw new LoginException("Failed to update last login ", e);
}
@@ -219,7 +223,8 @@
}
catch (JetspeedSecurityException e)
{
- throw new LoginException("Failed to get anonymous user: " + e);
+ Log.error( "Failed to get anonymous user: ", e );
+ throw new LoginException("Failed to get anonymous user: ", e);
}
return user;
}
@@ -246,6 +251,7 @@
}
catch (Exception e)
{
+ Log.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.6
diff -u -r1.6 TurbineGroupManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java 4 Mar 2003 00:05:12 -0000 1.6
+++ org/apache/jetspeed/services/security/turbine/TurbineGroupManagement.java 4 May 2003 21:43:14 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -150,6 +150,7 @@
}
catch(JetspeedSecurityException e)
{
+ Log.error( "Failed to Retrieve User: " + username, e );
throw new GroupException("Failed to Retrieve User: ", e);
}
Criteria criteria = new Criteria();
@@ -176,6 +177,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve groups for user " + username, e );
throw new GroupException("Failed to retrieve groups ", e);
}
return groups.values().iterator();
@@ -202,6 +204,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve groups ", e);
throw new GroupException("Failed to retrieve groups ", e);
}
return groups.iterator();
@@ -239,8 +242,9 @@
}
catch(Exception e)
{
- throw new GroupException("Failed to create group '" +
- group.getName() + "'", e);
+ String message = "Failed to create group '" + group.getName() + "'";
+ Log.error( message, e );
+ throw new GroupException( message, e );
}
try
@@ -256,7 +260,8 @@
catch (Exception e2)
{
}
- throw new GroupException("failed to add default PSML for Group resource", e);
+ Log.error( "Failed to add default PSML for Group resource", e );
+ throw new GroupException("Failed to add default PSML for Group resource", e);
}
}
@@ -284,6 +289,7 @@
catch(Exception e2)
{
}
+ Log.error( "Failed to create Group PSML", e );
throw new GroupException("Failed to create Group PSML", e);
}
}
@@ -322,8 +328,9 @@
}
catch(Exception e)
{
- throw new GroupException("Failed to create group '" +
- group.getName() + "'", e);
+ String message = "Failed to create group '" + group.getName() + "'";
+ Log.error( message, e );
+ throw new GroupException( message, e );
}
}
@@ -374,8 +381,9 @@
{
Log.error(sqle);
}
- throw new GroupException("Failed to remove group '" +
- groupname + "'", e);
+ String message = "Failed to remove group '" + groupname + "'";
+ Log.error( message, e );
+ throw new GroupException( message, e );
}
finally
{
@@ -383,7 +391,10 @@
{
Torque.closeConnection(conn);
}
- catch (Exception e){}
+ catch (Exception e)
+ {
+ Log.error( "Error closing Torque connection", e );
+ }
}
}
@@ -414,7 +425,9 @@
}
catch(Exception e)
{
- throw new GroupException("Join group '" + groupname + "' to user '" + username + "' failed: ", e);
+ String message = "Join group '" + groupname + "' to user '" + username + "' failed: ";
+ Log.error( message, e);
+ throw new GroupException( message, e );
}
}
@@ -444,7 +457,9 @@
}
catch(Exception e)
{
- throw new GroupException("Unjoin group '" + groupname + "' to user '" + username + "' failed: ", e);
+ String message = "Unjoin group '" + groupname + "' to user '" + username + "' failed: ";
+ Log.error( message, e);
+ throw new GroupException( message, e );
}
}
@@ -476,8 +491,9 @@
}
catch(Exception e)
{
- throw new GroupException("Failed to check group '" +
- groupname + "'", e);
+ String message = "Failed to check group '" + groupname + "'";
+ Log.error( message, e );
+ throw new GroupException( message, e );
}
return ( groups.size() > 0 );
}
@@ -506,8 +522,9 @@
}
catch(Exception e)
{
- throw new GroupException("Failed to retrieve group '" +
- groupname + "'", e);
+ String message = "Failed to retrieve group '" + groupname + "'";
+ Log.error( message, e );
+ throw new GroupException(message, e);
}
if ( groups.size() > 1 )
{
@@ -560,6 +577,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to check account's presence", e );
throw new GroupException(
"Failed to check account's presence", e);
}
@@ -606,6 +624,3 @@
}
-
-
-
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.6
diff -u -r1.6 TurbinePermissionManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java 4 Mar 2003 00:05:12 -0000 1.6
+++ org/apache/jetspeed/services/security/turbine/TurbinePermissionManagement.java 4 May 2003 21:43:15 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -150,6 +150,7 @@
}
catch(JetspeedSecurityException e)
{
+ Log.error( "Failed to Retrieve Role: ", e );
throw new PermissionException("Failed to Retrieve Role: ", e);
}
Criteria criteria = new Criteria();
@@ -176,6 +177,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve permissions ", e );
throw new PermissionException("Failed to retrieve permissions ", e);
}
return perms.values().iterator();
@@ -202,6 +204,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve permissions ", e);
throw new PermissionException("Failed to retrieve permissions ", e);
}
return permissions.iterator();
@@ -235,8 +238,9 @@
}
catch(Exception e)
{
- throw new PermissionException("Failed to create permission '" +
- permission.getName() + "'", e);
+ String message = "Failed to create permission '" + permission.getName() + "'";
+ Log.error( message, e );
+ throw new PermissionException(message, e);
}
}
@@ -273,8 +277,9 @@
}
catch(Exception e)
{
- throw new PermissionException("Failed to create permission '" +
- permission.getName() + "'", e);
+ String message = "Failed to create permission '" + permission.getName() + "'";
+ Log.error( message, e );
+ throw new PermissionException( message, e );
}
}
@@ -327,8 +332,9 @@
{
Log.error(sqle);
}
- throw new PermissionException("Failed to remove permission '" +
- permissionName + "'", e);
+ String message = "Failed to remove permission '" + permissionName + "'";
+ Log.error( message, e );
+ throw new PermissionException( message, e );
}
finally
{
@@ -336,7 +342,10 @@
{
Torque.closeConnection(conn);
}
- catch (Exception e){}
+ catch (Exception e)
+ {
+ Log.error( "Error closing Torque connection", e );
+ }
}
}
@@ -371,7 +380,9 @@
}
catch(Exception e)
{
- throw new PermissionException("Grant permission '" + permissionName + "' to role '" + roleName + "' failed: ", e);
+ String message = "Grant permission '" + permissionName + "' to role '" + roleName + "' failed: ";
+ Log.error( message, e );
+ throw new PermissionException( message, e );
}
}
@@ -405,7 +416,9 @@
}
catch(Exception e)
{
- throw new PermissionException("Revoke permission '" + permissionName + "' to role '" + roleName + "' failed: ", e);
+ String message = "Revoke permission '" + permissionName + "' to role '" + roleName + "' failed: ";
+ Log.error( message, e );
+ throw new PermissionException( message, e);
}
}
@@ -444,8 +457,9 @@
}
catch(Exception e)
{
- throw new PermissionException("Failed to check permission '" +
- permissionName + "'", e);
+ String message = "Failed to check permission '" + permissionName + "'";
+ Log.error( message , e );
+ throw new PermissionException( message, e );
}
return ( permissions.size() > 0 );
}
@@ -475,8 +489,9 @@
}
catch(Exception e)
{
- throw new PermissionException("Failed to retrieve permission '" +
- permissionName + "'", e);
+ String message = "Failed to retrieve permission '" + permissionName + "'";
+ Log.error( message, e );
+ throw new PermissionException( message, e );
}
if ( permissions.size() > 1 )
{
@@ -529,6 +544,7 @@
}
catch(Exception e)
{
+ Log.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.8
diff -u -r1.8 TurbineRoleManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java 4 Mar 2003 00:05:13 -0000 1.8
+++ org/apache/jetspeed/services/security/turbine/TurbineRoleManagement.java 4 May 2003 21:43:16 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -162,6 +162,7 @@
}
catch(JetspeedSecurityException e)
{
+ Log.error( "Failed to Retrieve User: " + username, e );
throw new RoleException("Failed to Retrieve User: ", e);
}
Criteria criteria = new Criteria();
@@ -188,6 +189,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve roles ", e );
throw new RoleException("Failed to retrieve roles ", e);
}
return roles.values().iterator();
@@ -214,6 +216,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve roles ", e );
throw new RoleException("Failed to retrieve roles ", e);
}
return roles.iterator();
@@ -247,8 +250,9 @@
}
catch(Exception e)
{
- throw new RoleException("Failed to create role '" +
- role.getName() + "'", e);
+ String message = "Failed to create role '" + role.getName() + "'";
+ Log.error( message, e );
+ throw new RoleException( message, e );
}
if (cachingEnable)
@@ -269,7 +273,8 @@
catch (Exception e2)
{
}
- throw new RoleException("failed to add default PSML for Role resource", e);
+ Log.error( "Failed to add default PSML for Role resource", e );
+ throw new RoleException("Failed to add default PSML for Role resource", e);
}
}
@@ -297,6 +302,7 @@
catch(Exception e2)
{
}
+ Log.error( "Failed to create Role PSML", e );
throw new RoleException("Failed to create Role PSML", e);
}
}
@@ -335,8 +341,9 @@
}
catch(Exception e)
{
- throw new RoleException("Failed to create role '" +
- role.getName() + "'", e);
+ String message = "Failed to create role '" + role.getName() + "'";
+ Log.error( message, e );
+ throw new RoleException( message, e );
}
}
@@ -395,8 +402,9 @@
{
Log.error(sqle);
}
- throw new RoleException("Failed to remove role '" +
- rolename + "'", e);
+ String message = "Failed to remove role '" + rolename + "'";
+ Log.error( message, e );
+ throw new RoleException( message, e );
}
finally
{
@@ -404,7 +412,10 @@
{
Torque.closeConnection(conn);
}
- catch (Exception e){}
+ catch (Exception e)
+ {
+ Log.error( "Error closing Torque connection", e );
+ }
}
}
@@ -439,7 +450,9 @@
}
catch(Exception e)
{
- throw new RoleException("Grant role '" + rolename + "' to user '" + username + "' failed: ", e);
+ String message = "Grant role '" + rolename + "' to user '" + username + "' failed: ";
+ Log.error( message, e );
+ throw new RoleException( message, e );
}
}
@@ -474,7 +487,9 @@
}
catch(Exception e)
{
- throw new RoleException("Revoke role '" + rolename + "' to user '" + username + "' failed: ", e);
+ String message = "Revoke role '" + rolename + "' to user '" + username + "' failed: ";
+ Log.error( message, e );
+ throw new RoleException( message, e );
}
}
@@ -515,8 +530,9 @@
}
catch(Exception e)
{
- throw new RoleException("Failed to check role '" +
- rolename + "'", e);
+ String message = "Failed to check role '" + rolename + "'";
+ Log.error( message, e );
+ throw new RoleException( message, e );
}
return ( roles.size() > 0 );
}
@@ -545,8 +561,9 @@
}
catch(Exception e)
{
- throw new RoleException("Failed to retrieve role '" +
- rolename + "'", e);
+ String message = "Failed to retrieve role '" + rolename + "'";
+ Log.error( message, e );
+ throw new RoleException( message, e);
}
if ( roles.size() > 1 )
{
@@ -599,6 +616,7 @@
}
catch(Exception e)
{
+ Log.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.8
diff -u -r1.8 TurbineUserManagement.java
--- org/apache/jetspeed/services/security/turbine/TurbineUserManagement.java 3 Dec 2002 23:13:12 -0000 1.8
+++ org/apache/jetspeed/services/security/turbine/TurbineUserManagement.java 4 May 2003 21:43:16 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -180,8 +180,9 @@
}
catch(Exception e)
{
- throw new UserException("Failed to retrieve user '" +
- principal.getName() + "'", e);
+ String message = "Failed to retrieve user '" + principal.getName() + "'";
+ Log.error( message, e );
+ throw new UserException( message, e );
}
if ( users.size() > 1 )
{
@@ -216,6 +217,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve users ", e );
throw new UserException("Failed to retrieve users ", e);
}
return users.iterator();
@@ -244,6 +246,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to retrieve users ", e );
throw new UserException("Failed to retrieve users ", e);
}
return users.iterator();
@@ -273,6 +276,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to save user object ", e );
throw new UserException("Failed to save user object ", e);
}
@@ -313,8 +317,9 @@
}
catch(Exception e)
{
- throw new UserException("Failed to create account '" +
- user.getUserName() + "'", e);
+ String message = "Failed to create account '" + user.getUserName() + "'";
+ Log.error( message, e );
+ throw new UserException( message, e );
}
addDefaultPSML(user);
@@ -355,7 +360,7 @@
}
catch (Exception e)
{
- e.printStackTrace();
+ Log.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);
}
@@ -398,8 +403,9 @@
}
catch(Exception e)
{
- throw new UserException("Failed to remove account '" +
- user.getUserName() + "'", e);
+ String message = "Failed to remove account '" + user.getUserName() + "'";
+ Log.error( message, e );
+ throw new UserException( message, e );
}
}
@@ -603,6 +609,7 @@
}
catch(Exception e)
{
+ Log.error( "Failed to check account's presence", e );
throw new UserException(
"Failed to check account's presence", e);
}
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.8
diff -u -r1.8 JetspeedTemplateService.java
--- org/apache/jetspeed/services/template/JetspeedTemplateService.java 4 Mar 2003 00:05:13 -0000 1.8
+++ org/apache/jetspeed/services/template/JetspeedTemplateService.java 4 May 2003 21:43:17 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,15 +57,22 @@
// Java Core Classes
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.StringTokenizer;
import java.io.File;
-import javax.servlet.*;
+import javax.servlet.ServletConfig;
// Turbine Utility Classes
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.*;
+import org.apache.turbine.util.Log;
+import org.apache.turbine.util.ServletUtils;
+import org.apache.turbine.services.TurbineBaseService;
+import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.modules.*;
+import org.apache.turbine.modules.ScreenLoader;
+import org.apache.turbine.modules.NavigationLoader;
/**
*
This service extends the TurbineTemplateService to modify its behaviour:
@@ -141,11 +148,11 @@
{
initTemplate(config);
setInit(true);
- org.apache.turbine.util.Log.info ("TemplateService " +
- "init()....finished!");
+ Log.info ("TemplateService init()....finished!");
}
catch (Exception e)
{
+ Log.error( "TurbineTemplateService failed to initialize", e );
throw new InitializationException("TurbineTemplateService failed to initialize", e);
}
}
@@ -291,7 +298,10 @@
}
else
{
- Log.debug("JetspeedTemplatePage.getLayoutTemplateName(" + key + ")");
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplatePage.getLayoutTemplateName(" + key + ")");
+ }
String[] names = parseScreenTemplate(key);
name = names[2];
addToCache( key, names[0], screenCache );
@@ -418,7 +428,10 @@
template = template + "." + getDefaultExtension();
}
- Log.debug("JetspeedTemplateService.parseScreen: template = " + template);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplateService.parseScreen: template = " + template);
+ }
StringTokenizer st = new StringTokenizer(template, "/");
List tokens = new ArrayList(st.countTokens());
@@ -430,7 +443,10 @@
tokens.add(token);
}
}
- Log.debug("JetspeedTemplateService.parseScreen: tokens1: " + tokens);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplateService.parseScreen: tokens1: " + tokens);
+ }
String fileName = (String)tokens.get(tokens.size() - 1);
tokens.remove(tokens.size()-1);
int dot = fileName.lastIndexOf('.');
@@ -446,7 +462,10 @@
String firstChar = String.valueOf(className.charAt(0));
firstChar = firstChar.toUpperCase();
className = firstChar + className.substring(1);
- Log.debug("JetspeedTemplateService.parseScreen: tokens2: " + tokens);
+ if ( Log.getLogger().isDebugEnabled() )
+ {
+ Log.debug("JetspeedTemplateService.parseScreen: tokens2: " + tokens);
+ }
// make sure the template exists and determine the correct
// templateRoot path
@@ -455,7 +474,10 @@
String pathSep = System.getProperty("path.separator");
for (int i=0; i
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.10
diff -u -r1.10 HTMLRewriter.java
--- org/apache/jetspeed/util/HTMLRewriter.java 9 Feb 2002 12:40:05 -0000 1.10
+++ org/apache/jetspeed/util/HTMLRewriter.java 4 May 2003 21:43:19 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -310,7 +310,7 @@
res = cb.getResult();
} catch (Exception e)
{
- e.printStackTrace();
+ Log.error( "Unable to convertURLS", e );
throw new MalformedURLException(e.toString());
}
return res;
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.5
diff -u -r1.5 SAXPIFilter.java
--- org/apache/jetspeed/util/SAXPIFilter.java 18 Jan 2002 13:14:35 -0000 1.5
+++ org/apache/jetspeed/util/SAXPIFilter.java 4 May 2003 21:43:19 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,14 +55,22 @@
package org.apache.jetspeed.util;
//standard java stuff
-import java.io.*;
-import java.util.*;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.util.Vector;
-import org.xml.sax.*;
+import org.xml.sax.AttributeList;
+import org.xml.sax.HandlerBase;
+import org.xml.sax.InputSource;
+import org.xml.sax.Parser;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.ParserFactory;
//turbine stuff
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
/**
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.20
diff -u -r1.20 SimpleTransform.java
--- org/apache/jetspeed/util/SimpleTransform.java 4 Mar 2003 00:05:15 -0000 1.20
+++ org/apache/jetspeed/util/SimpleTransform.java 4 May 2003 21:43:20 -0000
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,8 +55,16 @@
package org.apache.jetspeed.util;
//java stuff
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.Map;
//Trax support
import javax.xml.transform.TransformerFactory;
@@ -80,13 +88,13 @@
import org.xml.sax.InputSource;
//DOM Support
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
//turbine support
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.Log;
//Jetspeed stuff
-import org.apache.jetspeed.cache.disk.*;
+import org.apache.jetspeed.cache.disk.JetspeedDiskCache;
import org.apache.jetspeed.xml.JetspeedXMLEntityResolver;
@@ -275,11 +283,14 @@
in = new InputSource( url );
style = new InputSource( stylesheet_url );
}
-
- Log.info( "SimpleTransform: transforming url: " +
+
+ if ( Log.getLogger().isInfoEnabled() )
+ {
+ Log.info( "SimpleTransform: transforming url: " +
url +
" with stylesheet: " +
stylesheet_url );
+ }
in.setSystemId( url );
style.setSystemId( stylesheet_url );
@@ -501,7 +512,7 @@
}
catch (java.io.UnsupportedEncodingException uee)
{
- Log.debug("Need utf-8 encoding to SAXTransform");
+ Log.error("Need utf-8 encoding to SAXTransform", uee);
}
return new InputStreamReader ( pis, "utf-8" );
}
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.21
diff -u -r1.21 URILookup.java
--- org/apache/jetspeed/util/URILookup.java 4 Mar 2003 00:05:15 -0000 1.21
+++ org/apache/jetspeed/util/URILookup.java 4 May 2003 21:43:21 -0000
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,9 @@
import org.apache.jetspeed.services.rundata.JetspeedRunData;
//turbine
-import org.apache.turbine.util.*;
+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;
@@ -504,7 +506,10 @@
if (propertiesParameterValue!=null)
{
// found the parameter value, so replace the newURI with this one
- Log.info("URILookup: replaced uri "+newURI+" with "+propertiesParameterValue);
+ if ( Log.getLogger().isInfoEnabled() )
+ {
+ Log.info("URILookup: replaced uri "+newURI+" with "+propertiesParameterValue);
+ }
newURI = propertiesParameterValue;
}
@@ -660,6 +665,7 @@
ctxtPath = rundata.getRequest().getContextPath()+ctxtPath;
} catch (Exception e) {
// not servlet 2.2
+ Log.error( "Servlet container probably not 2.2", e );
}
return rundata.getServerScheme()+"://"+
rundata.getServerName()+