Skip to content

nashorn cambiado #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AARP41298 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nashorn cambiado #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@
<artifactId>javaee-web-api</artifactId>
<version>7.0</version>
<scope>provided</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
</dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/semanticwb/datamanager/DataExtractorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package org.semanticwb.datamanager;

import java.io.IOException;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
import org.semanticwb.datamanager.script.ScriptObject;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/semanticwb/datamanager/DataExtractorBaseImp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import java.util.TimerTask;
import java.util.logging.Level;
import java.util.logging.Logger;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
import org.semanticwb.datamanager.extractors.ScriptExtractor;
import org.semanticwb.datamanager.script.ScriptObject;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/semanticwb/datamanager/DataUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.util.Map;
import java.util.StringTokenizer;
import java.util.TimeZone;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
import org.semanticwb.datamanager.script.ScriptObject;
import org.semanticwb.datamanager.utils.SimpleDateFormatTS;

Expand Down Expand Up @@ -231,10 +231,10 @@ public static String encodeSHA(String str)
*/
public static Object toData(Object obj)
{
if(obj instanceof jdk.nashorn.internal.objects.NativeArray)
if(obj instanceof org.openjdk.nashorn.internal.objects.NativeArray)
{
//System.out.print(value);
jdk.nashorn.internal.objects.NativeArray narr=(jdk.nashorn.internal.objects.NativeArray)obj;
org.openjdk.nashorn.internal.objects.NativeArray narr=(org.openjdk.nashorn.internal.objects.NativeArray)obj;
Object arr[]=narr.asObjectArray();
DataList list=new DataList();
for(int x=0;x<arr.length;x++)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/semanticwb/datamanager/SWBBaseScriptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ protected DataObject invokeDataProcessors(SWBScriptEngine userengine, String dat
{
obj=(DataObject)r.getValue();
}
}catch(jdk.nashorn.internal.runtime.ECMAException ecma)
}catch(org.openjdk.nashorn.internal.runtime.ECMAException ecma)
{
throw ecma;
}catch(Throwable e)
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/org/semanticwb/datamanager/SWBDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public DataObjectIterator find(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObjectIterator find(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObjectIterator find(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return find(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -211,7 +211,7 @@ public DataObject mapByNumId(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject mapByNumId(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject mapByNumId(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return mapByNumId(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -243,7 +243,7 @@ public DataObject mapById(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject mapById(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject mapById(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return mapByField(DataUtils.toDataObject(json),"_id");
}
Expand Down Expand Up @@ -284,7 +284,7 @@ public DataObject mapByField(DataObject json, String field) throws IOException
* @return
* @throws IOException
*/
public DataObject mapByField(jdk.nashorn.api.scripting.ScriptObjectMirror json, String field) throws IOException
public DataObject mapByField(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json, String field) throws IOException
{
return mapByField(DataUtils.toDataObject(json),field);
}
Expand Down Expand Up @@ -317,7 +317,7 @@ public DataObject fetch(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject fetch(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject fetch(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return fetch(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -349,7 +349,7 @@ public DataObject aggregate(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject aggregate(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject aggregate(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return aggregate(DataUtils.toDataObject(json));
}
Expand All @@ -375,7 +375,7 @@ public DataObject addObj(DataObject obj) throws IOException
* @return
* @throws IOException
*/
public DataObject addObj(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject addObj(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return addObj(DataUtils.toDataObject(json));
}
Expand All @@ -401,7 +401,7 @@ public DataObject updateObj(DataObject obj) throws IOException
* @return
* @throws IOException
*/
public DataObject updateObj(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject updateObj(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return updateObj(DataUtils.toDataObject(json));
}
Expand All @@ -427,7 +427,7 @@ public DataObject removeObj(DataObject obj) throws IOException
* @return
* @throws IOException
*/
public DataObject removeObj(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject removeObj(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return removeObj(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -644,7 +644,7 @@ public DataObject update(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject update(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject update(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return update(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -682,7 +682,7 @@ public DataObject add(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject add(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject add(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return add(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -837,7 +837,7 @@ public DataObject remove(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject remove(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject remove(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return remove(DataUtils.toDataObject(json));
}
Expand Down Expand Up @@ -949,7 +949,7 @@ public DataObject validate(DataObject json) throws IOException
* @return
* @throws IOException
*/
public DataObject validate(jdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
public DataObject validate(org.openjdk.nashorn.api.scripting.ScriptObjectMirror json) throws IOException
{
return validate(DataUtils.toDataObject(json));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/semanticwb/datamanager/script/ScriptObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.Set;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import org.openjdk.nashorn.api.scripting.ScriptObjectMirror;
import org.semanticwb.datamanager.DataList;
import org.semanticwb.datamanager.DataMgr;
import org.semanticwb.datamanager.DataObject;
Expand Down