morciuch 2003/06/30 13:22:59
Modified: src/java/org/apache/jetspeed/portal/portlets/admin
DaemonAdminPortlet.java
src/java/org/apache/jetspeed/services/daemonfactory
JetspeedDaemonFactoryService.java
webapp/WEB-INF/conf JetspeedResources.properties
Log:
Daemons can now be manually started (see Bugzilla bug# 21195).
Also, removed the redundant security check which prevented admin from accessing this
Daemon Admin Portlet.
Revision Changes Path
1.27 +1 -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DaemonAdminPortlet.java 7 May 2003 15:16:51 -0000 1.26
+++ DaemonAdminPortlet.java 30 Jun 2003 20:22:59 -0000 1.27
@@ -107,14 +107,6 @@
public ConcreteElement getContent( RunData rundata ) {
- if (!JetspeedSecurity.checkPermission((JetspeedUser) rundata.getUser(),
- this,
- JetspeedSecurity.PERMISSION_VIEW))
- {
- return new JetspeedClearElement("Sorry, you have no permission to see
this portlet");
- }
-
-
try {
if ( rundata.getParameters().getString( REFRESH ) != null ) {
1.9 +27 -11
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JetspeedDaemonFactoryService.java 4 Mar 2003 00:05:07 -0000 1.8
+++ JetspeedDaemonFactoryService.java 30 Jun 2003 20:22:59 -0000 1.9
@@ -172,15 +172,25 @@
//create Daemon threads for them and pa
if( entries[i].onStartup() ) {
- Log.info( "DaemonFactory: start(): starting daemon -> " +
entries[i].getName() );
- DaemonThread dt = new DaemonThread( entries[i] );
- this.threads.put( entries[i], dt );
- dt.start();
+ start(entries[i]);
}
}
}
+
+ /**
+ * Starts a daemon entry
+ *
+ * @param entry
+ */
+ private void start(DaemonEntry entry)
+ {
+ Log.info( "DaemonFactory: start(): starting daemon -> " + entry.getName()
);
+ DaemonThread dt = new DaemonThread( entry );
+ this.threads.put( entry, dt );
+ dt.start();
+ }
/**
@@ -255,14 +265,20 @@
*/
public void process( DaemonEntry entry ) throws DaemonException {
+ DaemonThread dt = (DaemonThread)this.threads.get( entry );
+
+ if (dt == null)
+ {
+ start(entry);
+ dt = (DaemonThread) this.threads.get(entry);
+ }
+
//FIX ME: get the status of this daemon before kicking it off again.
int status = this.getStatus( entry );
- DaemonThread dt = (DaemonThread)this.threads.get( entry );
-
- if ( status != Daemon.STATUS_PROCESSING &&
- status != Daemon.STATUS_UNKNOWN ) {
-
+ if (status != Daemon.STATUS_PROCESSING &&
+ status != Daemon.STATUS_UNKNOWN &&
+ dt != null) {
//tell this thread to stop waiting and process immediately
synchronized (dt) {
dt.notify();
@@ -270,7 +286,7 @@
}
- if ( dt.isAlive() == false ) {
+ if ( dt != null && dt.isAlive() == false ) {
dt.start();
}
1.104 +2 -2
jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- JetspeedResources.properties 16 Jun 2003 20:19:24 -0000 1.103
+++ JetspeedResources.properties 30 Jun 2003 20:22:59 -0000 1.104
@@ -225,7 +225,7 @@
daemon.badurlmanagerdaemon.classname=org.apache.jetspeed.daemon.impl.BadURLManagerDaemon
daemon.badurlmanagerdaemon.interval=3600
-daemon.badurlmanagerdaemon.onstartup=false
+daemon.badurlmanagerdaemon.onstartup=true
#########################################
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
