Skip to content

The Unified and Autonomous Development Platform

Fix issue #1008 - Make OneDev 7.8 or higher compatible with old project urls

Robin Shen1cf48f5500e7
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index ec5c372199..12bcaf8727 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -171,7 +171,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
private final GitService gitService;
private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml",
- "favicon.ico", "favicon.png", "logo.png", "wicket");
+ "favicon.ico", "favicon.png", "logo.png", "wicket", "projects");
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
index 83d4bffb05..2f538110e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.html
@@ -2,7 +2,7 @@
<div class="project-info p-4">
<div class="d-flex justify-content-between">
<div class="mr-4">
- <a wicket:id="path" class="mb-0 h5"></a>
+ <a wicket:id="pathAndId" class="mb-0 h5"></a>
<wicket:enclosure child="forkedFrom">
<div class="text-muted">
Forked from <a wicket:id="forkedFrom"></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
index 4bc02e7332..cd203f2bd8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/info/ProjectInfoPanel.java
@@ -45,12 +45,12 @@ public abstract class ProjectInfoPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- add(new BookmarkablePageLink<Void>("path", ProjectDashboardPage.class,
+ add(new BookmarkablePageLink<Void>("pathAndId", ProjectDashboardPage.class,
ProjectDashboardPage.paramsOf(getProject())) {
@Override
public IModel<?> getBody() {
- return Model.of(getProject().getPath());
+ return Model.of(getProject().getPath() + " (id: " + getProject().getId() + ")");
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index f6e3ee7a60..204ecf8cdd 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -310,6 +310,9 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~projects/new", NewProjectPage.class));
add(new BasePageMapper("~projects/import/${importer}", ProjectImportPage.class));
+ // For backward compatibility
+ add(new BasePageMapper("projects", ProjectDashboardPage.class));
+
add(new ProjectPageMapper("${project}", ProjectDashboardPage.class));
add(new ProjectPageMapper("${project}/~files", ProjectBlobPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index ed383a9feb..f569f9bbbb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map;
import javax.persistence.EntityNotFoundException;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
@@ -26,6 +27,9 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
@@ -108,31 +112,32 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
private transient Map<ObjectId, Collection<Build>> buildsCache;
- public static PageParameters paramsOf(Long projectId) {
- ProjectFacade project = OneDev.getInstance(ProjectManager.class).findFacadeById(projectId);
- return paramsOf(project.getPath());
- }
-
- public static PageParameters paramsOf(String projectPath) {
- PageParameters params = new PageParameters();
- params.add(ProjectMapperUtils.PARAM_PROJECT, projectPath);
- return params;
- }
-
- public static PageParameters paramsOf(Project project) {
- return paramsOf(project.getPath());
- }
-
public ProjectPage(PageParameters params) {
super(params);
+ Request request = RequestCycle.get().getRequest();
+ String requestUrl = request.getUrl().toString();
+ requestUrl = StringUtils.stripStart(requestUrl, "/");
+ if (requestUrl.startsWith("projects/")) {
+ requestUrl = StringUtils.stripStart(requestUrl.substring("projects/".length()), "/");
+ Long projectId = Long.valueOf(StringUtils.substringBefore(requestUrl, "/"));
+ Project project = getProjectManager().load(projectId);
+ String suffix = StringUtils.substringAfter(requestUrl, "/");
+
+ String redirectUrl = "/" + project.getPath();
+ if (StringUtils.isNotBlank(suffix))
+ redirectUrl += "/~" + suffix;
+
+ throw new RedirectToUrlException(redirectUrl, HttpServletResponse.SC_MOVED_PERMANENTLY);
+ }
+
String projectPath = params.get(ProjectMapperUtils.PARAM_PROJECT).toOptionalString();
if (projectPath == null)
throw new RestartResponseException(ProjectListPage.class);
projectPath = StringUtils.strip(projectPath, "/");
- Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);
+ Project project = getProjectManager().findByPath(projectPath);
if (project == null)
throw new EntityNotFoundException();
@@ -503,7 +508,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
protected abstract void navToProject(Project project);
- protected ProjectManager getProjectManager() {
+ protected static ProjectManager getProjectManager() {
return OneDev.getInstance(ProjectManager.class);
}
@@ -520,5 +525,20 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
}
return builds;
}
-
+
+ public static PageParameters paramsOf(Long projectId) {
+ ProjectFacade project = getProjectManager().findFacadeById(projectId);
+ return paramsOf(project.getPath());
+ }
+
+ public static PageParameters paramsOf(String projectPath) {
+ PageParameters params = new PageParameters();
+ params.add(ProjectMapperUtils.PARAM_PROJECT, projectPath);
+ return params;
+ }
+
+ public static PageParameters paramsOf(Project project) {
+ return paramsOf(project.getPath());
+ }
+
}