From 5491415a98109ecea1c408a2e964054b7be13720 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Mon, 8 Feb 2016 12:00:38 +0000
Subject: [PATCH] Fixing pom and distro files for release 2.0.0

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution-bundle@122904 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml   | 8 ++++++++
 src/resources/setup.sh | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 6c46cac..aebe566 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,12 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.2-0-0" date="2015-02-08">
+		<Change>Fixing hostname code on setup</Change>
+		<Change>Upgraded bundle for version 2.0.0 of smartgears</Change>
+	</Changeset>
+	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-5" date="2015-01-08">
+		<Change>Used property to set tomcat version</Change>
+		<Change>Improve setup for smartgears-distribution-bundle (refs #77)</Change>
+	</Changeset>
 	<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-4" date="2015-10-16">
 		<Change>Passing smartgears-distribution version as argument when compiling</Change>
 		<Change>Used tomcat 7 range instead of fixed version</Change>
diff --git a/src/resources/setup.sh b/src/resources/setup.sh
index fa1fa93..e73d4e6 100644
--- a/src/resources/setup.sh
+++ b/src/resources/setup.sh
@@ -27,11 +27,10 @@ function showhelp {
 }
 
 function hostname {
-	local DOMAIN=$(/bin/domainname)
 	local HOSTNAME=$(/bin/hostname)
 	
 	if [ -z "$HOST" ]; then
-		HOST=${HOSTNAME}.${DOMAIN}
+		HOST=${HOSTNAME}
 	fi
 	
 	local HOST_OK=false