Author: xavier
Date: Thu Jul 5 09:17:04 2007
New Revision: 553548
URL: http://svn.apache.org/viewvc?view=rev&rev=553548
Log:
upgrade xooki version: fix bug with check up to date + auto detect non xooki
files in batch processing
Modified:
incubator/ivy/site/xooki/antlib.xml
incubator/ivy/site/xooki/xooki.js
Modified: incubator/ivy/site/xooki/antlib.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/site/xooki/antlib.xml?view=diff&rev=553548&r1=553547&r2=553548
==============================================================================
--- incubator/ivy/site/xooki/antlib.xml (original)
+++ incubator/ivy/site/xooki/antlib.xml Thu Jul 5 09:17:04 2007
@@ -15,6 +15,7 @@
srcFiles = ds.getIncludedFiles();
// iterate over that array
+ print('processing '+srcFiles.length+' source files...');
for (i=0; i<srcFiles.length; i++) {
// get the values via Java API
@@ -29,7 +30,7 @@
upToDate = project.createTask("uptodate");
upToDate.setProperty(p);
upToDate.setSrcfile(file);
- upToDate.setTargetFile(new
File(attributes.get("destdir")+"/"+filepath));
+ upToDate.setTargetFile(new
File(attributes.get("destdir")+"/"+filepath+"/"+filename));
upToDate.perform();
if (project.getProperty(p) != null) {
self.log(srcFiles[i]+" is up to date", 3);
Modified: incubator/ivy/site/xooki/xooki.js
URL:
http://svn.apache.org/viewvc/incubator/ivy/site/xooki/xooki.js?view=diff&rev=553548&r1=553547&r2=553548
==============================================================================
--- incubator/ivy/site/xooki/xooki.js (original)
+++ incubator/ivy/site/xooki/xooki.js Thu Jul 5 09:17:04 2007
@@ -792,128 +792,43 @@
xooki.io = {};
}
-if (batchMode) {
- importPackage(java.io);
-
- xooki.io.loadFile = function( url, warnOnError ) {
- var str = '';
- try {
- var r = new BufferedReader(new FileReader(url));
- line = r.readLine();
- while (line != null) {
- str += line + '\n';
- line = r.readLine();
- }
- r.close();
- } catch (e) {
- if (warnOnError) {
- throw e;
- } else {
- xooki.debug("error occured while loading "+url);
- }
- }
- return str;
- };
-
- xooki.io.saveFile = function (fileUrl, content) {
- p = new File(fileUrl).getParentFile();
- if (p != null) {
- p.mkdirs();
- }
- pw = new PrintWriter(new FileWriter(fileUrl));
- pw.write(content);
- pw.close();
- return true;
- }
- xooki.url.loadURL = function( url, warnOnError ) {
- return xooki.io.loadFile(url, warnOnError );
- };
-
- xooki.html.addHeader = function (head) {
- xooki.pageContent = xooki.pageContent.replace(/<\/head>/,
head+'\n</head>');
- };
-
- xooki.html.setBody = function(body) {
- xooki.pageContent =
xooki.pageContent.replace(/<body>(.|[^,])*<\/body>/gm, '<body>'+body+'</body>');
- }
-
- xooki.url.include = function(script_filename) {
- xooki.html.addHeader('<script language="javascript"
type="text/javascript"
src="'+xooki.c.relativeRoot+'xooki/'+script_filename+'"></script>');
- };
-
- xooki.input.source = function() {
- if (typeof this._source == 'undefined') {
- xooki.debug('searching source');
- var beg = xooki.pageContent.indexOf('<textarea
id="xooki-source">');
- beg += '<textarea id="xooki-source">'.length;
- var end = xooki.pageContent.lastIndexOf('</textarea>');
- this._source = xooki.pageContent.substring(beg, end);
- xooki.debug('source found');
- }
- return this._source;
+xooki.action = {}
+xooki.action.toggleDebug = function() {
+ if (xooki.c.debug) {
+ if (document.getElementById('xooki-debug').style.display == 'none') {
+ xooki.html.show('xooki-debug');
+ } else {
+ xooki.html.hide('xooki-debug');
+ }
}
-
- xooki.render.page = function() {
- // realize all components available
- xooki.debug('realizing components');
- for (var k in xooki.component) {
- xooki.c[k] = xooki.component[k]();
- }
-
- xooki.debug('processing body');
- xooki.c.body = xooki.input.processed();
-
- xooki.debug('updating body');
- var body = xooki.string.processTemplate(xooki.template.body,
xooki.c);
- xooki.html.setBody(body);
- };
+}
+xooki.action.evaluate = function () {
+ var exp = prompt("Please enter javascript expression to evaluate");
+ xooki.debugShowDetail(eval(exp));
+}
- xooki.display = function(message, background) {
- print(message);
- };
-
- xooki.debug = function (message) {
- if (xooki.c.debug) {
- print(message+'\n');
- }
- };
- var i=0;
- if (arguments.length > i && arguments[0] == '-debug') {
- xooki.c.debug = true;
- i++;
- } else {
- xooki.c.debug = false;
- }
-
- var file = 'index.html';
- if (arguments.length > i) {
- file = arguments[i];
- i++;
+// TODO, review use registration
+function keyCtrl(evt) {
+ var code = xooki.c.browser.NS ? evt.which : event.keyCode;
+ var ctrl = xooki.c.browser.NS ? evt.ctrlKey : event.ctrlKey;
+ var key = String.fromCharCode(code);
+ if (xooki.c.debug && ctrl && "d" == key) {
+ xooki.action.toggleDebug();
+ return false;
}
- var generateToDir = "gen";
- if (arguments.length > i) {
- generateToDir = arguments[i];
- i++;
+ if (xooki.c.allowEdit && ctrl && "s" == key) {
+ xooki.action.saveChanges();
+ return false;
}
-
- print('processing '+file+'...\n');
- xooki.pageContent = xooki.io.loadFile(file);
-
- var m = /var\s+xookiConfig\s+=\s+{.*};/.exec(xooki.pageContent);
- if (typeof m != 'undefined' && m != null) {
- eval(m[0]);
+ if (xooki.c.allowEdit && ctrl && "e" == key) {
+ xooki.action.toggleEdit();
+ return false;
}
}
-if (batchMode) {
- xooki.pageURL = new File(file).toURL().toExternalForm();
-} else {
- xooki.pageURL = window.location.toString();
-}
-
-// init xooki engine
-(function() {
+// xooki engine init function
+xooki.init = function() {
////////////////////////////////////////////////////////////////////////////
////////////////// config init
////////////////////////////////////////////////////////////////////////////
@@ -1138,48 +1053,137 @@
xooki.debug(k+": "+xooki.c[k]);
}
}
-})();
+};
-xooki.action = {}
-xooki.action.toggleDebug = function() {
- if (xooki.c.debug) {
- if (document.getElementById('xooki-debug').style.display == 'none') {
- xooki.html.show('xooki-debug');
- } else {
- xooki.html.hide('xooki-debug');
- }
+if (batchMode) {
+ importPackage(java.io);
+
+ xooki.io.loadFile = function( url, warnOnError ) {
+ var str = '';
+ try {
+ var r = new BufferedReader(new FileReader(url));
+ line = r.readLine();
+ while (line != null) {
+ str += line + '\n';
+ line = r.readLine();
+ }
+ r.close();
+ } catch (e) {
+ if (warnOnError) {
+ throw e;
+ } else {
+ xooki.debug("error occured while loading "+url);
+ }
+ }
+ return str;
+ };
+
+ xooki.io.saveFile = function (fileUrl, content) {
+ p = new File(fileUrl).getParentFile();
+ if (p != null) {
+ p.mkdirs();
+ }
+ pw = new PrintWriter(new FileWriter(fileUrl));
+ pw.write(content);
+ pw.close();
+ return true;
}
-}
-xooki.action.evaluate = function () {
- var exp = prompt("Please enter javascript expression to evaluate");
- xooki.debugShowDetail(eval(exp));
-}
-// TODO, review use registration
-function keyCtrl(evt) {
- var code = xooki.c.browser.NS ? evt.which : event.keyCode;
- var ctrl = xooki.c.browser.NS ? evt.ctrlKey : event.ctrlKey;
- var key = String.fromCharCode(code);
- if (xooki.c.debug && ctrl && "d" == key) {
- xooki.action.toggleDebug();
- return false;
+ xooki.url.loadURL = function( url, warnOnError ) {
+ return xooki.io.loadFile(url, warnOnError );
+ };
+
+ xooki.html.addHeader = function (head) {
+ xooki.pageContent = xooki.pageContent.replace(/<\/head>/,
head+'\n</head>');
+ };
+
+ xooki.html.setBody = function(body) {
+ xooki.pageContent =
xooki.pageContent.replace(/<body>(.|[^,])*<\/body>/gm, '<body>'+body+'</body>');
}
- if (xooki.c.allowEdit && ctrl && "s" == key) {
- xooki.action.saveChanges();
- return false;
+
+ xooki.url.include = function(script_filename) {
+ xooki.html.addHeader('<script language="javascript"
type="text/javascript"
src="'+xooki.c.relativeRoot+'xooki/'+script_filename+'"></script>');
+ };
+
+ xooki.input.source = function() {
+ if (typeof this._source == 'undefined') {
+ xooki.debug('searching source');
+ var beg = xooki.pageContent.indexOf('<textarea
id="xooki-source">');
+ beg += '<textarea id="xooki-source">'.length;
+ var end = xooki.pageContent.lastIndexOf('</textarea>');
+ this._source = xooki.pageContent.substring(beg, end);
+ xooki.debug('source found');
+ }
+ return this._source;
}
- if (xooki.c.allowEdit && ctrl && "e" == key) {
- xooki.action.toggleEdit();
- return false;
+
+ xooki.render.page = function() {
+ // realize all components available
+ xooki.debug('realizing components');
+ for (var k in xooki.component) {
+ xooki.c[k] = xooki.component[k]();
+ }
+
+ xooki.debug('processing body');
+ xooki.c.body = xooki.input.processed();
+
+ xooki.debug('updating body');
+ var body = xooki.string.processTemplate(xooki.template.body,
xooki.c);
+ xooki.html.setBody(body);
+ };
+
+ xooki.display = function(message, background) {
+ print(message);
+ };
+
+ xooki.debug = function (message) {
+ if (xooki.c.debug) {
+ print(message+'\n');
+ }
+ };
+ var i=0;
+ if (arguments.length > i && arguments[0] == '-debug') {
+ xooki.c.debug = true;
+ i++;
+ } else {
+ xooki.c.debug = false;
+ }
+
+ var file = 'index.html';
+ if (arguments.length > i) {
+ file = arguments[i];
+ i++;
+ }
+ var generateToDir = "gen";
+ if (arguments.length > i) {
+ generateToDir = arguments[i];
+ i++;
}
-}
-if (batchMode) {
- xooki.pageContent = xooki.pageContent.replace(/<script
type="text\/javascript" src="[^"]*xooki.js"><\/script>/g, '');
+ xooki.pageURL = new File(file).toURL().toExternalForm();
- xooki.render.page();
+ print('processing '+new File(file).getAbsolutePath()+'...\n');
+ xooki.pageContent = xooki.io.loadFile(file);
+
+ if (xooki.pageContent.match(/<textarea\s+id="xooki\-source">/) == null) {
+ print(file + ' is not a valid xooki source. ignored.');
+ } else {
+ var m = /var\s+xookiConfig\s+=\s+{.*};/.exec(xooki.pageContent);
+ if (typeof m != 'undefined' && m != null) {
+ eval(m[0]);
+ }
+
+ xooki.init();
+
+ xooki.pageContent = xooki.pageContent.replace(/<script
type="text\/javascript" src="[^"]*xooki.js"><\/script>/g, '');
+
+ xooki.render.page();
- print('generating to '+generateToDir+'/'+file);
- xooki.io.saveFile(generateToDir+'/'+file, xooki.pageContent);
+ print('generating to '+generateToDir+'/'+file);
+ xooki.io.saveFile(generateToDir+'/'+file, xooki.pageContent);
+ }
+} else {
+ xooki.pageURL = window.location.toString();
+ xooki.init();
}
