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/03/29 08:13:01 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin BadURLManagerPortlet.java GlobalAdminPortlet.java JavaRuntimePortlet.java
sgala 01/03/28 22:13:01
Modified: src/java/org/apache/jetspeed/portal/portlets/admin
BadURLManagerPortlet.java GlobalAdminPortlet.java
JavaRuntimePortlet.java
Log:
miscellaneous fixes and adding some information
Revision Changes Path
1.9 +11 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java
Index: BadURLManagerPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/BadURLManagerPortlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BadURLManagerPortlet.java 2001/03/07 06:47:33 1.8
+++ BadURLManagerPortlet.java 2001/03/29 06:13:01 1.9
@@ -73,7 +73,7 @@
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
@author <a href="mailto:sgala@hisitech.com">Santiago Gala</a>
-@version $Id: BadURLManagerPortlet.java,v 1.8 2001/03/07 06:47:33 taylor Exp $
+@version $Id: BadURLManagerPortlet.java,v 1.9 2001/03/29 06:13:01 sgala Exp $
*/
public class BadURLManagerPortlet extends AbstractPortlet {
@@ -117,10 +117,16 @@
while ( i.hasNext() ) {
URLInfo info = URLManager.getInfo( (String)i.next() );
- uri.removeQueryData( RETRY_URL );
- uri.addQueryData(RETRY_URL, info.getURL());
- ul.addElement( new LI().addElement( new A(uri.toString() ).addElement( info.getURL() ) )
- .addElement( new B( info.getMessage() ) ) );
+ /* It can happen that url is no longer in list while
+ we are processing */
+ if( info != null ) {
+ uri.removeQueryData( RETRY_URL );
+ uri.addQueryData(RETRY_URL, info.getURL());
+ ul.addElement( new LI()
+ .addElement( new A(uri.toString() )
+ .addElement( info.getURL() ) )
+ .addElement( new B( info.getMessage() ) ) );
+ }
}
root.addElement( ul );
1.12 +5 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java
Index: GlobalAdminPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/GlobalAdminPortlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GlobalAdminPortlet.java 2001/03/07 06:47:36 1.11
+++ GlobalAdminPortlet.java 2001/03/29 06:13:01 1.12
@@ -86,7 +86,7 @@
Returns global information about Jetspeed.
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: GlobalAdminPortlet.java,v 1.11 2001/03/07 06:47:36 taylor Exp $
+@version $Id: GlobalAdminPortlet.java,v 1.12 2001/03/29 06:13:01 sgala Exp $
*/
public class GlobalAdminPortlet extends AbstractPortlet {
@@ -129,8 +129,10 @@
this.createCategory( ec, "Resource Manager" );
- ec.addElement( this.getEntry( "Bad URLs",
- URLManager.list( URLManagerService.STATUS_BAD ).size() ) );
+ ec.addElement( this.getEntry( "Entries in Manager",
+ URLManager.list( URLManagerService.STATUS_ANY ).size() ) );
+ ec.addElement( this.getEntry( "Bad Entries",
+ URLManager.list( URLManagerService.STATUS_BAD ).size() ) );
ec.addElement( this.getEntry( "URLs Loading/Refreshing",
URLFetcher.getRealtimeURLs().size() ) );
1.14 +30 -30 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/JavaRuntimePortlet.java
Index: JavaRuntimePortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/JavaRuntimePortlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JavaRuntimePortlet.java 2001/03/07 06:47:37 1.13
+++ JavaRuntimePortlet.java 2001/03/29 06:13:01 1.14
@@ -69,6 +69,7 @@
//turbine
import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.Log;
//standard java stuff
import java.net.*;
@@ -79,7 +80,7 @@
Handles enumerating Portlets that are also applications
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: JavaRuntimePortlet.java,v 1.13 2001/03/07 06:47:37 taylor Exp $
+@version $Id: JavaRuntimePortlet.java,v 1.14 2001/03/29 06:13:01 sgala Exp $
*/
public class JavaRuntimePortlet extends AbstractPortlet {
@@ -88,48 +89,47 @@
Table table = new Table().setWidth("100%");
- //get Runtime status
-
- Runtime jvm = Runtime.getRuntime();
+ try {
+ //get Runtime status
+ Runtime jvm = Runtime.getRuntime();
- table.addElement( new TR()
- .addElement( new TD("Free Memory (in bytes)") )
- .addElement( new TD( Long.toString( jvm.freeMemory() ) ) ) );
+ table.addElement( new TR()
+ .addElement( new TD("Free Memory (in bytes)") )
+ .addElement( new TD( Long.toString( jvm.freeMemory() ) ) ) );
- table.addElement( new TR()
- .addElement( new TD("Total Memory (in bytes)") )
- .addElement( new TD( Long.toString( jvm.totalMemory() ) ) ) );
-
- //get the system properties
+ table.addElement( new TR()
+ .addElement( new TD("Total Memory (in bytes)") )
+ .addElement( new TD( Long.toString( jvm.totalMemory() ) ) ) );
- Properties props = System.getProperties();
+ //get the system properties (It can throw a SecurityException)
+ Properties props = System.getProperties();
- Enumeration enum = props.propertyNames();
-
- try {
-
- while( enum.hasMoreElements() ) {
- Object key = enum.nextElement();
-
- if ( ! ( key instanceof String ) ) {
- continue;
+ Enumeration enum = props.propertyNames();
+ while( enum.hasMoreElements() ) {
+ Object key = enum.nextElement();
+ if ( ! ( key instanceof String ) ) {
+ continue;
+ }
+
+ Object value = props.getProperty( key.toString() );
+ table.addElement( new TR()
+ .addElement( new TD( key.toString() ) )
+ .addElement( new TD( value.toString() ) ) );
+
}
-
- Object value = props.getProperty( key.toString() );
-
+ } catch (Throwable t) {
+ Log.error( t );
table.addElement( new TR()
- .addElement( new TD( key.toString() ) )
- .addElement( new TD( value.toString() ) ) );
-
+ .addElement( new TD( "Error" ) )
+ .addElement( new TD( "Could not read system properties" ) ) );
}
- } catch (Throwable t) {t.printStackTrace(); }
return table;
}
/**
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: JavaRuntimePortlet.java,v 1.13 2001/03/07 06:47:37 taylor Exp $
+ @version $Id: JavaRuntimePortlet.java,v 1.14 2001/03/29 06:13:01 sgala Exp $
*/
public void init() throws PortletException {
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org