From 8cbdf3ff0883c54f2bb0b87ee86d7984d83822eb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 17 Apr 2014 23:33:24 -0400
Subject: [PATCH] Remove User parameter from SSH dispatch command setup
---
src/main/java/com/gitblit/models/PluginRegistry.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/gitblit/models/PluginRegistry.java b/src/main/java/com/gitblit/models/PluginRegistry.java
index b5cf0ee..0c5d5a1 100644
--- a/src/main/java/com/gitblit/models/PluginRegistry.java
+++ b/src/main/java/com/gitblit/models/PluginRegistry.java
@@ -23,7 +23,7 @@
import org.parboiled.common.StringUtils;
-import ro.fortsoft.pf4j.PluginVersion;
+import ro.fortsoft.pf4j.Version;
/**
* Represents a list of plugin registrations.
@@ -47,10 +47,9 @@
}
}
- public PluginRegistration lookup(String idOrName) {
+ public PluginRegistration lookup(String id) {
for (PluginRegistration registration : registrations) {
- if (registration.id.equalsIgnoreCase(idOrName)
- || registration.name.equalsIgnoreCase(idOrName)) {
+ if (registration.id.equalsIgnoreCase(id)) {
return registration;
}
}
@@ -63,7 +62,7 @@
}
public static enum InstallState {
- NOT_INSTALLED, INSTALLED, CAN_UPDATE, UNKNOWN
+ NOT_INSTALLED, INSTALLED, UPDATE_AVAILABLE, UNKNOWN
}
/**
@@ -74,8 +73,6 @@
private static final long serialVersionUID = 1L;
public final String id;
-
- public String name;
public String description;
@@ -96,19 +93,40 @@
this.releases = new ArrayList<PluginRelease>();
}
- public PluginRelease getCurrentRelease() {
+ public PluginRelease getCurrentRelease(Version system) {
PluginRelease current = null;
if (!StringUtils.isEmpty(currentRelease)) {
// find specified
current = getRelease(currentRelease);
}
+ if (current != null) {
+ // verify the current release is acceptable for this system
+ Version requires = Version.ZERO;
+ if (!StringUtils.isEmpty(current.requires)) {
+ requires = Version.createVersion(current.requires);
+ }
+
+ if (!system.isZero() && !system.atLeast(requires)) {
+ // requires newer system version
+ current = null;
+ }
+ }
+
if (current == null) {
// find by date
Date date = new Date(0);
for (PluginRelease pv : releases) {
- if (pv.date.after(date)) {
- current = pv;
+ Version requires = Version.ZERO;
+ if (!StringUtils.isEmpty(pv.requires)) {
+ requires = Version.createVersion(pv.requires);
+ }
+
+ if (system.isZero() || system.atLeast(requires)) {
+ if (pv.date.after(date)) {
+ current = pv;
+ date = pv.date;
+ }
}
}
}
@@ -128,13 +146,13 @@
if (StringUtils.isEmpty(installedRelease)) {
return InstallState.NOT_INSTALLED;
}
- PluginVersion ir = PluginVersion.createVersion(installedRelease);
- PluginVersion cr = PluginVersion.createVersion(currentRelease);
+ Version ir = Version.createVersion(installedRelease);
+ Version cr = Version.createVersion(currentRelease);
switch (ir.compareTo(cr)) {
case -1:
return InstallState.UNKNOWN;
case 1:
- return InstallState.CAN_UPDATE;
+ return InstallState.UPDATE_AVAILABLE;
default:
return InstallState.INSTALLED;
}
@@ -146,7 +164,10 @@
}
}
- public static class PluginRelease implements Comparable<PluginRelease> {
+ public static class PluginRelease implements Serializable, Comparable<PluginRelease> {
+
+ private static final long serialVersionUID = 1L;
+
public String version;
public Date date;
public String requires;
@@ -154,7 +175,7 @@
@Override
public int compareTo(PluginRelease o) {
- return PluginVersion.createVersion(version).compareTo(PluginVersion.createVersion(o.version));
+ return Version.createVersion(version).compareTo(Version.createVersion(o.version));
}
}
}
--
Gitblit v1.9.1