From 10040d1947bdccf3df3c4d3e4c32b5a9a9c00c35 Mon Sep 17 00:00:00 2001
From: Guy Zana <guy@cloudius-systems.com>
Date: Sun, 19 May 2013 11:25:02 +0300
Subject: [PATCH] cli: java integration. get rid of defineClass for
com.cloudius.net.util.Networking
---
console/cli.js | 2 ++
java/cli/com/cloudius/cli/main/RhinoCLI.java | 2 --
java/cli/com/cloudius/cli/util/Networking.java | 17 +----------------
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/console/cli.js b/console/cli.js
index ca309d1c8..9467e3f63 100644
--- a/console/cli.js
+++ b/console/cli.js
@@ -1,5 +1,7 @@
importPackage(java.io);
importPackage(java.lang);
+importPackage(com.cloudius.util);
+importPackage(com.cloudius.cli.util);
load("/console/util.js");
load("/console/autocomplete.js");
diff --git a/java/cli/com/cloudius/cli/main/RhinoCLI.java b/java/cli/com/cloudius/cli/main/RhinoCLI.java
index 75f05e3e5..480015eb9 100644
--- a/java/cli/com/cloudius/cli/main/RhinoCLI.java
+++ b/java/cli/com/cloudius/cli/main/RhinoCLI.java
@@ -3,7 +3,6 @@ package com.cloudius.cli.main;
import java.io.*;
import com.cloudius.cli.util.ELFLoader;
-import com.cloudius.cli.util.Networking;
import sun.org.mozilla.javascript.*;
import sun.org.mozilla.javascript.tools.shell.*;
@@ -26,7 +25,6 @@ public class RhinoCLI {
global.init(_cx);
_scope = ScriptableObject.getTopLevelScope(global);
ScriptableObject.defineClass(_scope, ELFLoader.class);
- ScriptableObject.defineClass(_scope, Networking.class);
FileReader cli_js = new FileReader("/console/cli.js");
_cx.evaluateReader(_scope, cli_js, "cli.js", 1, null);
diff --git a/java/cli/com/cloudius/cli/util/Networking.java b/java/cli/com/cloudius/cli/util/Networking.java
index cfec73fc5..ce9fd5bce 100644
--- a/java/cli/com/cloudius/cli/util/Networking.java
+++ b/java/cli/com/cloudius/cli/util/Networking.java
@@ -6,15 +6,8 @@ import com.cloudius.net.Arp;
import com.cloudius.net.IFConfig;
import com.cloudius.net.Route;
-import sun.org.mozilla.javascript.ScriptableObject;
-import sun.org.mozilla.javascript.annotations.JSFunction;
+public class Networking {
-public class Networking extends ScriptableObject {
-
- // Identifies the scriptable object
- private static final long serialVersionUID = 436644325540039L;
-
- @JSFunction
public static boolean set_ip(String ifname, String ip, String netmask)
{
try {
@@ -25,7 +18,6 @@ public class Networking extends ScriptableObject {
}
}
- @JSFunction
public static boolean if_up(String ifname)
{
try {
@@ -36,21 +28,14 @@ public class Networking extends ScriptableObject {
}
}
- @JSFunction
public static void arp_add(String ifname, String macaddr, String ip)
{
Arp.add(ifname, macaddr, ip);
}
- @JSFunction
public static void route_add_default(String gw)
{
Route.add_default(gw);
}
- @Override
- public String getClassName() {
- return "Networking";
- }
-
}
--
GitLab