Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-20 05:52:32 +01:00
Code Issues Projects Releases Wiki Activity

Give core its own version file

Browse Source
This commit is contained in:
Mike Primm 2012-01-15 17:24:01 -06:00
parent b64094795e
commit 2d42b59a12
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/dynmap/DynmapCore.java
View File

@ -35,6 +35,7 @@ import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHandler; import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.yaml.snakeyaml.Yaml;
import javax.servlet.*; import javax.servlet.*;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
@ -42,7 +43,7 @@ import javax.servlet.http.HttpServletResponse;
public class DynmapCore { public class DynmapCore {
private DynmapServerInterface server; private DynmapServerInterface server;
private String version = "0.30-dev"; private String version;
private Server webServer = null; private Server webServer = null;
private ServletContextHandler webServerContextHandler = null; private ServletContextHandler webServerContextHandler = null;
public MapManager mapManager = null; public MapManager mapManager = null;
@ -222,6 +223,9 @@ public class DynmapCore {
public boolean enableCore() { public boolean enableCore() {
/* Start with clean events */ /* Start with clean events */
events = new Events(); events = new Events();
/* Load plugin version info */
loadVersion();
/* Initialize confguration.txt if needed */ /* Initialize confguration.txt if needed */
File f = new File(dataDirectory, "configuration.txt"); File f = new File(dataDirectory, "configuration.txt");
@ -337,7 +341,7 @@ public class DynmapCore {
}); });
/* Print version info */ /* Print version info */
Log.info("version " + version + " is enabled" ); Log.info("version " + plugin_ver + " is enabled - core version " + version );
events.<Object>trigger("initialized", null); events.<Object>trigger("initialized", null);
@ -1244,4 +1248,16 @@ public class DynmapCore {
public boolean processWorldLoad(DynmapWorld w) { public boolean processWorldLoad(DynmapWorld w) {
return mapManager.activateWorld(w); return mapManager.activateWorld(w);
} }
/* Load core version */
private void loadVersion() {
InputStream in = getClass().getResourceAsStream("/core.yml");
if(in == null)
return;
Yaml yaml = new Yaml();
@SuppressWarnings("unchecked")
Map<String,Object> val = (Map<String,Object>)yaml.load(in);
if(val != null)
version = (String)val.get("version");
}
} }

3
src/main/resources/core.yml Normal file
View File

@ -0,0 +1,3 @@
version: "${project.version}-${BUILD_NUMBER}"
authors: [FrozenCow, mikeprimm]