You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/10/02 20:07:26 UTC
svn commit: r452150 - in /cocoon/trunk/core/cocoon-core: ./
src/main/java/org/apache/cocoon/components/flow/
Author: danielf
Date: Mon Oct 2 11:07:25 2006
New Revision: 452150
URL: http://svn.apache.org/viewvc?view=rev&rev=452150
Log:
Removed the Rhino dependency from core and added it to some other projects that depended on Rhino indirectly before.
Moved PipelineUtil and CompilingInterpreter to the flowscript block as they seem to be floscript specific anyway.
Part II
Removed:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/CompilingInterpreter.java
Modified:
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=452150&r1=452149&r2=452150
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Mon Oct 2 11:07:25 2006
@@ -314,11 +314,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.6R2</version>
- </dependency>
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.2</version>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java?view=diff&rev=452150&r1=452149&r2=452150
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/AbstractInterpreter.java Mon Oct 2 11:07:25 2006
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.components.flow;
-import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Map;
@@ -33,7 +32,6 @@
import org.apache.avalon.framework.thread.SingleThreaded;
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.components.flow.util.PipelineUtil;
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.environment.Context;
import org.apache.cocoon.environment.Redirector;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java?view=diff&rev=452150&r1=452149&r2=452150
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/flow/FlowHelper.java Mon Oct 2 11:07:25 2006
@@ -16,9 +16,6 @@
*/
package org.apache.cocoon.components.flow;
-import org.mozilla.javascript.Undefined;
-import org.mozilla.javascript.Wrapper;
-
import java.util.Map;
/**
@@ -86,17 +83,5 @@
*/
public final static void setContextObject(Map objectModel, Object obj) {
objectModel.put(CONTEXT_OBJECT, obj);
- }
-
- /**
- * Unwrap a Rhino object (getting the raw java object) and convert undefined to null
- */
- public static Object unwrap(Object obj) {
- if (obj instanceof Wrapper) {
- obj = ((Wrapper)obj).unwrap();
- } else if (obj == Undefined.instance) {
- obj = null;
- }
- return obj;
}
}