You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by jb...@apache.org on 2010/06/12 21:35:56 UTC
svn commit: r954066 - in /commons/sandbox/gsoc/2010/scxml-js/trunk: build.js
src/scxml/cgf/SCXMLCompiler.js test/xslt/AbstractStatechartGenerator.xsl
Author: jbeard
Date: Sat Jun 12 19:35:56 2010
New Revision: 954066
URL: http://svn.apache.org/viewvc?rev=954066&view=rev
Log:
Intermediate commit. Working on getting executable content to work again for the state pattern.
Modified:
commons/sandbox/gsoc/2010/scxml-js/trunk/build.js
commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js
commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/build.js
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/build.js?rev=954066&r1=954065&r2=954066&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build.js (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build.js Sat Jun 12 19:35:56 2010
@@ -64,15 +64,15 @@ require.def("build",
"Safari" : { host:"localhost", port:4444, browser:"*safari" , ie: false},
//FIXME: selenium is unhappy with opera
//"Opera" : { host:"localhost", port:4444, browser:"*opera" , ie: false},
- //"IE" : { host:"localhost", port:4444, browser:"*iexplore", ie:true },
+ "IE" : { host:"localhost", port:4444, browser:"*iexplore", ie:true },
"Chrome" : { host:"localhost", port:4444, browser:"*googlechrome", ie:false }
}
//paths to all of the SCXML files we want to compile
var scxmlTests = {
- KitchenSink :"test/kitchen_sink/KitchenSink.xml",
+ //KitchenSink :"test/kitchen_sink/KitchenSink.xml",
//KitchenSink_performance :"test/kitchen_sink/KitchenSink_performance.xml",
- //KitchenSink_executableContent :"test/kitchen_sink/KitchenSink_executableContent.xml"
+ KitchenSink_executableContent :"test/kitchen_sink/KitchenSink_executableContent.xml"
}
@@ -85,16 +85,16 @@ require.def("build",
var unitTestScripts = [
+/*
{
path : "test/kitchen_sink/scripts/unitTest.js",
scxmlTest : scxmlTests.KitchenSink //back-link
},
- /*
+*/
{
path : "test/kitchen_sink/scripts/unitTest_executableContent.js",
scxmlTest : scxmlTests.KitchenSink_executableContent //back-link
}
- */
]
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js?rev=954066&r1=954065&r2=954066&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js Sat Jun 12 19:35:56 2010
@@ -365,17 +365,14 @@ require.def("src/scxml/cgf/SCXMLCompiler
var transformer = tFactory.newTransformer(new StreamSource("./test/xslt/StatePatternStatechartGenerator.xsl"));
//set parameters
- /*
- for(var paramName in conf){
- transformer.setParameter(paramName,conf[paramName]);
+ for(var oName in options){
+ transformer.setParameter(oName,options[oName]);
}
- */
transformer.transform(new StreamSource("build/tmp.xml"), new StreamResult(outWriter));
var transformedJs = new String(outWriter.toString()); //convert him from Java string to js string for js_beautify
if(options.beautify){
- debugger;
transformedJs = js_beautify(transformedJs);
}
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl?rev=954066&r1=954065&r2=954066&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl Sat Jun 12 19:35:56 2010
@@ -85,7 +85,7 @@
<call-template name="genContextHooks"/>
//initialization script
- <value-of select="script"/>
+ <value-of select="s:script"/>
//initialization method
<call-template name="genInitialization"/>
@@ -258,7 +258,13 @@
</template>
<template match="s:log">
- console.log(' <value-of select="@label"/> : ' + <value-of select="@expr"/> );
+ <if test="@label">
+ console.log( ' <value-of select="@label"/> : ' );
+ </if>
+ <if test="@expr">
+ console.log( <value-of select="@expr"/> );
+
+ </if>
</template>
<template match="s:raise">