HAD-620. NsNN package has to be separated in server and client pieces

Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/67311225
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/67311225
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/67311225

Branch: refs/heads/master
Commit: 6731122569e1ae001f3198b2d339fe6ccb41ef1e
Parents: e1de91d
Author: Konstantin Boudnik <[email protected]>
Authored: Mon Nov 11 12:44:38 2013 -0800
Committer: Konstantin Boudnik <[email protected]>
Committed: Thu Feb 20 15:16:11 2014 -0800

----------------------------------------------------------------------
 .../wdd-namenode-nonstop/do-component-build     |  4 +--
 .../SPECS/wdd-namenode-nonstop.spec             | 32 +++++++++++++++++---
 2 files changed, 30 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/67311225/bigtop-packages/src/common/wdd-namenode-nonstop/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/wdd-namenode-nonstop/do-component-build 
b/bigtop-packages/src/common/wdd-namenode-nonstop/do-component-build
index fe7d38e..eded341 100755
--- a/bigtop-packages/src/common/wdd-namenode-nonstop/do-component-build
+++ b/bigtop-packages/src/common/wdd-namenode-nonstop/do-component-build
@@ -9,6 +9,6 @@ set -ex
 sed -i -e "s#2.0.5.11-wdd3.6#$HADOOP_VERSION#" pom.xml
 mvn package -DskipTests -Dmaven.test.skip=true
 
-cd target
+cd server/target
 mkdir extra_libs && \
-  tar --extract --transform='s/.*\///' --show-transformed-names 
--file=namenode-${NONSTOP_VERSION}-dist.tar.gz -C extra_libs
+  tar --extract --transform='s/.*\///' --show-transformed-names 
--file=namenode-server-${NONSTOP_VERSION}-dist.tar.gz -C extra_libs

http://git-wip-us.apache.org/repos/asf/bigtop/blob/67311225/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
----------------------------------------------------------------------
diff --git 
a/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec 
b/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
index d150ef2..eed4378 100644
--- 
a/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
+++ 
b/bigtop-packages/src/rpm/wdd-namenode-nonstop/SPECS/wdd-namenode-nonstop.spec
@@ -34,6 +34,8 @@ AutoReq: no
 %define extra_libs  DConE-*.jar DConE_Platform-*.jar
 %define extra_deps_libs  java-uuid-generator*.jar prevayler-*.jar 
xstream-*.jar bcprov*.jar xmlpull-*.jar
 %define conf_checkpoints %{etc_hadoop}/checkpoints.nonstop
+%define server_jars server/target
+%define client_jars client/target
 
 %global initd_dir %{_sysconfdir}/rc.d/init.d
 
@@ -49,6 +51,22 @@ Requires: hadoop-hdfs-secondarynamenode, /sbin/chkconfig, 
/sbin/service
 %description checkpoints
 A service daemon for check-pointing of all instances of WANdisco Non-Stop 
namenode
 
+
+%package client
+Summary: Non-Stop HDFS namenode client libraries
+Group: Development/Libraries
+
+%description client
+A set of  WANdisco Non-Stop namenode libraries required for client applications
+
+%package server
+Summary: Non-Stop HDFS namenode server libraries and daemons
+Group: Development/Libraries
+Requires: hadoop-hdfs
+
+%description server
+A set of  WANdisco Non-Stop namenode libraries required for client applications
+
 %prep
 %setup -n %{artifactname}-%{wdd_namenode_nonstop_base_version}
 
@@ -72,14 +90,15 @@ rm -rf $RPM_BUILD_ROOT
 %__install -m 0755 %{SOURCE15} $RPM_BUILD_ROOT/%{lib_hadoop}/sbin
 
 ## Product specific lib
-%__install -m 0644 
target/%{artifactname}-%{wdd_namenode_nonstop_base_version}.jar 
$RPM_BUILD_ROOT/%{lib_hdfs}
+%__install -m 0644 
%{server_jars}/%{artifactname}-server-%{wdd_namenode_nonstop_base_version}.jar 
$RPM_BUILD_ROOT/%{lib_hdfs}
+%__install -m 0644 
%{client_jars}/%{artifactname}-client-%{wdd_namenode_nonstop_base_version}.jar 
$RPM_BUILD_ROOT/%{lib_hdfs}
 for extra_lib in %{extra_libs}
 do
-    %__install -m 644 target/extra_libs/${extra_lib} 
$RPM_BUILD_ROOT/%{lib_hdfs}/lib/
+    %__install -m 644 %{server_jars}/extra_libs/${extra_lib} 
$RPM_BUILD_ROOT/%{lib_hdfs}/lib/
 done
 for extra_lib in %{extra_deps_libs}
 do
-    %__install -m 644 target/extra_libs/${extra_lib} 
$RPM_BUILD_ROOT/%{lib_hdfs}/lib/
+    %__install -m 644 %{server_jars}/extra_libs/${extra_lib} 
$RPM_BUILD_ROOT/%{lib_hdfs}/lib/
 done
 
 # Init.d scripts
@@ -166,7 +185,7 @@ do
   fi
 done
 
-%files
+%files server
 %defattr(-,root,root)
 %{lib_hdfs}
 %{initd_dir}/hadoop-hdfs-nonstop
@@ -187,7 +206,12 @@ done
 %config(noreplace) /etc/default/hadoop-hdfs-nonstop-checkpoints
 %{conf_checkpoints}
 
+%files client
+%{lib_hdfs}/%{artifactname}-client-%{wdd_namenode_nonstop_base_version}.jar
+
 %changelog
+* Thu Feb 20 2014 Konstantin Boudnik <[email protected]>
+- HAD-620. Splitting server and client packages
 * Thu Jan 23 2014 Konstantin Boudnik <[email protected]>
 - Default settings shouldn't be upgraded in the package update
 * Thu Oct 24 2013 Konstantin Boudnik <[email protected]>

Reply via email to