cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom AO_FOM_JavaScriptInterpreter.java

[reinhard]

reinhard    2003/09/12 11:18:36

  Modified:    
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom
                        AO_FOM_JavaScriptInterpreter.java
  Log:
  - set the postfix for generated result scripts in a string constant
  
  Revision  Changes    Path
  1.4       +11 -2     
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AO_FOM_JavaScriptInterpreter.java 12 Sep 2003 14:47:27 -0000      1.3
  +++ AO_FOM_JavaScriptInterpreter.java 12 Sep 2003 18:18:36 -0000      1.4
  @@ -131,16 +131,24 @@
       // in the Christoper Oliver's Rhino JavaScript implementation
       static int OPTIMIZATION_LEVEL = -2;
   
  +    // the postfix of the resulting file streamed into the same directory as
  +    // the basescript
  +    // (RPO) added/changed by interception layer        
  +    public static final String INTERCEPTION_POSTFIX = "_intercepted.js";
  +    // end
  +         
       /**
        * When was the last time we checked for script modifications. Used
        * only if [EMAIL PROTECTED] #reloadScripts} is true.
        */
       protected long lastTimeCheck = 0;
   
  +    // (RPO) added/changed by interception layer      
       /**
        * Are interceptions enabled?
        */
       private boolean isInterceptionEnabled;
  +    // end
   
       /**
        * Shared global scope for scripts and other immutable objects
  @@ -490,6 +498,7 @@
                       JavaScriptAspectWeaver aspectWeaver = new 
JavaScriptAspectWeaver();
                       aspectWeaver.setEnvironment( environment );
                       aspectWeaver.enableLogging( this.getLogger() );
  +                    aspectWeaver.setCopyResultScript( this.copyResultScript 
);
                       aspectWeaver.setStopExecutionFunctionsConf( 
this.stopExecutionFunctionsConf );
                       entry.setAspectWeaver( aspectWeaver );
                   }        
  @@ -569,7 +578,7 @@
               this.getLogger().info( "Adding interceptions to script " + 
src.getURI() );
               Reader reader = new BufferedReader( 
                                       
aspectWeaver.getInterceptedScriptAsReader() );
  -            compiledScript = cx.compileReader(scope, reader, src.getURI() + 
"_intercepted", 1, null );            
  +            compiledScript = cx.compileReader(scope, reader, src.getURI() + 
INTERCEPTION_POSTFIX, 1, null );            
           }
           return compiledScript;
       }