From 48c43c5abbe6b7e76d278b451b7757c80a7f916a Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 10:06:23 -0600 Subject: [PATCH 1/7] Delay asking for PermissionHandler - might help PEX not freak out --- .../java/org/dynmap/permissions/NijikokunPermissions.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/dynmap/permissions/NijikokunPermissions.java b/src/main/java/org/dynmap/permissions/NijikokunPermissions.java index dade7c82..bf6ded94 100644 --- a/src/main/java/org/dynmap/permissions/NijikokunPermissions.java +++ b/src/main/java/org/dynmap/permissions/NijikokunPermissions.java @@ -12,11 +12,13 @@ import com.nijikokun.bukkit.Permissions.Permissions; public class NijikokunPermissions implements PermissionProvider { String name; PermissionHandler permissions; - + Plugin plugin; + public static NijikokunPermissions create(Server server, String name) { Plugin permissionsPlugin = server.getPluginManager().getPlugin("Permissions"); if (permissionsPlugin == null) return null; + server.getPluginManager().enablePlugin(permissionsPlugin); Log.info("Using Permissions " + permissionsPlugin.getDescription().getVersion() + " for access control"); return new NijikokunPermissions(permissionsPlugin, name); @@ -24,11 +26,13 @@ public class NijikokunPermissions implements PermissionProvider { public NijikokunPermissions(Plugin permissionsPlugin, String name) { this.name = name; - permissions = ((Permissions) permissionsPlugin).getHandler(); + plugin = permissionsPlugin; } @Override public boolean has(CommandSender sender, String permission) { + if(permissions == null) + permissions = ((Permissions)plugin).getHandler(); Player player = sender instanceof Player ? (Player) sender : null; return player != null ? permissions.has(player, name + "." + permission) || permissions.has(player, name + ".*") From 91fa58584edd6204002501ee3260d7e13ba1981c Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 11:25:22 -0600 Subject: [PATCH 2/7] Try another update to see if PEX is appeased --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7340fc9f..ede9d6b3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: dynmap main: org.dynmap.DynmapPlugin version: "${project.version}" authors: [FrozenCow, mikeprimm] -softdepend: [Permissions,PermissionEx,bPermissions,PermissionsBukkit] +softdepend: [ Permissions, PermissionEx, bPermissions, PermissionsBukkit] commands: dynmap: description: Controls Dynmap. From e0925dfc98748b9dc8244ccbc447f1e5a270b504 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 15:47:51 -0600 Subject: [PATCH 3/7] Switch maven shader from exclude to include - keep idiot maven from pulling in PEX from shared build server.... --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dce7f8fa..8f719f01 100644 --- a/pom.xml +++ b/pom.xml @@ -53,10 +53,9 @@ - - org.bukkit:bukkit:jar:* - com.nijikokun.bukkit:Permissions:jar:* - + + org.dynmap:dynmap-api:jar:* + From 236ba68cae074fb36c250b2615f3b50a34d37972 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 16:37:43 -0600 Subject: [PATCH 4/7] Switch maven dependencies to ranges --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8f719f01..a38c390c 100644 --- a/pom.xml +++ b/pom.xml @@ -95,14 +95,14 @@ org.bukkit bukkit - 1.0.0-R1-SNAPSHOT + [1.0.0-R1-SNAPSHOT,) jar compile org.dynmap dynmap-api - 0.25 + [0.25,) jar compile From ecf01547cd154d5e9a4794542383d5374d16e1ea Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 17:21:23 -0600 Subject: [PATCH 5/7] Try inserting build number into version --- pom.xml | 1 + src/main/resources/plugin.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a38c390c..90d54dde 100644 --- a/pom.xml +++ b/pom.xml @@ -6,6 +6,7 @@ dynmap UTF-8 + dev http://github.com/webbukkit/dynmap/ diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ede9d6b3..53b4ade7 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: dynmap main: org.dynmap.DynmapPlugin -version: "${project.version}" +version: "${project.version}-${BUILD_NUMBER}" authors: [FrozenCow, mikeprimm] softdepend: [ Permissions, PermissionEx, bPermissions, PermissionsBukkit] commands: From 1472e96104a577827bedf6bc9c8bd659bd112425 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 19:30:57 -0600 Subject: [PATCH 6/7] Add build number to version.js too --- web/version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version.js b/web/version.js index 463dc200..fc0afb9e 100644 --- a/web/version.js +++ b/web/version.js @@ -1 +1 @@ -var dynmapversion = "${project.version}"; \ No newline at end of file +var dynmapversion = "${project.version}_${BUILD_NUMBER}"; \ No newline at end of file From e77c36c6f38ac60264d681e24d2047c1b6f24f61 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 27 Nov 2011 19:35:49 -0600 Subject: [PATCH 7/7] Make sure format of version-buildnum matches --- web/version.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version.js b/web/version.js index fc0afb9e..0b0de1f8 100644 --- a/web/version.js +++ b/web/version.js @@ -1 +1 @@ -var dynmapversion = "${project.version}_${BUILD_NUMBER}"; \ No newline at end of file +var dynmapversion = "${project.version}-${BUILD_NUMBER}"; \ No newline at end of file