From 8e2295b6b7139a0cf36d4f78c5caeb6bf7919ef0 Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <anjalshireesh@gmail.com>
Date: Sat, 10 Dec 2011 12:59:27 +0530
Subject: Renamed glustermg build file to glustermg.ant, Introduced
 configuration parameter dataVersion in spring configuration, Replaced hard
 coded appVersion to use placeholder @VERSION@ in spring configuration, which
 will be replaced with actual version number at build time. Modified
 InitServerTask to upgrade data based on the new parameter dataVersion instead
 of appVersion

---
 .../buckminster.cspex                              |  2 +-
 .../build/glustermg.ant                            | 73 ++++++++++++++++++++++
 .../build/glusterserver.ant                        | 69 --------------------
 .../management/gateway/tasks/InitServerTask.java   | 17 +++--
 .../src/spring/gluster-server-base.xml             |  7 ++-
 5 files changed, 88 insertions(+), 80 deletions(-)
 create mode 100644 src/org.gluster.storage.management.gateway/build/glustermg.ant
 delete mode 100644 src/org.gluster.storage.management.gateway/build/glusterserver.ant

diff --git a/src/org.gluster.storage.management.gateway/buckminster.cspex b/src/org.gluster.storage.management.gateway/buckminster.cspex
index 31eb9d67..4133dfcb 100644
--- a/src/org.gluster.storage.management.gateway/buckminster.cspex
+++ b/src/org.gluster.storage.management.gateway/buckminster.cspex
@@ -15,7 +15,7 @@
 	<actions>
 		<public name="archive" actor="ant">
 	      <actorProperties>
-	        <property key="buildFile" value="build/glusterserver.ant"/>
+	        <property key="buildFile" value="build/glustermg.ant"/>
 	      </actorProperties>
 	    </public>
 	</actions>
diff --git a/src/org.gluster.storage.management.gateway/build/glustermg.ant b/src/org.gluster.storage.management.gateway/build/glustermg.ant
new file mode 100644
index 00000000..ac15e1bd
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/build/glustermg.ant
@@ -0,0 +1,73 @@
+<project name="org.gluster.storage.management.gateway" basedir="." default="archive">
+	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
+	<property name="OUT" value="${buckminster.output}/glusterserver/" />
+	<property name="WAR_FILE_NAME" value="glustermg.war" />
+	<property name="TEMP" value="${buckminster.output}/temp" />
+
+	<target name="help">
+		<echo>
+            --------------------------------------------------
+            compile - Compile
+            archive - Generate WAR file
+            --------------------------------------------------
+        </echo>
+	</target>
+
+	<target name="init">
+		<delete dir="${WEB-INF}/classes" />
+		<mkdir dir="${WEB-INF}/classes" />
+		<mkdir dir="${WEB-INF}/classes/spring" />
+		<mkdir dir="${WEB-INF}/classes/META-INF" />
+	</target>
+
+	<target name="compile" depends="init">
+		<!-- flatten=true means ignore directory structure and copy files directly to destination -->
+		<copy todir="${WEB-INF}/lib" flatten="true">
+			<fileset dir="${buckminster.output}/.." casesensitive="yes">
+				<include name="**/*.jar" />
+			</fileset>
+		</copy>
+		<copy todir="${WEB-INF}/classes/spring">
+			<fileset dir="${basedir}/src/spring" casesensitive="yes">
+				<include name="**/*.xml" />
+			</fileset>
+		</copy>
+		<copy todir="${WEB-INF}/classes/META-INF">
+			<fileset dir="${basedir}/src/META-INF" casesensitive="yes">
+				<include name="**/*.xml" />
+			</fileset>
+		</copy>
+		<copy todir="${WEB-INF}/classes">
+			<fileset dir="${basedir}/src" casesensitive="yes">
+				<include name="log4j.properties" />
+			</fileset>
+		</copy>
+		<!-- TODO: make debug option configurable in jenkins -->
+		<javac srcdir="${basedir}/src" destdir="${WEB-INF}/classes" classpathref="libs" debug="true" debuglevel="lines,vars,source"/>
+	</target>
+
+	<target name="archive" depends="compile">
+		<delete dir="${OUT}" />
+		<mkdir dir="${OUT}" />
+		<delete dir="${TEMP}" />
+		<mkdir dir="${TEMP}" />
+		<copy todir="${TEMP}">
+			<fileset dir="${basedir}/WebContent">
+				<!-- servlet-api.jar is required during compilation. At runtime, it is picked from tomcat lib directory -->
+				<exclude name="**/servlet-api.jar" />
+			</fileset>
+		</copy>
+
+        <!-- Update product version in xml files -->
+		<replace file="${TEMP}/WEB-INF/web.xml" token="@VERSION@" value="${product.version}" />
+		<replace file="${TEMP}/WEB-INF/classes/spring/gluster-server-base.xml" token="@VERSION@" value="${product.version}" />
+
+		<war destfile="${OUT}/${WAR_FILE_NAME}" basedir="${TEMP}" compress="true" webxml="${TEMP}/WEB-INF/web.xml" />
+		<delete dir="${TEMP}" />
+	</target>
+
+	<path id="libs">
+		<fileset includes="*.jar" dir="${WEB-INF}/lib" />
+	</path>
+
+</project>
diff --git a/src/org.gluster.storage.management.gateway/build/glusterserver.ant b/src/org.gluster.storage.management.gateway/build/glusterserver.ant
deleted file mode 100644
index d05a5fb9..00000000
--- a/src/org.gluster.storage.management.gateway/build/glusterserver.ant
+++ /dev/null
@@ -1,69 +0,0 @@
-<project name="org.gluster.storage.management.gateway" basedir="." default="archive">
-	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
-	<property name="OUT" value="${buckminster.output}/glusterserver/" />
-	<property name="WAR_FILE_NAME" value="glustermg.war" />
-	<property name="TEMP" value="${buckminster.output}/temp" />
-
-	<target name="help">
-		<echo>
-            --------------------------------------------------
-            compile - Compile
-            archive - Generate WAR file
-            --------------------------------------------------
-        </echo>
-	</target>
-
-	<target name="init">
-		<delete dir="${WEB-INF}/classes" />
-		<mkdir dir="${WEB-INF}/classes" />
-		<mkdir dir="${WEB-INF}/classes/spring" />
-		<mkdir dir="${WEB-INF}/classes/META-INF" />
-	</target>
-
-	<target name="compile" depends="init">
-		<!-- flatten=true means ignore directory structure and copy files directly to destination -->
-		<copy todir="${WEB-INF}/lib" flatten="true">
-			<fileset dir="${buckminster.output}/.." casesensitive="yes">
-				<include name="**/*.jar" />
-			</fileset>
-		</copy>
-		<copy todir="${WEB-INF}/classes/spring">
-			<fileset dir="${basedir}/src/spring" casesensitive="yes">
-				<include name="**/*.xml" />
-			</fileset>
-		</copy>
-		<copy todir="${WEB-INF}/classes/META-INF">
-			<fileset dir="${basedir}/src/META-INF" casesensitive="yes">
-				<include name="**/*.xml" />
-			</fileset>
-		</copy>
-		<copy todir="${WEB-INF}/classes">
-			<fileset dir="${basedir}/src" casesensitive="yes">
-				<include name="log4j.properties" />
-			</fileset>
-		</copy>
-		<!-- TODO: make debug option configurable in jenkins -->
-		<javac srcdir="${basedir}/src" destdir="${WEB-INF}/classes" classpathref="libs" debug="true" debuglevel="lines,vars,source"/>
-	</target>
-
-	<target name="archive" depends="compile">
-		<delete dir="${OUT}" />
-		<mkdir dir="${OUT}" />
-		<delete dir="${TEMP}" />
-		<mkdir dir="${TEMP}" />
-		<copy todir="${TEMP}">
-			<fileset dir="${basedir}/WebContent">
-				<!-- servlet-api.jar is required during compilation. At runtime, it is picked from tomcat lib directory -->
-				<exclude name="**/servlet-api.jar" />
-			</fileset>
-		</copy>
-		<replace file="${TEMP}/WEB-INF/web.xml" token="@VERSION@" value="${product.version}" />
-		<war destfile="${OUT}/${WAR_FILE_NAME}" basedir="${TEMP}" compress="true" webxml="${TEMP}/WEB-INF/web.xml" />
-		<delete dir="${TEMP}" />
-	</target>
-
-	<path id="libs">
-		<fileset includes="*.jar" dir="${WEB-INF}/lib" />
-	</path>
-
-</project>
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
index 4426683f..99e8c63d 100644
--- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
@@ -57,7 +57,7 @@ public class InitServerTask extends JdbcDaoSupport {
 	private UserDetailsService userDetailsService;
 
 	@Autowired
-	private String appVersion;
+	private String dataVersion;
 
 	@Autowired
 	private PersistenceDao<ClusterInfo> clusterDao;
@@ -104,7 +104,7 @@ public class InitServerTask extends JdbcDaoSupport {
 
 	private void initDatabase() {
 		logger.info("Initializing server data...");
-		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + appVersion));
+		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + dataVersion));
 
 		securePasswords(); // encrypt the passwords
 	}
