From e987881635a28aa18b98f8bfbe80043afaf22094 Mon Sep 17 00:00:00 2001
From: Shireesh Anjal <shireesh@gluster.com>
Date: Fri, 9 Dec 2011 21:30:13 +0530
Subject: Modified to use placeholder @VERSION@ instead of hard coding version
 number, and replacing the same at build time with required version number.

---
 src/org.gluster.storage.management.console/plugin.properties        | 2 +-
 .../WebContent/WEB-INF/web.xml                                      | 6 +++---
 src/org.gluster.storage.management.gateway/build/glusterserver.ant  | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/org.gluster.storage.management.console/plugin.properties b/src/org.gluster.storage.management.console/plugin.properties
index e9027ab1..b61106df 100644
--- a/src/org.gluster.storage.management.console/plugin.properties
+++ b/src/org.gluster.storage.management.console/plugin.properties
@@ -17,7 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 ###############################################################################
 aboutText=Gluster Management Console\n\
-Version: 1.0.0-alpha\n\n\
+Version: @VERSION@\n\n\
 Copyright (c) 2011 Gluster, Inc.\n\
 Visit http://www.gluster.com/\n\n\
 This product includes software developed by the\n\
diff --git a/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
index dc00a356..d2f2b742 100644
--- a/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
@@ -45,7 +45,7 @@
     <listener-class>org.gluster.storage.management.gateway.listeners.ShutdownListener</listener-class>
   </listener>
   <servlet>
-    <servlet-name>gluster-resources-1.0</servlet-name>
+    <servlet-name>gluster-resources-@VERSION@</servlet-name>
     <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
@@ -58,8 +58,8 @@
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
-    <servlet-name>gluster-resources-1.0</servlet-name>
-    <url-pattern>/1.0.0/*</url-pattern>
+    <servlet-name>gluster-resources-@VERSION@</servlet-name>
+    <url-pattern>/@VERSION@/*</url-pattern>
   </servlet-mapping>
   <servlet>
     <servlet-name>JnlpDownloadServlet</servlet-name>
diff --git a/src/org.gluster.storage.management.gateway/build/glusterserver.ant b/src/org.gluster.storage.management.gateway/build/glusterserver.ant
index 9ba36f55..d05a5fb9 100644
--- a/src/org.gluster.storage.management.gateway/build/glusterserver.ant
+++ b/src/org.gluster.storage.management.gateway/build/glusterserver.ant
@@ -1,6 +1,4 @@
 <project name="org.gluster.storage.management.gateway" basedir="." default="archive">
-	<echo message="basedir=${basedir}" />
-	<echo message="buckminster.output=${buckminster.output}" />
 	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
 	<property name="OUT" value="${buckminster.output}/glusterserver/" />
 	<property name="WAR_FILE_NAME" value="glustermg.war" />
@@ -59,6 +57,7 @@
 				<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>
-- 
cgit