Rename hive-apache1 to hive-hadoop1 and bundle with server