Repository: incubator-slider Updated Branches: refs/heads/develop 333b63572 -> 6263573dc
SLIDER-887 Rename command-logger appConfig and resources file names Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6263573d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6263573d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6263573d Branch: refs/heads/develop Commit: 6263573dcbe5a7c68b38650f80a3be3a3dab74c8 Parents: 333b635 Author: Gour Saha <[email protected]> Authored: Wed May 20 12:22:42 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Wed May 20 12:22:42 2015 -0700 ---------------------------------------------------------------------- .../slider-pkg/appConfig-default.json | 22 ++++++++++++++++++++ .../command-logger/slider-pkg/appConfig.json | 22 -------------------- .../slider-pkg/resources-default.json | 16 ++++++++++++++ .../command-logger/slider-pkg/resources.json | 16 -------------- .../slider-pkg/src/assembly/command-logger.xml | 8 +++---- 5 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6263573d/app-packages/command-logger/slider-pkg/appConfig-default.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/appConfig-default.json b/app-packages/command-logger/slider-pkg/appConfig-default.json new file mode 100644 index 0000000..a9e14d3 --- /dev/null +++ b/app-packages/command-logger/slider-pkg/appConfig-default.json @@ -0,0 +1,22 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip", + "java_home": "/usr/jdk64/jdk1.7.0_67", + "site.global.application_id": "CommandLogger", + "site.global.app_version": "1.0.0", + "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger", + "site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log", + "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p", + "site.cl-site.pattern.for.test.to.verify": "verify this pattern" + }, + "components": { + "COMMAND_LOGGER": { + }, + "slider-appmaster": { + "jvm.heapsize": "256M" + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6263573d/app-packages/command-logger/slider-pkg/appConfig.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json deleted file mode 100644 index a9e14d3..0000000 --- a/app-packages/command-logger/slider-pkg/appConfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - "application.def": ".slider/package/CMD_LOGGER/command-logger-slider-package.zip", - "java_home": "/usr/jdk64/jdk1.7.0_67", - "site.global.application_id": "CommandLogger", - "site.global.app_version": "1.0.0", - "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/command-logger", - "site.cl-site.logfile.location": "${AGENT_WORK_ROOT}/app/install/command-logger-app/operations.log", - "site.cl-site.datetime.format": "%A, %d. %B %Y %I:%M%p", - "site.cl-site.pattern.for.test.to.verify": "verify this pattern" - }, - "components": { - "COMMAND_LOGGER": { - }, - "slider-appmaster": { - "jvm.heapsize": "256M" - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6263573d/app-packages/command-logger/slider-pkg/resources-default.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/resources-default.json b/app-packages/command-logger/slider-pkg/resources-default.json new file mode 100644 index 0000000..f9edf51 --- /dev/null +++ b/app-packages/command-logger/slider-pkg/resources-default.json @@ -0,0 +1,16 @@ +{ + "schema": "http://example.org/specification/v2.0.0";, + "metadata": { + }, + "global": { + }, + "components": { + "COMMAND_LOGGER": { + "yarn.role.priority": "1", + "yarn.component.instances": "1", + "yarn.placement.escalate.seconds": "10" + }, + "slider-appmaster": { + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6263573d/app-packages/command-logger/slider-pkg/resources.json ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/resources.json b/app-packages/command-logger/slider-pkg/resources.json deleted file mode 100644 index f9edf51..0000000 --- a/app-packages/command-logger/slider-pkg/resources.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "schema": "http://example.org/specification/v2.0.0";, - "metadata": { - }, - "global": { - }, - "components": { - "COMMAND_LOGGER": { - "yarn.role.priority": "1", - "yarn.component.instances": "1", - "yarn.placement.escalate.seconds": "10" - }, - "slider-appmaster": { - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6263573d/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml ---------------------------------------------------------------------- diff --git a/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml b/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml index e283404..2f92fc4 100644 --- a/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml +++ b/app-packages/command-logger/slider-pkg/src/assembly/command-logger.xml @@ -29,13 +29,13 @@ <files> <file> - <source>appConfig.json</source> + <source>appConfig-default.json</source> <outputDirectory>/</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> </file> <file> - <source>resources.json</source> + <source>resources-default.json</source> <outputDirectory>/</outputDirectory> <filtered>true</filtered> <fileMode>0755</fileMode> @@ -81,8 +81,8 @@ <exclude>pom.xml</exclude> <exclude>src/**</exclude> <exclude>target/**</exclude> - <exclude>appConfig.json</exclude> - <exclude>resources.json</exclude> + <exclude>appConfig-default.json</exclude> + <exclude>resources-default.json</exclude> <exclude>metainfo.xml</exclude> </excludes> <fileMode>0755</fileMode>
