diff options
author | James Moger <james.moger@gitblit.com> | 2014-04-15 08:32:31 -0400 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2014-04-15 08:32:31 -0400 |
commit | cc26656d8deaf8ebe552897480240a7665b0fb76 (patch) | |
tree | 0f225c12af7705030524060540ddcaed8a796744 /src/main/java | |
parent | 289917bb90ee30fb357a3646ba0d40ceacf7e5ed (diff) | |
download | gitblit-cc26656d8deaf8ebe552897480240a7665b0fb76.tar.gz gitblit-cc26656d8deaf8ebe552897480240a7665b0fb76.zip |
Update to pf4j 0.8.0
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/gitblit/models/PluginRegistry.java | 8 | ||||
-rw-r--r-- | src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java | 32 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/main/java/com/gitblit/models/PluginRegistry.java b/src/main/java/com/gitblit/models/PluginRegistry.java index 7c1927f5..ef463163 100644 --- a/src/main/java/com/gitblit/models/PluginRegistry.java +++ b/src/main/java/com/gitblit/models/PluginRegistry.java @@ -23,7 +23,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.parboiled.common.StringUtils;
-import ro.fortsoft.pf4j.PluginVersion;
+import ro.fortsoft.pf4j.Version;
/**
* Represents a list of plugin registrations.
@@ -125,8 +125,8 @@ public class PluginRegistry implements Serializable { 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;
@@ -151,7 +151,7 @@ public class PluginRegistry implements Serializable { @Override
public int compareTo(PluginRelease o) {
- return PluginVersion.createVersion(version).compareTo(PluginVersion.createVersion(o.version));
+ return Version.createVersion(version).compareTo(Version.createVersion(o.version));
}
}
}
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java b/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java index f5b68548..70dc5130 100644 --- a/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java +++ b/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java @@ -75,7 +75,7 @@ public class PluginDispatcher extends DispatchCommand { protected void asTable(List<PluginWrapper> list) { String[] headers; if (verbose) { - String [] h = { "#", "Id", "Description", "Version", "Requires", "State", "Path", "Provider"}; + String [] h = { "#", "Id", "Description", "Version", "Requires", "State", "Path" }; headers = h; } else { String [] h = { "#", "Id", "Version", "State", "Path"}; @@ -86,7 +86,7 @@ public class PluginDispatcher extends DispatchCommand { PluginWrapper p = list.get(i); PluginDescriptor d = p.getDescriptor(); if (verbose) { - data[i] = new Object[] { "" + (i + 1), d.getPluginId(), null/*d.getDescription()*/, d.getVersion(), null/*d.getRequires()*/, p.getPluginState(), p.getPluginPath(), d.getProvider() }; + data[i] = new Object[] { "" + (i + 1), d.getPluginId(), d.getPluginDescription(), d.getVersion(), d.getRequires(), p.getPluginState(), p.getPluginPath() }; } else { data[i] = new Object[] { "" + (i + 1), d.getPluginId(), d.getVersion(), p.getPluginState(), p.getPluginPath() }; } @@ -100,7 +100,7 @@ public class PluginDispatcher extends DispatchCommand { for (PluginWrapper pw : list) { PluginDescriptor d = pw.getDescriptor(); if (verbose) { - outTabbed(d.getPluginId(), null/*d.getDescription()*/, d.getVersion(), null/*d.getRequires()*/, pw.getPluginState(), pw.getPluginPath(), d.getProvider()); + outTabbed(d.getPluginId(), d.getPluginDescription(), d.getVersion(), d.getRequires(), pw.getPluginState(), pw.getPluginPath()); } else { outTabbed(d.getPluginId(), d.getVersion(), pw.getPluginState(), pw.getPluginPath()); } @@ -157,7 +157,7 @@ public class PluginDispatcher extends DispatchCommand { if (PluginState.STARTED.equals(state)) { stdout.println(String.format("Started %s", pluginWrapper.getPluginId())); } else { - throw new Failure(1, String.format("Failed to start %s", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Failed to start %s", pluginWrapper.getPluginId())); } } } @@ -185,7 +185,7 @@ public class PluginDispatcher extends DispatchCommand { if (PluginState.STOPPED.equals(state)) { stdout.println(String.format("Stopped %s", pluginWrapper.getPluginId())); } else { - throw new Failure(1, String.format("Failed to stop %s", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Failed to stop %s", pluginWrapper.getPluginId())); } } } @@ -208,7 +208,7 @@ public class PluginDispatcher extends DispatchCommand { if (gitblit.enablePlugin(pluginWrapper.getPluginId())) { stdout.println(String.format("Enabled %s", pluginWrapper.getPluginId())); } else { - throw new Failure(1, String.format("Failed to enable %s", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Failed to enable %s", pluginWrapper.getPluginId())); } } } @@ -230,7 +230,7 @@ public class PluginDispatcher extends DispatchCommand { if (gitblit.disablePlugin(pluginWrapper.getPluginId())) { stdout.println(String.format("Disabled %s", pluginWrapper.getPluginId())); } else { - throw new Failure(1, String.format("Failed to disable %s", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Failed to disable %s", pluginWrapper.getPluginId())); } } } @@ -258,9 +258,9 @@ public class PluginDispatcher extends DispatchCommand { protected String buildFieldTable(PluginWrapper pw, PluginRegistration reg) { final String id = pw == null ? reg.id : pw.getPluginId(); - final String description = reg == null ? ""/*pw.getDescriptor().getDescription()*/ : reg.description; + final String description = reg == null ? pw.getDescriptor().getPluginDescription() : reg.description; final String version = pw == null ? reg.getCurrentRelease().version : pw.getDescriptor().getVersion().toString(); - final String requires = pw == null ? reg.getCurrentRelease().requires : ""/*pw.getDescriptor().getRequires().toString()*/; + final String requires = pw == null ? reg.getCurrentRelease().requires : pw.getDescriptor().getRequires().toString(); final String provider = pw == null ? reg.provider : pw.getDescriptor().getProvider(); final String registry = reg == null ? "" : reg.registry; final String path = pw == null ? "" : pw.getPluginPath(); @@ -516,7 +516,7 @@ public class PluginDispatcher extends DispatchCommand { if (gitblit.installPlugin(urlOrId, !disableChecksum)) { stdout.println(String.format("Installed %s", urlOrId)); } else { - new Failure(1, String.format("Failed to install %s", urlOrId)); + new UnloggedFailure(1, String.format("Failed to install %s", urlOrId)); } } else { PluginRelease pv = gitblit.lookupRelease(urlOrId, version); @@ -526,12 +526,12 @@ public class PluginDispatcher extends DispatchCommand { if (gitblit.installPlugin(pv.url, !disableChecksum)) { stdout.println(String.format("Installed %s", urlOrId)); } else { - throw new Failure(1, String.format("Failed to install %s", urlOrId)); + throw new UnloggedFailure(1, String.format("Failed to install %s", urlOrId)); } } } catch (IOException e) { log.error("Failed to install " + urlOrId, e); - throw new Failure(1, String.format("Failed to install %s", urlOrId), e); + throw new UnloggedFailure(1, String.format("Failed to install %s", urlOrId), e); } } } @@ -558,18 +558,18 @@ public class PluginDispatcher extends DispatchCommand { PluginRelease pv = gitblit.lookupRelease(pluginWrapper.getPluginId(), version); if (pv == null) { - throw new Failure(1, String.format("Plugin \"%s\" is not in the registry!", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Plugin \"%s\" is not in the registry!", pluginWrapper.getPluginId())); } try { if (gitblit.upgradePlugin(pluginWrapper.getPluginId(), pv.url, !disableChecksum)) { stdout.println(String.format("Upgraded %s", pluginWrapper.getPluginId())); } else { - throw new Failure(1, String.format("Failed to upgrade %s", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Failed to upgrade %s", pluginWrapper.getPluginId())); } } catch (IOException e) { log.error("Failed to upgrade " + pluginWrapper.getPluginId(), e); - throw new Failure(1, String.format("Failed to upgrade %s", pluginWrapper.getPluginId()), e); + throw new UnloggedFailure(1, String.format("Failed to upgrade %s", pluginWrapper.getPluginId()), e); } } } @@ -591,7 +591,7 @@ public class PluginDispatcher extends DispatchCommand { if (gitblit.deletePlugin(pluginWrapper.getPluginId())) { stdout.println(String.format("Uninstalled %s", pluginWrapper.getPluginId())); } else { - throw new Failure(1, String.format("Failed to uninstall %s", pluginWrapper.getPluginId())); + throw new UnloggedFailure(1, String.format("Failed to uninstall %s", pluginWrapper.getPluginId())); } } } |