SLIDER-767 rename "apache-slider-command-logger" and "command-logger" modules
diff --git a/app-packages/command-logger/application-pkg/README.txt b/app-packages/command-logger/application-pkg/README.txt
index 5596f30..ea5b2e8 100644
--- a/app-packages/command-logger/application-pkg/README.txt
+++ b/app-packages/command-logger/application-pkg/README.txt
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-Command logger is a simple application that does not have any moving parts yet.
+Command logger is a simple application that does not have any moving parts.
Its sole purpose is to get packaged as a tarball that includes some static files
suggesting how commands may be logged.
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index ec7f3fa..14577f8 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -23,12 +23,16 @@
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>command-logger</artifactId>
+ <artifactId>command-logger-sample</artifactId>
<packaging>pom</packaging>
- <name>Command Logger</name>
- <description>Command Logger</description>
+ <name>Command Logger Sample Application</name>
+ <description>
+ Command logger is a simple application that does not have any moving parts.
+ Its sole purpose is to get packaged as a tarball that includes some static files
+ suggesting how commands may be logged, for use in test deployments.
+ </description>
<properties>
- <app.package.name>command-logger</app.package.name>
+ <app.package.name>command-logger-sample</app.package.name>
</properties>
<build>
diff --git a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
index 4538d57..b1a0e93 100644
--- a/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
+++ b/app-packages/command-logger/application-pkg/src/packages/tarball/all.xml
@@ -18,7 +18,7 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <!--This 'agent-all' id is not appended to the produced bundle because we do this:
+ <!--This 'command-logger' id is not appended to the produced bundle because we do this:
http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
-->
<id>command-logger</id>
diff --git a/app-packages/command-logger/slider-pkg/appConfig.json b/app-packages/command-logger/slider-pkg/appConfig.json
index d4082a8..09e9252 100644
--- a/app-packages/command-logger/slider-pkg/appConfig.json
+++ b/app-packages/command-logger/slider-pkg/appConfig.json
@@ -3,7 +3,7 @@
"metadata": {
},
"global": {
- "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+ "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_root": "${AGENT_WORK_ROOT}/app/install/command-logger",
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index 6e8f979..9979cd3 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -24,13 +24,13 @@
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apache-slider-command-logger</artifactId>
+ <artifactId>command-logger-slider-package</artifactId>
<packaging>pom</packaging>
- <name>Slider Command Logger App Package</name>
+ <name>Slider Command Logger Slider App Package</name>
<description>Slider Command Logger App Package</description>
<properties>
<work.dir>package-tmp</work.dir>
- <app.package.name>apache-slider-command-logger</app.package.name>
+ <app.package.name>command-logger-slider-package</app.package.name>
</properties>
<build>
@@ -67,7 +67,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <includeArtifactIds>command-logger</includeArtifactIds>
+ <includeArtifactIds>command-logger-sample</includeArtifactIds>
<includeTypes>tar</includeTypes>
<outputDirectory>${project.build.directory}/${work.dir}</outputDirectory>
</configuration>
@@ -82,7 +82,7 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.slider</groupId>
- <artifactId>command-logger</artifactId>
+ <artifactId>command-logger-sample</artifactId>
<type>tar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/${work.dir}</outputDirectory>
@@ -100,7 +100,7 @@
<dependencies>
<dependency>
<groupId>org.apache.slider</groupId>
- <artifactId>command-logger</artifactId>
+ <artifactId>command-logger-sample</artifactId>
<version>${project.version}</version>
<type>tar</type>
</dependency>
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig.json b/slider-core/src/test/app_packages/test_command_log/appConfig.json
index a8d3d4b..b9383ec 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig.json
@@ -3,7 +3,7 @@
"metadata": {
},
"global": {
- "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+ "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_root": "${AGENT_WORK_ROOT}/app/install/command-logger",
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json b/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
index ac11c08..fa7312a 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json
@@ -5,7 +5,7 @@
"global": {
"heartbeat.monitor.interval": "20000",
"agent.instance.debug.data": "ANY:DO_NOT_REGISTER:NONE",
- "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+ "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_root": "${AGENT_WORK_ROOT}/app/install/command-logger",
diff --git a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json b/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
index 9d70879..eae57e7 100644
--- a/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
+++ b/slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json
@@ -5,7 +5,7 @@
"global": {
"heartbeat.monitor.interval": "20000",
"agent.instance.debug.data": "ANY:DO_NOT_HEARTBEAT:DO_NOT_HEARTBEAT:NONE",
- "application.def": ".slider/package/CMD_LOGGER/apache-slider-command-logger.zip",
+ "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_root": "${AGENT_WORK_ROOT}/app/install/command-logger",
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 708317c..8b88a61 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -119,7 +119,7 @@
<slider.conf.dir>${slider.conf.dir}</slider.conf.dir>
<slider.bin.dir>../slider-assembly/target/slider-${project.version}-all/slider-${project.version}</slider.bin.dir>
<test.app.pkg.dir>../app-packages/command-logger/slider-pkg/target</test.app.pkg.dir>
- <test.app.pkg.file>apache-slider-command-logger.zip</test.app.pkg.file>
+ <test.app.pkg.file>command-logger-slider-package.zip</test.app.pkg.file>
<test.app.pkg.name>CMD_LOGGER</test.app.pkg.name>
<test.app.resource>../slider-core/src/test/app_packages/test_command_log/resources.json</test.app.resource>
<test.app.template>../slider-core/src/test/app_packages/test_command_log/appConfig.json</test.app.template>
@@ -155,11 +155,11 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.slider</groupId>
- <artifactId>apache-slider-command-logger</artifactId>
+ <artifactId>command-logger-slider-package</artifactId>
<type>zip</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/${work.dir}</outputDirectory>
- <destFileName>apache-slider-command-logger.zip</destFileName>
+ <destFileName>command-logger-slider-package.zip</destFileName>
</artifactItem>
</artifactItems>
</configuration>
@@ -221,7 +221,7 @@
<dependency>
<groupId>org.apache.slider</groupId>
- <artifactId>apache-slider-command-logger</artifactId>
+ <artifactId>command-logger-slider-package</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>
