You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/12/18 22:33:20 UTC
[06/26] incubator-slider git commit: SLIDER-708 cleanup and better
javadocs
SLIDER-708 cleanup and better javadocs
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b42e250e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b42e250e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b42e250e
Branch: refs/heads/develop
Commit: b42e250ee95b83eca43114dcb8a892617af33fba
Parents: 5c882b1
Author: Steve Loughran <st...@apache.org>
Authored: Thu Dec 11 15:28:31 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Dec 16 20:25:39 2014 +0000
----------------------------------------------------------------------
.../registry/docstore/PublishedContent.java | 24 ----------
.../server/appmaster/web/rest/RestPaths.java | 49 ++++++++++++++++++--
2 files changed, 45 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b42e250e/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedContent.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedContent.java b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedContent.java
deleted file mode 100644
index 67a9b35..0000000
--- a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedContent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.slider.core.registry.docstore;
-
-public class PublishedContent {
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b42e250e/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
index c3c81fc..0df617f 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
@@ -25,7 +25,15 @@ public class RestPaths {
public static final String WS_CONTEXT = "ws";
public static final String AGENT_WS_CONTEXT = "ws";
+
+ /**
+ * Root path for the web services context: {@value}
+ */
public static final String WS_CONTEXT_ROOT = "/" + WS_CONTEXT;
+
+ /**
+ * agent content root: {@value}
+ */
public static final String WS_AGENT_CONTEXT_ROOT = "/" + AGENT_WS_CONTEXT;
public static final String SLIDER_CONTEXT_ROOT = WS_CONTEXT_ROOT +"/v1/slider";
public static final String SLIDER_AGENT_CONTEXT_ROOT = WS_AGENT_CONTEXT_ROOT +"/v1/slider";
@@ -34,22 +42,33 @@ public class RestPaths {
public static final String SLIDER_SUBPATH_AGENTS = "/agents";
public static final String SLIDER_SUBPATH_PUBLISHER = "/publisher";
+
+ /**
+ * management path: {@value}
+ */
public static final String SLIDER_PATH_MANAGEMENT = SLIDER_CONTEXT_ROOT
+ SLIDER_SUBPATH_MANAGEMENT;
+
+ /**
+ * Agents: {@value}
+ */
public static final String SLIDER_PATH_AGENTS = SLIDER_AGENT_CONTEXT_ROOT
+ SLIDER_SUBPATH_AGENTS;
+ /**
+ * Publisher: {@value}
+ */
public static final String SLIDER_PATH_PUBLISHER = SLIDER_CONTEXT_ROOT
+ SLIDER_SUBPATH_PUBLISHER;
public static final String SLIDER_SUBPATH_REGISTRY = "/registry";
+
+ /**
+ * Registry: {@value}
+ */
public static final String SLIDER_PATH_REGISTRY = SLIDER_CONTEXT_ROOT
+ SLIDER_SUBPATH_REGISTRY;
- @Deprecated
- public static final String REGISTRY_SERVICE = "v1/service";
- @Deprecated
- public static final String REGISTRY_ANYSERVICE = "v1/anyservice";
/**
* The regular expressions used to define valid configuration names/url path
@@ -65,10 +84,32 @@ public class RestPaths {
public static final String SLIDER_EXPORTS = "exports";
public static final String SLIDER_CLASSPATH = "classpath";
+
+ /**
+ * Codahale Metrics - base path: {@value}
+ */
+
public static final String SYSTEM = "/system";
+
+
+ /**
+ * Codahale Metrics - health: {@value}
+ */
public static final String SYSTEM_HEALTHCHECK = SYSTEM + "/health";
+ /**
+ * Codahale Metrics - metrics: {@value}
+ */
public static final String SYSTEM_METRICS = SYSTEM + "/metrics";
+ /**
+ * Codahale Metrics - metrics as JSON: {@value}
+ */
public static final String SYSTEM_METRICS_JSON = SYSTEM_METRICS + "?format=json";
+ /**
+ * Codahale Metrics - ping: {@value}
+ */
public static final String SYSTEM_PING = SYSTEM + "/ping";
+ /**
+ * Codahale Metrics - thread dump: {@value}
+ */
public static final String SYSTEM_THREADS = SYSTEM + "/threads";
}