Skip to content

The Unified and Autonomous Development Platform

Fix issue #458 - Allow users to access repositories by name (Web UI URL)

Robin Shencdbbd3944292
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index 932328248d..904d671c71 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -139,9 +139,9 @@ jobs:
| jq '.id')
- ''
- releaseJson="{\"name\":\"$buildVersion\",\"tag_name\":\"v$buildVersion\",\"body\":\"##
- Installation Guide\n\nhttps://code.onedev.io/projects/162/blob/main/pages/installation-guide.md\n\n##
- Change Log\n\nhttps://code.onedev.io/projects/160/builds/@build_number@/fixed-issues?query=%22State%22+is+%22Released%22+order+by+%22Type%22+asc+and+%22Priority%22+desc\n\n##
- Incompatibilities\n\nhttps://code.onedev.io/projects/160/builds/@build_number@/markdown/Incompatibilities/server-product/system/incompatibilities/incompatibilities.md\"}"
+ Installation Guide\n\nhttps://code.onedev.io/onedev/manual/~files/main/pages/installation-guide.md\n\n##
+ Change Log\n\nhttps://code.onedev.io/onedev/server/~builds/@build_number@/fixed-issues?query=%22State%22+is+%22Released%22+order+by+%22Type%22+asc+and+%22Priority%22+desc\n\n##
+ Incompatibilities\n\nhttps://code.onedev.io/onedev/server/~builds/@build_number@/markdown/Incompatibilities/server-product/system/incompatibilities/incompatibilities.md\"}"
- ''
- 'acceptHeader="Accept: application/vnd.github.v3+json"'
- if [ "$releaseId" == "null" ]; then
diff --git a/pom.xml b/pom.xml
index f4071b79d8..7f44e826bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.1.0</version>
</parent>
<artifactId>server</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
diff --git a/readme.md b/readme.md
index cef723af6b..7d70be3571 100644
--- a/readme.md
+++ b/readme.md
@@ -1,13 +1,13 @@
-**NOTE:** We develop OneDev at <a href="https://code.onedev.io/projects/160">code.onedev.io</a> for sake of dogfooding. All issues and pull requests should be submitted there
+**NOTE:** We develop OneDev at <a href="https://code.onedev.io/onedev/server">code.onedev.io</a> for sake of dogfooding. All issues and pull requests should be submitted there
<div align="center">
<h1>Self-hosted Git Server with Kanban and CI/CD</h1>
<div style="font-size: 18px;">
-| <a href="https://code.onedev.io/projects/162/blob/main/pages/quickstart.md">5-minute Quickstart</a>
-| <a href="https://code.onedev.io/projects/162/blob/main/pages/installation-guide.md">Installation Guide</a>
-| <a href="https://code.onedev.io/projects/162/blob/main/pages/tutorials.md">Tutorials</a>
-| <a href="https://code.onedev.io/projects/162/blob">All Documentations</a> |
+| <a href="https://code.onedev.io/onedev/manual/files/main/pages/quickstart.md">5-minute Quickstart</a>
+| <a href="https://code.onedev.io/onedev/manual/files/main/pages/installation-guide.md">Installation Guide</a>
+| <a href="https://code.onedev.io/onedev/manual/files/main/pages/tutorials.md">Tutorials</a>
+| <a href="https://code.onedev.io/onedev/manual/files">All Documentations</a> |
</div>
<p style="margin-bottom: 20px;">
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 3f8bd6d655..29ed7e65c0 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<build>
<plugins>
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index d3429f8ffd..8bc420d1b5 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -627,7 +627,7 @@ public class CoreModule extends AbstractPluginModule {
@Override
public void configure(FilterChainManager filterChainManager) {
- filterChainManager.createChain("/api/**", "noSessionCreation, authcBasic, authcBearer");
+ filterChainManager.createChain("/~api/**", "noSessionCreation, authcBasic, authcBearer");
}
});
@@ -670,7 +670,7 @@ public class CoreModule extends AbstractPluginModule {
@Override
public void configure(org.apache.wicket.protocol.http.WebApplication application) {
- application.mount(new BasePageMapper("/test", TestPage.class));
+ application.mount(new BasePageMapper("/~test", TestPage.class));
}
});
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index 0b57ac5cbd..1274ddbb5e 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -356,7 +356,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
public String getDocRoot() {
Version version = new Version(AppLoader.getProduct().getVersion());
- return "https://code.onedev.io/projects/162/blob/" + version.getMajor() + "." + version.getMinor();
+ return "https://code.onedev.io/onedev/manual/~files/" + version.getMajor() + "." + version.getMinor();
}
public static boolean isServerRunning(File installDir) {
diff --git a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java
index 64489ff542..05caaf1fbd 100644
--- a/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/attachment/DefaultAttachmentManager.java
@@ -132,7 +132,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
Client client = ClientBuilder.newClient();
try {
String fromServerUrl = clusterManager.getServerUrl(sourceStorageServerUUID);
- WebTarget target = client.target(fromServerUrl).path("/api/cluster/attachments")
+ WebTarget target = client.target(fromServerUrl).path("/~api/cluster/attachments")
.queryParam("projectId", sourceProjectId)
.queryParam("attachmentGroup", attachmentGroup);
Invocation.Builder builder = target.request();
@@ -305,7 +305,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
try {
String serverUrl = clusterManager.getServerUrl(storageServerUUID);
WebTarget target = client.target(serverUrl)
- .path("api/cluster/attachment")
+ .path("~api/cluster/attachment")
.queryParam("projectId", projectId)
.queryParam("attachmentGroup", attachmentGroup)
.queryParam("suggestedAttachmentName", suggestedAttachmentName);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index 928d2ade81..61993aa068 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -26,6 +26,9 @@ public interface ProjectManager extends EntityManager<Project> {
@Nullable
Project findByPath(String path);
+
+ @Nullable
+ ProjectFacade findFacadeById(Long id);
@Nullable
ProjectFacade findFacadeByPath(String path);
@@ -86,4 +89,6 @@ public interface ProjectManager extends EntityManager<Project> {
File getLfsObjectsDir(Long projectId);
+ Collection<String> getReservedNames();
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
index 18611aef83..08ae44b047 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java
@@ -18,6 +18,8 @@ public interface UrlManager {
String urlForProject(Long projectId);
+ String urlForProject(String projectPath);
+
String urlFor(Project project);
String urlFor(Project project, ObjectId commitId);
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 a50a419a9d..35082fd440 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
@@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory;
import com.beust.jcommander.internal.Lists;
import com.google.common.base.Splitter;
+import com.google.common.collect.Sets;
import com.hazelcast.cluster.Member;
import com.hazelcast.cluster.MembershipEvent;
import com.hazelcast.cluster.MembershipListener;
@@ -119,6 +120,7 @@ import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.ProjectNameReservation;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.facade.ProjectFacade;
@@ -164,6 +166,9 @@ 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", "wicket");
+
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
private volatile IMap<Long, ProjectServer> storageServers;
@@ -178,7 +183,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
UserAuthorizationManager userAuthorizationManager, RoleManager roleManager,
JobManager jobManager, IssueManager issueManager, LinkSpecManager linkSpecManager,
StorageManager storageManager, ClusterManager clusterManager, GitService gitService,
- ProjectUpdateManager updateManager) {
+ ProjectUpdateManager updateManager, Set<ProjectNameReservation> nameReservations) {
super(dao);
this.commitInfoManager = commitInfoManager;
@@ -197,6 +202,9 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
this.clusterManager = clusterManager;
this.gitService = gitService;
this.updateManager = updateManager;
+
+ for (ProjectNameReservation reservation: nameReservations)
+ reservedNames.addAll(reservation.getReserved());
}
public Object writeReplace() throws ObjectStreamException {
@@ -1029,6 +1037,11 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
return cache.find(path);
}
+ @Override
+ public ProjectFacade findFacadeById(Long id) {
+ return cache.get(id);
+ }
+
@Override
public File getLfsObjectsDir(Long projectId) {
return new File(storageManager.getProjectGitDir(projectId), "lfs/objects");
@@ -1135,4 +1148,10 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
}
+
+ @Override
+ public Collection<String> getReservedNames() {
+ return reservedNames;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
index c52808273a..e86d7f2510 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -200,7 +200,7 @@ public class GitFilter implements Filter {
try {
String serverUrl = clusterManager.getServerUrl(storageServerUUID);
WebTarget target = client.target(serverUrl)
- .path("api/cluster/git-pack")
+ .path("~api/cluster/git-pack")
.queryParam("projectId", projectId)
.queryParam("userId", userId)
.queryParam("protocol", protocol)
@@ -337,7 +337,7 @@ public class GitFilter implements Filter {
try {
String serverUrl = clusterManager.getServerUrl(storageServerUUID);
WebTarget target = client.target(serverUrl)
- .path("api/cluster/git-advertise-refs")
+ .path("~api/cluster/git-advertise-refs")
.queryParam("projectId", projectId)
.queryParam("protocol", protocol)
.queryParam("upload", upload);
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
index d73c9ae437..2800f663fc 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -192,7 +192,7 @@ public class GitLfsFilter implements Filter {
try {
String serverUrl = clusterManager.getServerUrl(storageServerUUID);
WebTarget target = client.target(serverUrl)
- .path("api/cluster/lfs")
+ .path("~api/cluster/lfs")
.queryParam("projectId", lfsObject.getProjectId())
.queryParam("objectId", lfsObject.getObjectId());
Invocation.Builder builder = target.request();
@@ -255,7 +255,7 @@ public class GitLfsFilter implements Filter {
try {
String serverUrl = clusterManager.getServerUrl(storageServerUUID);
WebTarget target = client.target(serverUrl)
- .path("api/cluster/lfs")
+ .path("~api/cluster/lfs")
.queryParam("projectId", lfsObject.getProjectId())
.queryParam("objectId", lfsObject.getObjectId());
Invocation.Builder builder = target.request();
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
index 51116daf30..d81890f05b 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
@@ -1306,7 +1306,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManager
try {
String serverUrl = clusterManager.getServerUrl(sourceStorageServerUUID);
WebTarget target = client.target(serverUrl)
- .path("api/cluster/commit-info")
+ .path("~api/cluster/commit-info")
.queryParam("projectId", sourceProjectId);
Invocation.Builder builder = target.request();
builder.header(HttpHeaders.AUTHORIZATION,
diff --git a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.java b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.java
index c27a368b63..b4da5a48db 100644
--- a/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.java
+++ b/server-core/src/main/java/io/onedev/server/jetty/DefaultJettyLauncher.java
@@ -88,8 +88,8 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletCont
servletContextHandler.addFilter(GuiceFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
- errorHandler.addErrorPage(HttpServletResponse.SC_NOT_FOUND, "/errors/404");
- errorHandler.addErrorPage(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "/errors/405");
+ errorHandler.addErrorPage(HttpServletResponse.SC_NOT_FOUND, "/~errors/404");
+ errorHandler.addErrorPage(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "/~errors/405");
servletContextHandler.setErrorHandler(errorHandler);
GzipHandler gzipHandler = new GzipHandler();
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
index 932e443974..a7d033150b 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobManager.java
@@ -1517,7 +1517,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
String serverUrl = clusterManager.getServerUrl(dependencyStorageServerUUID);
Client client = ClientBuilder.newClient();
try {
- WebTarget target = client.target(serverUrl).path("api/cluster/artifacts")
+ WebTarget target = client.target(serverUrl).path("~api/cluster/artifacts")
.queryParam("projectId", dependency.getProject().getId())
.queryParam("buildNumber", dependency.getNumber())
.queryParam("artifacts", dependence.getArtifacts());
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 68f6a7e153..257c491337 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -4457,5 +4457,67 @@ public class DataMigrator {
projectUpdatesDom.writeToFile(projectUpdatesFile, true);
}
+
+ private static final Pattern migrate104_pattern = Pattern.compile("\\(/projects/(\\d+)/attachment/(.*?)\\)");
+
+ private String migrate104_markdown(String content) {
+ StringBuffer buffer = new StringBuffer();
+ Matcher matcher = migrate104_pattern.matcher(content);
+ while (matcher.find()) {
+ matcher.appendReplacement(buffer,
+ Matcher.quoteReplacement("(/~downloads/projects/" + matcher.group(1) + "/attachments/" + matcher.group(2) + ")"));
+ }
+ matcher.appendTail(buffer);
+ return buffer.toString();
+ }
+ private void migrate104(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Issues.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element descriptionElement = element.element("description");
+ if (descriptionElement != null)
+ descriptionElement.setText(migrate104_markdown(descriptionElement.getText()));
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("IssueComments.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element contentElement = element.element("content");
+ contentElement.setText(migrate104_markdown(contentElement.getText()));
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequests.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element descriptionElement = element.element("description");
+ if (descriptionElement != null)
+ descriptionElement.setText(migrate104_markdown(descriptionElement.getText()));
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequestComments.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element contentElement = element.element("content");
+ contentElement.setText(migrate104_markdown(contentElement.getText()));
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("CodeComments.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element contentElement = element.element("content");
+ contentElement.setText(migrate104_markdown(contentElement.getText()));
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("CodeCommentReplys.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element contentElement = element.element("content");
+ contentElement.setText(migrate104_markdown(contentElement.getText()));
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index ef26bacccc..7d0775f7c0 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -1395,7 +1395,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
}
public String getAttachmentUrlPath(String attachmentGroup, String attachmentName) {
- return String.format("/projects/%d/attachment/%s/%s", getId(), attachmentGroup,
+ return String.format("/~downloads/projects/%s/attachments/%s/%s", getId(), attachmentGroup,
UrlEncoder.PATH_INSTANCE.encode(attachmentName, StandardCharsets.UTF_8));
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
index ecc9ee6799..c22cfc4319 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
@@ -30,12 +30,12 @@ public class NotificationTemplateSetting implements Serializable {
+ "<a href='https://docs.groovy-lang.org/latest/html/api/groovy/text/SimpleTemplateEngine.html' target='_blank'>Groovy simple template</a>. "
+ "When evaluating this template, below variables will be available:"
+ "<ul class='mb-0'>"
- + "<li><code>event:</code> <a href='https://code.onedev.io/projects/160/blob/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification"
+ + "<li><code>event:</code> <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification"
+ "<li><code>eventSummary:</code> a string representing summary of the event"
+ "<li><code>eventBody:</code> a string representing body of the event. May be <code>null</code>"
+ "<li><code>eventUrl:</code> a string representing event detail url"
+ "<li><code>replyable:</code> a boolean indiciating whether or not topic comment can be created directly by replying the email"
- + "<li><code>unsubscribable:</code> an <a href='https://code.onedev.io/projects/160/blob/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>object</a> holding unsubscribe information. "
+ + "<li><code>unsubscribable:</code> an <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>object</a> holding unsubscribe information. "
+ " A <code>null</code> value means that the notification can not be unsubscribed";
static {
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
index e9155db807..825a72ff44 100644
--- a/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildResource.java
@@ -33,7 +33,7 @@ import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.security.SecurityUtils;
@Api(order=4000, description="In most cases, build resource is operated with build id, which is different from build number. "
- + "To get build id of a particular build number, use the <a href='/help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ + "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ "instance <code>&quot;Number&quot; is &quot;projectName#100&quot;</code>")
@Path("/builds")
@Consumes(MediaType.APPLICATION_JSON)
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
index 44f708753b..c558357e45 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
@@ -53,7 +53,7 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.security.SecurityUtils;
@Api(order=2000, description="In most cases, issue resource is operated with issue id, which is different from issue number. "
- + "To get issue id of a particular issue number, use the <a href='/help/api/io.onedev.server.rest.IssueResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ + "To get issue id of a particular issue number, use the <a href='/~help/api/io.onedev.server.rest.IssueResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ "instance <code>&quot;Number&quot; is &quot;projectName#100&quot;</code>")
@Path("/issues")
@Consumes(MediaType.APPLICATION_JSON)
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
index 88f89fdc77..484c3fdb9e 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
@@ -51,7 +51,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectAndBranch;
@Api(order=3000, description="In most cases, pull request resource is operated with pull request id, which is different from pull request number. "
- + "To get pull request id of a particular pull request number, use the <a href='/help/api/io.onedev.server.rest.PullRequestResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ + "To get pull request id of a particular pull request number, use the <a href='/~help/api/io.onedev.server.rest.PullRequestResource/queryBasicInfo'>Query Basic Info</a> operation with query for "
+ "instance <code>&quot;Number&quot; is &quot;projectName#100&quot;</code>")
@Path("/pull-requests")
@Consumes(MediaType.APPLICATION_JSON)
diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
index 66d45978b1..3a6e7c97eb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/ProjectTextManager.java
@@ -401,14 +401,13 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
}
}
- @Nullable
private Long getLastEntityId(IndexSearcher searcher) throws IOException {
TopDocs topDocs = searcher.search(getTermQuery(FIELD_TYPE, FIELD_LAST_ENTITY_ID), 1);
if (topDocs.scoreDocs.length != 0) {
Document doc = searcher.doc(topDocs.scoreDocs[0].doc);
return Long.valueOf(doc.get(FIELD_LAST_ENTITY_ID));
} else {
- return null;
+ return 0L;
}
}
@@ -504,10 +503,7 @@ public abstract class ProjectTextManager<T extends ProjectBelonging> implements
@Override
protected Query getRangeQuery(String field, String part1, String part2, boolean startInclusive,
boolean endInclusive) throws ParseException {
- if (field.equals(FIELD_PROJECT_ID))
- return LongPoint.newRangeQuery(field, Long.parseLong(part1), Long.parseLong(part2));
- else
- return super.getRangeQuery(field, part1, part2, startInclusive, endInclusive);
+ return LongPoint.newRangeQuery(field, Long.parseLong(part1), Long.parseLong(part2));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectNameReservation.java b/server-core/src/main/java/io/onedev/server/util/ProjectNameReservation.java
new file mode 100644
index 0000000000..429a1be07c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectNameReservation.java
@@ -0,0 +1,9 @@
+package io.onedev.server.util;
+
+import java.util.Collection;
+
+public interface ProjectNameReservation {
+
+ Collection<String> getReserved();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
index 4000ab69af..b40812a4fd 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java
@@ -5,6 +5,8 @@ import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.util.validation.annotation.ProjectName;
public class ProjectNameValidator implements ConstraintValidator<ProjectName, String> {
@@ -32,7 +34,7 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, St
}
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (value.equals("new") || value.equals("import")) {
+ } else if (OneDev.getInstance(ProjectManager.class).getReservedNames().contains(value)) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
if (message.length() == 0)
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
index 7abce9e98e..8d2a5e4c43 100644
--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java
@@ -12,6 +12,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import com.google.common.base.Splitter;
+import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Build;
@@ -34,16 +35,24 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest
@Singleton
public class DefaultUrlManager implements UrlManager {
+ private final ProjectManager projectManager;
+
private final SettingManager settingManager;
@Inject
- public DefaultUrlManager(SettingManager settingManager) {
+ public DefaultUrlManager(ProjectManager projectManager, SettingManager settingManager) {
+ this.projectManager = projectManager;
this.settingManager = settingManager;
}
@Override
public String urlForProject(Long projectId) {
- return settingManager.getSystemSetting().getServerUrl() + "/projects/" + projectId;
+ return urlForProject(projectManager.findFacadeById(projectId).getPath());
+ }
+
+ @Override
+ public String urlForProject(String projectPath) {
+ return settingManager.getSystemSetting().getServerUrl() + "/" + projectPath;
}
@Override
@@ -101,12 +110,12 @@ public class DefaultUrlManager implements UrlManager {
params.set(0, newCommit.name());
CommitDetailPage.fillParams(params, state);
- return url + "/commits/" + paramsEncoder.encodePageParameters(params);
+ return url + "/~commits/" + paramsEncoder.encodePageParameters(params);
} else {
String url = urlFor(comment.getProject());
PageParameters params = new PageParameters();
RevisionComparePage.fillParams(params, RevisionComparePage.getState(comment, compareContext));
- return url + "/compare" + paramsEncoder.encodePageParameters(params);
+ return url + "/~compare" + paramsEncoder.encodePageParameters(params);
}
}
} else {
@@ -126,7 +135,7 @@ public class DefaultUrlManager implements UrlManager {
ProjectBlobPage.fillParams(params, state);
- return url + "/files/" + paramsEncoder.encodePageParameters(params);
+ return url + "/~files/" + paramsEncoder.encodePageParameters(params);
}
}
@@ -140,7 +149,7 @@ public class DefaultUrlManager implements UrlManager {
@Override
public String urlFor(PullRequest request) {
- return urlFor(request.getTarget().getProject()) + "/pulls/" + request.getNumber();
+ return urlFor(request.getTarget().getProject()) + "/~pulls/" + request.getNumber();
}
@Override
@@ -155,12 +164,12 @@ public class DefaultUrlManager implements UrlManager {
@Override
public String urlFor(Issue issue) {
- return urlFor(issue.getProject()) + "/issues/" + issue.getNumber();
+ return urlFor(issue.getProject()) + "/~issues/" + issue.getNumber();
}
@Override
public String urlFor(Build build) {
- return urlFor(build.getProject()) + "/builds/" + build.getNumber();
+ return urlFor(build.getProject()) + "/~builds/" + build.getNumber();
}
@Override
@@ -175,7 +184,7 @@ public class DefaultUrlManager implements UrlManager {
@Override
public String urlFor(Project project, ObjectId commitId) {
- return urlFor(project) + "/commits/" + commitId.name();
+ return urlFor(project) + "/~commits/" + commitId.name();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.java
index b460a485fe..9d57c6199a 100644
--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java
+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java
@@ -73,8 +73,8 @@ import io.onedev.server.web.resource.SpriteResourceReference;
import io.onedev.server.web.resource.SpriteResourceStream;
import io.onedev.server.web.resourcebundle.ResourceBundleReferences;
import io.onedev.server.web.util.AbsoluteUrlRenderer;
-import io.onedev.server.web.websocket.WebSocketMessages;
import io.onedev.server.web.websocket.WebSocketManager;
+import io.onedev.server.web.websocket.WebSocketMessages;
@Singleton
public class WebApplication extends org.apache.wicket.protocol.http.WebApplication {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
index f308429462..e9bf1ff5b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java
@@ -60,9 +60,9 @@ public abstract class CommandPalettePanel extends Panel {
private static final List<String[]> availableUrls = new ArrayList<>();
private static final PatternSet excludedUrlPatterns = PatternSet.parse(""
- + "test/** errors/** sso/** oauth/** verify-email-address/** create-user-from-invitation/** "
- + "reset-password/** signup/** logout/** login/** loading/** init/** help/** builds/** issues/** "
- + "pull-requests/** **/invalid **/blob **/${issue}/** -**/${issue} **/${request}/** -**/${request} "
+ + "~test/** ~errors/** ~sso/** ~oauth/** ~verify-email-address/** ~create-user-from-invitation/** "
+ + "~reset-password/** ~signup/** ~logout/** ~login/** ~loading/** ~init/** ~help/** ~builds/** issues/** "
+ + "~pull-requests/** **/invalid **/${issue}/** -**/${issue} **/${request}/** -**/${request} "
+ "**/${build}/** -**/${build} **/${milestone}/** -**/${milestone} **/${agent}/** -**/${agent} "
+ "**/${group}/** -**/${group}");
@@ -92,8 +92,8 @@ public abstract class CommandPalettePanel extends Panel {
List<String[]> mountedPaths = new ArrayList<>();
if (mountSegments != null && mountSegments.length != 0) {
int index = -1;
- if (Arrays.equals(mountSegments, new String[] {"projects", "${project}", "files"})) {
- mountedPaths.add(new String[] {"projects", "${project}", "files", "#{revision-and-path}"});
+ if (Arrays.equals(mountSegments, new String[] {"${project}", "~files"})) {
+ mountedPaths.add(new String[] {"${project}", "~files", "#{revision-and-path}"});
} else if ((index = Arrays.asList(mountSegments).indexOf("${" + ContributedAdministrationSettingPage.PARAM_SETTING + "}")) != -1) {
for (AdministrationSettingContribution contribution: OneDev.getExtensions(AdministrationSettingContribution.class)) {
for (Class<? extends ContributedAdministrationSetting> settingClass: contribution.getSettingClasses()) {
@@ -205,9 +205,9 @@ public abstract class CommandPalettePanel extends Panel {
if (getPage() instanceof ProjectPage) {
for (String[] url: availableUrls) {
try {
- if (url.length > 2 && url[0].equals("projects") && url[1].equals("${project}")) {
- String[] relativeUrl = new String[url.length-2];
- System.arraycopy(url, 2, relativeUrl, 0, relativeUrl.length);
+ if (url.length > 1 && url[0].equals("${project}")) {
+ String[] relativeUrl = new String[url.length-1];
+ System.arraycopy(url, 1, relativeUrl, 0, relativeUrl.length);
parsedUrls.add(newProjectAwareParsedUrl(relativeUrl));
}
} catch (IgnoredUrlParam e) {
@@ -219,9 +219,9 @@ public abstract class CommandPalettePanel extends Panel {
if (SecurityUtils.isAdministrator()) {
applicable = true;
} else if (SecurityUtils.getUser() != null) {
- if (!url[0].equals("administration"))
+ if (!url[0].equals("~administration"))
applicable = true;
- } else if (!url[0].equals("administration") && !url[0].equals("my")) {
+ } else if (!url[0].equals("~administration") && !url[0].equals("~my")) {
applicable = true;
}
if (applicable) {
@@ -312,8 +312,8 @@ public abstract class CommandPalettePanel extends Panel {
if (url.startsWith("/")) {
tag.put("onclick", String.format("javascript:window.location='%s';", url));
} else {
- Long projectId = ((ProjectPage)getPage()).getProject().getId();
- tag.put("onclick", String.format("javascript:window.location='/projects/%d/%s';", projectId, url));
+ String projectPath = ((ProjectPage)getPage()).getProject().getPath();
+ tag.put("onclick", String.format("javascript:window.location='/%s/%s';", projectPath, url));
}
}
else
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java
index 1f6174de58..073478d8b1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ParsedUrl.java
@@ -22,11 +22,11 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.mapper.ProjectMapperUtils;
import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;
import io.onedev.server.web.page.admin.groupmanagement.GroupPage;
import io.onedev.server.web.page.admin.rolemanagement.RoleDetailPage;
import io.onedev.server.web.page.admin.usermanagement.UserPage;
-import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
@@ -53,7 +53,7 @@ public abstract class ParsedUrl implements Serializable {
boolean optional = segment.contains("#");
String paramName = StringUtils.strip(segment, "$#{}");
switch (paramName) {
- case ProjectPage.PARAM_PROJECT:
+ case ProjectMapperUtils.PARAM_PROJECT:
parsedSegments.add(new ProjectParam(optional));
break;
case IssueDetailPage.PARAM_ISSUE:
@@ -107,7 +107,7 @@ public abstract class ParsedUrl implements Serializable {
String segment1 = segments.get(0);
String segment2 = segments.size()>1? segments.get(1): "";
switch (segment1) {
- case "settings":
+ case "~settings":
if (SecurityUtils.canManage(project)) {
if (segment2.equals("service-desk")) {
return OneDev.getInstance(SettingManager.class).getServiceDeskSetting() != null
@@ -118,15 +118,15 @@ public abstract class ParsedUrl implements Serializable {
} else {
return false;
}
- case "files":
- case "commits":
- case "pulls":
- case "compare":
- case "branches":
- case "tags":
- case "code-comments":
+ case "~files":
+ case "~commits":
+ case "~pulls":
+ case "~compare":
+ case "~branches":
+ case "~tags":
+ case "~code-comments":
return project.isCodeManagement() && SecurityUtils.canReadCode(project);
- case "stats":
+ case "~stats":
switch (segment2) {
case "contribs":
case "lines":
@@ -134,10 +134,10 @@ public abstract class ParsedUrl implements Serializable {
default:
return true;
}
- case "boards":
- case "issues":
+ case "~boards":
+ case "~issues":
return project.isIssueManagement();
- case "milestones":
+ case "~milestones":
if (project.isIssueManagement()) {
if (segment2.equals("new"))
return SecurityUtils.canManageIssues(project);
@@ -146,7 +146,7 @@ public abstract class ParsedUrl implements Serializable {
} else {
return false;
}
- case "builds":
+ case "~builds":
return project.isCodeManagement();
default:
return true;
@@ -157,7 +157,7 @@ public abstract class ParsedUrl implements Serializable {
Map<String, SuggestionContent> suggestions = new LinkedHashMap<>();
Map<String, String> paramValues = new HashMap<>();
if (getProject() != null) {
- paramValues.put(ProjectPage.PARAM_PROJECT, String.valueOf(getProject().getId()));
+ paramValues.put(ProjectMapperUtils.PARAM_PROJECT, getProject().getPath());
if (matchWith.startsWith("/"))
return suggestions;
} else {
@@ -182,10 +182,9 @@ public abstract class ParsedUrl implements Serializable {
FixedSegment fixedSegment = (FixedSegment) segment;
String path = fixedSegment.getPath();
- if ((index == 0 && getProject() != null
- || index != 0 && parsedSegments.get(index-1) instanceof ProjectParam)
- && !isApplicable(getProject(paramValues), path)) {
- break;
+ if ((index == 0 && getProject() != null || index != 0 && parsedSegments.get(index-1) instanceof ProjectParam)
+ && !isApplicable(getProject(paramValues), path)) {
+ break;
}
if (matchWith.startsWith(path)) {
@@ -210,11 +209,29 @@ public abstract class ParsedUrl implements Serializable {
}
} else {
ParamSegment paramSegment = (ParamSegment) segment;
- String paramValue = StringUtils.substringBefore(matchWith, "/");
- if (paramSegment.isExactMatch(paramValue, paramValues)) {
+ String paramValue;
+ if (paramSegment.getName().equals(ProjectMapperUtils.PARAM_PROJECT)) {
+ if (matchWith.contains("/~"))
+ paramValue = StringUtils.substringBefore(matchWith, "/~");
+ else
+ paramValue = null;
+ } else {
+ paramValue = StringUtils.substringBefore(matchWith, "/");
+ }
+
+ if (paramValue != null && paramSegment.isExactMatch(paramValue, paramValues)) {
paramValues.put(paramSegment.getName(), paramValue);
segments.add(paramValue);
- if (matchWith.contains("/")) {
+ if (paramSegment.getName().equals(ProjectMapperUtils.PARAM_PROJECT)) {
+ if (matchWith.contains("/~")) {
+ matchWith = StringUtils.substringAfter(matchWith, "/~");
+ } else if (matchWith.endsWith("/")) {
+ matchWith = StringUtils.substringAfterLast(matchWith, "/");
+ } else {
+ addSuggestion(suggestions, segments, hasMoreSegments, hasMoreRequiredSegments);
+ break;
+ }
+ } else if (matchWith.contains("/")) {
matchWith = StringUtils.substringAfter(matchWith, "/");
} else {
addSuggestion(suggestions, segments, hasMoreSegments, hasMoreRequiredSegments);
@@ -223,15 +240,23 @@ public abstract class ParsedUrl implements Serializable {
} else {
Map<String, String> paramSuggestions = paramSegment.suggest(matchWith, paramValues, count);
for (Map.Entry<String, String> entry: paramSuggestions.entrySet()) {
+ String label = entry.getKey();
+ if (paramSegment.getName().equals(ProjectMapperUtils.PARAM_PROJECT))
+ label = makeAbsoluteIfNecessary(label);
if (entry.getValue() != null) {
List<String> segmentsCopy = new ArrayList<>(segments);
segmentsCopy.add(entry.getValue());
String joined = StringUtils.join(segmentsCopy, "/");
String url = !hasMoreRequiredSegments? makeAbsoluteIfNecessary(joined): null;
- String searchBase = hasMoreSegments? makeAbsoluteIfNecessary(joined + "/"): null;
- suggestions.put(entry.getKey(), new SuggestionContent(url, searchBase));
+ String searchBase = null;
+ if (hasMoreSegments) {
+ searchBase = makeAbsoluteIfNecessary(joined + "/");
+ if (paramSegment.getName().equals(ProjectMapperUtils.PARAM_PROJECT))
+ searchBase += "~";
+ }
+ suggestions.put(label, new SuggestionContent(url, searchBase));
} else {
- suggestions.put(entry.getKey(), null);
+ suggestions.put(label, null);
}
}
break;
@@ -272,8 +297,8 @@ public abstract class ParsedUrl implements Serializable {
}
static Project getProject(Map<String, String> paramValues) {
- Long projectId = Long.valueOf(paramValues.get(ProjectPage.PARAM_PROJECT));
- return OneDev.getInstance(ProjectManager.class).load(projectId);
+ String projectPath = paramValues.get(ProjectMapperUtils.PARAM_PROJECT);
+ return OneDev.getInstance(ProjectManager.class).findByPath(projectPath);
}
static Build getBuild(Map<String, String> paramValues) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java
index 9be4b03733..b1001fe3a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/ProjectParam.java
@@ -8,14 +8,14 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.project.PathCriteria;
import io.onedev.server.search.entity.project.ProjectQuery;
-import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.mapper.ProjectMapperUtils;
public class ProjectParam extends ParamSegment {
private static final long serialVersionUID = 1L;
public ProjectParam(boolean optional) {
- super(ProjectPage.PARAM_PROJECT, optional);
+ super(ProjectMapperUtils.PARAM_PROJECT, optional);
}
@Override
@@ -29,7 +29,7 @@ public class ProjectParam extends ParamSegment {
query = new ProjectQuery(new PathCriteria("**/*" + matchWith + "*/**"));
Map<String, String> suggestions = new LinkedHashMap<>();
for (Project project: projectManager.query(query, 0, count))
- suggestions.put(project.getPath(), String.valueOf(project.getId()));
+ suggestions.put(project.getPath(), String.valueOf(project.getPath()));
return suggestions;
}
@@ -37,8 +37,7 @@ public class ProjectParam extends ParamSegment {
public boolean isExactMatch(String matchWith, Map<String, String> paramValues) {
ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
try {
- Long projectId = Long.valueOf(matchWith);
- if (projectManager.get(projectId) != null)
+ if (projectManager.findFacadeByPath(matchWith) != null)
return true;
} catch (NumberFormatException e) {
}
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 949f648b3d..008cef2bd0 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
@@ -164,12 +164,12 @@ public class BaseUrlMapper extends CompoundRequestMapper {
}
public BaseUrlMapper(WebApplication app) {
- add(new BasePageMapper("init", ServerInitPage.class));
- add(new BasePageMapper("loading", BrowserInfoPage.class));
+ add(new BasePageMapper("~init", ServerInitPage.class));
+ add(new BasePageMapper("~loading", BrowserInfoPage.class));
addProjectPages();
- add(new BasePageMapper("issues", IssueListPage.class));
- add(new BasePageMapper("pull-requests", PullRequestListPage.class));
- add(new BasePageMapper("builds", BuildListPage.class));
+ add(new BasePageMapper("~issues", IssueListPage.class));
+ add(new BasePageMapper("~pull-requests", PullRequestListPage.class));
+ add(new BasePageMapper("~builds", BuildListPage.class));
addAdministrationPages();
addMyPages();
addSecurityPages();
@@ -179,199 +179,198 @@ public class BaseUrlMapper extends CompoundRequestMapper {
}
private void addHelpPages() {
- add(new BasePageMapper("help/incompatibilities", IncompatibilitiesPage.class));
- add(new BasePageMapper("help/api", ResourceListPage.class));
- add(new BasePageMapper("help/api/${resource}", ResourceDetailPage.class));
- add(new BasePageMapper("help/api/${resource}/${method}", MethodDetailPage.class));
+ add(new BasePageMapper("~help/incompatibilities", IncompatibilitiesPage.class));
+ add(new BasePageMapper("~help/api", ResourceListPage.class));
+ add(new BasePageMapper("~help/api/${resource}", ResourceDetailPage.class));
+ add(new BasePageMapper("~help/api/${resource}/${method}", MethodDetailPage.class));
}
private void addMyPages() {
- add(new BasePageMapper("my", MyProfilePage.class));
- add(new BasePageMapper("my/email-addresses", MyEmailAddressesPage.class));
- add(new BasePageMapper("my/avatar", MyAvatarPage.class));
- add(new BasePageMapper("my/password", MyPasswordPage.class));
- add(new BasePageMapper("my/ssh-keys", MySshKeysPage.class));
- add(new BasePageMapper("my/gpg-keys", MyGpgKeysPage.class));
- add(new BasePageMapper("my/access-token", MyAccessTokenPage.class));
- add(new BasePageMapper("my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));
+ add(new BasePageMapper("~my", MyProfilePage.class));
+ add(new BasePageMapper("~my/email-addresses", MyEmailAddressesPage.class));
+ add(new BasePageMapper("~my/avatar", MyAvatarPage.class));
+ add(new BasePageMapper("~my/password", MyPasswordPage.class));
+ add(new BasePageMapper("~my/ssh-keys", MySshKeysPage.class));
+ add(new BasePageMapper("~my/gpg-keys", MyGpgKeysPage.class));
+ add(new BasePageMapper("~my/access-token", MyAccessTokenPage.class));
+ add(new BasePageMapper("~my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));
}
private void addResources() {
- add(new BaseResourceMapper("downloads/server-log", new ServerLogResourceReference()));
- add(new BaseResourceMapper("downloads/agent-log/${agent}", new AgentLogResourceReference()));
- add(new BaseResourceMapper("downloads/agent.zip", new AgentResourceReference()));
- add(new BaseResourceMapper("downloads/agent-lib", new AgentLibResourceReference()));
- add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log",
+ add(new BaseResourceMapper("~downloads/server-log", new ServerLogResourceReference()));
+ add(new BaseResourceMapper("~downloads/agent-logs/${agent}", new AgentLogResourceReference()));
+ add(new BaseResourceMapper("~downloads/agent.zip", new AgentResourceReference()));
+ add(new BaseResourceMapper("~downloads/agent-lib", new AgentLibResourceReference()));
+ add(new BaseResourceMapper("~downloads/projects/${project}/builds/${build}/log",
new BuildLogResourceReference()));
- add(new BaseResourceMapper("projects/${project}/archive/${revision}",
- new ArchiveResourceReference()));
- add(new BaseResourceMapper("projects/${project}/raw", new RawBlobResourceReference()));
+ add(new BaseResourceMapper("~downloads/projects/${project}/archives", new ArchiveResourceReference()));
+
+ add(new ProjectResourceMapper("${project}/~raw", new RawBlobResourceReference()));
// Change AttachmentResource.authorizeGroup accordingly if change attachment url here
- add(new BaseResourceMapper("projects/${project}/attachment/${attachment-group}/${attachment}",
+ add(new BaseResourceMapper("~downloads/projects/${project}/attachments/${attachment-group}/${attachment}",
new AttachmentResourceReference()));
- add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/artifacts",
+ add(new BaseResourceMapper("~downloads/projects/${project}/builds/${build}/artifacts",
new ArtifactResourceReference()));
+
add(new BaseResourceMapper(SpriteResourceReference.DEFAULT_MOUNT_PATH,
new SpriteResourceReference(IconScope.class)));
}
private void addErrorPages() {
- add(new BasePageMapper("/errors/404", PageNotFoundErrorPage.class));
- add(new BasePageMapper("/errors/405", MethodNotAllowedErrorPage.class));
+ add(new BasePageMapper("/~errors/404", PageNotFoundErrorPage.class));
+ add(new BasePageMapper("/~errors/405", MethodNotAllowedErrorPage.class));
}
private void addSecurityPages() {
- add(new BasePageMapper("login", LoginPage.class));
- add(new BasePageMapper("logout", LogoutPage.class));
- add(new BasePageMapper("signup", SignUpPage.class));
- add(new BasePageMapper("reset-password", PasswordResetPage.class));
- add(new BasePageMapper("verify-email-address/${emailAddress}/${verificationCode}",
+ add(new BasePageMapper("~login", LoginPage.class));
+ add(new BasePageMapper("~logout", LogoutPage.class));
+ add(new BasePageMapper("~signup", SignUpPage.class));
+ add(new BasePageMapper("~reset-password", PasswordResetPage.class));
+ add(new BasePageMapper("~verify-email-address/${emailAddress}/${verificationCode}",
EmailAddressVerificationPage.class));
- add(new BasePageMapper("create-user-from-invitation/${emailAddress}/${invitationCode}",
+ add(new BasePageMapper("~create-user-from-invitation/${emailAddress}/${invitationCode}",
CreateUserFromInvitationPage.class));
add(new BasePageMapper(SsoProcessPage.MOUNT_PATH + "/${stage}/${connector}", SsoProcessPage.class));
add(new BasePageMapper(OAuthCallbackPage.MOUNT_PATH, OAuthCallbackPage.class));
}
private void addAdministrationPages() {
- add(new BasePageMapper("administration/settings/system", SystemSettingPage.class));
- add(new BasePageMapper("administration/settings/security", SecuritySettingPage.class));
- add(new BasePageMapper("administration/users", UserListPage.class));
- add(new BasePageMapper("administration/users/new", NewUserPage.class));
- add(new BasePageMapper("administration/users/${user}", UserProfilePage.class));
- add(new BasePageMapper("administration/users/${user}/email-setting", UserEmailAddressesPage.class));
- add(new BasePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));
- add(new BasePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));
- add(new BasePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));
- add(new BasePageMapper("administration/users/${user}/password", UserPasswordPage.class));
- add(new BasePageMapper("administration/users/${user}/ssh-keys", UserSshKeysPage.class));
- add(new BasePageMapper("administration/users/${user}/gpg-keys", UserGpgKeysPage.class));
- add(new BasePageMapper("administration/users/${user}/access-token", UserAccessTokenPage.class));
- add(new BasePageMapper("administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));
- add(new BasePageMapper("administration/invitations", InvitationListPage.class));
- add(new BasePageMapper("administration/invitations/new", NewInvitationPage.class));
+ add(new BasePageMapper("~administration/settings/system", SystemSettingPage.class));
+ add(new BasePageMapper("~administration/settings/security", SecuritySettingPage.class));
+ add(new BasePageMapper("~administration/users", UserListPage.class));
+ add(new BasePageMapper("~administration/users/new", NewUserPage.class));
+ add(new BasePageMapper("~administration/users/${user}", UserProfilePage.class));
+ add(new BasePageMapper("~administration/users/${user}/email-setting", UserEmailAddressesPage.class));
+ add(new BasePageMapper("~administration/users/${user}/groups", UserMembershipsPage.class));
+ add(new BasePageMapper("~administration/users/${user}/authorizations", UserAuthorizationsPage.class));
+ add(new BasePageMapper("~administration/users/${user}/avatar", UserAvatarPage.class));
+ add(new BasePageMapper("~administration/users/${user}/password", UserPasswordPage.class));
+ add(new BasePageMapper("~administration/users/${user}/ssh-keys", UserSshKeysPage.class));
+ add(new BasePageMapper("~administration/users/${user}/gpg-keys", UserGpgKeysPage.class));
+ add(new BasePageMapper("~administration/users/${user}/access-token", UserAccessTokenPage.class));
+ add(new BasePageMapper("~administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));
+ add(new BasePageMapper("~administration/invitations", InvitationListPage.class));
+ add(new BasePageMapper("~administration/invitations/new", NewInvitationPage.class));
- add(new BasePageMapper("administration/roles", RoleListPage.class));
- add(new BasePageMapper("administration/roles/new", NewRolePage.class));
- add(new BasePageMapper("administration/roles/${role}", RoleDetailPage.class));
+ add(new BasePageMapper("~administration/roles", RoleListPage.class));
+ add(new BasePageMapper("~administration/roles/new", NewRolePage.class));
+ add(new BasePageMapper("~administration/roles/${role}", RoleDetailPage.class));
- add(new BasePageMapper("administration/groups", GroupListPage.class));
- add(new BasePageMapper("administration/groups/new", NewGroupPage.class));
- add(new BasePageMapper("administration/groups/${group}", GroupProfilePage.class));
- add(new BasePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));
- add(new BasePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));
+ add(new BasePageMapper("~administration/groups", GroupListPage.class));
+ add(new BasePageMapper("~administration/groups/new", NewGroupPage.class));
+ add(new BasePageMapper("~administration/groups/${group}", GroupProfilePage.class));
+ add(new BasePageMapper("~administration/groups/${group}/members", GroupMembershipsPage.class));
+ add(new BasePageMapper("~administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));
- add(new BasePageMapper("administration/settings/mail", MailSettingPage.class));
- add(new BasePageMapper("administration/settings/service-desk-setting",
+ add(new BasePageMapper("~administration/settings/mail", MailSettingPage.class));
+ add(new BasePageMapper("~administration/settings/service-desk-setting",
ServiceDeskSettingPage.class));
- add(new BasePageMapper("administration/settings/issue-notification-template",
+ add(new BasePageMapper("~administration/settings/issue-notification-template",
IssueNotificationTemplatePage.class));
- add(new BasePageMapper("administration/settings/pull-request-notification-template",
+ add(new BasePageMapper("~administration/settings/pull-request-notification-template",
PullRequestNotificationTemplatePage.class));
- add(new BasePageMapper("administration/labels", LabelManagementPage.class));
- add(new BasePageMapper("administration/settings/performance", PerformanceSettingPage.class));
- add(new BasePageMapper("administration/settings/backup", DatabaseBackupPage.class));
- add(new BasePageMapper("administration/settings/authenticator", AuthenticatorPage.class));
- add(new BasePageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));
- add(new BasePageMapper("administration/settings/ssh-server-key", SshServerKeyPage.class));
- add(new BasePageMapper("administration/settings/gpg-signing-key", GpgSigningKeyPage.class));
- add(new BasePageMapper("administration/settings/gpg-trusted-keys", GpgTrustedKeysPage.class));
+ add(new BasePageMapper("~administration/labels", LabelManagementPage.class));
+ add(new BasePageMapper("~administration/settings/performance", PerformanceSettingPage.class));
+ add(new BasePageMapper("~administration/settings/backup", DatabaseBackupPage.class));
+ add(new BasePageMapper("~administration/settings/authenticator", AuthenticatorPage.class));
+ add(new BasePageMapper("~administration/settings/sso-connectors", SsoConnectorListPage.class));
+ add(new BasePageMapper("~administration/settings/ssh-server-key", SshServerKeyPage.class));
+ add(new BasePageMapper("~administration/settings/gpg-signing-key", GpgSigningKeyPage.class));
+ add(new BasePageMapper("~administration/settings/gpg-trusted-keys", GpgTrustedKeysPage.class));
- add(new BasePageMapper("administration/agents", AgentListPage.class));
- add(new BasePageMapper("administration/agents/${agent}", AgentOverviewPage.class));
- add(new BasePageMapper("administration/agents/${agent}/builds", AgentBuildsPage.class));
- add(new BasePageMapper("administration/agents/${agent}/log", AgentLogPage.class));
- add(new BasePageMapper("administration/settings/job-executors", JobExecutorsPage.class));
- add(new BasePageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));
+ add(new BasePageMapper("~administration/agents", AgentListPage.class));
+ add(new BasePageMapper("~administration/agents/${agent}", AgentOverviewPage.class));
+ add(new BasePageMapper("~administration/agents/${agent}/builds", AgentBuildsPage.class));
+ add(new BasePageMapper("~administration/agents/${agent}/log", AgentLogPage.class));
+ add(new BasePageMapper("~administration/settings/job-executors", JobExecutorsPage.class));
+ add(new BasePageMapper("~administration/settings/groovy-scripts", GroovyScriptListPage.class));
- add(new BasePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));
- add(new BasePageMapper("administration/settings/issue-states", IssueStateListPage.class));
- add(new BasePageMapper("administration/settings/state-transitions", StateTransitionListPage.class));
- add(new BasePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));
- add(new BasePageMapper("administration/settings/issue-links", LinkSpecListPage.class));
- add(new BasePageMapper("administration/settings/issue-templates", IssueTemplateListPage.class));
+ add(new BasePageMapper("~administration/settings/issue-fields", IssueFieldListPage.class));
+ add(new BasePageMapper("~administration/settings/issue-states", IssueStateListPage.class));
+ add(new BasePageMapper("~administration/settings/state-transitions", StateTransitionListPage.class));
+ add(new BasePageMapper("~administration/settings/issue-boards", DefaultBoardListPage.class));
+ add(new BasePageMapper("~administration/settings/issue-links", LinkSpecListPage.class));
+ add(new BasePageMapper("~administration/settings/issue-templates", IssueTemplateListPage.class));
- add(new BasePageMapper("administration/settings/branding", BrandingSettingPage.class));
+ add(new BasePageMapper("~administration/settings/branding", BrandingSettingPage.class));
- add(new BasePageMapper("administration/settings/${" + ContributedAdministrationSettingPage.PARAM_SETTING + "}",
+ add(new BasePageMapper("~administration/settings/${" + ContributedAdministrationSettingPage.PARAM_SETTING + "}",
ContributedAdministrationSettingPage.class));
- add(new BasePageMapper("administration/server-log", ServerLogPage.class));
- add(new BasePageMapper("administration/server-information", ServerInformationPage.class));
+ add(new BasePageMapper("~administration/server-log", ServerLogPage.class));
+ add(new BasePageMapper("~administration/server-information", ServerInformationPage.class));
}
private void addProjectPages() {
- add(new BasePageMapper("projects", ProjectListPage.class));
- add(new BasePageMapper("projects/new", NewProjectPage.class));
- add(new BasePageMapper("projects/import/${importer}", ProjectImportPage.class));
- add(new BasePageMapper("projects/${project}", ProjectDashboardPage.class));
+ add(new BasePageMapper("~projects", ProjectListPage.class));
+ add(new BasePageMapper("~projects/new", NewProjectPage.class));
+ add(new BasePageMapper("~projects/import/${importer}", ProjectImportPage.class));
- // keep this url here for backward compatibility
- add(new BasePageMapper("projects/${project}/blob", ProjectBlobPage.class));
-
- add(new BasePageMapper("projects/${project}/files", ProjectBlobPage.class));
- add(new BasePageMapper("projects/${project}/commits", ProjectCommitsPage.class));
- add(new BasePageMapper("projects/${project}/commits/${commit}", CommitDetailPage.class));
- add(new BasePageMapper("projects/${project}/compare", RevisionComparePage.class));
- add(new BasePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));
- add(new BasePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));
+ add(new ProjectPageMapper("${project}", ProjectDashboardPage.class));
+
+ add(new ProjectPageMapper("${project}/~files", ProjectBlobPage.class));
+ add(new ProjectPageMapper("${project}/~commits", ProjectCommitsPage.class));
+ add(new ProjectPageMapper("${project}/~commits/${commit}", CommitDetailPage.class));
+ add(new ProjectPageMapper("${project}/~compare", RevisionComparePage.class));
+ add(new ProjectPageMapper("${project}/~stats/contribs", ProjectContribsPage.class));
+ add(new ProjectPageMapper("${project}/~stats/lines", SourceLinesPage.class));
- add(new BasePageMapper("projects/${project}/branches", ProjectBranchesPage.class));
- add(new BasePageMapper("projects/${project}/tags", ProjectTagsPage.class));
- add(new BasePageMapper("projects/${project}/code-comments", ProjectCodeCommentsPage.class));
- add(new BasePageMapper("projects/${project}/code-comments/${code-comment}/invalid", InvalidCodeCommentPage.class));
+ add(new ProjectPageMapper("${project}/~branches", ProjectBranchesPage.class));
+ add(new ProjectPageMapper("${project}/~tags", ProjectTagsPage.class));
+ add(new ProjectPageMapper("${project}/~code-comments", ProjectCodeCommentsPage.class));
+ add(new ProjectPageMapper("${project}/~code-comments/${code-comment}/invalid", InvalidCodeCommentPage.class));
- add(new BasePageMapper("projects/${project}/pulls", ProjectPullRequestsPage.class));
- add(new BasePageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));
- add(new BasePageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));
- add(new BasePageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));
- add(new BasePageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));
- add(new BasePageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));
+ add(new ProjectPageMapper("${project}/~pulls", ProjectPullRequestsPage.class));
+ add(new ProjectPageMapper("${project}/~pulls/new", NewPullRequestPage.class));
+ add(new ProjectPageMapper("${project}/~pulls/${request}", PullRequestActivitiesPage.class));
+ add(new ProjectPageMapper("${project}/~pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));
+ add(new ProjectPageMapper("${project}/~pulls/${request}/changes", PullRequestChangesPage.class));
+ add(new ProjectPageMapper("${project}/~pulls/${request}/invalid", InvalidPullRequestPage.class));
- add(new BasePageMapper("projects/${project}/boards", IssueBoardsPage.class));
- add(new BasePageMapper("projects/${project}/boards/${board}", IssueBoardsPage.class));
- add(new BasePageMapper("projects/${project}/issues", ProjectIssueListPage.class));
- add(new BasePageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));
- add(new BasePageMapper("projects/${project}/issues/${issue}/commits", IssueCommitsPage.class));
- add(new BasePageMapper("projects/${project}/issues/${issue}/pull-requests", IssuePullRequestsPage.class));
- add(new BasePageMapper("projects/${project}/issues/${issue}/builds", IssueBuildsPage.class));
- add(new BasePageMapper("projects/${project}/issues/${issue}/authorizations", IssueAuthorizationsPage.class));
- add(new BasePageMapper("projects/${project}/issues/new", NewIssuePage.class));
- add(new BasePageMapper("projects/${project}/issues/import/${importer}", IssueImportPage.class));
- add(new BasePageMapper("projects/${project}/milestones", MilestoneListPage.class));
- add(new BasePageMapper("projects/${project}/milestones/${milestone}", MilestoneIssuesPage.class));
- add(new BasePageMapper("projects/${project}/milestones/${milestone}/burndown", MilestoneBurndownPage.class));
- add(new BasePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));
- add(new BasePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));
+ add(new ProjectPageMapper("${project}/~boards", IssueBoardsPage.class));
+ add(new ProjectPageMapper("${project}/~boards/${board}", IssueBoardsPage.class));
+ add(new ProjectPageMapper("${project}/~issues", ProjectIssueListPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}", IssueActivitiesPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/commits", IssueCommitsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/pull-requests", IssuePullRequestsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/builds", IssueBuildsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/authorizations", IssueAuthorizationsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/new", NewIssuePage.class));
+ add(new ProjectPageMapper("${project}/~issues/import/${importer}", IssueImportPage.class));
+ add(new ProjectPageMapper("${project}/~milestones", MilestoneListPage.class));
+ add(new ProjectPageMapper("${project}/~milestones/${milestone}", MilestoneIssuesPage.class));
+ add(new ProjectPageMapper("${project}/~milestones/${milestone}/burndown", MilestoneBurndownPage.class));
+ add(new ProjectPageMapper("${project}/~milestones/${milestone}/edit", MilestoneEditPage.class));
+ add(new ProjectPageMapper("${project}/~milestones/new", NewMilestonePage.class));
- add(new BasePageMapper("projects/${project}/builds", ProjectBuildsPage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}/pipeline", BuildPipelinePage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}/artifacts", BuildArtifactsPage.class));
- add(new BasePageMapper("projects/${project}/builds/${build}/invalid", InvalidBuildPage.class));
+ add(new ProjectPageMapper("${project}/~builds", ProjectBuildsPage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}", BuildDashboardPage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}/pipeline", BuildPipelinePage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}/log", BuildLogPage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}/changes", BuildChangesPage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}/fixed-issues", FixedIssuesPage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}/artifacts", BuildArtifactsPage.class));
+ add(new ProjectPageMapper("${project}/~builds/${build}/invalid", InvalidBuildPage.class));
- add(new BasePageMapper("projects/${project}/children", ProjectChildrenPage.class));
+ add(new ProjectPageMapper("${project}/~children", ProjectChildrenPage.class));
- add(new BasePageMapper("projects/${project}/settings/general", GeneralProjectSettingPage.class));
- add(new BasePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));
- add(new BasePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));
- add(new BasePageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));
- add(new BasePageMapper("projects/${project}/settings/tag-protection", TagProtectionsPage.class));
- add(new BasePageMapper("projects/${project}/settings/build/job-secrets", JobSecretsPage.class));
- add(new BasePageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));
- add(new BasePageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));
- add(new BasePageMapper("projects/${project}/settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));
- add(new BasePageMapper("projects/${project}/settings/code-analysis", CodeAnalysisSettingPage.class));
- add(new BasePageMapper("projects/${project}/settings/service-desk", ProjectServiceDeskSettingPage.class));
- add(new BasePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
- add(new BasePageMapper("projects/${project}/settings/${" + ContributedProjectSettingPage.PARAM_SETTING + "}",
+ add(new ProjectPageMapper("${project}/~settings/general", GeneralProjectSettingPage.class));
+ add(new ProjectPageMapper("${project}/~settings/authorizations", ProjectAuthorizationsPage.class));
+ add(new ProjectPageMapper("${project}/~settings/avatar-edit", AvatarEditPage.class));
+ add(new ProjectPageMapper("${project}/~settings/branch-protection", BranchProtectionsPage.class));
+ add(new ProjectPageMapper("${project}/~settings/tag-protection", TagProtectionsPage.class));
+ add(new ProjectPageMapper("${project}/~settings/build/job-secrets", JobSecretsPage.class));
+ add(new ProjectPageMapper("${project}/~settings/build/action-authorizations", ActionAuthorizationsPage.class));
+ add(new ProjectPageMapper("${project}/~settings/build/build-preserve-rules", BuildPreservationsPage.class));
+ add(new ProjectPageMapper("${project}/~settings/build/default-fixed-issues-filter", DefaultFixedIssueFiltersPage.class));
+ add(new ProjectPageMapper("${project}/~settings/code-analysis", CodeAnalysisSettingPage.class));
+ add(new ProjectPageMapper("${project}/~settings/service-desk", ProjectServiceDeskSettingPage.class));
+ add(new ProjectPageMapper("${project}/~settings/web-hooks", WebHooksPage.class));
+ add(new ProjectPageMapper("${project}/~settings/${" + ContributedProjectSettingPage.PARAM_SETTING + "}",
ContributedProjectSettingPage.class));
- add(new BasePageMapper("projects/${project}/no-storage", NoProjectStoragePage.class));
+ add(new ProjectPageMapper("${project}/~no-storage", NoProjectStoragePage.class));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/PlaceholderProvider.java b/server-core/src/main/java/io/onedev/server/web/mapper/PlaceholderProvider.java
new file mode 100644
index 0000000000..0544ec7a4c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/PlaceholderProvider.java
@@ -0,0 +1,9 @@
+package io.onedev.server.web.mapper;
+
+public interface PlaceholderProvider {
+
+ String getPlaceholder(String mountSegment);
+
+ String getOptionalPlaceholder(String mountSegment);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java
new file mode 100644
index 0000000000..5a2c040dc5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectMapperUtils.java
@@ -0,0 +1,111 @@
+package io.onedev.server.web.mapper;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.core.request.mapper.MapperUtils;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.Strings;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Splitter;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+
+public class ProjectMapperUtils {
+
+ public static final String PARAM_PROJECT = "project";
+
+ @Nullable
+ public static Url normalize(Url url) {
+ Url normalizedUrl = new Url(url);
+ List<String> segments = normalizedUrl.getSegments();
+ Collection<String> reservedNames = OneDev.getInstance(ProjectManager.class).getReservedNames();
+ int nonProjectSegmentIndex = segments.size();
+ for (int i = 0; i < segments.size(); i++) {
+ String segment = segments.get(i);
+ if (segment.startsWith("~") || reservedNames.contains(segment)) {
+ nonProjectSegmentIndex = i;
+ break;
+ }
+ }
+
+ if (nonProjectSegmentIndex != 0) {
+ String projectPath = Joiner.on("/").join(segments.subList(0, nonProjectSegmentIndex));
+ for (int i = 0; i < nonProjectSegmentIndex; i++)
+ segments.remove(0);
+ segments.add(0, projectPath);
+ return normalizedUrl;
+ } else {
+ return null;
+ }
+ }
+
+ public static boolean setPlaceholders(PageParameters parameters, Url url, String[] mountSegments,
+ PlaceholderProvider placeholderProvider) {
+ boolean mandatoryParametersSet = true;
+
+ url.getSegments().remove(0);
+ int start = 0;
+ for (String projectName: Splitter.on("/").split(parameters.get(PARAM_PROJECT).toString())) {
+ url.getSegments().add(start++, projectName);
+ }
+ parameters.remove(PARAM_PROJECT);
+
+ int dropped = 0;
+ for (int i = 1; i < mountSegments.length; ++i) {
+ String placeholder = placeholderProvider.getPlaceholder(mountSegments[i]);
+ String optionalPlaceholder = placeholderProvider.getOptionalPlaceholder(mountSegments[i]);
+ if (placeholder != null) {
+ if (parameters.getNamedKeys().contains(placeholder)) {
+ url.getSegments().set(i - dropped + start -1, parameters.get(placeholder).toString());
+ parameters.remove(placeholder);
+ } else {
+ mandatoryParametersSet = false;
+ break;
+ }
+ } else if (optionalPlaceholder != null) {
+ if (parameters.getNamedKeys().contains(optionalPlaceholder)) {
+ url.getSegments().set(i - dropped + start - 1, parameters.get(optionalPlaceholder).toString(""));
+ parameters.remove(optionalPlaceholder);
+ } else {
+ url.getSegments().remove(i - dropped + start - 1);
+ dropped++;
+ }
+ }
+ }
+
+ return mandatoryParametersSet;
+ }
+
+ public static PageParameters extractPageParameters(final Request request, int segmentsToSkip,
+ final IPageParametersEncoder encoder) {
+ // strip the segments and first query parameter from URL
+ Url normalizedUrl = normalize(request.getUrl());
+ if (normalizedUrl == null)
+ normalizedUrl = new Url(request.getUrl());
+ while ((segmentsToSkip > 0) && (normalizedUrl.getSegments().isEmpty() == false)) {
+ normalizedUrl.getSegments().remove(0);
+ --segmentsToSkip;
+ }
+
+ if (!normalizedUrl.getQueryParameters().isEmpty()
+ && Strings.isEmpty(normalizedUrl.getQueryParameters().get(0).getValue())) {
+ removeMetaParameter(normalizedUrl);
+ }
+
+ return encoder.decodePageParameters(normalizedUrl);
+ }
+
+ private static void removeMetaParameter(Url url) {
+ if (MapperUtils.parsePageComponentInfoParameter(url.getQueryParameters().get(0)) != null)
+ url.getQueryParameters().remove(0);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/ProjectPageMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectPageMapper.java
new file mode 100644
index 0000000000..f521f6b2d2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectPageMapper.java
@@ -0,0 +1,73 @@
+package io.onedev.server.web.mapper;
+
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.component.IRequestablePage;
+import org.apache.wicket.request.mapper.info.PageComponentInfo;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class ProjectPageMapper extends BasePageMapper {
+
+ private final Class<? extends IRequestablePage> pageClass;
+
+ public ProjectPageMapper(String mountPath, Class<? extends IRequestablePage> pageClass) {
+ super(mountPath, pageClass);
+ this.pageClass = pageClass;
+ }
+
+ @Override
+ protected boolean setPlaceholders(PageParameters parameters, Url url) {
+ return ProjectMapperUtils.setPlaceholders(parameters, url, mountSegments, new PlaceholderProvider() {
+
+ @Override
+ public String getPlaceholder(String mountSegment) {
+ return ProjectPageMapper.this.getPlaceholder(mountSegment);
+ }
+
+ @Override
+ public String getOptionalPlaceholder(String mountSegment) {
+ return ProjectPageMapper.this.getOptionalPlaceholder(mountSegment);
+ }
+
+ });
+ }
+
+ @Override
+ protected PageParameters extractPageParameters(final Request request, int segmentsToSkip,
+ final IPageParametersEncoder encoder) {
+ return ProjectMapperUtils.extractPageParameters(request, segmentsToSkip, encoder);
+ }
+
+ @Override
+ protected boolean urlStartsWithMountedSegments(Url url) {
+ Url normalizedUrl = ProjectMapperUtils.normalize(url);
+ if (normalizedUrl == null)
+ normalizedUrl = url;
+ return super.urlStartsWithMountedSegments(normalizedUrl);
+ }
+
+ @Override
+ protected boolean urlStartsWith(Url url, String... segments) {
+ Url normalizedUrl = ProjectMapperUtils.normalize(url);
+ if (normalizedUrl == null)
+ normalizedUrl = url;
+ return super.urlStartsWith(normalizedUrl, segments);
+ }
+
+ @Override
+ protected UrlInfo parseRequest(Request request) {
+ Url normalizedUrl = ProjectMapperUtils.normalize(request.getUrl());
+
+ if (normalizedUrl != null && urlStartsWithMountedSegments(normalizedUrl)) {
+ // try to extract page and component information from URL
+ PageComponentInfo info = getPageComponentInfo(normalizedUrl);
+ PageParameters pageParameters = extractPageParameters(request, normalizedUrl);
+
+ return new UrlInfo(info, pageClass, pageParameters);
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/ProjectResourceMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectResourceMapper.java
new file mode 100644
index 0000000000..39570138cc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/ProjectResourceMapper.java
@@ -0,0 +1,145 @@
+package io.onedev.server.web.mapper;
+
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Request;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.request.mapper.parameter.INamedParameters;
+import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.resource.ResourceUtil;
+
+import com.google.common.base.Splitter;
+
+public class ProjectResourceMapper extends BaseResourceMapper {
+
+ private final String[] mountSegments;
+
+ private final IPageParametersEncoder parametersEncoder = new PageParametersEncoder();
+
+ public ProjectResourceMapper(String path, ResourceReference resourceReference) {
+ super(path, resourceReference);
+ mountSegments = getMountSegments(path);
+ }
+
+ @Override
+ protected boolean setPlaceholders(PageParameters parameters, Url url) {
+ return ProjectMapperUtils.setPlaceholders(parameters, url, mountSegments, new PlaceholderProvider() {
+
+ @Override
+ public String getPlaceholder(String mountSegment) {
+ return ProjectResourceMapper.this.getPlaceholder(mountSegment);
+ }
+
+ @Override
+ public String getOptionalPlaceholder(String mountSegment) {
+ return ProjectResourceMapper.this.getOptionalPlaceholder(mountSegment);
+ }
+
+ });
+ }
+
+ @Override
+ public IRequestHandler mapRequest(final Request request) {
+ Url normalizedUrl = ProjectMapperUtils.normalize(request.getUrl());
+ if (normalizedUrl == null)
+ normalizedUrl = new Url(request.getUrl());
+
+ // now extract the page parameters from the request url
+ PageParameters parameters = extractPageParameters(request, mountSegments.length, parametersEncoder);
+
+ // remove caching information from current request
+ removeCachingDecoration(normalizedUrl, parameters);
+
+ // check if url matches mount path
+ if (urlStartsWith(normalizedUrl, mountSegments) == false) {
+ return null;
+ }
+
+ // check if there are placeholders in mount segments
+ for (int index = 0; index < mountSegments.length; ++index) {
+ String placeholder = getPlaceholder(mountSegments[index]);
+
+ if (placeholder != null) {
+ // extract the parameter from URL
+ if (parameters == null) {
+ parameters = new PageParameters();
+ }
+ parameters.add(placeholder, normalizedUrl.getSegments().get(index), INamedParameters.Type.PATH);
+ }
+ }
+ return new ResourceReferenceRequestHandler(getResourceReference(), parameters);
+ }
+
+ @Override
+ public Url mapHandler(IRequestHandler requestHandler) {
+ if ((requestHandler instanceof ResourceReferenceRequestHandler) == false) {
+ return null;
+ }
+
+ ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler) requestHandler;
+
+ // see if request handler addresses the resource reference we serve
+ if (getResourceReference().equals(handler.getResourceReference()) == false) {
+ return null;
+ }
+
+ Url url = new Url();
+
+ // add mount path segments
+ for (String segment : mountSegments) {
+ url.getSegments().add(segment);
+ }
+
+ // replace placeholder parameters
+ PageParameters parameters = new PageParameters(handler.getPageParameters());
+
+ url.getSegments().remove(0);
+ int start = 0;
+ for (String projectName : Splitter.on("/").split(parameters.get(ProjectMapperUtils.PARAM_PROJECT).toString())) {
+ url.getSegments().add(start++, projectName);
+ }
+ parameters.remove(ProjectMapperUtils.PARAM_PROJECT);
+
+ for (int index = 1; index < mountSegments.length; ++index) {
+ String placeholder = getPlaceholder(mountSegments[index]);
+
+ if (placeholder != null) {
+ url.getSegments().set(index, parameters.get(placeholder).toString(""));
+ parameters.remove(placeholder);
+ }
+ }
+
+ // add caching information
+ addCachingDecoration(url, parameters);
+
+ ResourceUtil.encodeResourceReferenceAttributes(url, getResourceReference());
+ // create url
+ return encodePageParameters(url, parameters, parametersEncoder);
+ }
+
+ @Override
+ protected PageParameters extractPageParameters(final Request request, int segmentsToSkip,
+ final IPageParametersEncoder encoder) {
+ return ProjectMapperUtils.extractPageParameters(request, segmentsToSkip, encoder);
+ }
+
+ @Override
+ protected boolean urlStartsWithMountedSegments(Url url) {
+ Url normalizedUrl = ProjectMapperUtils.normalize(url);
+ if (normalizedUrl == null)
+ normalizedUrl = url;
+ return super.urlStartsWithMountedSegments(normalizedUrl);
+ }
+
+ @Override
+ protected boolean urlStartsWith(Url url, String... segments) {
+ Url normalizedUrl = ProjectMapperUtils.normalize(url);
+ if (normalizedUrl == null)
+ normalizedUrl = url;
+ return super.urlStartsWith(normalizedUrl, segments);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
index 9db3a0f64c..06f53b6290 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
@@ -41,7 +41,7 @@ public class IssueNotificationTemplatePage extends AdministrationPage {
NotificationTemplateSetting setting = getSettingManager().getNotificationTemplateSetting();
Map<String, String> variableHelp = new LinkedHashMap<>();
- variableHelp.put("issue", " represents the <a href='https://code.onedev.io/projects/160/blob/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a> object to be notified");
+ variableHelp.put("issue", " represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a> object to be notified");
add(new Label("notificationTemplateHelp", NotificationTemplateSetting.getTemplateHelp(variableHelp))
.setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
index f6a4e6619e..ed28503bad 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
@@ -41,7 +41,7 @@ public class PullRequestNotificationTemplatePage extends AdministrationPage {
NotificationTemplateSetting setting = getSettingManager().getNotificationTemplateSetting();
Map<String, String> variableHelp = new LinkedHashMap<>();
- variableHelp.put("pullRequest", " represents the <a href='https://code.onedev.io/projects/160/blob/main/server-core/src/main/java/io/onedev/server/model/PullRequest.java' target='_blank'>pull request</a> object to be notified");
+ variableHelp.put("pullRequest", " represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/PullRequest.java' target='_blank'>pull request</a> object to be notified");
add(new Label("notificationTemplateHelp", NotificationTemplateSetting.getTemplateHelp(variableHelp))
.setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java
index 1ed02329d0..9b95eedea7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssosetting/SsoProcessPage.java
@@ -26,7 +26,7 @@ import io.onedev.server.web.page.simple.security.LoginPage;
@SuppressWarnings("serial")
public class SsoProcessPage extends BasePage {
- public static final String MOUNT_PATH = "sso";
+ public static final String MOUNT_PATH = "~sso";
public static final String COOKIE_CONNECTOR = "ssoConnector";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
index 6695b83ec6..e4b8299206 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/MethodDetailPage.java
@@ -172,9 +172,9 @@ public class MethodDetailPage extends ApiHelpPage {
String endPoint;
if (methodPath != null)
- endPoint = "/api" + resourcePathValue + methodPath.value();
+ endPoint = "/~api" + resourcePathValue + methodPath.value();
else
- endPoint = "/api" + resourcePathValue;
+ endPoint = "/~api" + resourcePathValue;
add(new Label("path", endPoint));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index 54af07a80c..b35e58e4dc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -22,8 +22,8 @@
</a>
<div class="dropdown-menu">
<a wicket:id="docLink" class="dropdown-item" target="_blank">Documentation</a>
- <a href="https://code.onedev.io/projects/160/issues?query=%22State%22+is+%22Open%22" class="dropdown-item" target="_blank">Support &amp; Bug Report</a>
- <a href="/help/api" class="dropdown-item" target="_blank">RESTful API</a>
+ <a href="https://code.onedev.io/onedev/server/~issues?query=%22State%22+is+%22Open%22" class="dropdown-item" target="_blank">Support &amp; Bug Report</a>
+ <a href="/~help/api" class="dropdown-item" target="_blank">RESTful API</a>
<a wicket:id="incompatibilities" class="dropdown-item">Incompatibilities</a>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 84d3c46558..95e09cdc52 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -159,7 +159,7 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Security Setting",
SecuritySettingPage.class, new PageParameters()));
List<SidebarMenuItem> userManagementMenuItems = new ArrayList<>();
- userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Accounts", UserListPage.class,
+ userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Users", UserListPage.class,
new PageParameters(), Lists.newArrayList(NewUserPage.class, UserPage.class)));
userManagementMenuItems.add(new SidebarMenuItem.Page(null, "Invitations", InvitationListPage.class,
new PageParameters(), Lists.newArrayList(NewInvitationPage.class)));
@@ -351,7 +351,7 @@ public abstract class LayoutPage extends BasePage {
});
Plugin product = AppLoader.getProduct();
- sidebar.add(new ExternalLink("productVersion", "https://code.onedev.io/projects/160")
+ sidebar.add(new ExternalLink("productVersion", "https://code.onedev.io/onedev/server")
.setBody(Model.of("OneDev " + product.getVersion())));
sidebar.add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
sidebar.add(new BookmarkablePageLink<Void>("incompatibilities", IncompatibilitiesPage.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 4e753791fc..b50e784a13 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
@@ -7,9 +7,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.validation.ValidationException;
+import javax.persistence.EntityNotFoundException;
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -52,6 +51,7 @@ import io.onedev.server.web.component.project.avatar.ProjectAvatar;
import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;
import io.onedev.server.web.component.project.info.ProjectInfoPanel;
import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.mapper.ProjectMapperUtils;
import io.onedev.server.web.opengraph.OpenGraphHeaderMeta;
import io.onedev.server.web.opengraph.OpenGraphHeaderMetaType;
import io.onedev.server.web.page.layout.LayoutPage;
@@ -103,37 +103,37 @@ import io.onedev.server.web.util.ProjectAware;
@SuppressWarnings("serial")
public abstract class ProjectPage extends LayoutPage implements ProjectAware {
- public static final String PARAM_PROJECT = "project";
-
protected final IModel<Project> projectModel;
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(PARAM_PROJECT, projectId);
+ params.add(ProjectMapperUtils.PARAM_PROJECT, projectPath);
return params;
}
public static PageParameters paramsOf(Project project) {
- return paramsOf(project.getId());
+ return paramsOf(project.getPath());
}
public ProjectPage(PageParameters params) {
super(params);
- String projectIdString = params.get(PARAM_PROJECT).toOptionalString();
- if (StringUtils.isBlank(projectIdString))
+ String projectPath = params.get(ProjectMapperUtils.PARAM_PROJECT).toOptionalString();
+ if (projectPath == null)
throw new RestartResponseException(ProjectListPage.class);
-
- Long projectId;
- try {
- projectId = Long.valueOf(projectIdString);
- } catch (NumberFormatException e) {
- throw new ValidationException("Invalid project id: " + projectIdString);
- }
- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);
+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);
+ if (project == null)
+ throw new EntityNotFoundException();
+
+ Long projectId = project.getId();
projectModel = new LoadableDetachableModel<Project>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java
index b27899dad3..237102ef02 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/artifacts/ArtifactUploadPanel.java
@@ -147,7 +147,7 @@ public abstract class ArtifactUploadPanel extends Panel {
for (FileUpload upload: uploads) {
String filePath = getArtifactPath(upload);
WebTarget jerseyTarget = client.target(serverUrl)
- .path("api/cluster/artifact")
+ .path("~api/cluster/artifact")
.queryParam("projectId", projectId)
.queryParam("buildNumber", getBuild().getNumber())
.queryParam("artifactPath", filePath);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/OAuthCallbackPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/OAuthCallbackPage.java
index 16868a0a44..7704dca1df 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/OAuthCallbackPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/OAuthCallbackPage.java
@@ -12,7 +12,7 @@ import io.onedev.server.web.page.simple.SimplePage;
@SuppressWarnings("serial")
public class OAuthCallbackPage extends SimplePage {
- public static final String MOUNT_PATH = "oauth/callback";
+ public static final String MOUNT_PATH = "~oauth/callback";
private static final String PARAM_CODE = "code";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 694f34cc53..a69f50355f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -5,10 +5,16 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.Project;
import io.onedev.server.web.asset.mermaid.MermaidResourceReference;
import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.resource.ArchiveResource;
+import io.onedev.server.web.resource.ArchiveResourceReference;
@SuppressWarnings("serial")
public class TestPage extends BasePage {
@@ -25,9 +31,12 @@ public class TestPage extends BasePage {
@Override
public void onClick(AjaxRequestTarget target) {
+ Project project = OneDev.getInstance(ProjectManager.class).load(160L);
+ System.out.println(RequestCycle.get().urlFor(new ArchiveResourceReference(), ArchiveResource.paramsOf(project.getId(), "master", ArchiveResource.FORMAT_ZIP)));
}
});
+
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
index e8ac04d8e6..2b6d320708 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AttachmentResource.java
@@ -184,8 +184,8 @@ public class AttachmentResource extends AbstractResource {
public static String authorizeGroup(String attachmentUrl) {
try {
URIBuilder builder = new URIBuilder(attachmentUrl);
- if (builder.getPathSegments().size() >= 4) {
- String group = builder.getPathSegments().get(3);
+ if (builder.getPathSegments().size() >= 5) {
+ String group = builder.getPathSegments().get(4);
byte[] encrypted = CryptoUtils.encrypt(group.getBytes(StandardCharsets.UTF_8));
String base64 = Base64.encodeBase64URLSafeString(encrypted);
builder.addParameter(PARAM_AUTHORIZATION, base64);
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
index 356301c592..e203b2da69 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import javax.persistence.EntityNotFoundException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Invocation;
@@ -43,6 +44,7 @@ import io.onedev.server.git.LfsObject;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ExceptionUtils;
+import io.onedev.server.web.mapper.ProjectMapperUtils;
public class RawBlobResource extends AbstractResource {
@@ -50,17 +52,17 @@ public class RawBlobResource extends AbstractResource {
private static final Logger logger = LoggerFactory.getLogger(RawBlobResource.class);
- private static final String PARAM_PROJECT = "project";
-
private static final int BUFFER_SIZE = 8*1024;
@Override
protected ResourceResponse newResourceResponse(Attributes attributes) {
PageParameters params = attributes.getParameters();
- Long projectId = params.get(PARAM_PROJECT).toLong();
- Project project = OneDev.getInstance(ProjectManager.class).load(projectId);
-
+ String projectPath = params.get(ProjectMapperUtils.PARAM_PROJECT).toString();
+ Project project = OneDev.getInstance(ProjectManager.class).findByPath(projectPath);
+ if (project == null)
+ throw new EntityNotFoundException();
+
List<String> revisionAndPathSegments = new ArrayList<>();
for (int i = 0; i < params.getIndexedCount(); i++) {
String segment = params.get(i).toString();
@@ -178,12 +180,12 @@ public class RawBlobResource extends AbstractResource {
String serverUrl = getClusterManager().getServerUrl(storageServerUUID);
WebTarget target = client.target(serverUrl);
if (blob.getLfsPointer() != null) {
- target = target.path("api/cluster/lfs")
+ target = target.path("~api/cluster/lfs")
.queryParam("projectId", project.getId())
.queryParam("objectId", blob.getLfsPointer().getObjectId());
} else {
ObjectId commitId = project.getObjectId(blob.getIdent().revision, true);
- target = target.path("api/cluster/blob")
+ target = target.path("~api/cluster/blob")
.queryParam("projectId", project.getId())
.queryParam("revId", commitId.name())
.queryParam("path", blob.getIdent().path);
@@ -217,7 +219,7 @@ public class RawBlobResource extends AbstractResource {
public static PageParameters paramsOf(Project project, BlobIdent blobIdent) {
PageParameters params = new PageParameters();
- params.set(PARAM_PROJECT, project.getId());
+ params.set(ProjectMapperUtils.PARAM_PROJECT, project.getPath());
int index = 0;
for (String segment: Splitter.on("/").split(blobIdent.revision)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceReference.java b/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceReference.java
index eba72acbba..eaca583094 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/SpriteResourceReference.java
@@ -6,7 +6,7 @@ public class SpriteResourceReference extends PackageResourceReference {
private static final long serialVersionUID = 1L;
- public static final String DEFAULT_MOUNT_PATH = "icons.svg";
+ public static final String DEFAULT_MOUNT_PATH = "~icons.svg";
public static final String RESOURCE_NAME = "create-sprite-from-files.svg";
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index dc723c2c06..fad3e30085 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index c5da8716af..2a5a692f55 100644
--- a/server-plugin/server-plugin-archetype/pom.xml
+++ b/server-plugin/server-plugin-archetype/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index 24174d5894..9e7a471364 100644
--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml
+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml
index d0cb9fbd66..09edbd428c 100644
--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml
+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml
index f9c2451a1d..4b822c437f 100644
--- a/server-plugin/server-plugin-buildspec-maven/pom.xml
+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml
index e310aaa588..25adeeddd1 100644
--- a/server-plugin/server-plugin-buildspec-node/pom.xml
+++ b/server-plugin/server-plugin-buildspec-node/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index e0465547f6..6cd1903899 100644
--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml
index f1de900faf..95b62a0f2b 100644
--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml
+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xml
index fc408d2770..a5f02dc5f4 100644
--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml
+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml
index 2a70ad777b..b714951e4d 100644
--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml
+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 143bb296a1..5776e1ff0c 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -475,7 +475,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
throw new FailedException();
} finally {
cache.uninstallSymbolinks(hostWorkspace);
- // Fix https://code.onedev.io/projects/160/issues/597
+ // Fix https://code.onedev.io/onedev/server/~issues/597
if (SystemUtils.IS_OS_WINDOWS)
FileUtils.deleteDir(hostWorkspace);
if (hostAuthInfoHome.get() != null)
diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xml
index fa132241c1..48f5be8a46 100644
--- a/server-plugin/server-plugin-executor-servershell/pom.xml
+++ b/server-plugin/server-plugin-executor-servershell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index 8f13ead950..ed8615403d 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -265,7 +265,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
if (!successful)
throw new FailedException();
} finally {
- // Fix https://code.onedev.io/projects/160/issues/597
+ // Fix https://code.onedev.io/onedev/server/~issues/597
if (SystemUtils.IS_OS_WINDOWS && workspaceDir.exists())
FileUtils.deleteDir(workspaceDir);
synchronized (buildDir) {
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
index 09b916c941..a56272de34 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml
index ea0d8128c1..653b91312d 100644
--- a/server-plugin/server-plugin-import-gitea/pom.xml
+++ b/server-plugin/server-plugin-import-gitea/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index 91ce7de011..9b3682e8ac 100644
--- a/server-plugin/server-plugin-import-github/pom.xml
+++ b/server-plugin/server-plugin-import-github/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml
index 550e1dc599..edb5e39788 100644
--- a/server-plugin/server-plugin-import-gitlab/pom.xml
+++ b/server-plugin/server-plugin-import-gitlab/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
index 682b472b67..a8fe3d83ca 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java
@@ -440,6 +440,7 @@ public class ImportServer implements Serializable, Validatable {
issue.setProject(oneDevProject);
issue.setTitle(issueNode.get("title").asText());
issue.setDescription(issueNode.get("description").asText(null));
+ issue.setConfidential(issueNode.get("confidential").asBoolean());
issue.setNumberScope(oneDevProject.getForkRoot());
diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml
index 34f4c23f8e..242d8c86fc 100644
--- a/server-plugin/server-plugin-import-jiracloud/pom.xml
+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xml
index 923d7b52e1..d97166a874 100644
--- a/server-plugin/server-plugin-import-url/pom.xml
+++ b/server-plugin/server-plugin-import-url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml
index 681cfdde8c..e4b225e5a7 100644
--- a/server-plugin/server-plugin-import-youtrack/pom.xml
+++ b/server-plugin/server-plugin-import-youtrack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xml
index cfc20b7d36..96c0d6dd28 100644
--- a/server-plugin/server-plugin-notification-discord/pom.xml
+++ b/server-plugin/server-plugin-notification-discord/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>
diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xml
index 428be5f9f0..5096603dca 100644
--- a/server-plugin/server-plugin-notification-slack/pom.xml
+++ b/server-plugin/server-plugin-notification-slack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index e2b4de447d..956d37557e 100644
--- a/server-plugin/server-plugin-report-checkstyle/pom.xml
+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 4c13f0279a..1f6ccaf142 100644
--- a/server-plugin/server-plugin-report-clover/pom.xml
+++ b/server-plugin/server-plugin-report-clover/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xml
index a66d1481c7..544581a407 100644
--- a/server-plugin/server-plugin-report-coverage/pom.xml
+++ b/server-plugin/server-plugin-report-coverage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java
index bddf542133..060ec71381 100644
--- a/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java
+++ b/server-plugin/server-plugin-report-coverage/src/main/java/io/onedev/server/plugin/report/coverage/CoverageModule.java
@@ -32,7 +32,7 @@ import io.onedev.server.model.CoverageMetric;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebApplicationConfigurator;
-import io.onedev.server.web.mapper.BasePageMapper;
+import io.onedev.server.web.mapper.ProjectPageMapper;
import io.onedev.server.web.page.layout.SidebarMenuItem;
import io.onedev.server.web.page.project.StatisticsMenuContribution;
import io.onedev.server.web.page.project.builds.detail.BuildTab;
@@ -112,8 +112,8 @@ public class CoverageModule extends AbstractPluginModule {
@Override
public void configure(WebApplication application) {
- application.mount(new BasePageMapper("projects/${project}/builds/${build}/coverage/${report}", CoverageReportPage.class));
- application.mount(new BasePageMapper("projects/${project}/stats/coverage", CoverageStatsPage.class));
+ application.mount(new ProjectPageMapper("${project}/~builds/${build}/coverage/${report}", CoverageReportPage.class));
+ application.mount(new ProjectPageMapper("${project}/~stats/coverage", CoverageStatsPage.class));
}
});
diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xml
index a108317bf5..b472196dd1 100644
--- a/server-plugin/server-plugin-report-cpd/pom.xml
+++ b/server-plugin/server-plugin-report-cpd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
index c5d416ac61..0de90acf51 100644
--- a/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
+++ b/server-plugin/server-plugin-report-cpd/src/main/java/io/onedev/server/plugin/report/cpd/PublishCPDReportStep.java
@@ -122,7 +122,7 @@ public class PublishCPDReportStep extends PublishProblemReportStep {
ProjectBlobPage.fillParams(params, state);
PageParametersEncoder paramsEncoder = new PageParametersEncoder();
- String url = "/projects/" + build.getProject().getId() + "/blob/" + paramsEncoder.encodePageParameters(params);
+ String url = "/" + build.getProject().getPath() + "/~files/" + paramsEncoder.encodePageParameters(params);
String message = String.format(""
+ "Duplicated with '%s' at <a href='%s'>line %s - %s</a>",
HtmlEscape.escapeHtml5(duplicateWith.blobPath), url, duplicateWith.range.getFromRow()+1,
diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xml
index 71fdbafd4e..58728880b5 100644
--- a/server-plugin/server-plugin-report-jacoco/pom.xml
+++ b/server-plugin/server-plugin-report-jacoco/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index 08e8ff6648..cf5f3d576f 100644
--- a/server-plugin/server-plugin-report-jest/pom.xml
+++ b/server-plugin/server-plugin-report-jest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xml
index 6862e7a009..cb566cd347 100644
--- a/server-plugin/server-plugin-report-junit/pom.xml
+++ b/server-plugin/server-plugin-report-junit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index 51ba58e054..e41fdc0372 100644
--- a/server-plugin/server-plugin-report-markdown/pom.xml
+++ b/server-plugin/server-plugin-report-markdown/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java
index 1df4c8191d..6385b6491d 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/MarkdownModule.java
@@ -24,7 +24,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebApplicationConfigurator;
-import io.onedev.server.web.mapper.BasePageMapper;
+import io.onedev.server.web.mapper.ProjectPageMapper;
import io.onedev.server.web.page.project.builds.detail.BuildTab;
import io.onedev.server.web.page.project.builds.detail.BuildTabContribution;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestSummaryContribution;
@@ -100,8 +100,8 @@ public class MarkdownModule extends AbstractPluginModule {
@Override
public void configure(WebApplication application) {
- application.mount(new BasePageMapper(
- "projects/${project}/builds/${build}/markdown/${report}",
+ application.mount(new ProjectPageMapper(
+ "${project}/~builds/${build}/markdown/${report}",
MarkdownReportPage.class));
}
diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xml
index 6cd0ec93fb..f1b893f9c3 100644
--- a/server-plugin/server-plugin-report-pmd/pom.xml
+++ b/server-plugin/server-plugin-report-pmd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xml
index d3251292fd..530be5381a 100644
--- a/server-plugin/server-plugin-report-problem/pom.xml
+++ b/server-plugin/server-plugin-report-problem/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java
index 8c9a9df6aa..9324e45c5b 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemModule.java
@@ -32,7 +32,7 @@ import io.onedev.server.model.ProblemMetric;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebApplicationConfigurator;
-import io.onedev.server.web.mapper.BasePageMapper;
+import io.onedev.server.web.mapper.ProjectPageMapper;
import io.onedev.server.web.page.layout.SidebarMenuItem;
import io.onedev.server.web.page.project.StatisticsMenuContribution;
import io.onedev.server.web.page.project.builds.detail.BuildTab;
@@ -113,9 +113,9 @@ public class ProblemModule extends AbstractPluginModule {
@Override
public void configure(WebApplication application) {
- application.mount(new BasePageMapper("projects/${project}/builds/${build}/problem/${report}",
+ application.mount(new ProjectPageMapper("${project}/~builds/${build}/problem/${report}",
ProblemReportPage.class));
- application.mount(new BasePageMapper("projects/${project}/stats/problem", ProblemStatsPage.class));
+ application.mount(new ProjectPageMapper("${project}/~stats/problem", ProblemStatsPage.class));
}
});
diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xml
index f90485ea96..03b38e807c 100644
--- a/server-plugin/server-plugin-report-spotbugs/pom.xml
+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xml
index 305afa7038..731a8b3454 100644
--- a/server-plugin/server-plugin-report-unittest/pom.xml
+++ b/server-plugin/server-plugin-report-unittest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java
index 794545b02e..e623ee5817 100644
--- a/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java
+++ b/server-plugin/server-plugin-report-unittest/src/main/java/io/onedev/server/plugin/report/unittest/UnitTestModule.java
@@ -22,7 +22,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.UnitTestMetric;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebApplicationConfigurator;
-import io.onedev.server.web.mapper.BasePageMapper;
+import io.onedev.server.web.mapper.ProjectPageMapper;
import io.onedev.server.web.page.layout.SidebarMenuItem;
import io.onedev.server.web.page.project.StatisticsMenuContribution;
import io.onedev.server.web.page.project.builds.detail.BuildTab;
@@ -82,9 +82,9 @@ public class UnitTestModule extends AbstractPluginModule {
@Override
public void configure(WebApplication application) {
- application.mount(new BasePageMapper("projects/${project}/builds/${build}/unit-test/${report}/test-suites", UnitTestSuitesPage.class));
- application.mount(new BasePageMapper("projects/${project}/builds/${build}/unit-test/${report}/test-cases", UnitTestCasesPage.class));
- application.mount(new BasePageMapper("projects/${project}/stats/unit-test", UnitTestStatsPage.class));
+ application.mount(new ProjectPageMapper("${project}/~builds/${build}/unit-test/${report}/test-suites", UnitTestSuitesPage.class));
+ application.mount(new ProjectPageMapper("${project}/~builds/${build}/unit-test/${report}/test-cases", UnitTestCasesPage.class));
+ application.mount(new ProjectPageMapper("${project}/~stats/unit-test", UnitTestStatsPage.class));
}
});
diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xml
index 19a21942c8..317b26403a 100644
--- a/server-plugin/server-plugin-sso-discord/pom.xml
+++ b/server-plugin/server-plugin-sso-discord/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index 321793e837..52630abc2e 100644
--- a/server-plugin/server-plugin-sso-openid/pom.xml
+++ b/server-plugin/server-plugin-sso-openid/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>
diff --git a/server-product/helm/README.md b/server-product/helm/README.md
index 84e98ed6c8..050536cd8c 100644
--- a/server-product/helm/README.md
+++ b/server-product/helm/README.md
@@ -1 +1 @@
-https://code.onedev.io/projects/162/blob/main/pages/deploy-into-k8s.md#installation-using-helm
+https://code.onedev.io/onedev/manual/files/main/pages/deploy-into-k8s.md#installation-using-helm
diff --git a/server-product/helm/values.yaml b/server-product/helm/values.yaml
index 884cadeec3..bf9ced4e00 100644
--- a/server-product/helm/values.yaml
+++ b/server-product/helm/values.yaml
@@ -1,5 +1,5 @@
## Set this as true to stop OneDev server to perform various maintenance tasks such as backup, restore.
-## Check https://code.onedev.io/projects/162/blob/main/pages/backup-restore.md for details
+## Check https://code.onedev.io/onedev/manual/~files/main/pages/backup-restore.md for details
maintenance: false
nodeSelector:
@@ -35,7 +35,7 @@ service:
annotations:
## Ingress support, check below for more info.
-## Check https://code.onedev.io/projects/162/blob/main/pages/deploy-into-k8s-with-helm.md#ingress-setup for details
+## Check https://code.onedev.io/onedev/manual/~files/main/pages/deploy-into-k8s-with-helm.md#ingress-setup for details
ingress:
## Optionally specify dns name to access OneDev via ingress controller
host: ""
@@ -54,7 +54,7 @@ ingress:
letsencrypt:
## Specify an email here to enable LetsEncrypt.
- ## Check https://code.onedev.io/projects/162/blob/main/pages/deploy-into-k8s-with-helm.md#letsencrypt-setup for details
+ ## Check https://code.onedev.io/onedev./server/~files/main/pages/deploy-into-k8s-with-helm.md#letsencrypt-setup for details
email: ""
resources:
diff --git a/server-product/pom.xml b/server-product/pom.xml
index fb7f4a2b9b..ea02c50e48 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>7.7.14</version>
+ <version>7.7.15</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
index fc4094fbb4..3d1659783c 100644
--- a/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
+++ b/server-product/src/main/java/io/onedev/server/product/DefaultServerConfig.java
@@ -65,18 +65,22 @@ public class DefaultServerConfig implements ServerConfig {
String httpPortStr = System.getenv(PROP_HTTP_PORT);
if (StringUtils.isBlank(httpPortStr))
httpPortStr = props.getProperty(PROP_HTTP_PORT);
- if (StringUtils.isNotBlank(httpPortStr))
+ if (StringUtils.isNotBlank(httpPortStr)) {
httpPort = Integer.parseInt(httpPortStr.trim());
- else
- throw new ExplicitException(PROP_HTTP_PORT + " should be specified");
+ } else {
+ logger.warn(PROP_HTTP_PORT + " not specified, default to 6610");
+ httpPort = 6610;
+ }
String sshPortStr = System.getenv(PROP_SSH_PORT);
if (StringUtils.isBlank(sshPortStr))
sshPortStr = props.getProperty(PROP_SSH_PORT);
- if (StringUtils.isNotBlank(sshPortStr))
+ if (StringUtils.isNotBlank(sshPortStr)) {
sshPort = Integer.parseInt(sshPortStr.trim());
- else
- throw new ExplicitException(PROP_SSH_PORT + " should be specified");
+ } else {
+ logger.warn(PROP_SSH_PORT + " not specified, default to 6611");
+ sshPort = 6611;
+ }
String trustCerts = System.getenv(PROP_TRUST_CERTS);
if (StringUtils.isBlank(trustCerts))
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductModule.java b/server-product/src/main/java/io/onedev/server/product/ProductModule.java
index bdbc38e2ba..0eff7d59c3 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductModule.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductModule.java
@@ -7,6 +7,9 @@ import static org.hibernate.cfg.AvailableSettings.URL;
import static org.hibernate.cfg.AvailableSettings.USER;
import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AbstractPluginModule;
@@ -16,6 +19,7 @@ import io.onedev.server.ServerConfig;
import io.onedev.server.jetty.ServerConfigurator;
import io.onedev.server.jetty.ServletConfigurator;
import io.onedev.server.persistence.HibernateConfig;
+import io.onedev.server.util.ProjectNameReservation;
public class ProductModule extends AbstractPluginModule {
@@ -52,6 +56,18 @@ public class ProductModule extends AbstractPluginModule {
contribute(ServerConfigurator.class, ProductConfigurator.class);
contribute(ServletConfigurator.class, ProductServletConfigurator.class);
+
+ contribute(ProjectNameReservation.class, new ProjectNameReservation() {
+
+ @Override
+ public Collection<String> getReserved() {
+ Set<String> reserved = new HashSet<>();
+ for (var file: new File(Bootstrap.getSiteDir(), "assets").listFiles())
+ reserved.add(file.getName());
+ return reserved;
+ }
+
+ });
}
}
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index a0c1566496..7c9fc5abf9 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -126,8 +126,8 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addServlet(new ServletHolder(new FileAssetServlet(file)), "/" + file.getName() + "/*");
}
- context.addServlet(new ServletHolder(jerseyServlet), "/api/*");
- context.addServlet(new ServletHolder(serverServlet), "/server");
+ context.addServlet(new ServletHolder(jerseyServlet), "/~api/*");
+ context.addServlet(new ServletHolder(serverServlet), "/~server");
}
}
diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.md
index 7fa7162145..5513650581 100644
--- a/server-product/system/incompatibilities/incompatibilities.md
+++ b/server-product/system/incompatibilities/incompatibilities.md
@@ -1,3 +1,13 @@
+# 7.8.0
+
+To be more user friendly, OneDev now uses project path instead of project id to access project via web UI, for instance `https://code.onedev.io/projects/160` has been changed to `https://code.onedev.io/onedev/server`. To avoid conflicting with this url scheme,
+other service urls have been re-organized and this causes two incompatibitlities:
+
+1. The RESTful api url now starts with `~api` instead of `api`, for instance url to access project information is now
+`/~api/projects/{projectId}` instead of `/api/projects/{projectId}`
+2. Agents can not upgrade itself for this version, as url connecting to server has been changed. You will need to re-download
+agent package from server if running in bare-metal mode, or re-pull the agent image if running in docker mode
+
# 7.7.0
OneDev server and agent now requires Java 11 or higher. Follow below steps to upgrade agent manually:
@@ -11,10 +21,10 @@ with Java 11 or higher following the instructions
### RESTful api
-1. A boolean property "confidential" must be added to create endpoint of [issue resource](/help/api/io.onedev.server.rest.IssueResource/create) to indicate whether or not the issue is confidential
+1. A boolean property "confidential" must be added to create endpoint of [issue resource](/~help/api/io.onedev.server.rest.IssueResource/create) to indicate whether or not the issue is confidential
# 7.3.5
-1. [RESTful api] Service desk name property of [project resource](/help/api/io.onedev.server.rest.ProjectResource) moved from basic info endpoint to setting endpoint
+1. [RESTful api] Service desk name property of [project resource](/~help/api/io.onedev.server.rest.ProjectResource) moved from basic info endpoint to setting endpoint
# 7.3.0
1. [CI/CD] Docker sock is NOT mounted by default for server docker executor, remote docker executor and Kubernetes
@@ -24,9 +34,9 @@ to only allow trusted jobs to use the executors
# 7.0.0
-1. [RESTful api] Email addresses of a user should now be retrieved via [UserResource.getEmailAddresses](/help/api/io.onedev.server.rest.UserResource/getEmailAddresses), and should be operated via [EmailAddressResource](/help/api/io.onedev.server.rest.EmailAddressResource)
-2. [RESTful api] Access token of a user should now be retrieved via [UserResource.getAccessToken](/help/api/io.onedev.server.rest.UserResource/getAccessToken)
-3. [RESTful api] User query by login name, full name and email should now be done via [UserResource.queryProfile](/help/api/io.onedev.server.rest.UserResource/queryProfile)
+1. [RESTful api] Email addresses of a user should now be retrieved via [UserResource.getEmailAddresses](/~help/api/io.onedev.server.rest.UserResource/getEmailAddresses), and should be operated via [EmailAddressResource](/~help/api/io.onedev.server.rest.EmailAddressResource)
+2. [RESTful api] Access token of a user should now be retrieved via [UserResource.getAccessToken](/~help/api/io.onedev.server.rest.UserResource/getAccessToken)
+3. [RESTful api] User query by login name, full name and email should now be done via [UserResource.queryProfile](/~help/api/io.onedev.server.rest.UserResource/queryProfile)
# 6.2.1
@@ -85,7 +95,7 @@ consideration. As a result of this, password authentication specified previously
1. Submodule authentication
- You will need to use custom http/ssh clone credential with permission to access submodule projects to retrieve source. Refer to [usage scenario](https://code.onedev.io/projects/162/blob/main/pages/clone-submodules-via-ssh.md) for an example.
+ You will need to use custom http/ssh clone credential with permission to access submodule projects to retrieve source. Refer to [usage scenario](https://code.onedev.io/onedev/manual/files/main/pages/clone-submodules-via-ssh.md) for an example.
2. Project dependency authentication
diff --git a/server-product/system/site/assets/root/robots.txt b/server-product/system/site/assets/robots.txt
similarity index 100%
rename from server-product/system/site/assets/root/robots.txt
rename to server-product/system/site/assets/robots.txt