You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/05/11 20:52:55 UTC
[3/3] incubator-quarks git commit: Merge branch 'pr-115'
Merge branch 'pr-115'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/dc0ce293
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/dc0ce293
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/dc0ce293
Branch: refs/heads/master
Commit: dc0ce2930b1d58222022101429e84a750064bbeb
Parents: db196c1 4a75437
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Wed May 11 13:53:32 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Wed May 11 13:53:32 2016 -0700
----------------------------------------------------------------------
.../mbeans/ApplicationServiceMXBean.java | 5 +++
.../java/quarks/providers/iot/IotProvider.java | 4 --
.../java/quarks/providers/iot/package-info.java | 46 +++++++++++++++++++-
.../runtime/jsoncontrol/JsonControlService.java | 7 ++-
.../runtime/jsoncontrol/package-info.java | 20 +++++----
5 files changed, 67 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/dc0ce293/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
----------------------------------------------------------------------
diff --cc runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
index c0b48d0,0c63e5f..83eaf79
--- a/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
+++ b/runtime/jsoncontrol/src/main/java/quarks/runtime/jsoncontrol/JsonControlService.java
@@@ -39,13 -36,14 +39,16 @@@ import quarks.execution.services.Contro
/**
* Control service that accepts control instructions as JSON objects.
+ * <BR>
+ * A JSON object representing a control request can be passed
+ * to {@link #controlRequest(JsonObject)} to invoke a control
+ * operation (method) on a registered MBean.
*
- * Currently just supports operations with no arguments as
- * a work in progress.
+ * @see quarks.runtime.jsoncontrol Format of control request operation
*/
public class JsonControlService implements ControlService {
+
+ private static final Logger logger = LoggerFactory.getLogger(ControlService.class);
/**
* Key for the type of the control MBean in a JSON request.