vgritsenko 2004/02/12 16:24:31
Modified: src/java/org/apache/cocoon/generation
JXTemplateGenerator.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_JavaScriptInterpreter.java
Removed: src/java/org/apache/cocoon/components/flow/javascript
JSCocoon.java JSGlobal.java JSLog.java
JSWebContinuation.java JavaScriptFlow.java
JavaScriptInterpreter.java system.js
Log:
Remove non-FOM flow classes and system.js
Revision Changes Path
1.37 +23 -22
cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- JXTemplateGenerator.java 5 Feb 2004 19:32:18 -0000 1.36
+++ JXTemplateGenerator.java 13 Feb 2004 00:24:31 -0000 1.37
@@ -78,7 +78,6 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.flow.WebContinuation;
-import org.apache.cocoon.components.flow.javascript.JavaScriptFlow;
import
org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -974,7 +973,7 @@
location, exc);
} catch (Error err) {
throw new SAXParseException(errorPrefix + err.getMessage(),
- location,
+ location,
new ErrorHolder(err));
}
}
@@ -1257,7 +1256,7 @@
throw new
SAXParseException(err.getMessage(),
this.location,
new
ErrorHolder(err));
-
+
}
substitutions.add(new Expression(str,
compiledExpression));
@@ -2884,7 +2883,7 @@
}
cocoon.put("context",
FOM_JavaScriptFlowHelper.getFOM_Context(objectModel));
- cocoon.put("continuation",
+ cocoon.put("continuation",
FOM_JavaScriptFlowHelper.getFOM_WebContinuation(objectModel));
cocoon.put("parameters", Parameters.toProperties(parameters));
this.variables = new MyVariables(cocoon, contextObject, kont,
request,
@@ -2909,8 +2908,8 @@
// FIXME (VG): Is this required (what it's used for - examples)?
// Here I use Rhino's live-connect objects to allow Jexl to call
// java constructors
- Object javaPkg = JavaScriptFlow.getJavaPackage(objectModel);
- Object pkgs = JavaScriptFlow.getPackages(objectModel);
+ Object javaPkg =
FOM_JavaScriptFlowHelper.getJavaPackage(objectModel);
+ Object pkgs = FOM_JavaScriptFlowHelper.getPackages(objectModel);
map.put("java", javaPkg);
map.put("Packages", pkgs);
}
@@ -2986,7 +2985,7 @@
event.location, e);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- event.location,
+ event.location,
new ErrorHolder(err));
}
}
@@ -3082,9 +3081,11 @@
}
}
*/
+
private void executeDOM(final XMLConsumer consumer,
- MyJexlContext jexlContext, JXPathContext jxpathContext,
- Node node) throws SAXException {
+ MyJexlContext jexlContext,
+ JXPathContext jxpathContext,
+ Node node) throws SAXException {
DOMStreamer streamer = new DOMStreamer(consumer);
streamer.stream(node);
}
@@ -3196,7 +3197,7 @@
ev.location, e);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new
ErrorHolder(err));
}
}
@@ -3245,7 +3246,7 @@
ev.location, e);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
boolean result = false;
@@ -3332,7 +3333,7 @@
ev.location, exc);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
MyJexlContext localJexlContext =
@@ -3510,7 +3511,7 @@
ev.location,
e);
} catch (Error err) {
throw new
SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new
ErrorHolder(err));
}
if (val == null) {
@@ -3539,7 +3540,7 @@
} catch (Error err) {
throw new SAXParseException(
err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
if (val == null) {
@@ -3619,7 +3620,7 @@
ev.location,
e);
} catch (Error err) {
throw new
SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new
ErrorHolder(err));
}
if (val == null) {
@@ -3650,7 +3651,7 @@
ev.location, e);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
} else if (ev instanceof StartFormatDate) {
@@ -3667,7 +3668,7 @@
ev.location, e);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
} else if (ev instanceof StartPrefixMapping) {
@@ -3758,7 +3759,7 @@
ev.location, exc);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
ev = startEval.endInstruction.next;
@@ -3773,7 +3774,7 @@
ev.location, exc);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
ev = startEval.endInstruction.next;
@@ -3810,7 +3811,7 @@
ev.location,
exc);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new
ErrorHolder(err));
}
if (val == null) {
@@ -3884,7 +3885,7 @@
ev.location, exc);
} catch (Error err) {
throw new SAXParseException(err.getMessage(),
- ev.location,
+ ev.location,
new ErrorHolder(err));
}
}
1.22 +19 -19
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Index: FOM_JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FOM_JavaScriptInterpreter.java 11 Feb 2004 18:15:29 -0000 1.21
+++ FOM_JavaScriptInterpreter.java 13 Feb 2004 00:24:31 -0000 1.22
@@ -203,7 +203,7 @@
while (iter.hasNext()) {
Map.Entry e = (Map.Entry)iter.next();
String uri = (String)e.getKey();
- SourceValidity validity =
+ SourceValidity validity =
(SourceValidity)e.getValue();
int valid = validity.isValid();
if (valid == SourceValidity.UNKNOWN) {
@@ -293,7 +293,7 @@
javaSourcePath[i++] = izer.nextToken();
}
} else {
- javaSourcePath = new String[]{""};
+ javaSourcePath = new String[]{""};
}
updateSourcePath();
}
@@ -339,7 +339,7 @@
}
if (reload) {
classLoader = new CompilingClassLoader(
- Thread.currentThread().getContextClassLoader(),
+ Thread.currentThread().getContextClassLoader(),
(SourceResolver)manager.lookup(SourceResolver.ROLE),
javaClassRepository);
classLoader.addSourceListener(
@@ -350,7 +350,7 @@
public void sourceCompilationError(Source src,
String
errMsg) {
-
+
if (src != null) {
throw Context.reportRuntimeError(errMsg);
}
@@ -518,9 +518,9 @@
context.newObject(thrScope, "FOM_Cocoon", args);
cocoon.setParentScope(thrScope);
thrScope.put("cocoon", thrScope, cocoon);
- ((ScriptableObject)thrScope).defineProperty(LAST_EXEC_TIME,
- new Long(0),
- ScriptableObject.DONTENUM | ScriptableObject.PERMANENT);
+ thrScope.defineProperty(LAST_EXEC_TIME,
+ new Long(0),
+ ScriptableObject.DONTENUM |
ScriptableObject.PERMANENT);
thrScope.reset();
return thrScope;
@@ -533,7 +533,7 @@
* <p>If you want to maintain the state of global variables across
* multiple invocations of <code><map:call
* function="..."></code>, you need to instanciate the session
- * object which is a property of the cocoon object
+ * object which is a property of the cocoon object
* <code>var session = cocoon.session</code>. This will place the
* newly create Scriptable object in the user's session, where it
* will be retrieved from at the next invocation of [EMAIL PROTECTED]
#callFunction}.</p>
@@ -568,7 +568,7 @@
// We need to setup the FOM_Cocoon object according to the current
// request. Everything else remains the same.
thrScope.setupPackages(getClassLoader(needsRefresh));
- cocoon.pushCallContext(this, environment, manager, serviceManager,
+ cocoon.pushCallContext(this, environment, manager, serviceManager,
avalonContext, getLogger(), null);
// Check if we need to compile and/or execute scripts
@@ -620,7 +620,7 @@
/**
* Compile filename as JavaScript code
- *
+ *
* @param cx Rhino context
* @param environment source resolver
* @param fileName resource uri
@@ -642,7 +642,7 @@
}
compiledScript = entry.getScript(cx, this.scope, false,
this);
return compiledScript;
- }
+ }
} else {
throw new ResourceNotFoundException(fileName + ": not found");
}
@@ -659,7 +659,7 @@
return compiledScript;
} finally {
is.close();
- }
+ }
} else {
throw new ResourceNotFoundException(src.getURI() + ": not
found");
}
@@ -689,7 +689,7 @@
try {
setupContext(environment, context, thrScope, classLoader);
cocoon = (FOM_Cocoon)thrScope.get("cocoon", thrScope);
-
+
// Register the current scope for scripts indirectly called
from this function
cocoon.getRequest().setAttribute(
FOM_JavaScriptFlowHelper.FOM_SCOPE, thrScope);
@@ -773,8 +773,8 @@
Scriptable kScope = k.getParentScope();
synchronized (kScope) {
FOM_Cocoon cocoon = (FOM_Cocoon)kScope.get("cocoon", kScope);
- cocoon.pushCallContext(this, environment, manager,
- serviceManager, avalonContext,
+ cocoon.pushCallContext(this, environment, manager,
+ serviceManager, avalonContext,
getLogger(), wk);
// Register the current scope for scripts indirectly called from
this function
cocoon.getRequest().setAttribute(
@@ -792,7 +792,7 @@
cocoon.setParameters(parameters);
FOM_WebContinuation fom_wk = new FOM_WebContinuation(wk);
fom_wk.setParentScope(kScope);
- fom_wk.setPrototype(ScriptableObject.getClassPrototype(kScope,
+ fom_wk.setPrototype(ScriptableObject.getClassPrototype(kScope,
fom_wk.getClassName()));
Object[] args = new Object[] {k, fom_wk};
try {
@@ -842,9 +842,9 @@
Object bizData, FOM_WebContinuation fom_wk,
Environment environment) throws Exception {
setupView(scope, cocoon, environment, fom_wk);
- super.forwardTo(uri, bizData,
+ super.forwardTo(uri, bizData,
fom_wk == null ? null :
- fom_wk.getWebContinuation(),
+ fom_wk.getWebContinuation(),
environment);
}
