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/04 17:57:18 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin DaemonAdminPortlet.java
sgala 01/12/04 08:57:18
Modified: src/java/org/apache/jetspeed/portal/portlets/admin
DaemonAdminPortlet.java
Log:
Security check and small javadoc cleanup
Revision Changes Path
1.22 +13 -9 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java
Index: DaemonAdminPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/admin/DaemonAdminPortlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DaemonAdminPortlet.java 2001/06/04 17:47:04 1.21
+++ DaemonAdminPortlet.java 2001/12/04 16:57:18 1.22
@@ -66,6 +66,7 @@
import org.apache.jetspeed.daemon.impl.*;
import org.apache.jetspeed.cache.disk.*;
import org.apache.jetspeed.services.daemonfactory.DaemonFactory;
+import org.apache.jetspeed.services.JetspeedSecurity;
//turbine
import org.apache.turbine.util.*;
@@ -79,7 +80,9 @@
Handles enumerating Portlets that are also applications
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: DaemonAdminPortlet.java,v 1.21 2001/06/04 17:47:04 raphael Exp $
+@author <a href="mailto:raphael@apache.org">Raphael Luta</a>
+@author <a href="mailto:sgala@apache.org">Santiago Gala</a>
+@version $Id: DaemonAdminPortlet.java,v 1.22 2001/12/04 16:57:18 sgala Exp $
*/
public class DaemonAdminPortlet extends AbstractPortlet {
@@ -92,7 +95,13 @@
public ConcreteElement getContent( RunData rundata ) {
-
+
+ if (!JetspeedSecurity.checkPermission(rundata,
+ JetspeedSecurity.PERMISSION_VIEW,
+ this))
+ {
+ return new ClearElement("Sorry, you have no permission to see this portlet");
+ }
try {
@@ -108,12 +117,12 @@
DaemonEntry entry = DaemonFactory.getDaemonEntry( daemon );
- Log.note( "Admin -> asking " + daemon + " to run..." );
+ Log.info( "Admin -> asking " + daemon + " to run..." );
//now that we have the DaemonEntry kick it off for processing
DaemonFactory.process( entry );
} catch (DaemonNotFoundException e) {
- Log.note( "Could not process daemon..." );
+ Log.info( "Could not process daemon..." );
Log.error( e );
}
}
@@ -174,7 +183,6 @@
/**
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: DaemonAdminPortlet.java,v 1.21 2001/06/04 17:47:04 raphael Exp $
*/
private String getStatus(int status) {
@@ -200,7 +208,6 @@
/**
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: DaemonAdminPortlet.java,v 1.21 2001/06/04 17:47:04 raphael Exp $
*/
private String getResult( int result ) {
@@ -227,7 +234,6 @@
/**
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: DaemonAdminPortlet.java,v 1.21 2001/06/04 17:47:04 raphael Exp $
*/
private ConcreteElement getFeedCount() {
@@ -241,7 +247,6 @@
Return a form that can refresh the current daemon
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: DaemonAdminPortlet.java,v 1.21 2001/06/04 17:47:04 raphael Exp $
*/
private Form getForm( String daemon, RunData rundata ) {
@@ -274,7 +279,6 @@
/**
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- @version $Id: DaemonAdminPortlet.java,v 1.21 2001/06/04 17:47:04 raphael Exp $
*/
public void init() throws PortletException {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>