Author: michiel
Date: 2010-02-17 17:23:03 +0100 (Wed, 17 Feb 2010)
New Revision: 41117
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/RecreateCacheFunction.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/AbstractTranscoder.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:
Moved MimeType to mmbase-core
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/RecreateCacheFunction.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/RecreateCacheFunction.java
2010-02-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/RecreateCacheFunction.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -29,7 +29,7 @@
import org.mmbase.streams.createcaches.Processor;
import org.mmbase.streams.transcoders.*;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
import org.mmbase.util.functions.*;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.*;
@@ -60,13 +60,13 @@
@Override
protected Boolean getFunctionValue(final Node node, final Parameters
parameters) {
LOG.debug("params: " + parameters);
- if (node.getNumber() > 0
+ if (node.getNumber() > 0
&&
node.getCloud().may(ActionRepository.getInstance().get("streams",
"retrigger_jobs"), null)) {
-
+
Node recache = (Node) parameters.get("recache");
LOG.info("Recreating cache #" + recache.getNumber() + " for node
#" + node.getNumber());
final Field url = node.getNodeManager().getField("url");
-
+
String in = null;
Node inNode = recache.getNodeValue("id");
if (inNode.getNumber() != node.getNumber()) {
@@ -88,18 +88,18 @@
LOG.error("Exception while trying to (re)transcode - " + e);
return false;
}
-
+
JobDefinition jd = new JobDefinition(id, in, null, transcoder, new
MimeType(mimetype), Stage.TRANSCODER);
Map<String, JobDefinition> jdlist = new LinkedHashMap<String,
JobDefinition>();
jdlist.put(id, jd);
-
+
{
final Processor cc = CreateCachesFunction.getCacheCreator(url);
-
+
if (cc != null) {
LOG.service("Calling " + cc);
cc.createCaches(node.getCloud().getNonTransactionalCloud(), node.getNumber(),
jdlist);
-
+
return true;
} else {
LOG.error("No CreateCacheProcessor in " + url);
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobDefinition.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -26,7 +26,7 @@
import org.mmbase.streams.transcoders.Analyzer;
import org.mmbase.streams.transcoders.Transcoder;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
/**
@@ -51,8 +51,8 @@
/**
* Creates a JobDefinition template as used in the configuration container
or to kick-start
* a transcoding.
- * @param id identifier of this job, normally matches the one in
configuration
- * @param inId identifier of the jobdefinition or cache that is used as
input.
+ * @param id identifier of this job, normally matches the one in
configuration
+ * @param inId identifier of the jobdefinition or cache that is used as
input.
If no inId is found the orginal source is used, otherwise
it should match with
a preceding jobdefinition id in config or a node number of
an already existing cache.
* @param label description for user purposes of the result
@@ -81,7 +81,7 @@
public List<Analyzer> getAnalyzers() {
return Collections.unmodifiableList(analyzers);
}
-
+
public MimeType getMimeType() {
return mimeType;
}
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -32,7 +32,6 @@
import org.mmbase.security.UserContext;
import org.mmbase.servlet.FileServlet;
import org.mmbase.streams.transcoders.*;
-import org.mmbase.applications.media.MimeType;
import org.mmbase.util.*;
import org.mmbase.util.externalprocess.CommandExecutor;
import org.mmbase.util.logging.*;
@@ -385,7 +384,7 @@
LOG.debug("url: " + node.getStringValue("url"));
if (node.isChanged(field.getName())) {
LOG.service("For node " + node.getNumber() + ", the field '" +
field.getName() + "' is changed " + node.getChanged() + ". That means that we
must schedule create caches");
-
+
final Cloud ntCloud =
node.getCloud().getNonTransactionalCloud();
final int nodeNumber = node.getNumber();
createCaches(ntCloud, nodeNumber);
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/RecognizerResult.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -24,7 +24,7 @@
import java.net.URI;
import org.mmbase.bridge.Node;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -24,7 +24,7 @@
import java.net.URI;
import org.mmbase.bridge.Node;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
/**
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/SkippedResult.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -24,7 +24,7 @@
import java.net.URI;
import org.mmbase.bridge.Node;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
/**
* This is a place holder for the result of a transcoder which is not to be
done, because production
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -24,7 +24,7 @@
import java.io.File;
import java.net.URI;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
import org.mmbase.applications.media.State;
import org.mmbase.bridge.Node;
import org.mmbase.util.logging.Logger;
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AbstractTranscoder.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AbstractTranscoder.java
2010-02-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AbstractTranscoder.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -23,13 +23,13 @@
import org.mmbase.applications.media.Format;
import org.mmbase.applications.media.Codec;
-import org.mmbase.applications.media.MimeType;
import java.net.*;
import java.lang.reflect.*;
import java.io.*;
import java.util.*;
import org.mmbase.util.externalprocess.*;
import org.mmbase.util.WriterOutputStream;
+import org.mmbase.util.MimeType;
import org.mmbase.util.logging.*;
@@ -49,7 +49,7 @@
public static Transcoder getInstance(String key) throws
ClassNotFoundException, InstantiationException, IllegalAccessException,
NoSuchMethodException, InvocationTargetException {
String[] split = key.split(" ", 2);
Transcoder trans;
- {
+ { // parse split[0] (a class name) to instantiate object
String[] idWithClass = split[0].split(":", 2);
if (idWithClass.length == 1) {
idWithClass = new String[] { "", split[0]};
@@ -60,7 +60,7 @@
} catch (ClassNotFoundException cnfe) {
clazz = Class.forName(PACKAGE + idWithClass[1]);
}
-
+
if (!"".equals(idWithClass[0])) {
Constructor constructor = clazz.getConstructor(String.class);
trans = (Transcoder) constructor.newInstance(idWithClass[0]);
@@ -68,7 +68,7 @@
trans = (Transcoder) clazz.newInstance();
}
}
- {
+ { // parse split[1] to set properties on it.
String[] props = split[1].split(", ");
for (String prop : props) {
String[] entry = prop.split("=", 2);
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -25,11 +25,12 @@
import java.util.regex.Pattern;
import org.mmbase.applications.media.Codec;
-import org.mmbase.applications.media.MimeType;
import org.mmbase.applications.media.State;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import org.mmbase.util.MimeType;
+
import org.mmbase.util.logging.*;
/**
@@ -138,7 +139,7 @@
Cloud cloud = source.getCloud();
fixMimeType("image", source);
if (cloud != null) {
- if (updateSource && cloud.hasNodeManager(IMAGE)
+ if (updateSource && cloud.hasNodeManager(IMAGE)
&& ! source.getNodeManager().getName().equals(IMAGE)) {
if (log.isDebugEnabled()) {
log.debug("This is image, now converting type. source: " +
source.getNodeManager().getName() + " " + source.getNumber() + (dest != null ?
" dest:" + dest.getNumber() : ""));
@@ -226,11 +227,11 @@
Matcher m = PATTERN_DURATION.matcher(l);
if (m.matches()) {
Node fragment = source.getNodeValue("mediafragment");
-
+
if (! source.getNodeManager().hasField("length")) {
toVideo(source, dest);
}
-
+
if (log.isDebugEnabled()) log.debug("duration: " + m.group(1));
long length = getLength(m.group(1));
if (updateSource) {
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -24,7 +24,7 @@
import java.io.*;
import java.net.URI;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
import org.mmbase.util.WriterOutputStream;
import org.mmbase.util.externalprocess.CommandExecutor;
@@ -33,7 +33,7 @@
/**
* A recognizer that uses FFmpeg to analyze media.
- *
+ *
* @author Michiel Meeuwissen
* @version $Id: FFMpegRecognizer.java 36518 2009-07-02 12:52:01Z michiel $
*/
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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/Recognizer.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -23,7 +23,7 @@
import java.net.URI;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/RecognizerTranscoder.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -25,7 +25,7 @@
import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.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-17 15:31:45 UTC (rev 41116)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/urlcomposers/ImagesURLComposer.java
2010-02-17 16:23:03 UTC (rev 41117)
@@ -1,6 +1,6 @@
/*
-This file is part of the MMBase Streams application,
+This file is part of the MMBase Streams application,
which is part of MMBase - an open source content management system.
Copyright (C) 2009 André van Toly, Michiel Meeuwissen
@@ -23,7 +23,7 @@
package org.mmbase.streams.urlcomposers;
import org.mmbase.applications.media.Format;
-import org.mmbase.applications.media.MimeType;
+import org.mmbase.util.MimeType;
import org.mmbase.applications.media.State;
import org.mmbase.applications.media.urlcomposers.FragmentURLComposer;
import org.mmbase.module.builders.ImageCaches;
@@ -39,7 +39,7 @@
/**
* The FragmentURLComposer to make images urls available the same way as audio
and video.
- *
+ *
* @author Michiel Meeuwissen
* @version $Id$
*/
@@ -72,7 +72,7 @@
ImageSources builder = (ImageSources)
MMBase.getMMBase().getBuilder("imagesources");
return builder;
}
-
+
private String getImagetype() {
ImageCaches imageCaches = (ImageCaches)
MMBase.getMMBase().getBuilder("icaches");
if (imageCaches == null) {
@@ -85,7 +85,7 @@
}
return imageCaches.getImageFormat(icacheNode);
}
-
+
@Override
public MimeType getMimeType() {
return new MimeType("image", getImagetype());
@@ -101,7 +101,7 @@
MMObjectNode icacheNode = getBuilder().getCachedNode(source, template);
return new Dimension(icacheNode.getIntValue("width"),
icacheNode.getIntValue("height"));
}
-
+
@Override
public int getFilesize() {
MMObjectNode icacheNode = getBuilder().getCachedNode(source, template);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
