vgritsenko 2004/02/16 13:31:02
Modified: . status.xml
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_JavaScriptInterpreter.java
src/java/org/apache/cocoon/generation
JXTemplateGenerator.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.180 +4 -1 cocoon-2.2/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/status.xml,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- status.xml 16 Feb 2004 04:51:28 -0000 1.179
+++ status.xml 16 Feb 2004 21:31:02 -0000 1.180
@@ -189,6 +189,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="VG" type="remove">
+ Remove non-FOM flow classes and system.js
+ </action>
<action dev="AG" type="update">
Updated commons-httpclient to 2.0-final
</action>
1.14 +4 -5
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Index: FOM_JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FOM_JavaScriptInterpreter.java 26 Dec 2003 18:43:39 -0000 1.13
+++ FOM_JavaScriptInterpreter.java 16 Feb 2004 21:31:02 -0000 1.14
@@ -334,10 +334,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;
1.26 +13 -10
cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- JXTemplateGenerator.java 5 Jan 2004 08:17:31 -0000 1.25
+++ JXTemplateGenerator.java 16 Feb 2004 21:31:02 -0000 1.26
@@ -75,7 +75,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;
@@ -1127,7 +1126,7 @@
static class TextEvent extends Event {
- TextEvent(Locator location,
+ TextEvent(Locator location,
char[] chars, int start, int length)
throws SAXException {
super(location);
@@ -1228,7 +1227,7 @@
}
static class Characters extends TextEvent {
- Characters(Locator location,
+ Characters(Locator location,
char[] chars, int start, int length)
throws SAXException {
super(location, chars, start, length);
@@ -1251,7 +1250,7 @@
}
static class EndElement extends Event {
- EndElement(Locator location,
+ EndElement(Locator location,
StartElement startElement) {
super(location);
this.startElement = startElement;
@@ -1268,7 +1267,7 @@
}
static class IgnorableWhitespace extends TextEvent {
- IgnorableWhitespace(Locator location,
+ IgnorableWhitespace(Locator location,
char[] chars, int start, int length)
throws SAXException {
super(location, chars, start, length);
@@ -1667,12 +1666,16 @@
if (e instanceof StartParameter) {
StartParameter startParam = (StartParameter)e;
if (!params) {
- throw new SAXParseException("<parameter> not allowed
here: \""+startParam.name +"\"", startParam.location, null);
+ throw new SAXParseException("<parameter> not allowed
here: \"" + startParam.name + "\"",
+ startParam.location,
+ null);
}
Object prev =
parameters.put(startParam.name, startParam);
if (prev != null) {
- throw new SAXParseException("duplicate parameter:
\""+startParam.name +"\"", location, null);
+ throw new SAXParseException("duplicate parameter:
\"" + startParam.name + "\"",
+ location,
+ null);
}
e = startParam.endInstruction.next;
} else if (e instanceof IgnorableWhitespace) {
@@ -2803,8 +2806,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);
}
