Skip to content

Commit

Permalink
Corrected Script Services Signature and added Rhino Javascript Librar…
Browse files Browse the repository at this point in the history
…y 0.1.27
  • Loading branch information
carlescm committed Jun 3, 2020
1 parent 6e0ad49 commit ff53090
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 5 deletions.
Binary file modified bin/ConcurrencyExtension.jar
Binary file not shown.
Binary file modified bin/classes/com/wup/wupConcurrencySC.class
Binary file not shown.
2 changes: 1 addition & 1 deletion configfiles/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
name="ConcurrencyExtension"
description="Concurrency Tools, based on the code provided by 'antondorf' on the ThingWorx Developers Community."
vendor=""
packageVersion="0.1.26"
packageVersion="0.1.27"
minimumThingWorxVersion="6.5.0">
<JarResources>
<FileResource type="JAR" file="ConcurrencyExtension.jar"/>
Expand Down
Binary file added lib/custom-rhino-js-5.1.0.jar
Binary file not shown.
19 changes: 15 additions & 4 deletions src/com/wup/wupConcurrencySC.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.thingworx.metadata.annotations.ThingworxServiceDefinition;
import com.thingworx.metadata.annotations.ThingworxServiceResult;


public class wupConcurrencySC {

@ThingworxServiceDefinition(
Expand All @@ -14,7 +13,11 @@ public class wupConcurrencySC {
aspects = {"isAsync:false" }
)
@ThingworxServiceResult(name = "result", description = "The total ammount.", baseType = "LONG", aspects = {})
public static long GetTotalActiveLocks_wupMutexTS() {
public static long GetTotalActiveLocks_wupMutexTS(
org.mozilla.javascript.Context cx,
org.mozilla.javascript.Scriptable thisObj,
Object[] args,
org.mozilla.javascript.Function funObj) {
return wupMutexTS.getTotalActiveLocks();
}

Expand All @@ -26,7 +29,11 @@ public static long GetTotalActiveLocks_wupMutexTS() {
aspects = {"isAsync:false" }
)
@ThingworxServiceResult(name = "result", description = "The total ammount.", baseType = "LONG", aspects = {})
public static long GetTotalActiveWaiting_wupMutexTS() {
public static long GetTotalActiveWaiting_wupMutexTS(
org.mozilla.javascript.Context cx,
org.mozilla.javascript.Scriptable thisObj,
Object[] args,
org.mozilla.javascript.Function funObj) {
return wupMutexTS.getTotalActiveWaiting();
}

Expand All @@ -38,7 +45,11 @@ public static long GetTotalActiveWaiting_wupMutexTS() {
aspects = {"isAsync:false" }
)
@ThingworxServiceResult(name = "result", description = "The total ammount.", baseType = "LONG", aspects = {})
public static long GetTotalThingsLocksUsage_wupMutexTS() {
public static long GetTotalThingsLocksUsage_wupMutexTS(
org.mozilla.javascript.Context cx,
org.mozilla.javascript.Scriptable thisObj,
Object[] args,
org.mozilla.javascript.Function funObj) {
return wupMutexTS.getTotalThingsLocksUsage();
}

Expand Down
Binary file modified zip/ConcurrencyExtension.zip
Binary file not shown.

0 comments on commit ff53090

Please sign in to comment.