You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sg...@apache.org on 2001/12/17 16:32:29 UTC
cvs commit: jakarta-jetspeed/modules/CocoonPortlet/webapp/dynamic/portletbrowser/xsp index.xml search.xml
sgala 01/12/17 07:32:29
Modified: src/java/org/apache/jetspeed/capability
CapabilityMapFactory.java
src/java/org/apache/jetspeed/daemon DaemonThread.java
src/java/org/apache/jetspeed/daemon/impl
BadURLManagerDaemon.java DiskCacheDaemon.java
FeedDaemon.java
src/java/org/apache/jetspeed/daemon/impl/util
ThreadGroupJoin.java
src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon
URLRefresher.java
src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon
EntryInstantiator.java Instantiator.java
src/java/org/apache/jetspeed/modules/actions JLoginUser.java
src/java/org/apache/jetspeed/modules/layouts
JetspeedJspLayout.java
src/java/org/apache/jetspeed/modules/screens
Customizer2.java
src/java/org/apache/jetspeed/portal/controls
TitlePortletControl.java
src/java/org/apache/jetspeed/portal/portlets
ApplicationsPortlet.java WMLFilePortlet.java
src/java/org/apache/jetspeed/portal/portlets/customize
CustomizePortlet.java
src/java/org/apache/jetspeed/services/daemonfactory
JetspeedDaemonFactoryService.java
src/java/org/apache/jetspeed/services/portletcache
JetspeedPortletCacheService.java
src/java/org/apache/jetspeed/services/portletfactory
JetspeedPortletFactoryService.java
src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
src/java/org/apache/jetspeed/services/resources
VariableResourcesService.java
src/java/org/apache/jetspeed/services/template
JetspeedTemplateLocatorService.java
src/java/org/apache/jetspeed/services/threadpool
JetspeedThreadPoolService.java
src/java/org/apache/jetspeed/services/urlmanager
JetspeedURLManagerService.java URLFetcher.java
URLFetcherDownloader.java
src/java/org/apache/jetspeed/util PSMLManager.java
URILookup.java
src/java/org/apache/jetspeed/util/customization
PSMLDocument.java PSMLEntry.java
modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/portlets
CocoonPortlet.java
modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon
JetspeedCocoonService.java
modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet
JetspeedServletRequest.java
modules/CocoonPortlet/webapp/dynamic/portletbrowser/xsp
index.xml search.xml
Log:
Getting rid of remaining Log.note deprecated turbine calls in HEAD
Revision Changes Path
1.7 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/capability/CapabilityMapFactory.java
Index: CapabilityMapFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/capability/CapabilityMapFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CapabilityMapFactory.java 2001/03/07 06:42:41 1.6
+++ CapabilityMapFactory.java 2001/12/17 15:32:23 1.7
@@ -66,7 +66,7 @@
handle more browsers.
@author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
-@version $Id: CapabilityMapFactory.java,v 1.6 2001/03/07 06:42:41 taylor Exp $
+@version $Id: CapabilityMapFactory.java,v 1.7 2001/12/17 15:32:23 sgala Exp $
*/
public class CapabilityMapFactory {
@@ -115,7 +115,7 @@
String userAgent = rundata.getUserAgent();
- Log.note( "Created a CapabilityMap for agent: " + userAgent );
+ Log.info( "Created a CapabilityMap for agent: " + userAgent );
cm = getCapabilityMap( userAgent );
1.15 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/DaemonThread.java
Index: DaemonThread.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/DaemonThread.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DaemonThread.java 2001/03/07 06:42:56 1.14
+++ DaemonThread.java 2001/12/17 15:32:24 1.15
@@ -63,7 +63,7 @@
/**
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: DaemonThread.java,v 1.14 2001/03/07 06:42:56 taylor Exp $
+@version $Id: DaemonThread.java,v 1.15 2001/12/17 15:32:24 sgala Exp $
*/
public class DaemonThread extends Thread {
@@ -98,7 +98,7 @@
DaemonEntry de = this.getDaemon().getDaemonEntry();
- Log.note( "DaemonThread: started processing daemon " + de.getName() );
+ Log.info( "DaemonThread: started processing daemon " + de.getName() );
if ( de.onStartup() ) {
this.runDaemon( this.getDaemon() );
@@ -133,7 +133,7 @@
daemon.setStatus( Daemon.STATUS_PROCESSING );
- Log.note( "DaemonThread -> PROCESSING daemon -> " + daemon.getDaemonEntry().getName() );
+ Log.info( "DaemonThread -> PROCESSING daemon -> " + daemon.getDaemonEntry().getName() );
try {
daemon.run();
@@ -141,7 +141,7 @@
Log.error( "Could not process Daemon: " + daemon.getDaemonEntry().getName(), t );
}
- Log.note( "DaemonThread -> *DONE* PROCESSING daemon -> " + daemon.getDaemonEntry().getName() );
+ Log.info( "DaemonThread -> *DONE* PROCESSING daemon -> " + daemon.getDaemonEntry().getName() );
daemon.setStatus( Daemon.STATUS_PROCESSED );
1.10 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/BadURLManagerDaemon.java
Index: BadURLManagerDaemon.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/BadURLManagerDaemon.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BadURLManagerDaemon.java 2001/09/24 09:42:43 1.9
+++ BadURLManagerDaemon.java 2001/12/17 15:32:24 1.10
@@ -74,7 +74,7 @@
them from the BadURLManager and placing them in the DiskCache.
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
-@version $Id: BadURLManagerDaemon.java,v 1.9 2001/09/24 09:42:43 sgala Exp $
+@version $Id: BadURLManagerDaemon.java,v 1.10 2001/12/17 15:32:24 sgala Exp $
*/
public class BadURLManagerDaemon implements Daemon {
@@ -88,7 +88,7 @@
*/
public void run() {
- Log.note("Checking for valid URLs within the URLManager");
+ Log.info("Checking for valid URLs within the URLManager");
this.setResult( Daemon.RESULT_PROCESSING );
@@ -105,7 +105,7 @@
URLManager.unregister(url);
- Log.note("Removing " + url + " from BadURL list" );
+ Log.info("Removing " + url + " from BadURL list" );
this.save();
//FIXME: It should check refresh of the portlets, like DiskCache...
@@ -122,7 +122,7 @@
JetspeedDiskCache.getInstance().remove( url );
} catch (IOException ioe) {}
}
- Log.note("Failed to load: " + url + " from BadURL list");
+ Log.info("Failed to load: " + url + " from BadURL list");
}
}
1.19 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/DiskCacheDaemon.java
Index: DiskCacheDaemon.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/DiskCacheDaemon.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DiskCacheDaemon.java 2001/09/24 09:42:43 1.18
+++ DiskCacheDaemon.java 2001/12/17 15:32:24 1.19
@@ -75,7 +75,7 @@
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
-@version $Id: DiskCacheDaemon.java,v 1.18 2001/09/24 09:42:43 sgala Exp $
+@version $Id: DiskCacheDaemon.java,v 1.19 2001/12/17 15:32:24 sgala Exp $
*/
public class DiskCacheDaemon implements Daemon {
@@ -92,7 +92,7 @@
*/
public void run() {
- Log.note("parsing out document store");
+ Log.info("parsing out document store");
this.setResult( Daemon.RESULT_PROCESSING );
DiskCacheEntry urls[] = JetspeedDiskCache.getInstance().getEntries();
1.37 +7 -7 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/FeedDaemon.java
Index: FeedDaemon.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/FeedDaemon.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- FeedDaemon.java 2001/09/24 09:42:43 1.36
+++ FeedDaemon.java 2001/12/17 15:32:24 1.37
@@ -100,7 +100,7 @@
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
@author <A HREF="mailto:sgala@apache.org">Santiago Gala</A>
-@version $Id: FeedDaemon.java,v 1.36 2001/09/24 09:42:43 sgala Exp $
+@version $Id: FeedDaemon.java,v 1.37 2001/12/17 15:32:24 sgala Exp $
*/
public class FeedDaemon implements Daemon {
@@ -173,7 +173,7 @@
this.setResult( Daemon.RESULT_PROCESSING );
- Log.note( "Jetspeed: FeedDaemon -- BEGIN -- " );
+ Log.info( "Jetspeed: FeedDaemon -- BEGIN -- " );
FeedDaemon.count = 0;
Feed[] feeds = getFeeds();
@@ -188,20 +188,20 @@
try {
- Log.note( "BEGIN FEED -> " + url );
+ Log.info( "BEGIN FEED -> " + url );
//get the list of PortletMarkup entries from OCS
transformed = getEntries( url );
//the string transformed should now contain PML... tranform it into PortletMarkup
- Log.note("Determining portlets...");
+ Log.info("Determining portlets...");
FileRegistry registry = (FileRegistry)TurbineServices.getInstance()
.getService( RegistryService.SERVICE_NAME );
registry.createFragment( name, transformed , true );
- Log.note( "END FEED -> " + url + " -> SUCCESS");
+ Log.info( "END FEED -> " + url + " -> SUCCESS");
this.setResult( Daemon.RESULT_SUCCESS );
@@ -215,7 +215,7 @@
}
} finally {
- Log.note( "Jetspeed: FeedDaemon -- END -- " );
+ Log.info( "Jetspeed: FeedDaemon -- END -- " );
}
}
@@ -248,7 +248,7 @@
String stylesheet = JetspeedResources.getString( JetspeedResources.CONTENTFEEDS_STYLESHEET_URL_KEY );
- Log.note( "FeedDaemon: transforming url: " +
+ Log.info( "FeedDaemon: transforming url: " +
url +
" with stylesheet: " +
stylesheet );
1.6 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java
Index: ThreadGroupJoin.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/ThreadGroupJoin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ThreadGroupJoin.java 2001/03/07 06:43:14 1.5
+++ ThreadGroupJoin.java 2001/12/17 15:32:24 1.6
@@ -61,7 +61,7 @@
for completion.
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
-@version $Id: ThreadGroupJoin.java,v 1.5 2001/03/07 06:43:14 taylor Exp $
+@version $Id: ThreadGroupJoin.java,v 1.6 2001/12/17 15:32:24 sgala Exp $
*/
public class ThreadGroupJoin {
@@ -114,14 +114,14 @@
long seconds = ( System.currentTimeMillis() - begin ) / 1000;
begin = System.currentTimeMillis();
- Log.note( source + ": has completed " + i + " threads in " + seconds + " second(s)" );
+ Log.info( source + ": has completed " + i + " threads in " + seconds + " second(s)" );
}
}
} catch (InterruptedException e) {
- Log.note( "Thread: " + threads[i].getName() + " -> DONE");
+ Log.info( "Thread: " + threads[i].getName() + " -> DONE");
//noop. this is standard.
}
}
1.12 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java
Index: URLRefresher.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/diskcachedaemon/URLRefresher.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- URLRefresher.java 2001/07/29 13:41:51 1.11
+++ URLRefresher.java 2001/12/17 15:32:25 1.12
@@ -79,7 +79,7 @@
</p>
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
-@version $Id: URLRefresher.java,v 1.11 2001/07/29 13:41:51 raphael Exp $
+@version $Id: URLRefresher.java,v 1.12 2001/12/17 15:32:25 sgala Exp $
*/
public class URLRefresher implements Runnable {
@@ -131,7 +131,7 @@
catch (Throwable t)
{
//FIXME: Put it in the bad URL list
- Log.note( "DiskCacheDaemon: Error refreshing: " + url );
+ Log.info( "DiskCacheDaemon: Error refreshing: " + url );
}
}
}
1.12 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java
Index: EntryInstantiator.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/EntryInstantiator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EntryInstantiator.java 2001/07/29 13:41:51 1.11
+++ EntryInstantiator.java 2001/12/17 15:32:25 1.12
@@ -73,7 +73,7 @@
everything is in memory.
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
-@version $Id: EntryInstantiator.java,v 1.11 2001/07/29 13:41:51 raphael Exp $
+@version $Id: EntryInstantiator.java,v 1.12 2001/12/17 15:32:25 sgala Exp $
*/
public class EntryInstantiator {
@@ -89,7 +89,7 @@
public void process() {
- Log.note( "BEGIN: EntryInstantiator: Instantiating " +
+ Log.info( "BEGIN: EntryInstantiator: Instantiating " +
Registry.get(Registry.PORTLET).getEntryCount() +
" Portlet(s) found in the PortletRegistry" );
@@ -100,7 +100,7 @@
}
- Log.note( "END: EntryInstantiator: Instantiating all Portlets found in the PortletRegistry" );
+ Log.info( "END: EntryInstantiator: Instantiating all Portlets found in the PortletRegistry" );
}
1.21 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java
Index: Instantiator.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/daemon/impl/util/feeddaemon/Instantiator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Instantiator.java 2001/09/24 09:42:43 1.20
+++ Instantiator.java 2001/12/17 15:32:25 1.21
@@ -84,7 +84,7 @@
</p>
@author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
-@version $Id: Instantiator.java,v 1.20 2001/09/24 09:42:43 sgala Exp $
+@version $Id: Instantiator.java,v 1.21 2001/12/17 15:32:25 sgala Exp $
*/
public class Instantiator implements Runnable {
@@ -228,7 +228,7 @@
//log how many portlets we have instantiated.
if ( id != 0 &&
id % LOG_INTERVAL == 0 ) {
- Log.note( "Instantiator: instanted " + id + " portlet(s)" );
+ Log.info( "Instantiator: instanted " + id + " portlet(s)" );
}
}
1.18 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JLoginUser.java 2001/11/19 07:49:39 1.17
+++ JLoginUser.java 2001/12/17 15:32:25 1.18
@@ -98,7 +98,7 @@
}
// we are on the ConfirmRegistration page
- Log.note("Entering JLoginUser action");
+ Log.info("Entering JLoginUser action");
boolean newUserApproval = JetspeedResources.getBoolean("newuser.approval.enable", false);
String secretkey = (String) data.getParameters().getString("secretkey", null);
1.17 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java
Index: JetspeedJspLayout.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/layouts/JetspeedJspLayout.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JetspeedJspLayout.java 2001/03/08 16:26:08 1.16
+++ JetspeedJspLayout.java 2001/12/17 15:32:26 1.17
@@ -68,7 +68,7 @@
* The Ecs.jsp will handle ecs-screen processing.
*
* @author <a href="mailto:ingo@raleigh.ibm.com">Ingo Schuster</a>
- * @version $Id: JetspeedJspLayout.java,v 1.16 2001/03/08 16:26:08 ingo Exp $
+ * @version $Id: JetspeedJspLayout.java,v 1.17 2001/12/17 15:32:26 sgala Exp $
*/
public class JetspeedJspLayout extends Layout
{
@@ -83,7 +83,7 @@
// set the content type (including charset)
data.getResponse().setContentType(data.getContentType());
- Log.note("JetspeedJspLayout: set response content type to " + data.getContentType());
+ Log.info("JetspeedJspLayout: set response content type to " + data.getContentType());
// tell turbine that the response is handled by the JSP system.
data.declareDirectResponse();
@@ -91,13 +91,13 @@
// Put the path to the screen template into the request.
String path = jsp.getProperties().getProperty("templates", "/WEB-INF/templates/jsp") + "/screens";
data.getRequest().setAttribute("screenJsp", path + data.getScreenTemplate() );
- Log.note("JetspeedJspLayout: set 'screenJSP' to: " + path + data.getScreenTemplate() );
+ Log.info("JetspeedJspLayout: set 'screenJSP' to: " + path + data.getScreenTemplate() );
// Grab the layout template set in the JetspeedTemplatePage.
String templateName = data.getLayoutTemplate();
// Finally, generate the layout template and output to the response
- Log.note("JetspeedJspLayout: forward request to: " + "/layouts" + templateName);
+ Log.info("JetspeedJspLayout: forward request to: " + "/layouts" + templateName);
jsp.handleRequest(data, "/layouts" + templateName, false);
}
1.2 +1 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Customizer2.java
Index: Customizer2.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/screens/Customizer2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Customizer2.java 2001/05/08 06:29:09 1.1
+++ Customizer2.java 2001/12/17 15:32:26 1.2
@@ -220,7 +220,7 @@
// Step through the portlet name array.
for (int i=0; i<portletNames.length; i++) {
- Log.note ("CustomizerScreen2: PortletNames[" + i + "] : " + portletNames[i] );
+ Log.info ("CustomizerScreen2: PortletNames[" + i + "] : " + portletNames[i] );
// Create a new hidden field for this portlet's column information.
hiddenFields[i] = new Input();
hiddenFields[i].setType(Input.HIDDEN);
1.17 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/TitlePortletControl.java
Index: TitlePortletControl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/TitlePortletControl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TitlePortletControl.java 2001/05/07 20:48:56 1.16
+++ TitlePortletControl.java 2001/12/17 15:32:26 1.17
@@ -80,7 +80,7 @@
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
@author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
-@version $Id: TitlePortletControl.java,v 1.16 2001/05/07 20:48:56 raphael Exp $
+@version $Id: TitlePortletControl.java,v 1.17 2001/12/17 15:32:26 sgala Exp $
*/
public class TitlePortletControl extends AbstractPortletControl {
@@ -172,7 +172,7 @@
}
catch (JetspeedException e)
{
- Log.note(e.getMessage());
+ Log.info(e.getMessage());
}
@@ -191,7 +191,7 @@
}
catch (JetspeedException e)
{
- Log.note(e.getMessage());
+ Log.info(e.getMessage());
}
1.34 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java
Index: ApplicationsPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/ApplicationsPortlet.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ApplicationsPortlet.java 2001/07/29 13:41:58 1.33
+++ ApplicationsPortlet.java 2001/12/17 15:32:27 1.34
@@ -81,7 +81,7 @@
*
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
- * @version $Id: ApplicationsPortlet.java,v 1.33 2001/07/29 13:41:58 raphael Exp $
+ * @version $Id: ApplicationsPortlet.java,v 1.34 2001/12/17 15:32:27 sgala Exp $
*/
public class ApplicationsPortlet extends AbstractPortlet {
@@ -98,7 +98,7 @@
this.setTitle( "Applications" );
this.setDescription( "A list of Applications that are installed within Jetspeed" );
- Log.note( "Jetspeed: initializing the ApplicationsPortlet: BEGIN " );
+ Log.info( "Jetspeed: initializing the ApplicationsPortlet: BEGIN " );
Enumeration portlets = Registry.get( Registry.PORTLET ).getEntries();
@@ -112,7 +112,7 @@
}
}
- Log.note( "Jetspeed: initializing the ApplicationsPortlet: END " );
+ Log.info( "Jetspeed: initializing the ApplicationsPortlet: END " );
}
1.6 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WMLFilePortlet.java
Index: WMLFilePortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WMLFilePortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WMLFilePortlet.java 2001/11/30 10:53:59 1.5
+++ WMLFilePortlet.java 2001/12/17 15:32:27 1.6
@@ -84,7 +84,7 @@
* serve fragments of WML documents, without the <wml> tag</strong>
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: WMLFilePortlet.java,v 1.5 2001/11/30 10:53:59 kimptoc Exp $
+ * @version $Id: WMLFilePortlet.java,v 1.6 2001/12/17 15:32:27 sgala Exp $
*/
public class WMLFilePortlet extends FileWatchPortlet {
@@ -202,7 +202,7 @@
}
public void warning(SAXParseException ex) {
- Log.note(getLocationString(ex)+": "+ex.getMessage());
+ Log.info(getLocationString(ex)+": "+ex.getMessage());
}
public void error(SAXParseException ex) {
1.22 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java
Index: CustomizePortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CustomizePortlet.java 2001/11/30 10:53:59 1.21
+++ CustomizePortlet.java 2001/12/17 15:32:27 1.22
@@ -185,12 +185,12 @@
if ( page == null || PAGE_ONE.equals( page ) )
{
- Log.note( "Customizer--> Call page one" );
+ Log.info( "Customizer--> Call page one" );
return getPageOne( data );
}
else if ( SAVE_SETTINGS.equals( page ) )
{
- Log.note( " Customizer --> Save settings for ( " + data.getUser( ).getUserName( ) + ") and return to Homepage " );
+ Log.info( " Customizer --> Save settings for ( " + data.getUser( ).getUserName( ) + ") and return to Homepage " );
saveSettings( data );
// forward to the homepage
data.setStatusCode( HttpServletResponse.SC_MOVED_TEMPORARILY );
@@ -483,7 +483,7 @@
}
catch ( ArrayIndexOutOfBoundsException ex )
{
- Log.note( "Customizer ( " + data.getUser( ).getUserName( ) + "): Invalid psml file. Restoring psml file from default.");
+ Log.info( "Customizer ( " + data.getUser( ).getUserName( ) + "): Invalid psml file. Restoring psml file from default.");
psmlFile = PSMLManager.getPSMLContent( data, mime ) ;
try
{
@@ -560,7 +560,7 @@
// finally write the changed Portlets tree to disk
PSMLManager.setPSMLContent( data, mime, psmlFile );
- Log.note( " CustomizePortlet --> Writing completed..." );
+ Log.info( " CustomizePortlet --> Writing completed..." );
}
}
1.7 +8 -8 jakarta-jetspeed/src/java/org/apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java
Index: JetspeedDaemonFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/daemonfactory/JetspeedDaemonFactoryService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JetspeedDaemonFactoryService.java 2001/09/04 12:06:58 1.6
+++ JetspeedDaemonFactoryService.java 2001/12/17 15:32:27 1.7
@@ -75,7 +75,7 @@
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
-@version $Id: JetspeedDaemonFactoryService.java,v 1.6 2001/09/04 12:06:58 sgala Exp $
+@version $Id: JetspeedDaemonFactoryService.java,v 1.7 2001/12/17 15:32:27 sgala Exp $
*/
public class JetspeedDaemonFactoryService
extends TurbineBaseService
@@ -104,12 +104,12 @@
*/
public void init( )
{
- Log.note( "Late init for DaemonFactory called" );
+ Log.info( "Late init for DaemonFactory called" );
while( !getInit() ) {
try {
Thread.sleep(500);
} catch (InterruptedException ie ) {
- Log.note("DaemonFactory service: Waiting for init()..." );
+ Log.info("DaemonFactory service: Waiting for init()..." );
}
}
@@ -125,7 +125,7 @@
// already initialized
if (getInit()) return;
- Log.note( "Early init for DaemonFactory called..." );
+ Log.info( "Early init for DaemonFactory called..." );
this.context = new DaemonContext();
@@ -148,7 +148,7 @@
}
setInit(true);
- Log.note( "Early init for DaemonFactory done" );
+ Log.info( "Early init for DaemonFactory done" );
//Finish by starting requested Daemons...
this.start();
@@ -167,7 +167,7 @@
*/
public void start() {
- Log.note( "DaemonFactory: Starting up necessary daemons." );
+ Log.info( "DaemonFactory: Starting up necessary daemons." );
//get all the entries..
DaemonEntry[] entries = this.getDaemonEntries();
@@ -176,7 +176,7 @@
//create Daemon threads for them and pa
if( entries[i].onStartup() ) {
- Log.note( "DaemonFactory: start(): starting daemon -> " + entries[i].getName() );
+ Log.info( "DaemonFactory: start(): starting daemon -> " + entries[i].getName() );
DaemonThread dt = new DaemonThread( entries[i] );
this.threads.put( entries[i], dt );
dt.start();
@@ -200,7 +200,7 @@
if( daemon != null ) {
return daemon;
} else {
- Log.note( "Creating daemon: " + entry.getName() );
+ Log.info( "Creating daemon: " + entry.getName() );
}
try {
1.6 +6 -6 jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletcache/JetspeedPortletCacheService.java
Index: JetspeedPortletCacheService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletcache/JetspeedPortletCacheService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JetspeedPortletCacheService.java 2001/10/07 12:29:15 1.5
+++ JetspeedPortletCacheService.java 2001/12/17 15:32:28 1.6
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: JetspeedPortletCacheService.java,v 1.5 2001/10/07 12:29:15 paulsp Exp $
+ * @version $Id: JetspeedPortletCacheService.java,v 1.6 2001/12/17 15:32:28 sgala Exp $
*/
public class JetspeedPortletCacheService
extends TurbineBaseService
@@ -82,9 +82,9 @@
{
try
{
- Log.note ( "JetspeedPortletCacheService early init()....starting!");
+ Log.info ( "JetspeedPortletCacheService early init()....starting!");
// no specific init required, relies on GlobalCacheService
- Log.note ( "JetspeedPortletCacheService early init()....finished!");
+ Log.info ( "JetspeedPortletCacheService early init()....finished!");
}
catch (Exception e)
{
@@ -156,14 +156,14 @@
try {
obj = GlobalCache.getObject( handle );
} catch (ObjectExpiredException e) {
- Log.note( "cache miss, object expired: " + handle );
+ Log.info( "cache miss, object expired: " + handle );
}
if ( obj == null ) {
- //Log.note( "cache miss: " + handle );
+ //Log.info( "cache miss: " + handle );
return null;
} /*else {
- Log.note( "cache hit: " + handle );
+ Log.info( "cache hit: " + handle );
} */
return (Cacheable)obj.getContents();
1.3 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java
Index: JetspeedPortletFactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portletfactory/JetspeedPortletFactoryService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedPortletFactoryService.java 2001/07/29 13:42:00 1.2
+++ JetspeedPortletFactoryService.java 2001/12/17 15:32:28 1.3
@@ -87,7 +87,7 @@
* Simple implementation of the PortalFactoryService.
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: JetspeedPortletFactoryService.java,v 1.2 2001/07/29 13:42:00 raphael Exp $
+ * @version $Id: JetspeedPortletFactoryService.java,v 1.3 2001/12/17 15:32:28 sgala Exp $
*/
public class JetspeedPortletFactoryService extends TurbineBaseService
implements PortletFactoryService
@@ -227,7 +227,7 @@
//portlet in cache but expired, remove it from cache
if ((portlet!=null) && ((Cacheable)portlet).getExpire().isExpired() )
{
- Log.note( "The portlet (" + handle + ") is expired" );
+ Log.info( "The portlet (" + handle + ") is expired" );
PortletCache.removeCacheable(handle);
portlet = null;
}
1.19 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JetspeedProfilerService.java 2001/12/10 16:36:53 1.18
+++ JetspeedProfilerService.java 2001/12/17 15:32:28 1.19
@@ -131,7 +131,7 @@
*
* @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
- * @version $Id: JetspeedProfilerService.java,v 1.18 2001/12/10 16:36:53 taylor Exp $
+ * @version $Id: JetspeedProfilerService.java,v 1.19 2001/12/17 15:32:28 sgala Exp $
*/
public class JetspeedProfilerService extends TurbineBaseService
@@ -223,12 +223,12 @@
* fails to initialize
*/
public void init() throws InitializationException {
- Log.note( "Late init for JetspeedProfilerService called" );
+ Log.info( "Late init for JetspeedProfilerService called" );
while( !getInit() ) {
//Not yet...
try {
Thread.sleep( 100 );
- Log.note( "Waiting for init of JetspeedProfilerService..." );
+ Log.info( "Waiting for init of JetspeedProfilerService..." );
} catch (InterruptedException ie ) {
Log.error( ie );
}
1.15 +5 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CastorPsmlManagerService.java 2001/12/06 05:12:40 1.14
+++ CastorPsmlManagerService.java 2001/12/17 15:32:28 1.15
@@ -112,7 +112,7 @@
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @author <a href="mailto:sgala@apache.org">Santiago Gala</a>
- * @version $Id: CastorPsmlManagerService.java,v 1.14 2001/12/06 05:12:40 taylor Exp $
+ * @version $Id: CastorPsmlManagerService.java,v 1.15 2001/12/17 15:32:28 sgala Exp $
*/
public class CastorPsmlManagerService extends TurbineBaseService
implements PsmlManagerService
@@ -294,7 +294,7 @@
}
File base = this.rootDir;
String path = mapLocatorToFile(locator);
- Log.note("PSML-Man: calculated resource:" + path + ". Base: " + base);
+ Log.info("PSML-Man: calculated resource:" + path + ". Base: " + base);
File file = new File(base, path);
String name = file.getAbsolutePath();
@@ -330,7 +330,7 @@
doc = loadDocument(name);
if (null == doc)
{
- Log.note( "CastorPsmlManager: about to return null doc: " );
+ Log.info( "CastorPsmlManager: about to return null doc: " );
return null;
}
@@ -671,7 +671,7 @@
}
catch (InterruptedException e)
{
- Log.note("DocumentWatcher: recieved interruption, aborting.");
+ Log.info("DocumentWatcher: recieved interruption, aborting.");
}
}
@@ -686,7 +686,7 @@
{
File base = this.rootDir;
String path = mapLocatorToFile((ProfileLocator)profile);
- //Log.note("PSML-Man: calculated resource:" + path);
+ //Log.info("PSML-Man: calculated resource:" + path);
File file = new File(base, path);
String name = file.getAbsolutePath();
PSMLDocument template = profile.getDocument();
1.9 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/VariableResourcesService.java
Index: VariableResourcesService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/resources/VariableResourcesService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VariableResourcesService.java 2001/05/01 13:26:17 1.8
+++ VariableResourcesService.java 2001/12/17 15:32:28 1.9
@@ -97,7 +97,7 @@
* </p>
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: VariableResourcesService.java,v 1.8 2001/05/01 13:26:17 raphael Exp $
+ * @version $Id: VariableResourcesService.java,v 1.9 2001/12/17 15:32:28 sgala Exp $
*/
public class VariableResourcesService extends TurbineResourceService
{
@@ -126,7 +126,7 @@
try {
Thread.sleep(500);
} catch (InterruptedException ie ) {
- Log.note("VariableResources service: Waiting for init()..." );
+ Log.info("VariableResources service: Waiting for init()..." );
}
}
}
1.4 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java
Index: JetspeedTemplateLocatorService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/template/JetspeedTemplateLocatorService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedTemplateLocatorService.java 2001/11/24 00:44:36 1.3
+++ JetspeedTemplateLocatorService.java 2001/12/17 15:32:28 1.4
@@ -109,7 +109,7 @@
* @author <a href="mailto:rapahel@apache.org">Raphael Luta</a>
* @author <a href="mailto:paulsp@apache.org">Paul Spener</a>
* @author <a href="mailto:kimptoc_mail@yahoo.com">Chris Kimpton</a>
- * @version $Id: JetspeedTemplateLocatorService.java,v 1.3 2001/11/24 00:44:36 nacho Exp $
+ * @version $Id: JetspeedTemplateLocatorService.java,v 1.4 2001/12/17 15:32:28 sgala Exp $
*/
public class JetspeedTemplateLocatorService extends TurbineBaseService
@@ -159,12 +159,12 @@
}
public void init() throws InitializationException {
- Log.note( "Late init for JetspeedTemplateLocatorService called" );
+ Log.info( "Late init for JetspeedTemplateLocatorService called" );
while( !getInit() ) {
//Not yet...
try {
Thread.sleep( 100 );
- Log.note( "Waiting for init of JetspeedTemplateLocatorService..." );
+ Log.info( "Waiting for init of JetspeedTemplateLocatorService..." );
} catch (InterruptedException ie ) {
Log.error( ie );
}
1.7 +8 -8 jakarta-jetspeed/src/java/org/apache/jetspeed/services/threadpool/JetspeedThreadPoolService.java
Index: JetspeedThreadPoolService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/threadpool/JetspeedThreadPoolService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JetspeedThreadPoolService.java 2001/09/24 09:45:27 1.6
+++ JetspeedThreadPoolService.java 2001/12/17 15:32:28 1.7
@@ -83,7 +83,7 @@
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
- * @version $Id: JetspeedThreadPoolService.java,v 1.6 2001/09/24 09:45:27 sgala Exp $
+ * @version $Id: JetspeedThreadPoolService.java,v 1.7 2001/12/17 15:32:28 sgala Exp $
*/
public class JetspeedThreadPoolService
extends TurbineBaseService
@@ -152,7 +152,7 @@
try {
Thread.sleep(500);
} catch (InterruptedException ie ) {
- Log.note("ThreadPool service: Waiting for init()..." );
+ Log.info("ThreadPool service: Waiting for init()..." );
}
}
}
@@ -171,10 +171,10 @@
try
{
- Log.note ( "JetspeedThreadPoolService early init()....starting!");
+ Log.info ( "JetspeedThreadPoolService early init()....starting!");
initThreadpool(config);
setInit(true);
- Log.note ( "JetspeedThreadPoolService early init()....finished!");
+ Log.info ( "JetspeedThreadPoolService early init()....finished!");
}
catch (Exception e)
{
@@ -310,7 +310,7 @@
if ( r != null ) {
this.process( r );
} else {
- Log.note( "JetspeedThreadPoolService: no Runnable found." );
+ Log.info( "JetspeedThreadPoolService: no Runnable found." );
}
}
@@ -366,7 +366,7 @@
return;
}
- Log.note( "JetspeedThreadPoolService: creating " +
+ Log.info( "JetspeedThreadPoolService: creating " +
count +
" more thread(s) for a total of: " +
( this.getThreadCount() + count ) );
@@ -435,7 +435,7 @@
* fashion.
*
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- * @version $Id: JetspeedThreadPoolService.java,v 1.6 2001/09/24 09:45:27 sgala Exp $
+ * @version $Id: JetspeedThreadPoolService.java,v 1.7 2001/12/17 15:32:28 sgala Exp $
*/
class Queue {
@@ -463,7 +463,7 @@
public synchronized Runnable get() {
if ( this.queue.size() == 0 ) {
- Log.note( "JetspeedThreadPoolService->Queue: No more Runnables left in queue. Returning null" );
+ Log.info( "JetspeedThreadPoolService->Queue: No more Runnables left in queue. Returning null" );
return null;
}
1.12 +6 -6 jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/JetspeedURLManagerService.java
Index: JetspeedURLManagerService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/JetspeedURLManagerService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JetspeedURLManagerService.java 2001/05/29 09:29:54 1.11
+++ JetspeedURLManagerService.java 2001/12/17 15:32:28 1.12
@@ -75,7 +75,7 @@
* @see URLManagerService
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
- * @version $Id: JetspeedURLManagerService.java,v 1.11 2001/05/29 09:29:54 sgala Exp $
+ * @version $Id: JetspeedURLManagerService.java,v 1.12 2001/12/17 15:32:28 sgala Exp $
*/
public class JetspeedURLManagerService
extends TurbineBaseService
@@ -105,7 +105,7 @@
try {
Thread.sleep(500);
} catch (InterruptedException ie ) {
- Log.note("URLManager service: Waiting for init()..." );
+ Log.info("URLManager service: Waiting for init()..." );
}
}
@@ -125,7 +125,7 @@
try
{
- Log.note ( "JetspeedURLManagerService early init()....starting!");
+ Log.info ( "JetspeedURLManagerService early init()....starting!");
// Proxy Settings are stored as 'services.URLManager.proxy.<protocol>.port' and as
// 'services.URLManager.proxy.<protocol>.port' in JetspeedResource.properties.
@@ -155,7 +155,7 @@
.getString( "services."+URLManagerService.SERVICE_NAME+".url" ) );
load();
- Log.note ( "JetspeedURLManagerService early init()....finished!");
+ Log.info ( "JetspeedURLManagerService early init()....finished!");
}
catch (Throwable t)
{
@@ -336,7 +336,7 @@
Map store = new HashMap();
Configuration config = null;
- Log.note( "Restoring the URLs from disk: " + path );
+ Log.info( "Restoring the URLs from disk: " + path );
try {
config = new Configuration( path );
@@ -355,7 +355,7 @@
count++;
}
- Log.note( "URLManager loaded " + count + " urls" );
+ Log.info( "URLManager loaded " + count + " urls" );
} catch ( Exception e ) {
Log.error( "Could not restore URLManager state", e );
1.7 +8 -8 jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/URLFetcher.java
Index: URLFetcher.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/URLFetcher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- URLFetcher.java 2001/03/07 06:49:33 1.6
+++ URLFetcher.java 2001/12/17 15:32:28 1.7
@@ -78,7 +78,7 @@
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
@author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
-@version $Id: URLFetcher.java,v 1.6 2001/03/07 06:49:33 taylor Exp $
+@version $Id: URLFetcher.java,v 1.7 2001/12/17 15:32:28 sgala Exp $
*/
public class URLFetcher {
@@ -122,7 +122,7 @@
//SGP
if( force == false && DiskCacheUtils.isCached( url ) == true)
{
- Log.note( "The url " +
+ Log.info( "The url " +
url +
" is fetched from the Cache" );
return JetspeedDiskCache.getInstance().getEntry( url ).getReader();
@@ -134,7 +134,7 @@
isRealtimeURL( url ) == false &&
force == false ) {
- Log.note( "The url " +
+ Log.info( "The url " +
url +
" is not in the cache and will be fetched now because you have configured -> " +
JetspeedResources.CACHE_REQUIRE_CACHED_KEY );
@@ -157,7 +157,7 @@
url.intern().wait();
} catch (InterruptedException e)
{
- Log.note("Wait Interrupted");
+ Log.info("Wait Interrupted");
} finally
{
removeRealtimeURL( url );
@@ -308,7 +308,7 @@
last == 0 ||
last > dce.getLastModified()) ) {
- Log.note( "URLFetcher: Found updated URL: " +
+ Log.info( "URLFetcher: Found updated URL: " +
url +
" Modified " + last + " Expires: " + expires +
" CLength: " + clength );
@@ -341,7 +341,7 @@
dce.setExpirationTime(expires);
- Log.note( "DiskCacheDaemon: URL still valid: " + url +
+ Log.info( "DiskCacheDaemon: URL still valid: " + url +
" Modified " + last + " Expires: " + expires +
" CLength: " + clength);
//removeRealtimeURL( url ); (done in finally)
@@ -358,7 +358,7 @@
}
} else {
- Log.note( "URLFetcher: Cache miss during validation! Forcing url: " + url );
+ Log.info( "URLFetcher: Cache miss during validation! Forcing url: " + url );
removeRealtimeURL( url );
JetspeedDiskCache.getInstance().getEntry( url, true );
return true;
@@ -406,7 +406,7 @@
decl.indexOf( '"' , off + key.length()) );
}
}
- Log.note("URLFetcher: found URL with encoding -> " + enc );
+ Log.info("URLFetcher: found URL with encoding -> " + enc );
//Reset the bytes read
is.reset();
Reader rdr = new InputStreamReader( is,
1.3 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/URLFetcherDownloader.java
Index: URLFetcherDownloader.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/urlmanager/URLFetcherDownloader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URLFetcherDownloader.java 2001/03/07 06:49:35 1.2
+++ URLFetcherDownloader.java 2001/12/17 15:32:28 1.3
@@ -61,7 +61,7 @@
operating in CACHE_REQUIRED mode.
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: URLFetcherDownloader.java,v 1.2 2001/03/07 06:49:35 taylor Exp $
+@version $Id: URLFetcherDownloader.java,v 1.3 2001/12/17 15:32:28 sgala Exp $
*/
public class URLFetcherDownloader implements Runnable {
@@ -77,7 +77,7 @@
URLFetcher.addRealtimeURL( url );
try {
- Log.note( "URLFetcherDownloader -> now downloading URL: " + this.url );
+ Log.info( "URLFetcherDownloader -> now downloading URL: " + this.url );
URLFetcher.fetch( url, true ); //SGP I think it should be forced
// URLFetcher will put forced entries in the cache
} catch ( Throwable t ) {
1.15 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/util/PSMLManager.java
Index: PSMLManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/PSMLManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PSMLManager.java 2001/09/13 14:01:49 1.14
+++ PSMLManager.java 2001/12/17 15:32:28 1.15
@@ -127,7 +127,7 @@
}
catch (Exception e)
{
- Log.note("Profiled URL doesn't exist, using default");
+ Log.info("Profiled URL doesn't exist, using default");
try
{
@@ -145,7 +145,7 @@
return null;
}
- Log.note("PSMLManager: Reading "+username+"'s PSML for "+mimetype.toString()+" from " + profile.getDocument().getName());
+ Log.info("PSMLManager: Reading "+username+"'s PSML for "+mimetype.toString()+" from " + profile.getDocument().getName());
return portlets;
}
@@ -197,7 +197,7 @@
return false;
}
- Log.note("PSMLManager: Writing "+username+"'s PSML for '" + mimetype.toString() + "' to '" + profile.getDocument().getName() + "'");
+ Log.info("PSMLManager: Writing "+username+"'s PSML for '" + mimetype.toString() + "' to '" + profile.getDocument().getName() + "'");
profile.getDocument().setPortlets(portlets);
profile.store();
1.19 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java
Index: URILookup.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- URILookup.java 2001/07/29 13:42:01 1.18
+++ URILookup.java 2001/12/17 15:32:28 1.19
@@ -120,7 +120,7 @@
*
* @author <A HREF="shesmer@raleigh.ibm.com">Stephan Hesmer</A>
* @author <A HREF="sgala@apache.org">Santiago Gala</A>
- * @version $Id: URILookup.java,v 1.18 2001/07/29 13:42:01 raphael Exp $
+ * @version $Id: URILookup.java,v 1.19 2001/12/17 15:32:28 sgala Exp $
*/
public class URILookup {
@@ -508,7 +508,7 @@
if (propertiesParameterValue!=null)
{
// found the parameter value, so replace the newURI with this one
- Log.note("URILookup: replaced uri "+newURI+" with "+propertiesParameterValue);
+ Log.info("URILookup: replaced uri "+newURI+" with "+propertiesParameterValue);
newURI = propertiesParameterValue;
}
1.8 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLDocument.java
Index: PSMLDocument.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLDocument.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PSMLDocument.java 2001/07/17 16:46:11 1.7
+++ PSMLDocument.java 2001/12/17 15:32:28 1.8
@@ -82,7 +82,7 @@
*
* @author <a href="mailto:pyoo@gluecode.com">Peter Yoo </a>
* @author <a href="mailto:eros@gluecode.com">Ernest Ros </a>
- * @version $Id: PSMLDocument.java,v 1.7 2001/07/17 16:46:11 taylor Exp $
+ * @version $Id: PSMLDocument.java,v 1.8 2001/12/17 15:32:28 sgala Exp $
*
*/
public class PSMLDocument
@@ -122,7 +122,7 @@
}
catch (Exception e)
{
- Log.note("Profiled URL doesn't exist, using default");
+ Log.info("Profiled URL doesn't exist, using default");
try
{
profile = Profiler.getProfile( null, MimeType.HTML );
@@ -466,7 +466,7 @@
Entry testEntry;
// Check each entry in this portlets object.
- Log.note("Column " + colnum + " has " + pTree.getEntryCount() + " Entries.");
+ Log.info("Column " + colnum + " has " + pTree.getEntryCount() + " Entries.");
for (counter=0; counter < pTree.getEntryCount(); counter++)
{
testEntry = pTree.getEntry(counter);
1.5 +2 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLEntry.java
Index: PSMLEntry.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/customization/PSMLEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PSMLEntry.java 2001/07/29 13:42:02 1.4
+++ PSMLEntry.java 2001/12/17 15:32:29 1.5
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:pyoo@gluecode.com">Peter Yoo </a>
* @author <a href="mailto:eros@gluecode.com">Ernest Ros </a>
- * @version $Id: PSMLEntry.java,v 1.4 2001/07/29 13:42:02 raphael Exp $
+ * @version $Id: PSMLEntry.java,v 1.5 2001/12/17 15:32:29 sgala Exp $
*
*/
public class PSMLEntry
@@ -120,7 +120,7 @@
public int[] getCoordinates()
{
- Log.note("Returning the coordinates: " + this.coordinates[0]);
+ Log.info("Returning the coordinates: " + this.coordinates[0]);
return this.coordinates;
}// end getCoordinates()
1.4 +2 -2 jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/portlets/CocoonPortlet.java
Index: CocoonPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/portal/portlets/CocoonPortlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonPortlet.java 2001/03/07 07:12:27 1.3
+++ CocoonPortlet.java 2001/12/17 15:32:29 1.4
@@ -96,7 +96,7 @@
@author <A HREF="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</A>
-@version $Id: CocoonPortlet.java,v 1.3 2001/03/07 07:12:27 taylor Exp $
+@version $Id: CocoonPortlet.java,v 1.4 2001/12/17 15:32:29 sgala Exp $
*/
public class CocoonPortlet extends AbstractPortlet {
@@ -140,7 +140,7 @@
}
- Log.note( "CocoonPortlet: transforming " +
+ Log.info( "CocoonPortlet: transforming " +
url +
" with stylesheet " +
stylesheet );
1.4 +5 -5 jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/JetspeedCocoonService.java
Index: JetspeedCocoonService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/JetspeedCocoonService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedCocoonService.java 2001/03/07 07:12:29 1.3
+++ JetspeedCocoonService.java 2001/12/17 15:32:29 1.4
@@ -76,7 +76,7 @@
* @author <A HREF ="mailto:luta.raphael@networks.vivendi.net">Rapha�l Luta</A>
* @author <A HREF="mailto:jeffprickett@mindspring.com">Jeff Prickett</A>
* @author <A HREF="mailto:burton@apache.org">Kevin A. Burton</A>
- * @version $Id: JetspeedCocoonService.java,v 1.3 2001/03/07 07:12:29 taylor Exp $
+ * @version $Id: JetspeedCocoonService.java,v 1.4 2001/12/17 15:32:29 sgala Exp $
*/
public class JetspeedCocoonService
extends TurbineBaseService
@@ -93,9 +93,9 @@
{
try
{
- Log.note ( "JetspeedCocoonService early init()....starting!" );
+ Log.info ( "JetspeedCocoonService early init()....starting!" );
initCocoon( config );
- Log.note ( "JetspeedCocoonService early init()....finished!" );
+ Log.info ( "JetspeedCocoonService early init()....finished!" );
}
catch (Exception e)
{
@@ -202,7 +202,7 @@
private void initCocoon( ServletConfig config ) {
try {
- Log.note("Initializing the Cocoon Engine");
+ Log.info("Initializing the Cocoon Engine");
String properties = TurbineResources.getString(
"services."+CocoonService.SERVICE_NAME+".properties" );
ServletContext context = config.getServletContext();
@@ -215,7 +215,7 @@
}
}
- Log.note( "JetspeedCocoonService is using " + properties );
+ Log.info( "JetspeedCocoonService is using " + properties );
cocoon = Engine.getInstance( new Configurations( properties ), context );
1.4 +4 -4 jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletRequest.java
Index: JetspeedServletRequest.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/src/java/org/apache/jetspeed/services/cocoon/servlet/JetspeedServletRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedServletRequest.java 2001/03/07 07:12:32 1.3
+++ JetspeedServletRequest.java 2001/12/17 15:32:29 1.4
@@ -86,7 +86,7 @@
return
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: JetspeedServletRequest.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
+@version $Id: JetspeedServletRequest.java,v 1.4 2001/12/17 15:32:29 sgala Exp $
*/
public class JetspeedServletRequest implements HttpServletRequest {
//public class JetspeedServletRequest extends CocoonServletRequest {
@@ -140,7 +140,7 @@
*/
this.contextPath = req.getContextPath();
} catch (Throwable t) {
- Log.note( "JetspeedServletRequest: getContextPath failed. :" +
+ Log.info( "JetspeedServletRequest: getContextPath failed. :" +
t.getMessage() );
}
String path = "//" + filePath;
@@ -171,7 +171,7 @@
@param pc PortletConfig to be stored in the JetspeedServletRequest
@author <A HREF="mailto:neeme@one.lv">Neeme Praks</A>
- @version $Id: JetspeedServletRequest.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
+ @version $Id: JetspeedServletRequest.java,v 1.4 2001/12/17 15:32:29 sgala Exp $
*/
/*public JetspeedServletRequest( String filePath,
String document,
@@ -185,7 +185,7 @@
@return pc PortletConfig object stored in the request object
@author <A HREF="mailto:neeme@one.lv">Neeme Praks</A>
- @version $Id: JetspeedServletRequest.java,v 1.3 2001/03/07 07:12:32 taylor Exp $
+ @version $Id: JetspeedServletRequest.java,v 1.4 2001/12/17 15:32:29 sgala Exp $
*/
public PortletConfig getPortletConfig() {
return pc;
1.3 +2 -2 jakarta-jetspeed/modules/CocoonPortlet/webapp/dynamic/portletbrowser/xsp/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/webapp/dynamic/portletbrowser/xsp/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 2000/12/22 13:25:57 1.2
+++ index.xml 2001/12/17 15:32:29 1.3
@@ -7,7 +7,7 @@
<!--
Author: Kevin A Burton (burton@apache.org)
-Version: $Id: index.xml,v 1.2 2000/12/22 13:25:57 luta Exp $
+Version: $Id: index.xml,v 1.3 2001/12/17 15:32:29 sgala Exp $
-->
<xsp:page language="java"
@@ -115,7 +115,7 @@
<entry>
<xsp:logic>
- Log.note( "PortletBrowser: browsing portlet: " + (start + i) + " of a total of " + total );
+ Log.info( "PortletBrowser: browsing portlet: " + (start + i) + " of a total of " + total );
</xsp:logic>
<title>
1.3 +2 -2 jakarta-jetspeed/modules/CocoonPortlet/webapp/dynamic/portletbrowser/xsp/search.xml
Index: search.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/modules/CocoonPortlet/webapp/dynamic/portletbrowser/xsp/search.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- search.xml 2000/12/22 13:25:58 1.2
+++ search.xml 2001/12/17 15:32:29 1.3
@@ -7,7 +7,7 @@
<!--
Author: Kevin A Burton (burton@apache.org)
-Version: $Id: search.xml,v 1.2 2000/12/22 13:25:58 luta Exp $
+Version: $Id: search.xml,v 1.3 2001/12/17 15:32:29 sgala Exp $
-->
<xsp:page language="java"
@@ -145,7 +145,7 @@
<entry>
<xsp:logic>
- Log.note( "PortletBrowser: browsing portlet: " + (start + i) + " of a total of " + total );
+ Log.info( "PortletBrowser: browsing portlet: " + (start + i) + " of a total of " + total );
</xsp:logic>
<title>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>