Author: michiel
Date: 2009-11-18 11:50:48 +0100 (Wed, 18 Nov 2009)
New Revision: 39763
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Stage.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilTranscodingFunction.java
Log:
cleaned up a bit
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -14,26 +14,20 @@
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
import org.mmbase.bridge.util.Queries;
import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
import org.mmbase.applications.media.State;
import org.mmbase.applications.media.Format;
import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
import java.util.*;
import java.util.concurrent.*;
import java.io.*;
import java.net.*;
import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
/**
* A Job is associated with a 'source' node, and describes what is currently
happening to create
@@ -292,7 +286,7 @@
* Re-submit this job.
*/
- public synchronized void submit(JobCallable jc) {
+ synchronized void submit(JobCallable jc) {
LOG.info("Will submit " + jc);
findResults();
if (getCurrent() == null) {
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -12,28 +12,11 @@
import org.mmbase.streams.transcoders.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
-import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
import java.util.*;
import java.util.concurrent.*;
-import java.io.*;
import java.net.*;
import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
/**
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -10,30 +10,10 @@
package org.mmbase.streams.createcaches;
import org.mmbase.streams.transcoders.*;
-import org.mmbase.bridge.*;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
import java.util.*;
-import java.util.concurrent.*;
import java.io.*;
-import java.net.*;
-import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -13,18 +13,12 @@
import org.mmbase.streams.createcaches.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
import org.mmbase.security.UserContext;
import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
import org.mmbase.util.*;
import org.mmbase.util.xml.*;
import org.mmbase.util.externalprocess.CommandExecutor;
import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
import org.mmbase.servlet.FileServlet;
import org.mmbase.core.event.*;
@@ -32,7 +26,6 @@
import java.util.*;
import java.util.concurrent.*;
import java.io.*;
-import java.net.*;
import org.mmbase.util.logging.*;
import org.w3c.dom.*;
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -9,31 +9,10 @@
*/
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
-import org.mmbase.bridge.*;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
import java.net.*;
-import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
/**
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -9,35 +9,14 @@
*/
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
-import org.mmbase.bridge.*;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
import java.net.*;
-import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
-abstract class Result {
+public abstract class Result {
final JobDefinition definition;
final URI in;
boolean ready = false;
@@ -47,7 +26,7 @@
this.in = in;
}
- public JobDefinition getJobDefinition() {
+ JobDefinition getJobDefinition() {
return definition;
}
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -9,31 +9,10 @@
*/
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
-import org.mmbase.bridge.*;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
import java.net.*;
-import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
class SkippedResult extends Result {
SkippedResult(JobDefinition def, URI in) {
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Stage.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Stage.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Stage.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -9,34 +9,8 @@
*/
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
-import org.mmbase.bridge.*;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
-import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
-import java.net.*;
-import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
-
-
/**
* This enum can contain the 'stage' of the transcoding process
*/
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -9,31 +9,13 @@
*/
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
-import org.mmbase.bridge.*;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
-import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.bridge.util.Queries;
-import org.mmbase.util.*;
-import org.mmbase.util.xml.*;
-import org.mmbase.util.externalprocess.CommandExecutor;
-import org.mmbase.datatypes.processors.*;
import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
-import java.util.*;
-import java.util.concurrent.*;
import java.io.*;
import java.net.*;
import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -11,9 +11,6 @@
import org.mmbase.util.functions.*;
import org.mmbase.bridge.*;
-import org.mmbase.bridge.util.*;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.datatypes.processors.*;
import org.mmbase.util.logging.*;
/**
@@ -24,6 +21,8 @@
public class WaitUntilRecognizedFunction extends NodeFunction<Boolean> {
+ private static final long serialVersionUID = 0L;
+
private static final Logger LOG =
Logging.getLoggerInstance(WaitUntilRecognizedFunction.class);
public WaitUntilRecognizedFunction() {
super("waitfor");
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilTranscodingFunction.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilTranscodingFunction.java
2009-11-18 10:46:52 UTC (rev 39762)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilTranscodingFunction.java
2009-11-18 10:50:48 UTC (rev 39763)
@@ -11,9 +11,6 @@
import org.mmbase.util.functions.*;
import org.mmbase.bridge.*;
-import org.mmbase.bridge.util.*;
-import org.mmbase.security.ActionRepository;
-import org.mmbase.datatypes.processors.*;
import org.mmbase.util.logging.*;
/**
@@ -23,6 +20,7 @@
*/
public class WaitUntilTranscodingFunction extends NodeFunction<Boolean> {
+ private static final long serialVersionUID = 0L;
private static final Logger LOG =
Logging.getLoggerInstance(WaitUntilTranscodingFunction.class);
public WaitUntilTranscodingFunction() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