@@ -136,14 +136,13 @@ public class InitServerTask extends JdbcDaoSupport {
 	 */
 	public synchronized void initServer() {
 		try {
-			String dbVersion = getDBVersion();
-			if (!appVersion.equals(dbVersion)) {
-				logger.info("App version [" + appVersion + "] differs from data version [" + dbVersion
-						+ "]. Trying to upgrade data...");
-				upgradeData(dbVersion, appVersion);
+			String currentDataVersion = getDataVersion();
+			if (!dataVersion.equals(currentDataVersion)) {
+				logger.info("Upgrading data from [" + currentDataVersion + "] to [" + dataVersion + "]...");
+				upgradeData(currentDataVersion, dataVersion);
 			}
 		} catch (Exception ex) {
-			logger.info("No cluster created yet. DB version query failed with error [" + ex.getMessage() + "]", ex);
+			logger.info("Data version query failed with error [" + ex.getMessage() + "]", ex);
 			// Database not created yet. Create it!
 			initDatabase();
 		}
@@ -153,7 +152,7 @@ public class InitServerTask extends JdbcDaoSupport {
 		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + fromVersion + "-" + toVersion));
 	}
 
-	private String getDBVersion() {
+	private String getDataVersion() {
 		return (String) clusterDao.getSingleResultFromSQL("select version from version");
 	}
 }
diff --git a/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
index 9bce061d..43a0aadb 100644
--- a/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
+++ b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
@@ -62,6 +62,11 @@
 	
 	<!-- Gluster Management Gateway Version -->
 	<bean id="appVersion" class="java.lang.String">
+		<constructor-arg value="@VERSION@" />
+	</bean>
+
+	<!-- Gluster Management Gateway Data Version -->
+	<bean id="dataVersion" class="java.lang.String">
 		<constructor-arg value="1.0.0" />
 	</bean>
 
@@ -115,4 +120,4 @@
 	<bean class="org.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-</beans>
\ No newline at end of file
+</beans>
-- 
cgit