[MMBASE SCM] r40052 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins: . EmbedCode EmbedCode/img EmbedCode/popups
Author: raintang
Date: 2009-12-01 09:02:20 +0100 (Tue, 01 Dec 2009)
New Revision: 40052
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/embed-code.gif
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/placeholder.gif
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html
Log:
CMSC-1556 Insert possibilities for embedding YouTube-code easily in rich text
article
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
2009-12-01 08:02:20 UTC (rev 40052)
@@ -0,0 +1,63 @@
+function EmbedCode(editor) {
+ this.editor = editor;
+ var cfg = editor.config;
+ var self = this;
+
+ this.placeholderImg = 'img class=EC_placeholder
src='+Xinha.getPluginDir(EmbedCode)+'/img/placeholder.gif /';
+
+ // register the toolbar buttons provided by this plugin
+ cfg.registerButton({
+ id : embed-code,
+ tooltip : this._lc(Embed Code),
+ image: editor.imgURL(embed-code.gif, EmbedCode),
+ textMode : false,
+ action : function(editor)
+{
+ self.buttonPress(editor);
+}
+ });
+ cfg.URIs['embed_code'] = _editor_url + 'popups/embed_code.html';
+ cfg.addToolbarElement(embed-code, createlink, 1);
+}
+
+EmbedCode._pluginInfo = {
+ name : EmbedCode,
+ version : 1.0,
+ developer : Rain Tang,
+ developer_url : ,
+ sponsor : ,
+ sponsor_url : ,
+ c_owner : Rain Tang,
+ license : none
+ };
+
+EmbedCode.prototype._lc = function(string) {
+return Xinha._lc(string, 'EmbedCode');
+};
+
+EmbedCode.prototype.onGenerate = function() {
+ this.editor.addEditorStylesheet(Xinha.getPluginDir(EmbedCode) +
'/embed-code.css');
+
+};
+//inwardHtml outwardHtml are used for change video to image while swiitching
modes
+//EmbedCode.prototype.inwardHtml = function(html)
+//{
+//return html;
+//}
+//EmbedCode.prototype.outwardHtml = function(html)
+//{
+//return html;
+//}
+
+EmbedCode.prototype.buttonPress = function(editor){
+editor._popupDialog(_editor_url +
/plugins/EmbedCode/popups/embed_code.html, function(param){
+if (param['embededCode']) {
+var code = param['embededCode'];
+ var re = /embed([\s\S]*?)\/embed/g;
+ code = code.match(re);
+var v = document.createElement(p);
+v.innerHTML = code;
+editor.insertNodeAtSelection(v);
+}
+}, null);
+}
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/embed-code.gif
===
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/embed-code.gif
___
Name: svn:mime-type
+ application/octet-stream
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/placeholder.gif
===
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/img/placeholder.gif
___
Name: svn:mime-type
+ application/octet-stream
Added:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/popups/embed_code.html
(rev 0)
+++
[MMBASE SCM] r40053 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha
Author: raintang Date: 2009-12-01 09:04:59 +0100 (Tue, 01 Dec 2009) New Revision: 40053 Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js Log: CMSC-1556 Insert possibilities for embedding YouTube-code easily in rich text article Modified: CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js === --- CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js 2009-12-01 08:02:20 UTC (rev 40052) +++ CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js 2009-12-01 08:04:59 UTC (rev 40053) @@ -7,6 +7,7 @@ 'CharacterMap', 'ContextMenu', 'InsertAnchor', + 'EmbedCode', // 'ListType', // 'FullScreen', // 'SpellChecker', ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40054 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode
Author: raintang
Date: 2009-12-01 09:11:24 +0100 (Tue, 01 Dec 2009)
New Revision: 40054
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
Log:
CMSC-1556 Insert possibilities for embedding YouTube-code easily in rich text
article
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
2009-12-01 08:04:59 UTC (rev 40053)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/plugins/EmbedCode/EmbedCode.js
2009-12-01 08:11:24 UTC (rev 40054)
@@ -8,7 +8,7 @@
// register the toolbar buttons provided by this plugin
cfg.registerButton({
id : embed-code,
- tooltip : this._lc(Embed Code),
+ tooltip : this._lc(Insert embed content),
image: editor.imgURL(embed-code.gif, EmbedCode),
textMode : false,
action : function(editor)
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40055 - mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate
Author: michiel
Date: 2009-12-01 10:49:10 +0100 (Tue, 01 Dec 2009)
New Revision: 40055
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
Log:
moved init code to a seperate method, so that you can easier call it yourself
too
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
===
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
2009-12-01 08:11:24 UTC (rev 40054)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
2009-12-01 09:49:10 UTC (rev 40055)
@@ -5,7 +5,7 @@
mm:content type=text/javascript expires=0
/**
- * This javascript binds to a div.list.
+ * This javascript binds to a div.list. It happens on document.ready on every
div.list in the document. You can also call {...@link #init} manually, e.g.
after an AJAX load.
*
* This div is supposed to contain an ol with a class=delete /, and a a
class=create /
*
@@ -27,15 +27,7 @@
$(document).ready(function() {
-var l = List; // hoping to make IE a bit faster
-$(document).find(div.list).each(function() {
-if (this.list == null) {
-this.list = new l(this);
-}
-});
-$(document).find(div.list:last).each(function() {
-l.seq = $(this).find(input[name = 'seq'])[0].value;
-});
+List.prototype.init(document);
});
@@ -198,6 +190,20 @@
}
+/**
+ * Initializes every div.list in the given element to be a List
+ */
+List.prototype.init = function(el) {
+var l = List; // hoping to make IE a bit faster
+$(el).find(div.list).each(function() {
+if (this.list == null) {
+this.list = new l(this);
+}
+});
+$(el).find(div.list:last).each(function() {
+l.seq = $(this).find(input[name = 'seq'])[0].value;
+});
+}
List.prototype.wasResetSequence = false;
List.prototype.instances = {};
@@ -616,7 +622,7 @@
}
/**
- * @param stale Number of millisecond the content may be aut of date. Defaults
to 5 s. But on unload it is set to 0.
+ * @param stale Number of millisecond the content may be out of date. Defaults
to 5 s. But on unload it is set to 0.
*/
List.prototype.commit = function(stale, leavePage) {
var result;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40056 - mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp
Author: michiel
Date: 2009-12-01 10:49:56 +0100 (Tue, 01 Dec 2009)
New Revision: 40056
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes-1.jspx
Log:
added a searchdirs attribute only
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes-1.jspx
===
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes-1.jspx
2009-12-01 09:49:10 UTC (rev 40055)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/relatednodes-1.jspx
2009-12-01 09:49:56 UTC (rev 40056)
@@ -25,6 +25,7 @@
h3mm:field name=title //h3
mm-sr:relatednodes
type=news
+searchdirs=destination
unlink=true
max=${max}
sortable=true
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40057 - mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF
Author: michiel Date: 2009-12-01 10:50:16 +0100 (Tue, 01 Dec 2009) New Revision: 40057 Modified: mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/web.xml Log: added index.jsp as a welcome file too Modified: mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/web.xml === --- mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/web.xml 2009-12-01 09:49:56 UTC (rev 40056) +++ mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/web.xml 2009-12-01 09:50:16 UTC (rev 40057) @@ -119,6 +119,7 @@ welcome-file-list welcome-fileindex.jspx/welcome-file +welcome-fileindex.jsp/welcome-file /welcome-file-list error-page ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40058 - mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp
Author: michiel
Date: 2009-12-01 10:50:58 +0100 (Tue, 01 Dec 2009)
New Revision: 40058
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-search.jspx
Log:
made the nodemanager which is teste configurable
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-search.jspx
===
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-search.jspx
2009-12-01 09:50:16 UTC (rev 40057)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/mmform-search.jspx
2009-12-01 09:50:58 UTC (rev 40058)
@@ -10,11 +10,13 @@
mm:import externid=config/mm:import
+ mm:import externid=nodemanagerurls/mm:import
+
mm:form name=bloe
-h3Urls/h3
-mm-sr:search type=urls implicit=false create=true /
+h3mm:nodeinfo nodetype=${nodemanager} type=guinodemanager //h3
+mm-sr:search type=${nodemanager} implicit=false create=true /
/mm:form
mm:escape escape=links$URL$/mm:escape
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40059 - mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate
Author: michiel
Date: 2009-12-01 11:06:33 +0100 (Tue, 01 Dec 2009)
New Revision: 40059
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
Log:
anticipate searchers too
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
===
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
2009-12-01 09:50:58 UTC (rev 40058)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
2009-12-01 10:06:33 UTC (rev 40059)
@@ -27,7 +27,7 @@
$(document).ready(function() {
-List.prototype.init(document);
+List.prototype.init(document, false);
});
@@ -193,7 +193,17 @@
/**
* Initializes every div.list in the given element to be a List
*/
-List.prototype.init = function(el) {
+List.prototype.init = function(el, initSearchers) {
+if (typeof initSearchers == undefined || initSearchers) {
+if (typeof MMBaseRelater == function) {
+$(el).find(div.mm_related).each(function() {
+if (this.relater == null) {
+this.relater = new MMBaseRelater(this);
+}
+});
+}
+}
+
var l = List; // hoping to make IE a bit faster
$(el).find(div.list).each(function() {
if (this.list == null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40060 - mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp
Author: michiel
Date: 2009-12-01 11:21:12 +0100 (Tue, 01 Dec 2009)
New Revision: 40060
Added:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/ajax.jspx
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/loaded-with-ajax.jspx
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/example.js
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
Log:
added an example on how to load it via ajax
Added:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/ajax.jspx
===
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/ajax.jspx
(rev 0)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/ajax.jspx
2009-12-01 10:21:12 UTC (rev 40060)
@@ -0,0 +1,20 @@
+?xml version=1.0 ?
+mm-sre:html
+xmlns:mm-sre=urn:jsptagdir:/WEB-INF/tags/mm/searchrelateexample
+xmlns:mm-srt=urn:jsptagdir:/WEB-INF/tags/mm/searchrelate
+xmlns:mm-sr=http://www.mmbase.org/tags/mm/searchrelate;
+xmlns:mm=http://www.mmbase.org/mmbase-taglib-2.0;
+
+ mm:import id=max6/mm:import
+ script type=text/javascript
+$(function() {
+ $(#test).load(loaded-with-ajax.jspx, {}, function() {
+ List.prototype.init(this);
+ }
+ )});
+ /script
+ div id=test /div
+ hr /
+ mm:escape escape=links$URL$/mm:escape
+
+/mm-sre:html
Property changes on:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/ajax.jspx
___
Name: svn:keywords
+ URL
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/example.js
===
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/example.js
2009-12-01 10:06:33 UTC (rev 40059)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/example.js
2009-12-01 10:21:12 UTC (rev 40060)
@@ -13,22 +13,24 @@
{ // default 'implicit' search results are not shown,
// except on the 'search' example page itself
if (! $(body).hasClass(search)) {
-MMBaseSearcher.prototype.implicitsAreHidden();
+if (typeof MMBaseSearcher == function) {
+MMBaseSearcher.prototype.implicitsAreHidden();
+}
}
}
{ // Setup tinymcy on the example page for that.
if ($(body).hasClass(tinymce)) {
-
-
+
+
var tinyMceConfiguration = {
theme : simple,
content_css: style.css,
entity_encoding : raw, /* needed when XHTML */
setup : List.prototype.setupTinyMCE
}
-
+
// bind tinymce to news bodies already displayed:
$(.mm_validate.mm_nm_news.mm_f_body).each(function() {
List.prototype.tinymce(this, tinyMceConfiguration);
@@ -39,7 +41,7 @@
List.prototype.tinymce(this,
tinyMceConfiguration);
});
});
-
+
}
}
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
===
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
2009-12-01 10:06:33 UTC (rev 40059)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/index.jspx
2009-12-01 10:21:12 UTC (rev 40060)
@@ -164,6 +164,12 @@
a href=${_}Samp;amp;R and tinyMCE/a
/mm:link
/li
+
+ li class=done
+mm:link page=ajax.jspx referids=${referids}
+ a href=${_}Loaded with javascript/a
+/mm:link
+ /li
/ul
h3TODO/h3
Added:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/loaded-with-ajax.jspx
===
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/loaded-with-ajax.jspx
(rev 0)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/loaded-with-ajax.jspx
2009-12-01 10:21:12 UTC (rev 40060)
@@ -0,0 +1,26 @@
+?xml version=1.0 ?
+div class=loaded-with-ajax
+ xmlns:jsp=http://java.sun.com/JSP/Page;
+ xmlns:mm-srt=urn:jsptagdir:/WEB-INF/tags/mm/searchrelate
+ xmlns:mm-sr=http://www.mmbase.org/tags/mm/searchrelate;
+ xmlns:mm=http://www.mmbase.org/mmbase-taglib-2.0;
+ jsp:output omit-xml-declaration=true /
+ mm:cloud rank=administrator
+mm:import id=max6/mm:import
+mm:node
[MMBASE SCM] r40061 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: michiel
Date: 2009-12-01 13:26:14 +0100 (Tue, 01 Dec 2009)
New Revision: 40061
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
Log:
log also about wich damn file we're talking
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-12-01 10:21:12 UTC (rev 40060)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-12-01 12:26:14 UTC (rev 40061)
@@ -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
@@ -31,7 +31,7 @@
/**
- * Container for the result of a JobDefinition This is the result of an actual
transcoding.
+ * 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()}.
*
* @author Michiel Meeuwissen
@@ -69,7 +69,7 @@
if (outFile.length() 1) { // @TODO: there should maybe be
other ways to detect if a transcoding failed
dest.setIntValue(state, State.DONE.getValue());
} else {
-LOG.warn(Filesize 1, setting + dest.getNumber() + to
failed);
+LOG.warn(Filesize of + outFile + 1, setting +
dest.getNumber() + to failed);
dest.setIntValue(state, State.FAILED.getValue());
}
if (definition.getLabel() != null
dest.getNodeManager().hasField(label)) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40062 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: michiel
Date: 2009-12-01 13:28:46 +0100 (Tue, 01 Dec 2009)
New Revision: 40062
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
Log:
well, the check is on 1 (i.e. 0?)
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-12-01 12:26:14 UTC (rev 40061)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-12-01 12:28:46 UTC (rev 40062)
@@ -66,7 +66,7 @@
if (dest != null) {
File outFile = new File(directory,
dest.getStringValue(url).replace(/, File.separator));
dest.setLongValue(filesize, outFile.length());
-if (outFile.length() 1) { // @TODO: there should maybe be
other ways to detect if a transcoding failed
+if (outFile.length() = 1) { // @TODO: there should maybe be
other ways to detect if a transcoding failed
dest.setIntValue(state, State.DONE.getValue());
} else {
LOG.warn(Filesize of + outFile + 1, setting +
dest.getNumber() + to failed);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40063 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: andre
Date: 2009-12-01 17:03:46 +0100 (Tue, 01 Dec 2009)
New Revision: 40063
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/Processor.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
Log:
work-in-progress on waiting for files for streamcaches nodes, bit of javadoc
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-12-01 12:28:46 UTC (rev 40062)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-12-01 16:03:46 UTC (rev 40063)
@@ -106,6 +106,17 @@
assert url.length() 0;
File f = new File(processor.getDirectory(), url);
assert f.exists() : No such file + f;
+
+if (!f.exists()) {
+LOG.warn(No such file ' + f + ' waiting 10
sec);
+try {
+getThread().sleep(1);
+} catch (java.lang.InterruptedException ie) {
+
+}
+if (!f.exists()) LOG.error(NO FILE!);
+}
+
inURI = f.toURI();
inNode = node;
} else {
@@ -342,7 +353,7 @@
* exists in the cloud or otherwise will create one.
*
* @param src source node to create stream from
- * @param key representation of the way the stream was created from its
source
+ * @param key representation of the way the stream was created from its
source, f.e. trancoding parameters
* @return cached stream node
*/
protected Node getCacheNode(Node src, final String key) {
@@ -365,7 +376,7 @@
}
final NodeManager caches =
src.getCloud().getNodeManager(src.getNodeManager().getProperty(org.mmbase.streams.cachestype));
-Node newNode = caches.createNode();
+Node newNode = caches.createNode();
newNode.setNodeValue(id, src);
newNode.setStringValue(key, key);
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-12-01 12:28:46 UTC (rev 40062)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-12-01 16:03:46 UTC (rev 40063)
@@ -158,6 +158,8 @@
for (AnalyzerLogger al : analyzerLoggers) {
al.getAnalyzer().ready(thisJob.getNode(),
result.getDestination());
}
+logger.debug(Analyzer ready, waiting 10 sec. to be sure
filesystem is ready.);
+thisJob.getThread().sleep(1);
resultCount++;
result.ready();
logger.info(RESULT + thisJob + ( +
thisJob.getNode().getNodeManager().getName() + : +
thisJob.getNode().getNumber() + ): + result);
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-12-01 12:28:46 UTC (rev 40062)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2009-12-01 16:03:46 UTC (rev 40063)
@@ -314,7 +314,8 @@
/**
* Creates and submits a job transcoding everything as configured for one
source object, this
* produces all new 'streamssourcescaches' as configured in
createcaches.xml.
- * @param node source stream
+ * @param ntCloud a non transactional cloud
+ * @param node node number of a source stream
* @param loggera logger that keeps track
* @return job trans coding a source stream in (an)other stream(s)
*/
@@ -338,7 +339,7 @@
/**
* Creates caches nodes when not existing by creating a transcoding Job
* @param ntCloud a non transactional cloud
- * @param int node number
+ * @param int node number of a source node
* @return Job recognizing and/or transcoding the source stream
*/
public Job createCaches(final Cloud ntCloud, final int node) {
Modified:
[MMBASE SCM] r40064 - mmbase/trunk/core/src/main/java/org/mmbase/cache
Author: michiel
Date: 2009-12-01 18:28:26 +0100 (Tue, 01 Dec 2009)
New Revision: 40064
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/cache/CacheManager.java
Log:
lowered log
Modified: mmbase/trunk/core/src/main/java/org/mmbase/cache/CacheManager.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/cache/CacheManager.java
2009-12-01 16:03:46 UTC (rev 40063)
+++ mmbase/trunk/core/src/main/java/org/mmbase/cache/CacheManager.java
2009-12-01 17:28:26 UTC (rev 40064)
@@ -96,7 +96,7 @@
try {
MBeanServer mbs =
ManagementFactory.getPlatformMBeanServer();
mbs.registerMBean(instance, on);
-log.info(Registered + on);
+log.service(Registered + on);
} catch (JMException jmo) {
log.warn( + on + + jmo.getClass() + +
jmo.getMessage());
} catch (Throwable t) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40065 - mmbase/trunk/core/src/main/java/org/mmbase/module/core
Author: michiel
Date: 2009-12-01 18:32:27 +0100 (Tue, 01 Dec 2009)
New Revision: 40065
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
Log:
as a matter of backwards compatiblity with 1.8 dont spit so much in the log (a
stack trace) if a builder class is not found. An error should suffice.
Modified: mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
2009-12-01 17:28:26 UTC (rev 40064)
+++ mmbase/trunk/core/src/main/java/org/mmbase/module/core/MMBase.java
2009-12-01 17:32:27 UTC (rev 40065)
@@ -1089,7 +1089,11 @@
} else {
newclass = MMObjectBuilder.class;
}
-log.error(cnfe.toString() + (for ' +
parser.getClassName() + ' of builder ' + ipath + builderName + ') Falling
back to + newclass.getName(), cnfe);
+if (log.isDebugEnabled()) {
+log.error(cnfe.toString() + (for ' +
parser.getClassName() + ' of builder ' + ipath + builderName + ') Falling
back to + newclass.getName(), cnfe);
+} else {
+log.error(cnfe.toString() + (for ' +
parser.getClassName() + ' of builder ' + ipath + builderName + ') Falling
back to + newclass.getName());
+}
} catch (NoClassDefFoundError ncdfe) {
MMObjectBuilder p = parser.getParentBuilder();
if(p != null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40066 - mmbase/trunk/core/src/main/java/org/mmbase/util
Author: michiel
Date: 2009-12-01 18:53:47 +0100 (Tue, 01 Dec 2009)
New Revision: 40066
Added:
mmbase/trunk/core/src/main/java/org/mmbase/util/MockInputStream.java
mmbase/trunk/core/src/main/java/org/mmbase/util/NullInputStream.java
mmbase/trunk/core/src/main/java/org/mmbase/util/RandomInputStream.java
Log:
will add some tests about binaries. In that these 'mock' streams will be used.
They may be of more general use
Added: mmbase/trunk/core/src/main/java/org/mmbase/util/MockInputStream.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/util/MockInputStream.java
(rev 0)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/MockInputStream.java
2009-12-01 17:53:47 UTC (rev 40066)
@@ -0,0 +1,88 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
+
+package org.mmbase.util;
+
+import java.io.*;
+import org.mmbase.util.logging.*;
+
+/**
+ *
+ * @since MMBase-1.9.2
+ * @author Michiel Meeuwissen
+ * @version $Id$
+ */
+public abstract class MockInputStream extends InputStream {
+
+protected boolean closed = false;
+private final int length;
+private int cursor = 0;
+
+public MockInputStream(int l) {
+length = l;
+}
+
+protected abstract int oneByte();
+
+protected abstract void fillArray(byte[] data, int offset, int l);
+
+
+@Override
+public int read() throws IOException {
+checkOpen();
+if (cursor = length) return -1;
+cursor++;
+return oneByte();
+}
+
+
+@Override
+public int read(byte[] data, int offset, int l) throws IOException {
+checkOpen();
+if (cursor = length) return -1;
+cursor += l;
+if (cursor length) {
+l -= (cursor - length);
+cursor = length;
+}
+fillArray(data, offset, l);
+return l;
+}
+
+
+
+
+@Override
+public long skip(long bytesToSkip) throws IOException {
+checkOpen();
+cursor += bytesToSkip;
+if (cursor length) {
+bytesToSkip -= (cursor - length);
+cursor = length;
+}
+return bytesToSkip;
+}
+
+@Override
+public void close() {
+this.closed = true;
+}
+
+private void checkOpen() throws IOException {
+if (closed) {
+throw new IOException(getClass().getName() + : Input stream
closed);
+}
+}
+
+@Override
+public int available() {
+return length - cursor;
+}
+}
Property changes on:
mmbase/trunk/core/src/main/java/org/mmbase/util/MockInputStream.java
___
Name: svn:keywords
+ Id
Added: mmbase/trunk/core/src/main/java/org/mmbase/util/NullInputStream.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/util/NullInputStream.java
(rev 0)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/NullInputStream.java
2009-12-01 17:53:47 UTC (rev 40066)
@@ -0,0 +1,43 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+*/
+
+package org.mmbase.util;
+
+import java.io.*;
+import java.util.Arrays;
+
+
+
+/**
+ * An input stream only producing zeros. Not costing any memory though.
+ * @since MMBase-1.9.2
+ * @author Michiel Meeuwissen
+ * @version $Id$
+ */
+public class NullInputStream extends MockInputStream {
+
+public NullInputStream(int l) {
+super(l);
+}
+public NullInputStream() {
+this(Integer.MAX_VALUE);
+}
+
+
+@Override
+protected int oneByte() {
+return 0;
+}
+
+@Override
+protected void fillArray(byte[] data, int offset, int l) {
+Arrays.fill(data, offset, l, (byte) 0);
+}
+}
Property changes on:
mmbase/trunk/core/src/main/java/org/mmbase/util/NullInputStream.java
___
Name: svn:keywords
+ Id
Added: mmbase/trunk/core/src/main/java/org/mmbase/util/RandomInputStream.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/util/RandomInputStream.java
(rev 0)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/RandomInputStream.java
2009-12-01 17:53:47 UTC (rev 40066)
@@ -0,0 +1,46 @@
+/*
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
[MMBASE SCM] r40068 - mmbase/trunk/core/src/test/java/org/mmbase/util
Author: michiel
Date: 2009-12-01 18:55:08 +0100 (Tue, 01 Dec 2009)
New Revision: 40068
Modified:
mmbase/trunk/core/src/test/java/org/mmbase/util/SerializableInputStreamTest.java
Log:
added some test with the new input stream impls. And giving the temporary files
a more recognizable name
Modified:
mmbase/trunk/core/src/test/java/org/mmbase/util/SerializableInputStreamTest.java
===
---
mmbase/trunk/core/src/test/java/org/mmbase/util/SerializableInputStreamTest.java
2009-12-01 17:54:28 UTC (rev 40067)
+++
mmbase/trunk/core/src/test/java/org/mmbase/util/SerializableInputStreamTest.java
2009-12-01 17:55:08 UTC (rev 40068)
@@ -54,6 +54,16 @@
os.close();
return new SerializableInputStream(di);
}
+
+protected SerializableInputStream getRandomInstance() throws IOException {
+final int length = 1;
+return new SerializableInputStream(new RandomInputStream(length),
length);
+}
+protected SerializableInputStream getNullInstance() throws IOException {
+final int length = 1;
+return new SerializableInputStream(new NullInputStream(length),
length);
+}
+
protected SerializableInputStream getDiskItemInstanceBig() throws
IOException {
DiskFileItem di = new DiskFileItem(file, application/octet-stream,
false, foobar, 100, new File(System.getProperty(java.io.tmpdir)));
OutputStream os = di.getOutputStream();
@@ -65,7 +75,7 @@
return new SerializableInputStream(di);
}
protected File getTestFile() throws IOException {
-File file = File.createTempFile(getClass().getName(), .test);
+File file = File.createTempFile(getClass().getName(), .testfile);
OutputStream os = new FileOutputStream(file);
for (int i = 1; i 1; i++) {
os.write( (i % 100) + 20);
@@ -93,8 +103,8 @@
assertEquals(getByteArrayInstance(), getByteArrayInstance());
SerializableInputStream i = getByteArrayInstance();
-assertTrue(Arrays.equals(new byte[] { 0, 1, 2}, i.get()));
-assertTrue(Arrays.equals(new byte[] { 0, 1, 2}, i.get()));
+assertTrue(Arrays.equals(new byte[] {0, 1, 2}, i.get()));
+assertTrue(Arrays.equals(new byte[] {0, 1, 2}, i.get()));
assertTrue(Arrays.equals(i.get(), i.get()));
}
@@ -117,7 +127,7 @@
}
-protected void testSerializableMany(SerializableInputStream l) throws
IOException, java.lang.ClassNotFoundException {
+protected void testSerializableMany(SerializableInputStream l, String id)
throws IOException, java.lang.ClassNotFoundException {
byte[] before = l.get();
testSerializable(l);
testSerializable(l);
@@ -128,7 +138,7 @@
testSerializable(l);
after = l.get();
assertTrue( + before.length + + after.length,
Arrays.equals(before, after));
-File f = File.createTempFile(foo, .bar);
+File f = File.createTempFile(getClass().getName() + . + id + .,
.many);
l.moveTo(f);
testSerializable(l);
testSerializable(l);
@@ -148,32 +158,43 @@
@Test
public void testSerializableA() throws IOException, ClassNotFoundException
{
SerializableInputStream a = getByteArrayInstance();
-testSerializableMany(a);
+testSerializableMany(a, A);
}
@Test
public void testSerializableB() throws IOException, ClassNotFoundException
{
SerializableInputStream b = getInputStreamInstance();
-testSerializableMany(b);
+testSerializableMany(b, B);
}
@Test
public void testSerializableC() throws IOException, ClassNotFoundException
{
SerializableInputStream c = getDiskItemInstance();
-testSerializableMany(c);
+testSerializableMany(c, C);
}
@Test
public void testSerializableD() throws IOException, ClassNotFoundException
{
SerializableInputStream c = getDiskItemInstanceBig();
-testSerializableMany(c);
+testSerializableMany(c, D);
}
@Test
public void testSerializableE() throws IOException, ClassNotFoundException
{
SerializableInputStream c = getFileInstance();
-testSerializableMany(c);
+testSerializableMany(c, E);
}
+@Test
+public void testSerializableF() throws IOException, ClassNotFoundException
{
+SerializableInputStream c = getRandomInstance();
+testSerializableMany(c, F);
+}
+@Test
+public void testSerializableG() throws IOException, ClassNotFoundException
{
+SerializableInputStream c = getNullInstance();
+testSerializableMany(c, G);
+}
+
public File testCopy(SerializableInputStream l) throws IOException {
-File f = File.createTempFile(oof, .bar);
+File f = File.createTempFile(getClass().getName(), .copy);
IOUtil.copy(l, new FileOutputStream(f));
[MMBASE SCM] r40069 - mmbase/trunk/core/src/test/java/org/mmbase/util
Author: michiel
Date: 2009-12-01 18:55:39 +0100 (Tue, 01 Dec 2009)
New Revision: 40069
Modified:
mmbase/trunk/core/src/test/java/org/mmbase/util/CastingTest.java
Log:
started on a test for Casting#toSerializableInputStream
Modified: mmbase/trunk/core/src/test/java/org/mmbase/util/CastingTest.java
===
--- mmbase/trunk/core/src/test/java/org/mmbase/util/CastingTest.java
2009-12-01 17:55:08 UTC (rev 40068)
+++ mmbase/trunk/core/src/test/java/org/mmbase/util/CastingTest.java
2009-12-01 17:55:39 UTC (rev 40069)
@@ -165,4 +165,11 @@
}
+@Test
+public void serializableInputStream() {
+assertEquals(3, Casting.toSerializableInputStream(aaa).getSize());
+assertEquals(1000, Casting.toSerializableInputStream(new
NullInputStream(1000)).getSize());
+}
+
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40070 - mmbase/trunk/core/src/main/java/org/mmbase/datatypes
Author: michiel
Date: 2009-12-01 18:57:16 +0100 (Tue, 01 Dec 2009)
New Revision: 40070
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BinaryDataType.java
Log:
avoid casting the same value twice. That's bad, especially for binaries.
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
2009-12-01 17:55:39 UTC (rev 40069)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BasicDataType.java
2009-12-01 17:57:16 UTC (rev 40070)
@@ -555,6 +555,9 @@
errors = typeRestriction.addError(errors, value, node, field);
castValue = value;
}
+if (log.isDebugEnabled()) {
+log.debug(Validating cast value + castValue);
+}
//System.out.println( + value + - + castValue + ( + errors);
if (errors.size() 0) {
@@ -571,7 +574,7 @@
return errors; // null is valid, unless required.
}
if (testEnum) {
-errors = enumerationRestriction.validate(errors, value, node,
field);
+errors = enumerationRestriction.validate(errors, castValue, node,
field);
}
errors = uniqueRestriction.validate(errors, castValue, node, field);
errors = validateCastValue(errors, castValue, value, node, field);
@@ -1325,6 +1328,7 @@
if(!isRequired()) return true;
return v != null;
}
+
}
// UNIQUE
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BinaryDataType.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BinaryDataType.java
2009-12-01 17:55:39 UTC (rev 40069)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/BinaryDataType.java
2009-12-01 17:57:16 UTC (rev 40070)
@@ -12,6 +12,8 @@
import org.mmbase.util.logging.*;
import org.mmbase.util.SerializableInputStream;
import org.mmbase.bridge.*;
+import org.mmbase.util.*;
+import java.util.Collection;
import java.io.InputStream;
import java.util.regex.Pattern;
import org.apache.commons.fileupload.FileItem;
@@ -64,6 +66,9 @@
@Override
public long getLength(Object value) {
if (value == null) return 0;
+if (log.isDebugEnabled()) {
+log.debug(Finding lenth for + value);
+}
if (value instanceof byte[]) {
byte[] bytes = (byte[]) value;
if (log.isDebugEnabled()) {
@@ -89,6 +94,10 @@
}
}
+@Override
+protected CollectionLocalizedString
validateRequired(CollectionLocalizedString errors, Object castValue, Object
value, Node node, Field field) {
+return requiredRestriction.validate(errors, castValue, node, field);
+}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40071 - mmbase/trunk/core/src/main/java/org/mmbase/datatypes
Author: michiel
Date: 2009-12-01 18:57:48 +0100 (Tue, 01 Dec 2009)
New Revision: 40071
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/LengthDataType.java
Log:
cosmetic change only. For interfaces 'public' is default
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/LengthDataType.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/LengthDataType.java
2009-12-01 17:57:16 UTC (rev 40070)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/LengthDataType.java
2009-12-01 17:57:48 UTC (rev 40071)
@@ -27,45 +27,45 @@
* this datatype. There does not exist a generic interface for this, so
the implementation
* will cast to the expected type (String, byte[]..)
*/
-public long getLength(Object value);
+long getLength(Object value);
/**
* Returns the minimum length of values for this datatype.
* @return the minimum length as an codeint/code, or 0 if there is no
minimum length.
*/
-public long getMinLength();
+long getMinLength();
/**
* Returns the 'minLength' restriction, containing the value,
errormessages, and fixed status of this attribute.
* @return the restriction as a {...@link DataType.Restriction}
*/
-public DataType.RestrictionLong getMinLengthRestriction();
+DataType.RestrictionLong getMinLengthRestriction();
/**
* Sets the minimum length of binary values for this datatype.
* @param value the minimum length as an codelong/code, or 0 if there
is no minimum length.
* @throws Class Identifier: java.lang.UnsupportedOperationException if
this datatype is finished
*/
-public void setMinLength(long value);
+void setMinLength(long value);
/**
* Returns the maximum length of values for this datatype.
* @return the maximum length as an codelong/code, or a very very big
value
* (codeLong.MAX_VALUE/code) if there is no maximum length.
*/
-public long getMaxLength();
+long getMaxLength();
/**
* Returns the 'maxLength' restriction, containing the value,
errormessages, and fixed status of this attribute.
* @return the restriction as a {...@link DataType.Restriction}
*/
-public DataType.RestrictionLong getMaxLengthRestriction();
+DataType.RestrictionLong getMaxLengthRestriction();
/**
* Sets the maximum length of values for this datatype.
* @param value see {...@link #getMaxLength}
* @throws Class Identifier: java.lang.UnsupportedOperationException if
this datatype is finished
*/
-public void setMaxLength(long value);
+void setMaxLength(long value);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40072 - mmbase/trunk/core/src/main/java/org/mmbase/datatypes
Author: michiel
Date: 2009-12-01 18:58:02 +0100 (Tue, 01 Dec 2009)
New Revision: 40072
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/StringDataType.java
Log:
indentation only
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/StringDataType.java
===
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/StringDataType.java
2009-12-01 17:57:48 UTC (rev 40071)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/StringDataType.java
2009-12-01 17:58:02 UTC (rev 40072)
@@ -342,7 +342,8 @@
}
}
-@Override public StringDataType clone(String name) {
+@Override
+public StringDataType clone(String name) {
StringDataType clone = (StringDataType) super.clone(name);
return clone;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40073 - mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload
Author: michiel
Date: 2009-12-01 19:00:38 +0100 (Tue, 01 Dec 2009)
New Revision: 40073
Added:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package-info.java
Removed:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package.html
Log:
javadoc
Added:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package-info.java
===
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package-info.java
(rev 0)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package-info.java
2009-12-01 18:00:38 UTC (rev 40073)
@@ -0,0 +1,7 @@
+/**
+ * This package contains some helper classes which enables use to 'monitor'
the status of a user upload.
+ * It is used by {...@link org.mmbase.datatypes.handlers.html.MultiPart}
+ * @version $Id$
+ * @since MMBase-1.9.2
+ */
+package org.mmbase.datatypes.handlers.html.upload;
Property changes on:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package-info.java
___
Name: svn:keywords
+ Id
Deleted:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package.html
===
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package.html
2009-12-01 17:58:02 UTC (rev 40072)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/upload/package.html
2009-12-01 18:00:38 UTC (rev 40073)
@@ -1,16 +0,0 @@
-!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
-html
- head
-titleorg.mmbase.datatypes.handlers.html.upload/title
- /head
- body
-p
- This package contains some helper classes which enables use to 'monitor'
the status of a user upload.
-/p
-p
- It is used by a href=../MultiPart.htmlMultiPart/a
-/p
-!-- version of package description $Id: package.html 34900 2009-05-01
16:29:42Z michiel $--
-@since MMBase-1.9.2
- /body
-/html
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40074 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: michiel
Date: 2009-12-01 21:01:40 +0100 (Tue, 01 Dec 2009)
New Revision: 40074
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/TranscoderResult.java
Log:
moved waiting a bit, and added a loop
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-12-01 18:00:38 UTC (rev 40073)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-12-01 20:01:40 UTC (rev 40074)
@@ -158,8 +158,6 @@
for (AnalyzerLogger al : analyzerLoggers) {
al.getAnalyzer().ready(thisJob.getNode(),
result.getDestination());
}
-logger.debug(Analyzer ready, waiting 10 sec. to be sure
filesystem is ready.);
-thisJob.getThread().sleep(1);
resultCount++;
result.ready();
logger.info(RESULT + thisJob + ( +
thisJob.getNode().getNodeManager().getName() + : +
thisJob.getNode().getNumber() + ): + result);
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-12-01 18:00:38 UTC (rev 40073)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-12-01 20:01:40 UTC (rev 40074)
@@ -65,7 +65,18 @@
super.ready();
if (dest != null) {
File outFile = new File(directory,
dest.getStringValue(url).replace(/, File.separator));
-LOG.info(Looking at: + outFile);
+LOG.debug(Looking at: + outFile);
+int count = 0;
+while (!outFile.exists() || outFile.length() 1 count 20) {
+LOG.service(Result ready but, but file + outFile +
(outFile.exists() ? is too small : doesn't exists) + . Waiting 10 sec. to
be sure filesystem is ready ( + count + ));
+try {
+Thread.currentThread().sleep(1);
+count++;
+} catch (InterruptedException ie) {
+LOG.info(Interrupted);
+return;
+}
+}
dest.setLongValue(filesize, outFile.length());
if (outFile.length() = 1) { // @TODO: there should maybe be
other ways to detect if a transcoding failed
dest.setIntValue(state, State.DONE.getValue());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40075 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: michiel
Date: 2009-12-01 21:02:27 +0100 (Tue, 01 Dec 2009)
New Revision: 40075
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
Log:
moved waiting a bit, and added a loop
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-12-01 20:01:40 UTC (rev 40074)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-12-01 20:02:27 UTC (rev 40075)
@@ -67,7 +67,7 @@
File outFile = new File(directory,
dest.getStringValue(url).replace(/, File.separator));
LOG.debug(Looking at: + outFile);
int count = 0;
-while (!outFile.exists() || outFile.length() 1 count 20) {
+while ((!outFile.exists() || outFile.length() 1) count 20) {
LOG.service(Result ready but, but file + outFile +
(outFile.exists() ? is too small : doesn't exists) + . Waiting 10 sec. to
be sure filesystem is ready ( + count + ));
try {
Thread.currentThread().sleep(1);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40076 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: andre
Date: 2009-12-01 21:03:08 +0100 (Tue, 01 Dec 2009)
New Revision: 40076
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
Log:
wait for file
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-12-01 20:02:27 UTC (rev 40075)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-12-01 20:03:08 UTC (rev 40076)
@@ -107,16 +107,17 @@
File f = new File(processor.getDirectory(), url);
assert f.exists() : No such file + f;
-if (!f.exists()) {
-LOG.warn(No such file ' + f + ' waiting 10
sec);
+int w = 0;
+while (!f.exists() w 15) {
+LOG.warn(No such file ' + f + ' waiting 2 sec...);
try {
-getThread().sleep(1);
+getThread().sleep(2000);
+w++;
} catch (java.lang.InterruptedException ie) {
-
+LOG.error(ie);
}
-if (!f.exists()) LOG.error(NO FILE!);
}
-
+if (!f.exists()) LOG.error(NO FILE! ' + f + ', but
continuing anyway.);
inURI = f.toURI();
inNode = node;
} else {
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-12-01 20:02:27 UTC (rev 40075)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-12-01 20:03:08 UTC (rev 40076)
@@ -158,6 +158,8 @@
for (AnalyzerLogger al : analyzerLoggers) {
al.getAnalyzer().ready(thisJob.getNode(),
result.getDestination());
}
+
+
resultCount++;
result.ready();
logger.info(RESULT + thisJob + ( +
thisJob.getNode().getNodeManager().getName() + : +
thisJob.getNode().getNumber() + ): + result);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40077 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: michiel
Date: 2009-12-01 21:28:06 +0100 (Tue, 01 Dec 2009)
New Revision: 40077
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
Log:
a bit less sloppy
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-12-01 20:03:08 UTC (rev 40076)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-12-01 20:28:06 UTC (rev 40077)
@@ -68,7 +68,7 @@
LOG.debug(Looking at: + outFile);
int count = 0;
while ((!outFile.exists() || outFile.length() 1) count 20) {
-LOG.service(Result ready but, but file + outFile +
(outFile.exists() ? is too small : doesn't exists) + . Waiting 10 sec. to
be sure filesystem is ready ( + count + ));
+LOG.service(Result ready, but file + outFile +
(outFile.exists() ? is too small : doesn't exists) + . Waiting 10 sec.
to be sure filesystem is ready ( + count + ));
try {
Thread.currentThread().sleep(1);
count++;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40078 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: andre
Date: 2009-12-01 21:30:28 +0100 (Tue, 01 Dec 2009)
New Revision: 40078
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/TranscoderResult.java
Log:
spacing, log message
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-12-01 20:28:06 UTC (rev 40077)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-12-01 20:30:28 UTC (rev 40078)
@@ -108,16 +108,16 @@
assert f.exists() : No such file + f;
int w = 0;
-while (!f.exists() w 15) {
-LOG.warn(No such file ' + f + ' waiting 2 sec...);
+while (!f.exists() !f.isFile() w 30) {
+LOG.service(Checking if file exists ' + f + '.
Waiting 5 sec. to be sure filesystem is ready ( + w + ));
try {
-getThread().sleep(2000);
+getThread().sleep(5000);
w++;
-} catch (java.lang.InterruptedException ie) {
-LOG.error(ie);
+} catch (InterruptedException ie) {
+LOG.info(Interrupted + ie);
}
}
-if (!f.exists()) LOG.error(NO FILE! ' + f + ', but
continuing anyway.);
+if (!f.exists() !f.isFile()) LOG.error(NO FILE! ' + f
+ ', but continuing anyway.);
inURI = f.toURI();
inNode = node;
} else {
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-12-01 20:28:06 UTC (rev 40077)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-12-01 20:30:28 UTC (rev 40078)
@@ -65,7 +65,6 @@
super.ready();
if (dest != null) {
File outFile = new File(directory,
dest.getStringValue(url).replace(/, File.separator));
-LOG.debug(Looking at: + outFile);
int count = 0;
while ((!outFile.exists() || outFile.length() 1) count 20) {
LOG.service(Result ready, but file + outFile +
(outFile.exists() ? is too small : doesn't exists) + . Waiting 10 sec.
to be sure filesystem is ready ( + count + ));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40079 - mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches
Author: andre
Date: 2009-12-02 00:26:14 +0100 (Wed, 02 Dec 2009)
New Revision: 40079
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/TranscoderResult.java
Log:
sometimes the url field is not set of a streamcaces node resulting in failing
transcodings
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-12-01 20:30:28 UTC (rev 40078)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-12-01 23:26:14 UTC (rev 40079)
@@ -98,15 +98,18 @@
if (results.get(i) == null) {
JobDefinition jd = entry.getValue();
URI inURI;
-Node inNode;
+Node inNode; // inNode (input stream) to be used
-// inNode (input stream) to be used
if (jd.getInId() == null) {
String url = node.getStringValue(url);
+if (url.length() 0) LOG.error(No value for field url:
+ url);
assert url.length() 0;
File f = new File(processor.getDirectory(), url);
+LOG.info(New file: + f);
assert f.exists() : No such file + f;
+/*
+// this does not happen?
int w = 0;
while (!f.exists() !f.isFile() w 30) {
LOG.service(Checking if file exists ' + f + '.
Waiting 5 sec. to be sure filesystem is ready ( + w + ));
@@ -117,7 +120,9 @@
LOG.info(Interrupted + ie);
}
}
+*/
if (!f.exists() !f.isFile()) LOG.error(NO FILE! ' + f
+ ', but continuing anyway.);
+
inURI = f.toURI();
inNode = node;
} else {
@@ -180,6 +185,7 @@
File inFile = new File(processor.getDirectory(),
Job.this.node.getStringValue(url).replace(/, File.separator));
+
StringBuilder buf = new StringBuilder();
org.mmbase.storage.implementation.database.DatabaseStorageManager.appendDirectory(buf,
Job.this.node.getNumber(), /);
buf.append(/);
@@ -188,17 +194,39 @@
if (outFileName.startsWith(/)) {
outFileName = outFileName.substring(1);
}
+if (outFileName == null outFileName.length() 1) {
+LOG.error(NO outFileName ' + outFileName + ');
+}
assert outFileName != null;
assert outFileName.length() 0;
dest.setStringValue(url, outFileName);
dest.commit();
+String destFileName = dest.getStringValue(url);
+if (destFileName == null destFileName.length() 1) {
+LOG.error(NO destFileName ' + destFileName + ');
+}
+
+assert destFileName != null;
+assert destFileName.length() 0;
+
+int w = 0;
+while (destFileName == null destFileName.length() 1
w 10) {
+LOG.service(Checking for destFileName ' +
destFileName + '. Waiting 5 sec. to be sure the node is commited ( + w + ));
+try {
+getThread().sleep(5000);
+w++;
+} catch (InterruptedException ie) {
+LOG.info(Interrupted + ie);
+}
+destFileName = dest.getStringValue(url);
+}
+
+File outFile = new File(processor.getDirectory(),
destFileName);
-String destFile = dest.getStringValue(url);
-assert destFile != null;
-assert destFile.length() 0;
-File outFile = new File(processor.getDirectory(),
destFile);
+// does not happen?
+if (!outFile.exists() !outFile.isFile()) LOG.error(NO
FILE! ' + outFile + ', but continuing anyway.);
if (FileServlet.getInstance() != null) {
File inMeta =
FileServlet.getInstance().getMetaFile(inFile);
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
[MMBASE SCM] r40080 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
Author: kevinshen
Date: 2009-12-02 02:38:25 +0100 (Wed, 02 Dec 2009)
New Revision: 40080
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1581 Content/Asset channel explorer: select all checkbox is missing label.
Adding a bit of padding between the checkbox and the label
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -132,7 +132,7 @@
tr
th% if (role != null
SecurityUtil.isWriter(role)) { %
c:if test=${fn:length(elements) 1}
- input type=checkbox name=selectall
class=checkbox onclick=selectAll(this.checked, 'assetForm', 'chk_');
value=on style=margin:0px 0px 0px 4px !important; margin:0px 0px
!important;margin:0px 0px;/span
style=position:absolute;text-transform:nonefmt:message
key=locate.selectall //span/c:if % } %/th
+ input type=checkbox name=selectall
class=checkbox onclick=selectAll(this.checked, 'assetForm', 'chk_');
value=on style=margin:0px 0px 0px 4px !important; margin:0px 0px
!important;margin:0px 0px;/span
style=padding-left:4px;position:absolute;text-transform:nonefmt:message
key=locate.selectall //span/c:if % } %/th
tha href=javascript:sortBy('Asset',
'otype','mm:write referid=parentchannel /') class=headerlink
fmt:message key=asset.typecolumn//a/th
tha href=javascript:sortBy('Asset',
'title','mm:write referid=parentchannel /') class=headerlink
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -406,7 +406,7 @@
th
mm:present referid=returnurlinput type=hidden
name=returnurl value=mm:write referid=returnurl///mm:present
c:if test=${fn:length(results) 1}
- input type=checkbox onclick=selectAll(this.checked,
'linkForm', 'chk_'); class=checkbox value=on name=selectall
style=margin:0px 0px 0px 4px !important; margin:0px 0px !important;margin:0px
0px;/span style=position:absolute;text-transform:nonefmt:message
key=locate.selectall //span
+ input type=checkbox onclick=selectAll(this.checked,
'linkForm', 'chk_'); class=checkbox value=on name=selectall
style=margin:0px 0px 0px 4px !important; margin:0px 0px !important;margin:0px
0px;/span
style=padding-left:4px;position:absolute;text-transform:nonefmt:message
key=locate.selectall //span
/c:if
/th
tha href=javascript:orderBy('otype') class=headerlink
fmt:message key=locate.typecolumn //a/th
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
2009-12-01 23:26:14 UTC (rev 40079)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp
2009-12-02 01:38:25 UTC (rev 40080)
@@ -111,7 +111,7 @@
tr
th% if (role != null SecurityUtil.isWriter(role)) { %
c:if test=${fn:length(elements) 1}
-input type=checkbox name=selectall class=checkbox
onclick=selectAll(this.checked, 'contentForm', 'chk_'); value=on
style=margin:0px 0px 0px 4px !important; margin:0px 0px !important;margin:0px
0px;/span style=position:absolute;text-transform:nonefmt:message
key=locate.selectall //span
+input type=checkbox name=selectall class=checkbox
onclick=selectAll(this.checked, 'contentForm', 'chk_'); value=on
style=margin:0px 0px 0px 4px !important; margin:0px 0px !important;margin:0px
0px;/span
[MMBASE SCM] r40081 - CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
Author: raintang Date: 2009-12-02 07:17:31 +0100 (Wed, 02 Dec 2009) New Revision: 40081 Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java Log: CMSC-1577 Error when exiting personalpage editwizards Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java === --- CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-12-02 01:38:25 UTC (rev 40080) +++ CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java 2009-12-02 06:17:31 UTC (rev 40081) @@ -42,5 +42,5 @@ return mapping.findForward(SUCCESS); } } - + } } ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
