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 2015/01/11 17:45:51 UTC
[07/19] incubator-slider git commit: SLIDER-655 split app packages
out of slider POM for independent releases
SLIDER-655 split app packages out of slider POM for independent releases
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/90e3d28d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/90e3d28d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/90e3d28d
Branch: refs/heads/branches/branch-0.6
Commit: 90e3d28d9c8c7428ba762209f9febfdd5c20a33e
Parents: 1f183bf
Author: Steve Loughran <st...@apache.org>
Authored: Wed Dec 3 15:35:01 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Jan 10 16:26:37 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 1 +
app-packages/hbase-win/appConfig-default.json | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/appConfig-default.json | 2 +-
app-packages/hbase/pom.xml | 1 +
app-packages/storm-win/pom.xml | 1 +
app-packages/storm/appConfig-default.json | 8 ++++----
app-packages/storm/pom.xml | 1 +
8 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index cee1041..2246ecf 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -23,6 +23,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-accumulo-app-package</artifactId>
<packaging>jar</packaging>
<name>Slider Accumulo App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/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
index 04cb9a9..719a743 100644
--- a/app-packages/hbase-win/appConfig-default.json
+++ b/app-packages/hbase-win/appConfig-default.json
@@ -8,7 +8,7 @@
"java_home": "C:\\java",
"site.global.app_user": "hadoop",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.hbase_instance_name": "instancename",
"site.global.user_group": "hadoop",
"site.global.hbase_additional_cp": "c:\\java\\lib\\tools.jar;",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 14bbcce..7e7481f 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -24,11 +24,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package for Windows</name>
<description>Slider HBase App Package for Windows</description>
- <version>${pkg.version}</version>
<properties>
<work.dir>package-tmp</work.dir>
<app.package.name>${project.artifactId}-${project.version}</app.package.name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/hbase/appConfig-default.json b/app-packages/hbase/appConfig-default.json
index 52587e5..f065185 100644
--- a/app-packages/hbase/appConfig-default.json
+++ b/app-packages/hbase/appConfig-default.json
@@ -9,7 +9,7 @@
"system_configs": "core-site",
"site.global.app_user": "yarn",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/hbase-${hbase.version}",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_port": "8667",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index ca54e57..7ea39f5 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-hbase-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider HBase App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 3b4cb9d..e1c0fe3 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-win-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/storm/appConfig-default.json
----------------------------------------------------------------------
diff --git a/app-packages/storm/appConfig-default.json b/app-packages/storm/appConfig-default.json
index d7908a3..9fd7130 100644
--- a/app-packages/storm/appConfig-default.json
+++ b/app-packages/storm/appConfig-default.json
@@ -8,7 +8,7 @@
"create.default.zookeeper.node": "true",
"site.global.app_user": "${USER_NAME}",
- "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}",
+ "site.global.app_root": "${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}",
"site.global.user_group": "hadoop",
"site.global.ganglia_server_host": "${NN_HOST}",
"site.global.ganglia_server_id": "Application2",
@@ -21,10 +21,10 @@
"site.storm-site.storm.local.dir": "${AGENT_WORK_ROOT}/app/tmp/storm",
"site.storm-site.transactional.zookeeper.root": "/transactional",
"site.storm-site.storm.zookeeper.port": "2181",
- "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
- "site.storm-site.supervisor.childopts": "-Xmx256m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
+ "site.storm-site.nimbus.childopts": "-Xmx1024m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Nimbus_JVM",
+ "site.storm-site.supervisor.childopts": "-Xmx256m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Supervisor_JVM",
"site.storm-site.ui.childopts": "-Xmx768m",
- "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${pkg.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
+ "site.storm-site.worker.childopts": "-Xmx768m -javaagent:${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/lib/jmxetric-1.0.4.jar=host=${@//site/global/ganglia_server_host},port=${@//site/global/ganglia_server_port},wireformat31x=true,mode=multicast,config=${AGENT_WORK_ROOT}/app/install/apache-storm-${storm.version}/external/storm-jmxetric/conf/jmxetric-conf.xml,process=Worker_%ID%_JVM",
"site.storm-site.dev.zookeeper.path": "${AGENT_WORK_ROOT}/app/tmp/dev-storm-zookeeper",
"site.storm-site.drpc.invocations.port": "0",
"site.storm-site.storm.zookeeper.root": "${DEFAULT_ZK_PATH}",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/90e3d28d/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index b586a73..94904c7 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -24,6 +24,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.slider.packages</groupId>
<artifactId>slider-storm-app-package</artifactId>
<packaging>pom</packaging>
<name>Slider Storm App Package</name>