From 03f62bd8f6c0279a39f30ce03a44ddb41bd46496 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Fri, 9 Sep 2011 20:35:22 +0200
Subject: [PATCH] Made the different version numbers refer to version in
 pom.xml.

---
 pom.xml                             | 18 ++++++++++++++++++
 src/main/assembly/package.xml       | 19 ++++++++++++++++---
 src/main/resources/lightings.txt    |  2 +-
 src/main/resources/perspectives.txt |  2 +-
 src/main/resources/plugin.yml       |  4 ++--
 web/index.html                      |  1 +
 web/js/map.js                       |  1 -
 web/version.js                      |  1 +
 8 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 web/version.js

diff --git a/pom.xml b/pom.xml
index b7ce19e0..dbdbf371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,24 @@
   	<url>https://github.com/FrozenCow/dynmap/issues</url>
   </issueManagement>
   <build>
+	  <resources>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>true</filtering>
+		  <includes>
+			<include>*.yml</include>
+			<include>*.txt</include>
+		  </includes>
+		</resource>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>false</filtering>
+		  <excludes>
+			<exclude>*.yml</exclude>
+			<exclude>*.txt</exclude>
+		  </excludes>
+		</resource>
+	  </resources>
       <plugins>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
index b11688c4..ad84a28f 100644
--- a/src/main/assembly/package.xml
+++ b/src/main/assembly/package.xml
@@ -15,9 +15,20 @@
         <include>CHANGELOG*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/web/</directory>
+      <outputDirectory>/dynmap/web/</outputDirectory>
+	  <includes>
+		<include>version.js</include>
+	  </includes>
+      <filtered>true</filtered>
+    </fileSet>
     <fileSet>
       <directory>${project.basedir}/web</directory>
       <outputDirectory>/dynmap/web</outputDirectory>
+	  <excludes>
+		<exclude>version.js</exclude>
+	  </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/colorschemes</directory>
@@ -32,7 +43,9 @@
   </fileSets>
   <files>
   	<file>
-  		<source>${project.build.directory}/${artifactId}-${version}.jar</source>
-  		<outputDirectory>/</outputDirectory>
-  		<destName>dynmap.jar</destName></file></files>
+  	  <source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  	  <outputDirectory>/</outputDirectory>
+  	  <destName>dynmap.jar</destName>
+	</file>
+  </files>
 </assembly>
diff --git a/src/main/resources/lightings.txt b/src/main/resources/lightings.txt
index a5f6c97e..935cd856 100644
--- a/src/main/resources/lightings.txt
+++ b/src/main/resources/lightings.txt
@@ -1,4 +1,4 @@
-version: 0.22
+version: ${project.version}
 #
 # This file contains default standard lighting profiles.  The contents of this file CAN need to be replaced and updated
 # during upgrades, so new or updated lighting definitions should be done in the custom-lightings.txt file
diff --git a/src/main/resources/perspectives.txt b/src/main/resources/perspectives.txt
index 0fc3ca84..47407b31 100644
--- a/src/main/resources/perspectives.txt
+++ b/src/main/resources/perspectives.txt
@@ -1,4 +1,4 @@
-version: 0.22
+version: ${project.version}
 #
 # This file contains default standard perspective definitions.  The contents of this file CAN need to be replaced and updated
 # during upgrades, so new or updated perspective definitions should be done in the custom-perspectives.txt file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 8a45511e..04ef011e 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: dynmap
 main: org.dynmap.DynmapPlugin
-version: "0.22"
+version: "${project.version}"
 authors: [FrozenCow, mikeprimm, zeeZ]
 softdepend: [Permissions]
 commands:
@@ -139,4 +139,4 @@ permissions:
   dynmap.marker.addicon:
     description: Allows /dmarker addicon
     default: op
-            
\ No newline at end of file
+            
diff --git a/web/index.html b/web/index.html
index ba399cf9..d7e54ae0 100644
--- a/web/index.html
+++ b/web/index.html
@@ -27,6 +27,7 @@
 	<link rel="stylesheet" type="text/css" href="css/dynmap_style.css" media="screen" />
 	<!-- <link rel="stylesheet" type="text/css" href="css/override.css" media="screen" /> -->
 
+	<script type="text/javascript" src="version.js"></script>
 	<script type="text/javascript" src="js/jquery.json.js"></script>
 	<script type="text/javascript" src="js/jquery.mousewheel.js"></script>
 	<script type="text/javascript" src="js/minecraft.js"></script>
diff --git a/web/js/map.js b/web/js/map.js
index 9d1250cd..1fb8378f 100644
--- a/web/js/map.js
+++ b/web/js/map.js
@@ -1,7 +1,6 @@
 "use strict";
 //if (!console) console = { log: function() {} }; 
 
-var dynmapversion = "0.22";	// This needs to match plugin verison
 var componentconstructors = {};
 var maptypes = {};
 var map = null;	// Leaflet assumes top-level 'map'...
diff --git a/web/version.js b/web/version.js
new file mode 100644
index 00000000..463dc200
--- /dev/null
+++ b/web/version.js
@@ -0,0 +1 @@
+var dynmapversion = "${project.version}";
\ No newline at end of file