You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mr...@apache.org on 2006/07/27 04:17:27 UTC
svn commit: r425932 - in /jakarta/commons/sandbox/js2j/trunk: ./
src/main/java/org/apache/commons/flow/ src/main/java/org/apache/commons/js2j/
Author: mrdon
Date: Wed Jul 26 19:17:26 2006
New Revision: 425932
URL: http://svn.apache.org/viewvc?rev=425932&view=rev
Log:
Fixed packages, now compiles
Added:
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/
- copied from r425930, jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/flow/sugar/
Removed:
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/flow/
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableDynaBean.java
Modified:
jakarta/commons/sandbox/js2j/trunk/pom.xml
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/CollectionExtensions.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ExtensionFunction.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/FileExtensions.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/InputStreamExtensions.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ListExtensions.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableList.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java
jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/SugarWrapFactory.java
Modified: jakarta/commons/sandbox/js2j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/pom.xml?rev=425932&r1=425931&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/pom.xml (original)
+++ jakarta/commons/sandbox/js2j/trunk/pom.xml Wed Jul 26 19:17:26 2006
@@ -83,13 +83,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/CollectionExtensions.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/CollectionExtensions.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/CollectionExtensions.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/CollectionExtensions.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ExtensionFunction.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ExtensionFunction.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ExtensionFunction.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ExtensionFunction.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
import java.util.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/FileExtensions.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/FileExtensions.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/FileExtensions.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/FileExtensions.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/InputStreamExtensions.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/InputStreamExtensions.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/InputStreamExtensions.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/InputStreamExtensions.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/JavaObjectWrapper.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ListExtensions.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ListExtensions.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ListExtensions.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ListExtensions.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableList.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableList.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableList.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableList.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/ScriptableMap.java Wed Jul 26 19:17:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.NativeJavaObject;
import org.mozilla.javascript.Scriptable;
Modified: jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/SugarWrapFactory.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/SugarWrapFactory.java?rev=425932&r1=425930&r2=425932&view=diff
==============================================================================
--- jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/SugarWrapFactory.java (original)
+++ jakarta/commons/sandbox/js2j/trunk/src/main/java/org/apache/commons/js2j/SugarWrapFactory.java Wed Jul 26 19:17:26 2006
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.flow.sugar;
+package org.apache.commons.js2j;
import org.mozilla.javascript.*;
import java.io.*;
import java.util.*;
import java.lang.reflect.*;
-import org.apache.commons.beanutils.DynaBean;
/**
* Wraps Java objects by adding support for function extensions, which are
@@ -86,8 +85,6 @@
Scriptable wrap = null;
if (javaObject instanceof Map) {
wrap = new ScriptableMap(scope, javaObject, staticType, map);
- } else if (javaObject instanceof DynaBean) {
- wrap = new ScriptableDynaBean(scope, javaObject, staticType, map);
} else if (javaObject instanceof List) {
wrap = new ScriptableList(scope, javaObject, staticType, map);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org