You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by te...@apache.org on 2014/07/09 21:53:42 UTC
[1/2] git commit: SLIDER-220 Provide script for retrieving
hbase-site.xml given cluster name
Repository: incubator-slider
Updated Branches:
refs/heads/develop 859ca5212 -> c011e7ac5
SLIDER-220 Provide script for retrieving hbase-site.xml given cluster name
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/80424c1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/80424c1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/80424c1d
Branch: refs/heads/develop
Commit: 80424c1d57328081fcb37d4a6d17f9836206f61c
Parents: 55aa2b1
Author: tedyu <yu...@gmail.com>
Authored: Wed Jul 9 12:53:23 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Jul 9 12:53:23 2014 -0700
----------------------------------------------------------------------
app-packages/hbase/get-hbase-site.sh | 24 ++++++++++++++++++++++++
get-hbase-site.sh | 8 --------
2 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80424c1d/app-packages/hbase/get-hbase-site.sh
----------------------------------------------------------------------
diff --git a/app-packages/hbase/get-hbase-site.sh b/app-packages/hbase/get-hbase-site.sh
new file mode 100755
index 0000000..0edac30
--- /dev/null
+++ b/app-packages/hbase/get-hbase-site.sh
@@ -0,0 +1,24 @@
+# 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.
+
+tuple=`slider status $1 | grep "info.am.web.url"`
+FS=":"
+url=`echo $tuple | awk '{split($0,array,": ")} END{print array[2]}'`
+url="${url%,}"
+url="${url%\"}"
+url="${url#\"}"
+url="${url}ws/v1/slider/publisher/slider/hbase-site.xml"
+curl -k -o hbase-site.xml $url
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/80424c1d/get-hbase-site.sh
----------------------------------------------------------------------
diff --git a/get-hbase-site.sh b/get-hbase-site.sh
deleted file mode 100755
index 32942a2..0000000
--- a/get-hbase-site.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-tuple=`slider status $1 | grep "info.am.web.url"`
-FS=":"
-url=`echo $tuple | awk '{split($0,array,": ")} END{print array[2]}'`
-url="${url%,}"
-url="${url%\"}"
-url="${url#\"}"
-url="${url}ws/v1/slider/publisher/slider/hbase-site.xml"
-curl -k -o hbase-site.xml $url
[2/2] git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Posted by te...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c011e7ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c011e7ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c011e7ac
Branch: refs/heads/develop
Commit: c011e7ac5a5120c87fa4800058af8f4cf8166636
Parents: 80424c1 859ca52
Author: tedyu <yu...@gmail.com>
Authored: Wed Jul 9 12:53:31 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Jul 9 12:53:31 2014 -0700
----------------------------------------------------------------------
pom.xml | 17 +-
.../src/main/python/agent/AgentConfig.py | 3 +
.../src/main/python/agent/Controller.py | 32 ++-
slider-agent/src/main/python/agent/NetUtil.py | 8 +-
slider-agent/src/main/python/agent/main.py | 15 +-
slider-agent/src/main/python/agent/security.py | 7 +-
.../src/test/python/agent/TestController.py | 4 +-
slider-agent/src/test/python/agent/TestMain.py | 8 +-
.../src/test/python/agent/TestNetUtil.py | 2 +-
slider-core/pom.xml | 7 +
.../java/org/apache/slider/api/StatusKeys.java | 3 +
.../org/apache/slider/common/SliderKeys.java | 14 +
.../apache/slider/common/tools/SliderUtils.java | 2 +-
.../core/launch/ClasspathConstructor.java | 1 -
.../registry/info/CustomRegistryConstants.java | 2 +-
.../providers/AbstractProviderService.java | 7 +-
.../slider/providers/ProviderService.java | 8 +-
.../slider/providers/agent/AgentKeys.java | 1 +
.../providers/agent/AgentProviderService.java | 16 +-
.../slideram/SliderAMClientProvider.java | 7 +-
.../slideram/SliderAMProviderService.java | 18 +-
.../server/appmaster/SliderAppMaster.java | 68 ++++-
.../server/appmaster/web/AgentService.java | 53 ++++
.../server/appmaster/web/SliderAmIpFilter.java | 18 +-
.../slider/server/appmaster/web/WebAppApi.java | 9 +-
.../server/appmaster/web/WebAppApiImpl.java | 16 +-
.../appmaster/web/rest/AMWebServices.java | 7 +-
.../server/appmaster/web/rest/RestPaths.java | 5 +-
.../appmaster/web/rest/agent/AgentResource.java | 25 +-
.../appmaster/web/rest/agent/AgentWebApp.java | 203 +++++++++++++++
.../web/rest/agent/AgentWebServices.java | 40 +++
.../services/security/CertificateManager.java | 257 +++++++++++++++++++
.../server/services/security/SecurityUtils.java | 209 +++++++++++++++
.../services/security/SignCertResponse.java | 67 +++++
.../server/services/security/SignMessage.java | 54 ++++
.../providers/slideram/instance/appconf.json | 5 +-
.../main/resources/webapps/slideragent/.keep | 0
.../agent/TestAgentAMManagementWS.groovy | 46 +++-
.../model/mock/MockProviderService.groovy | 12 +-
.../view/TestClusterSpecificationBlock.groovy | 2 +-
.../web/view/TestContainerStatsBlock.groovy | 2 +-
.../appmaster/web/view/TestIndexBlock.groovy | 2 +-
.../agent/TestAgentProviderService.java | 6 +-
.../web/rest/agent/TestAMAgentWebServices.java | 217 ++++++++--------
.../management/TestAMManagementWebServices.java | 2 +-
.../security/TestCertificateManager.java | 60 +++++
slider-core/src/test/python/agent/main.py | 2 +
.../providers/hbase/HBaseProviderService.java | 5 +-
48 files changed, 1381 insertions(+), 193 deletions(-)
----------------------------------------------------------------------