Author: andre
Date: 2010-02-03 11:12:55 +0100 (Wed, 03 Feb 2010)
New Revision: 40830
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/Recognizer.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/RecognizerTranscoder.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/urlcomposers/ImagesURLComposer.java
Log:
packages
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,24 +21,19 @@
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
+import java.io.File;
+import java.net.URI;
+import java.util.*;
+import java.util.concurrent.Future;
+
+import org.mmbase.applications.media.*;
import org.mmbase.bridge.*;
-import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.storage.search.*;
import org.mmbase.bridge.util.Queries;
+import org.mmbase.servlet.FileServlet;
+import org.mmbase.storage.search.FieldCompareConstraint;
+import org.mmbase.streams.transcoders.CommandTranscoder;
import org.mmbase.util.*;
import org.mmbase.util.externalprocess.CommandExecutor;
-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 java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
-import java.net.*;
import org.mmbase.util.logging.*;
/**
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,13 +21,14 @@
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
+import java.io.Serializable;
+import java.util.*;
+
+import org.mmbase.streams.transcoders.Analyzer;
+import org.mmbase.streams.transcoders.Transcoder;
import org.mmbase.applications.media.MimeType;
-import java.util.*;
-import java.io.*;
-
/**
* The description or definition of one 'transcoding' sub job that's doing the
transcoding. This
* combines a {...@link Transcoder}, with a mime type for which it must be
valid, and a list of analyzers.
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,27 +21,28 @@
package org.mmbase.streams.createcaches;
-import org.mmbase.streams.transcoders.*;
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.*;
+
import org.mmbase.bridge.*;
-import org.mmbase.bridge.Node;
+import org.mmbase.core.event.*;
+import org.mmbase.datatypes.processors.CommitProcessor;
+import org.mmbase.security.ActionRepository;
import org.mmbase.security.UserContext;
-import org.mmbase.security.ActionRepository;
+import org.mmbase.servlet.FileServlet;
+import org.mmbase.streams.transcoders.*;
+import org.mmbase.applications.media.MimeType;
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.MimeType;
-import org.mmbase.servlet.FileServlet;
-import org.mmbase.core.event.*;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
import org.mmbase.util.logging.*;
-import org.w3c.dom.*;
+import org.mmbase.util.xml.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
/**
* This commit-processor is used on nodes of type 'streamsources' and is used
to initiate the
* conversions to other formats which are saved in 'streamsourcescaches'. Its
analogy is derived
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,12 +21,12 @@
package org.mmbase.streams.createcaches;
+import java.net.URI;
+
import org.mmbase.bridge.Node;
import org.mmbase.applications.media.MimeType;
-import java.net.*;
-
/**
* Result of a recognizer JobDefinition, just recognizes the type of stream
etc.
* Does not transcode. The result out is the same as in, same for mimetype.
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,13 +21,12 @@
package org.mmbase.streams.createcaches;
+import java.net.URI;
+
import org.mmbase.bridge.Node;
import org.mmbase.applications.media.MimeType;
-import java.net.*;
-
-
/**
* When executing an actual {...@link JobDefinition} the result is contained
in an object like this.
* @author Michiel Meeuwissen
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,11 +21,11 @@
package org.mmbase.streams.createcaches;
+import java.net.URI;
+
import org.mmbase.bridge.Node;
import org.mmbase.applications.media.MimeType;
-import java.net.*;
-
/**
* This is a place holder for the result of a transcoder which is not to be
done, because production
* of its source was skipped already, or because the source does not match the
mime type.
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,15 +21,16 @@
package org.mmbase.streams.createcaches;
+import java.io.File;
+import java.net.URI;
+
+import org.mmbase.applications.media.MimeType;
+import org.mmbase.applications.media.State;
import org.mmbase.bridge.Node;
-import org.mmbase.applications.media.State;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
-import java.io.*;
-import java.net.*;
-import org.mmbase.util.logging.*;
-
/**
* Container for the result of a JobDefinition This is the result of an actual
transcoding.
* This means that it does have a 'destination' node {...@link
#getDestination()} and URI {...@link #getOut()}.
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,13 +21,15 @@
package org.mmbase.streams.transcoders;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.MimeType;
import org.mmbase.applications.media.State;
-import java.util.*;
-import java.util.regex.*;
-import org.mmbase.bridge.*;
-import org.mmbase.bridge.util.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+
import org.mmbase.util.logging.*;
/**
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,16 +21,14 @@
package org.mmbase.streams.transcoders;
-import org.mmbase.applications.media.*;
-import java.net.*;
import java.io.*;
-import java.util.*;
-import org.mmbase.bridge.util.*;
-import org.mmbase.bridge.*;
-import org.mmbase.util.logging.*;
-import org.mmbase.util.externalprocess.*;
+import java.net.URI;
+
+import org.mmbase.applications.media.MimeType;
+
import org.mmbase.util.WriterOutputStream;
-import java.util.regex.*;
+import org.mmbase.util.externalprocess.CommandExecutor;
+import org.mmbase.util.logging.*;
/**
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/Recognizer.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/Recognizer.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/Recognizer.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,9 +21,10 @@
package org.mmbase.streams.transcoders;
-import org.mmbase.util.logging.*;
-import java.net.*;
+import java.net.URI;
+
import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.logging.Logger;
/**
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/RecognizerTranscoder.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/RecognizerTranscoder.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/RecognizerTranscoder.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -21,15 +21,12 @@
package org.mmbase.streams.transcoders;
-import org.mmbase.applications.media.*;
-import java.net.*;
-import java.lang.reflect.*;
-import java.io.*;
-import java.util.*;
-import org.mmbase.util.externalprocess.*;
-import org.mmbase.util.WriterOutputStream;
+import java.net.URI;
-import org.mmbase.util.logging.*;
+import org.mmbase.applications.media.Codec;
+import org.mmbase.applications.media.Format;
+import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.logging.Logger;
/**
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/urlcomposers/ImagesURLComposer.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/urlcomposers/ImagesURLComposer.java
2010-02-03 09:53:59 UTC (rev 40829)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/urlcomposers/ImagesURLComposer.java
2010-02-03 10:12:55 UTC (rev 40830)
@@ -22,20 +22,19 @@
package org.mmbase.streams.urlcomposers;
-import java.util.*;
-
-import org.mmbase.module.core.*;
-import org.mmbase.module.builders.*;
-
import org.mmbase.applications.media.Format;
import org.mmbase.applications.media.MimeType;
import org.mmbase.applications.media.State;
import org.mmbase.applications.media.urlcomposers.FragmentURLComposer;
-
-import org.mmbase.util.images.*;
-import org.mmbase.util.logging.*;
-
+import org.mmbase.module.builders.ImageCaches;
+import org.mmbase.module.builders.Images;
+import org.mmbase.module.core.MMBase;
+import org.mmbase.module.core.MMObjectNode;
import org.mmbase.streams.builders.ImageSources;
+import org.mmbase.util.images.Dimension;
+import org.mmbase.util.images.Factory;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
/**
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
