SLIDER-450 Rename template and resources json files to -default
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5470c47a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5470c47a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5470c47a Branch: refs/heads/feature/SLIDER-158_slider_diagnostic_option Commit: 5470c47aae8af30e62404a69cce6fc3e573efa24 Parents: a34837c Author: tedyu <[email protected]> Authored: Wed Sep 24 15:38:57 2014 -0700 Committer: tedyu <[email protected]> Committed: Wed Sep 24 15:38:57 2014 -0700 ---------------------------------------------------------------------- app-packages/hbase-win/appConfig-default.json | 38 ++++++++++++++++ app-packages/hbase-win/appConfig.json | 38 ---------------- app-packages/hbase-win/resources-default.json | 24 ++++++++++ app-packages/hbase-win/resources.json | 24 ---------- app-packages/hbase-win/src/assembly/hbase.xml | 4 +- app-packages/hbase/appConfig-default.json | 47 ++++++++++++++++++++ app-packages/hbase/appConfig.json | 47 -------------------- app-packages/hbase/pom.xml | 4 +- app-packages/hbase/resources-default.json | 36 +++++++++++++++ app-packages/hbase/resources.json | 36 --------------- app-packages/hbase/src/assembly/hbase.xml | 4 +- .../src/test/resources/resources-default.json | 24 ++++++++++ .../hbase/src/test/resources/resources.json | 24 ---------- 13 files changed, 175 insertions(+), 175 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase-win/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/appConfig-default.json b/app-packages/hbase-win/appConfig-default.json new file mode 100644 index 0000000..5b97e69 --- /dev/null +++ b/app-packages/hbase-win/appConfig-default.json @@ -0,0 +1,38 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${bld.version}.zip", + "create.default.zookeeper.node": "true", + "java_home": "C:\\java", + + "site.global.app_user": "hadoop", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}", + "site.global.hbase_instance_name": "instancename", + "site.global.hbase_root_password": "secret", + "site.global.user_group": "hadoop", + "site.global.security_enabled": "false", + "site.global.monitor_protocol": "http", + "site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;", + "site.global.java_library_path": "c:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\bin", + + "site.hbase-env.hbase_master_heapsize": "1024m", + "site.hbase-env.hbase_regionserver_heapsize": "1024m", + "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}", + "site.hbase-site.hbase.superuser": "yarn", + "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp", + "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local", + "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}", + "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}", + "site.hbase-site.hbase.regionserver.info.port": "0", + "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}", + "site.hbase-site.hbase.regionserver.port": "0", + "site.hbase-site.hbase.master.port": "0" + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase-win/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/appConfig.json b/app-packages/hbase-win/appConfig.json deleted file mode 100644 index 5b97e69..0000000 --- a/app-packages/hbase-win/appConfig.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/HBASE/slider-hbase-app-win-package-${bld.version}.zip", - "create.default.zookeeper.node": "true", - "java_home": "C:\\java", - - "site.global.app_user": "hadoop", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}", - "site.global.hbase_instance_name": "instancename", - "site.global.hbase_root_password": "secret", - "site.global.user_group": "hadoop", - "site.global.security_enabled": "false", - "site.global.monitor_protocol": "http", - "site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;", - "site.global.java_library_path": "c:\\hdp\\hadoop-2.4.0.2.1.3.0-1990\\bin", - - "site.hbase-env.hbase_master_heapsize": "1024m", - "site.hbase-env.hbase_regionserver_heapsize": "1024m", - "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}", - "site.hbase-site.hbase.superuser": "yarn", - "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp", - "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local", - "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}", - "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}", - "site.hbase-site.hbase.regionserver.info.port": "0", - "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}", - "site.hbase-site.hbase.regionserver.port": "0", - "site.hbase-site.hbase.master.port": "0" - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase-win/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/resources-default.json b/app-packages/hbase-win/resources-default.json new file mode 100644 index 0000000..eb38726 --- /dev/null +++ b/app-packages/hbase-win/resources-default.json @@ -0,0 +1,24 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "yarn.log.include.patterns": "", + "yarn.log.exclude.patterns": "", + "yarn.log.interval": "0" + }, + "components": { + "HBASE_MASTER": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "slider-appmaster": { + }, + "HBASE_REGIONSERVER": { + "yarn.role.priority": "2", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase-win/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/resources.json b/app-packages/hbase-win/resources.json deleted file mode 100644 index eb38726..0000000 --- a/app-packages/hbase-win/resources.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" - }, - "components": { - "HBASE_MASTER": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "slider-appmaster": { - }, - "HBASE_REGIONSERVER": { - "yarn.role.priority": "2", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase-win/src/assembly/hbase.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase-win/src/assembly/hbase.xml b/app-packages/hbase-win/src/assembly/hbase.xml index e62da84..a94c827 100644 --- a/app-packages/hbase-win/src/assembly/hbase.xml +++ b/app-packages/hbase-win/src/assembly/hbase.xml @@ -30,7 +30,7 @@ <files> <file> - <source>appConfig.json</source> + <source>appConfig-default.json</source> <outputDirectory>/</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> @@ -57,7 +57,7 @@ <exclude>pom.xml</exclude> <exclude>src/**</exclude> <exclude>target/**</exclude> - <exclude>appConfig.json</exclude> + <exclude>appConfig-default.json</exclude> <exclude>metainfo.xml</exclude> </excludes> <fileMode>0755</fileMode> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json new file mode 100644 index 0000000..78479db --- /dev/null +++ b/app-packages/hbase/appConfig-default.json @@ -0,0 +1,47 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/HBASE/slider-hbase-app-package-${bld.version}.zip", + "create.default.zookeeper.node": "true", + "java_home": "/usr/jdk64/jdk1.7.0_45", + "system_configs": "core-site", + + "site.global.app_user": "yarn", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}", + + "site.global.ganglia_server_host": "${NN_HOST}", + "site.global.ganglia_server_port": "8667", + "site.global.ganglia_server_id": "Application1", + "site.global.ganglia_enabled":"true", + + "site.global.hbase_instance_name": "instancename", + "site.global.hbase_root_password": "secret", + "site.global.user_group": "hadoop", + "site.global.security_enabled": "false", + "site.global.monitor_protocol": "http", + "site.global.hbase_thrift_port": "${HBASE_THRIFT.ALLOCATED_PORT}", + "site.global.hbase_thrift2_port": "${HBASE_THRIFT2.ALLOCATED_PORT}", + "site.global.hbase_rest_port": "${HBASE_REST.ALLOCATED_PORT}", + + "site.hbase-env.hbase_master_heapsize": "1024m", + "site.hbase-env.hbase_regionserver_heapsize": "1024m", + + "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}", + "site.hbase-site.hbase.superuser": "yarn", + "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp", + "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local", + "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}", + "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}", + "site.hbase-site.hbase.regionserver.info.port": "0", + "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}", + "site.hbase-site.hbase.regionserver.port": "0", + "site.hbase-site.hbase.master.port": "0" + }, + "components": { + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/appConfig.json b/app-packages/hbase/appConfig.json deleted file mode 100644 index 78479db..0000000 --- a/app-packages/hbase/appConfig.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/HBASE/slider-hbase-app-package-${bld.version}.zip", - "create.default.zookeeper.node": "true", - "java_home": "/usr/jdk64/jdk1.7.0_45", - "system_configs": "core-site", - - "site.global.app_user": "yarn", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}", - - "site.global.ganglia_server_host": "${NN_HOST}", - "site.global.ganglia_server_port": "8667", - "site.global.ganglia_server_id": "Application1", - "site.global.ganglia_enabled":"true", - - "site.global.hbase_instance_name": "instancename", - "site.global.hbase_root_password": "secret", - "site.global.user_group": "hadoop", - "site.global.security_enabled": "false", - "site.global.monitor_protocol": "http", - "site.global.hbase_thrift_port": "${HBASE_THRIFT.ALLOCATED_PORT}", - "site.global.hbase_thrift2_port": "${HBASE_THRIFT2.ALLOCATED_PORT}", - "site.global.hbase_rest_port": "${HBASE_REST.ALLOCATED_PORT}", - - "site.hbase-env.hbase_master_heapsize": "1024m", - "site.hbase-env.hbase_regionserver_heapsize": "1024m", - - "site.hbase-site.hbase.rootdir": "${DEFAULT_DATA_DIR}", - "site.hbase-site.hbase.superuser": "yarn", - "site.hbase-site.hbase.tmp.dir": "${AGENT_WORK_ROOT}/work/app/tmp", - "site.hbase-site.hbase.local.dir": "${hbase.tmp.dir}/local", - "site.hbase-site.hbase.zookeeper.quorum": "${ZK_HOST}", - "site.hbase-site.zookeeper.znode.parent": "${DEF_ZK_PATH}", - "site.hbase-site.hbase.regionserver.info.port": "0", - "site.hbase-site.hbase.master.info.port": "${HBASE_MASTER.ALLOCATED_PORT}", - "site.hbase-site.hbase.regionserver.port": "0", - "site.hbase-site.hbase.master.port": "0" - }, - "components": { - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml index 3d57ac5..519d7c1 100644 --- a/app-packages/hbase/pom.xml +++ b/app-packages/hbase/pom.xml @@ -162,8 +162,8 @@ </slider.bin.dir> <test.app.pkg.dir>target</test.app.pkg.dir> <test.app.pkg.file>${app.package.name}.zip</test.app.pkg.file> - <test.app.resource>target/test-config/resources.json</test.app.resource> - <test.app.template>target/${app.package.name}/appConfig.json</test.app.template> + <test.app.resource>target/test-config/resources-default.json</test.app.resource> + <test.app.template>target/${app.package.name}/appConfig-default.json</test.app.template> </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/resources-default.json b/app-packages/hbase/resources-default.json new file mode 100644 index 0000000..c3fec68 --- /dev/null +++ b/app-packages/hbase/resources-default.json @@ -0,0 +1,36 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + }, + "components": { + "HBASE_MASTER": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "slider-appmaster": { + }, + "HBASE_REGIONSERVER": { + "yarn.role.priority": "2", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "HBASE_REST": { + "yarn.role.priority": "3", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "HBASE_THRIFT": { + "yarn.role.priority": "4", + "yarn.component.instances": "0", + "yarn.memory": "256" + }, + "HBASE_THRIFT2": { + "yarn.role.priority": "5", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/resources.json b/app-packages/hbase/resources.json deleted file mode 100644 index c3fec68..0000000 --- a/app-packages/hbase/resources.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - }, - "components": { - "HBASE_MASTER": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "slider-appmaster": { - }, - "HBASE_REGIONSERVER": { - "yarn.role.priority": "2", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "HBASE_REST": { - "yarn.role.priority": "3", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "HBASE_THRIFT": { - "yarn.role.priority": "4", - "yarn.component.instances": "0", - "yarn.memory": "256" - }, - "HBASE_THRIFT2": { - "yarn.role.priority": "5", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/src/assembly/hbase.xml ---------------------------------------------------------------------- diff --git a/app-packages/hbase/src/assembly/hbase.xml b/app-packages/hbase/src/assembly/hbase.xml index e62da84..a94c827 100644 --- a/app-packages/hbase/src/assembly/hbase.xml +++ b/app-packages/hbase/src/assembly/hbase.xml @@ -30,7 +30,7 @@ <files> <file> - <source>appConfig.json</source> + <source>appConfig-default.json</source> <outputDirectory>/</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> @@ -57,7 +57,7 @@ <exclude>pom.xml</exclude> <exclude>src/**</exclude> <exclude>target/**</exclude> - <exclude>appConfig.json</exclude> + <exclude>appConfig-default.json</exclude> <exclude>metainfo.xml</exclude> </excludes> <fileMode>0755</fileMode> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/src/test/resources/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/src/test/resources/resources-default.json b/app-packages/hbase/src/test/resources/resources-default.json new file mode 100644 index 0000000..eb38726 --- /dev/null +++ b/app-packages/hbase/src/test/resources/resources-default.json @@ -0,0 +1,24 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "yarn.log.include.patterns": "", + "yarn.log.exclude.patterns": "", + "yarn.log.interval": "0" + }, + "components": { + "HBASE_MASTER": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.memory": "256" + }, + "slider-appmaster": { + }, + "HBASE_REGIONSERVER": { + "yarn.role.priority": "2", + "yarn.component.instances": "1", + "yarn.memory": "256" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5470c47a/app-packages/hbase/src/test/resources/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/hbase/src/test/resources/resources.json b/app-packages/hbase/src/test/resources/resources.json deleted file mode 100644 index eb38726..0000000 --- a/app-packages/hbase/src/test/resources/resources.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "yarn.log.include.patterns": "", - "yarn.log.exclude.patterns": "", - "yarn.log.interval": "0" - }, - "components": { - "HBASE_MASTER": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.memory": "256" - }, - "slider-appmaster": { - }, - "HBASE_REGIONSERVER": { - "yarn.role.priority": "2", - "yarn.component.instances": "1", - "yarn.memory": "256" - } - } -}
