summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath6
-rw-r--r--build.moxie4
-rw-r--r--gitblit.iml14
-rw-r--r--releases.moxie17
-rw-r--r--src/main/java/com/gitblit/manager/PluginManager.java2
-rw-r--r--src/main/java/com/gitblit/models/PluginRegistry.java47
-rw-r--r--src/main/java/com/gitblit/servlet/PagesServlet.java99
-rw-r--r--src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java5
-rw-r--r--src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java10
-rw-r--r--src/main/java/welcome_fr.mkd2
-rw-r--r--src/site/siteindex.mkd2
11 files changed, 116 insertions, 92 deletions
diff --git a/.classpath b/.classpath
index f61ebd24..b2e98b1a 100644
--- a/.classpath
+++ b/.classpath
@@ -11,8 +11,8 @@
<classpathentry kind="lib" path="ext/javawriter-2.1.1.jar" sourcepath="ext/src/javawriter-2.1.1.jar" />
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
- <classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" />
- <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" />
+ <classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" sourcepath="ext/src/slf4j-api-1.7.5.jar" />
+ <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" sourcepath="ext/src/slf4j-log4j12-1.7.5.jar" />
<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
<classpathentry kind="lib" path="ext/jetty-all-9.1.4.v20140401.jar" sourcepath="ext/src/jetty-all-9.1.4.v20140401.jar" />
@@ -51,7 +51,7 @@
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" />
- <classpathentry kind="lib" path="ext/sshd-core-0.10.1.jar" sourcepath="ext/src/sshd-core-0.10.1.jar" />
+ <classpathentry kind="lib" path="ext/sshd-core-0.11.0.jar" sourcepath="ext/src/sshd-core-0.11.0.jar" />
<classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" />
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
diff --git a/build.moxie b/build.moxie
index 82713dfe..6d80c50f 100644
--- a/build.moxie
+++ b/build.moxie
@@ -10,7 +10,7 @@ name: Gitblit
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.5.1-SNAPSHOT
+version: 1.6.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
@@ -109,7 +109,7 @@ properties: {
bouncycastle.version : 1.49
selenium.version : 2.28.0
wikitext.version : 1.4
- sshd.version: 0.10.1
+ sshd.version: 0.11.0
mina.version: 2.0.7
}
diff --git a/gitblit.iml b/gitblit.iml
index 48a1c226..582127d1 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -85,7 +85,9 @@
<root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.5.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -94,7 +96,9 @@
<root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.5.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -514,13 +518,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="sshd-core-0.10.1.jar">
+ <library name="sshd-core-0.11.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/sshd-core-0.10.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.10.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
diff --git a/releases.moxie b/releases.moxie
index 11e0877d..12b82e7a 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -9,11 +9,20 @@ r23: {
html: ~
text: ~
security: ~
- fixes: ~
- changes: ~
+ fixes:
+ - Fix subdirectory links in pages servlet (issue-411)
+ - Fix subdirectory navigation in pages servlet (issue-412)
+ changes:
+ - improve French translation (pr-176)
+ - simplify current plugin release detection and ignore the currentRelease registry field
additions: ~
- dependencyChanges: ~
- contributors: ~
+ dependencyChanges:
+ - update to Apache MINA/SSHD 0.11.0 (issue-410)
+ contributors:
+ - James Moger
+ - Julien Kirch
+ - Ralph Hoffman
+ - Olivier Rouits
}
#
diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index 9e6a31f6..2ee48558 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -377,7 +377,7 @@ public class PluginManager implements IPluginManager, PluginStateListener {
List<PluginRegistration> list = getRegisteredPlugins();
Iterator<PluginRegistration> itr = list.iterator();
while (itr.hasNext()) {
- if (state != itr.next().getInstallState()) {
+ if (state != itr.next().getInstallState(getSystemVersion())) {
itr.remove();
}
}
diff --git a/src/main/java/com/gitblit/models/PluginRegistry.java b/src/main/java/com/gitblit/models/PluginRegistry.java
index 0c5d5a19..8da34578 100644
--- a/src/main/java/com/gitblit/models/PluginRegistry.java
+++ b/src/main/java/com/gitblit/models/PluginRegistry.java
@@ -80,8 +80,6 @@ public class PluginRegistry implements Serializable {
public String projectUrl;
- public String currentRelease;
-
public transient String installedRelease;
public transient String registry;
@@ -95,38 +93,17 @@ public class PluginRegistry implements Serializable {
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
+ Date date = new Date(0);
+ for (PluginRelease pv : releases) {
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 (!StringUtils.isEmpty(pv.requires)) {
+ requires = Version.createVersion(pv.requires);
}
- }
- if (current == null) {
- // find by date
- Date date = new Date(0);
- for (PluginRelease pv : releases) {
- 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;
- }
+ if (system.isZero() || system.atLeast(requires)) {
+ if (pv.date.after(date)) {
+ current = pv;
+ date = pv.date;
}
}
}
@@ -142,12 +119,16 @@ public class PluginRegistry implements Serializable {
return null;
}
- public InstallState getInstallState() {
+ public InstallState getInstallState(Version system) {
if (StringUtils.isEmpty(installedRelease)) {
return InstallState.NOT_INSTALLED;
}
Version ir = Version.createVersion(installedRelease);
- Version cr = Version.createVersion(currentRelease);
+ Version cr = Version.ZERO;
+ PluginRelease curr = getCurrentRelease(system);
+ if (cr != null) {
+ cr = Version.createVersion(curr.version);
+ }
switch (ir.compareTo(cr)) {
case -1:
return InstallState.UNKNOWN;
diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java
index 74c1cb2d..7e48f8e2 100644
--- a/src/main/java/com/gitblit/servlet/PagesServlet.java
+++ b/src/main/java/com/gitblit/servlet/PagesServlet.java
@@ -20,14 +20,15 @@ import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.Map;
+import java.util.TreeMap;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree;
@@ -156,7 +157,6 @@ public class PagesServlet extends DaggerServlet {
"# Error\nSorry, the repository {0} does not have a **gh-pages** branch!",
repository);
error(response, mkd);
- r.close();
return;
}
@@ -169,45 +169,59 @@ public class PagesServlet extends DaggerServlet {
if (res.endsWith("/")) {
res = res.substring(0, res.length() - 1);
}
- Set<String> names = new TreeSet<String>();
- for (PathModel entry : JGitUtils.getFilesInPath(r, res, commit)) {
- names.add(entry.name);
- }
+
+ List<PathModel> pathEntries = JGitUtils.getFilesInPath(r, res, commit);
byte[] content = null;
- if (names.isEmpty()) {
+ if (pathEntries.isEmpty()) {
// not a path, a specific resource
try {
- String contentType = context.getMimeType(resource);
+ String contentType = context.getMimeType(res);
if (contentType == null) {
contentType = "text/plain";
}
if (contentType.startsWith("text")) {
- content = JGitUtils.getStringContent(r, tree, resource, encodings).getBytes(
+ content = JGitUtils.getStringContent(r, tree, res, encodings).getBytes(
Constants.ENCODING);
} else {
- content = JGitUtils.getByteContent(r, tree, resource, false);
+ content = JGitUtils.getByteContent(r, tree, res, false);
}
response.setContentType(contentType);
} catch (Exception e) {
}
} else {
- // path
+ // path request
+ if (!request.getPathInfo().endsWith("/")) {
+ // redirect to trailing '/' url
+ response.sendRedirect(request.getServletPath() + request.getPathInfo() + "/");
+ return;
+ }
+
+ Map<String, String> names = new TreeMap<String, String>();
+ for (PathModel entry : pathEntries) {
+ names.put(entry.name.toLowerCase(), entry.name);
+ }
+
List<String> extensions = new ArrayList<String>();
extensions.add("html");
extensions.add("htm");
extensions.addAll(processor.getMarkupExtensions());
for (String ext : extensions) {
- String file = "index." + ext;
+ String key = "index." + ext;
- if (names.contains(file)) {
- String stringContent = JGitUtils.getStringContent(r, tree, file, encodings);
+ if (names.containsKey(key)) {
+ String fileName = names.get(key);
+ String fullPath = fileName;
+ if (!res.isEmpty()) {
+ fullPath = res + "/" + fileName;
+ }
+ String stringContent = JGitUtils.getStringContent(r, tree, fullPath, encodings);
if (stringContent == null) {
continue;
}
content = stringContent.getBytes(Constants.ENCODING);
if (content != null) {
- resource = file;
+ res = fullPath;
// assume text/html unless the servlet container
// overrides
response.setContentType("text/html; charset=" + Constants.ENCODING);
@@ -217,26 +231,9 @@ public class PagesServlet extends DaggerServlet {
}
}
- // no content, try custom 404 page
+ // no content, document list or custom 404 page
if (ArrayUtils.isEmpty(content)) {
- String ext = StringUtils.getFileExtension(resource);
- if (StringUtils.isEmpty(ext)) {
- // document list
- response.setContentType("text/html");
- response.getWriter().append("<style>table th, table td { min-width: 150px; text-align: left; }</style>");
- response.getWriter().append("<table>");
- response.getWriter().append("<thead><tr><th>path</th><th>mode</th><th>size</th></tr>");
- response.getWriter().append("</thead>");
- response.getWriter().append("<tbody>");
- String pattern = "<tr><td><a href=\"{0}\">{0}</a></td><td>{1}</td><td>{2}</td></tr>";
- final ByteFormat byteFormat = new ByteFormat();
- List<PathModel> entries = JGitUtils.getFilesInPath(r, resource, commit);
- for (PathModel entry : entries) {
- response.getWriter().append(MessageFormat.format(pattern, entry.name, JGitUtils.getPermissionsFromMode(entry.mode), byteFormat.format(entry.size)));
- }
- response.getWriter().append("</tbody>");
- response.getWriter().append("</table>");
- } else {
+ if (pathEntries.isEmpty()) {
// 404
String custom404 = JGitUtils.getStringContent(r, tree, "404.html", encodings);
if (!StringUtils.isEmpty(custom404)) {
@@ -260,6 +257,34 @@ public class PagesServlet extends DaggerServlet {
} catch (Throwable t) {
logger.error("Failed to write page to client", t);
}
+ } else {
+ // document list
+ response.setContentType("text/html");
+ response.getWriter().append("<style>table th, table td { min-width: 150px; text-align: left; }</style>");
+ response.getWriter().append("<table>");
+ response.getWriter().append("<thead><tr><th>path</th><th>mode</th><th>size</th></tr>");
+ response.getWriter().append("</thead>");
+ response.getWriter().append("<tbody>");
+ String pattern = "<tr><td><a href=\"{0}/{1}\">{1}</a></td><td>{2}</td><td>{3}</td></tr>";
+ final ByteFormat byteFormat = new ByteFormat();
+ if (!pathEntries.isEmpty()) {
+ if (pathEntries.get(0).path.indexOf('/') > -1) {
+ // we are in a subdirectory, add parent directory link
+ pathEntries.add(0, new PathModel("..", resource + "/..", 0, FileMode.TREE.getBits(), null, null));
+ }
+ }
+
+ String basePath = request.getServletPath() + request.getPathInfo();
+ if (basePath.charAt(basePath.length() - 1) == '/') {
+ // strip trailing slash
+ basePath = basePath.substring(0, basePath.length() - 1);
+ }
+ for (PathModel entry : pathEntries) {
+ response.getWriter().append(MessageFormat.format(pattern, basePath, entry.name,
+ JGitUtils.getPermissionsFromMode(entry.mode), byteFormat.format(entry.size)));
+ }
+ response.getWriter().append("</tbody>");
+ response.getWriter().append("</table>");
}
return;
}
@@ -283,10 +308,10 @@ public class PagesServlet extends DaggerServlet {
logger.error("Failed to write page to client", t);
}
- // close the repository
- r.close();
} catch (Throwable t) {
logger.error("Failed to write page to client", t);
+ } finally {
+ r.close();
}
}
diff --git a/src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java b/src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java
index 03eed746..de661a4d 100644
--- a/src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java
+++ b/src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java
@@ -36,6 +36,11 @@ public class DisabledFilesystemFactory implements FileSystemFactory {
public SshFile getFile(String file) {
return null;
}
+
+ @Override
+ public FileSystemView getNormalizedView() {
+ return null;
+ }
};
}
}
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 42325e79..ce0958c3 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/PluginDispatcher.java
@@ -283,7 +283,7 @@ public class PluginDispatcher extends DispatchCommand {
state = Joiner.on(", ").join(InstallState.INSTALLED, pw.getPluginState());
} else {
// registered, installed plugin
- state = Joiner.on(", ").join(reg.getInstallState(), pw.getPluginState());
+ state = Joiner.on(", ").join(reg.getInstallState(system), pw.getPluginState());
}
StringBuilder sb = new StringBuilder();
@@ -486,9 +486,9 @@ public class PluginDispatcher extends DispatchCommand {
curr = new PluginRelease();
}
if (verbose) {
- data[i] = new Object[] {p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(), p.registry};
+ data[i] = new Object[] {p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(system), p.registry};
} else {
- data[i] = new Object[] {p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState()};
+ data[i] = new Object[] {p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState(system)};
}
}
@@ -504,9 +504,9 @@ public class PluginDispatcher extends DispatchCommand {
curr = new PluginRelease();
}
if (verbose) {
- outTabbed(p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(), p.provider, p.registry);
+ outTabbed(p.id, p.description, p.installedRelease, curr.version, curr.requires, p.getInstallState(system), p.provider, p.registry);
} else {
- outTabbed(p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState());
+ outTabbed(p.id, p.installedRelease, curr.version, curr.requires, p.getInstallState(system));
}
}
}
diff --git a/src/main/java/welcome_fr.mkd b/src/main/java/welcome_fr.mkd
index e6027292..f449bdf2 100644
--- a/src/main/java/welcome_fr.mkd
+++ b/src/main/java/welcome_fr.mkd
@@ -1,3 +1,3 @@
## Bienvenue sur Gitblit
-Une solution rapide et facile d'héberger ou visualiser vos propre dépôts [Git](http://www.git-scm.com).
+Une solution rapide et facile pour héberger ou visualiser vos propre dépôts [Git](http://www.git-scm.com).
diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd
index 1b6dcdf4..5f58fb04 100644
--- a/src/site/siteindex.mkd
+++ b/src/site/siteindex.mkd
@@ -83,7 +83,7 @@ Gitblit includes a backup mechanism (*federation*) which can be used to backup r
### Java Runtime Requirement
-Gitblit requires a Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK).
+Gitblit requires a Java 7 Runtime Environment (JRE) or a Java 7 Development Kit (JDK).
[jgit]: http://eclipse.org/jgit "Eclipse JGit Site"
[git]: http://git-scm.com "Official Git Site"
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-31 09:47:41 +0000