reinhard 2003/09/12 11:41:36
Modified:
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom
AO_FOM_JavaScriptInterpreter.java
JavaScriptAspectWeaver.java
src/blocks/scratchpad/conf intercepted-flow.xconf
Log:
- copyResultScript is not correct, serializeResultScript is a better name
Revision Changes Path
1.5 +5 -5
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
Index: AO_FOM_JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AO_FOM_JavaScriptInterpreter.java 12 Sep 2003 18:18:36 -0000 1.4
+++ AO_FOM_JavaScriptInterpreter.java 12 Sep 2003 18:41:36 -0000 1.5
@@ -242,7 +242,7 @@
// (RPO) added by interception layer
Configuration stopExecutionFunctionsConf = null;
- boolean copyResultScript = false;
+ boolean serializeResultScript = false;
// --end
public void configure(Configuration config)
@@ -267,8 +267,8 @@
config.getChild( "enable-interception" ).getValueAsBoolean( true
);
stopExecutionFunctionsConf =
config.getChild( "cont-creating-functions" );
- copyResultScript =
- config.getChild( "copy-result-script" ).getValueAsBoolean( false
);
+ serializeResultScript =
+ config.getChild( "serialize-result-script" ).getValueAsBoolean(
false );
// --end
}
@@ -498,7 +498,7 @@
JavaScriptAspectWeaver aspectWeaver = new
JavaScriptAspectWeaver();
aspectWeaver.setEnvironment( environment );
aspectWeaver.enableLogging( this.getLogger() );
- aspectWeaver.setCopyResultScript( this.copyResultScript
);
+ aspectWeaver.setSerializeResultScriptParam(
this.serializeResultScript );
aspectWeaver.setStopExecutionFunctionsConf(
this.stopExecutionFunctionsConf );
entry.setAspectWeaver( aspectWeaver );
}
1.6 +5 -5
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/JavaScriptAspectWeaver.java
Index: JavaScriptAspectWeaver.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/JavaScriptAspectWeaver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaScriptAspectWeaver.java 12 Sep 2003 18:26:54 -0000 1.5
+++ JavaScriptAspectWeaver.java 12 Sep 2003 18:41:36 -0000 1.6
@@ -125,7 +125,7 @@
Environment environement = null;
/** If debugging is true, the intercepted script is writen to filesystem
*/
- boolean copyResultScript = false;
+ boolean serializeResultScript = false;
/** Base script <code>org.apache.excalibur.source.Source</code>*/
Source source = null;
@@ -188,7 +188,7 @@
this.getLogger().info( "\n\n" + this.baseScriptTokenList.toString()
+ "\n" );
// create a file to make debugging easier
- if( copyResultScript ) {
+ if( serializeResultScript ) {
this.baseScriptTokenList.writeToFile( this.source );
}
@@ -230,8 +230,8 @@
* Should the JavaScriptAspectWeaver write the result script
* into separate file in the same directory as the basescript?
*/
- public void setCopyResultScript( boolean copy ) {
- this.copyResultScript = copy;
+ public void setSerializeResultScriptParam( boolean serialize ) {
+ this.serializeResultScript = serialize;
}
/**
1.4 +1 -1
cocoon-2.1/src/blocks/scratchpad/conf/intercepted-flow.xconf
Index: intercepted-flow.xconf
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/conf/intercepted-flow.xconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- intercepted-flow.xconf 12 Sep 2003 18:22:13 -0000 1.3
+++ intercepted-flow.xconf 12 Sep 2003 18:41:36 -0000 1.4
@@ -27,7 +27,7 @@
[yourPath]/[yourBasescript-name]_intercepted.js which will be
overwritten
-->
- <copy-result-script>false</copy-result-script>
+ <serialize-result-script>false</serialize-result-script>
</component-instance>
</xconf>
